diff --git a/README.md b/README.md index 634a995..9fc1c26 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,11 @@ ## Introduction Geopter is **opt**ical design software based on **geo**metrical ray tracing. -There have been developed several commercial software for optical design. They have advanced functionality to be a definitive choice for professional work, but their annual licensing fees are too expensive for private purpose. +There have been developed several commercial software for optical design nowadays. They have advanced functionality to deserve a definitive choice for professional work, while their annual licensing fees are too expensive for private purpose. -This is where free software comes in as the first option for those who got an interest in optics. Fortunately, more and more optical design libraries are being developed as open source projects these days. One of their drawbacks, however, is that they require matured programming skills to master how to use and sometimes to construct a complex environment. +This is why free software becomes the first option for those interested in optics. Fortunately, more and more optical design libraries are being developed as open source projects these days. One of their drawbacks, however, is that they require matured programming skills to master how to use and sometimes require to construct a complex environment. -Geopter aims to be somewhere in between. Geopter is freely available and its whole internal aspects are open to the public, as is common with open source projects. This fundamental feature allows anyone to use, learn, validate and even modify it on their own. It also features an intuitive graphical interface taking higher priority to make the users concentrate on the design workflow. +Geopter aims to be somewhere in between. As is common with open source projects,Geopter is freely available and its whole internal aspects are open to the public. This fundamental feature allows anyone to use, learn, validate and even modify it on their own. It also features an intuitive graphical interface taking higher priority to allow the user to concentrate on the design workflow. The primary user of Geopter could be a fresh optical engineer or a student who majors in optics. Geopter wishes to be a starting platform to gain an introductory experience in optical design. @@ -58,7 +58,7 @@ Please read [CONTRIBUTING](CONTRIBUTING.md) for details on our code of conduct, ## Contact -- Hiiragi [ e-mail ]() +- Hiiragi [ e-mail ](mailto:heterophyllus.work@gmail.com) ## Acknowledgement diff --git a/geopter/gui/AnalysisDlg/Layout2dDlg.cpp b/geopter/gui/AnalysisDlg/Layout2dDlg.cpp index 5bf3675..972fe01 100644 --- a/geopter/gui/AnalysisDlg/Layout2dDlg.cpp +++ b/geopter/gui/AnalysisDlg/Layout2dDlg.cpp @@ -19,7 +19,8 @@ Layout2dDlg::Layout2dDlg(OpticalSystem* sys, PlotViewDock *parent) : ui->editNumRays->setValidator(new QIntValidator(1, 20, this)); ui->editNumRays->setText(QString::number(10)); - //QObject::connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(onAccept())); + QObject::connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(onAccept())); + QObject::connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject())); } Layout2dDlg::~Layout2dDlg() @@ -28,13 +29,13 @@ Layout2dDlg::~Layout2dDlg() delete ui; } -/* -void LayoutDialog::onAccept() + +void Layout2dDlg::onAccept() { //updateParentDockContent(); accept(); } -*/ + void Layout2dDlg::updateParentDockContent() { diff --git a/geopter/gui/AnalysisDlg/Layout2dDlg.h b/geopter/gui/AnalysisDlg/Layout2dDlg.h index b0d6151..da2bc25 100644 --- a/geopter/gui/AnalysisDlg/Layout2dDlg.h +++ b/geopter/gui/AnalysisDlg/Layout2dDlg.h @@ -20,7 +20,7 @@ class Layout2dDlg : public AnalysisSettingDlg void updateParentDockContent() override; private slots: - //void onAccept(); + void onAccept(); private: Ui::Layout2dDlg *ui; diff --git a/geopter/gui/MainWindow.cpp b/geopter/gui/MainWindow.cpp index ad2d196..43864f8 100644 --- a/geopter/gui/MainWindow.cpp +++ b/geopter/gui/MainWindow.cpp @@ -308,7 +308,7 @@ void MainWindow::showFFTPSF() void MainWindow::showGeoMTF() { - QMessageBox::information(this,tr("Info"), tr("This is a test function. Be careful for the result")); + QMessageBox::information(this,tr("Info"), tr("This is a test function.")); showAnalysisPlot("Geometrical MTF"); } diff --git a/geopter/gui/SystemEditor/LensDataEditor/GridTableHeaderModel.cpp b/geopter/gui/SystemEditor/LensDataEditor/GridTableHeaderModel.cpp index b3f4ac7..bb3eda4 100644 --- a/geopter/gui/SystemEditor/LensDataEditor/GridTableHeaderModel.cpp +++ b/geopter/gui/SystemEditor/LensDataEditor/GridTableHeaderModel.cpp @@ -1,3 +1,6 @@ +//https://stackoverflow.com/questions/46469720/how-to-make-a-qheaderview-multilevel +//https://github.com/eyllanesc/stackoverflow/tree/master/questions/46469720 + #include "GridTableHeaderModel.h" #include diff --git a/geopter/gui/SystemEditor/LensDataEditor/GridTableHeaderModel.h b/geopter/gui/SystemEditor/LensDataEditor/GridTableHeaderModel.h index 1107d0f..7ae4ba8 100644 --- a/geopter/gui/SystemEditor/LensDataEditor/GridTableHeaderModel.h +++ b/geopter/gui/SystemEditor/LensDataEditor/GridTableHeaderModel.h @@ -1,3 +1,6 @@ +//https://stackoverflow.com/questions/46469720/how-to-make-a-qheaderview-multilevel +//https://github.com/eyllanesc/stackoverflow/tree/master/questions/46469720 + #ifndef GRIDTABLEHEADERMODEL_H #define GRIDTABLEHEADERMODEL_H diff --git a/geopter/gui/SystemEditor/LensDataEditor/GridTableHeaderView.cpp b/geopter/gui/SystemEditor/LensDataEditor/GridTableHeaderView.cpp index 3b8da67..4e60ba1 100644 --- a/geopter/gui/SystemEditor/LensDataEditor/GridTableHeaderView.cpp +++ b/geopter/gui/SystemEditor/LensDataEditor/GridTableHeaderView.cpp @@ -1,3 +1,7 @@ + +//https://stackoverflow.com/questions/46469720/how-to-make-a-qheaderview-multilevel +//https://github.com/eyllanesc/stackoverflow/tree/master/questions/46469720 + #include "GridTableHeaderView.h" #include "GridTableHeaderModel.h" @@ -10,7 +14,7 @@ GridTableHeaderView::GridTableHeaderView(Qt::Orientation orientation, int rows, QSize baseSectionSize; if (orientation == Qt::Horizontal) { baseSectionSize.setWidth(defaultSectionSize()); - baseSectionSize.setHeight(20); + baseSectionSize.setHeight(30); } else { baseSectionSize.setWidth(50); baseSectionSize.setHeight(defaultSectionSize()); diff --git a/geopter/gui/SystemEditor/LensDataEditor/GridTableHeaderView.h b/geopter/gui/SystemEditor/LensDataEditor/GridTableHeaderView.h index f246b18..9bee859 100644 --- a/geopter/gui/SystemEditor/LensDataEditor/GridTableHeaderView.h +++ b/geopter/gui/SystemEditor/LensDataEditor/GridTableHeaderView.h @@ -1,11 +1,11 @@ +//https://stackoverflow.com/questions/46469720/how-to-make-a-qheaderview-multilevel +//https://github.com/eyllanesc/stackoverflow/tree/master/questions/46469720 + #ifndef GRIDTABLEHEADERVIEW_H #define GRIDTABLEHEADERVIEW_H #include -//https://stackoverflow.com/questions/46469720/how-to-make-a-qheaderview-multilevel -//https://github.com/eyllanesc/stackoverflow/tree/master/questions/46469720 - class GridTableHeaderView : public QHeaderView { Q_OBJECT diff --git a/geopter/gui/SystemEditor/LensDataEditor/TableHeaderItem.cpp b/geopter/gui/SystemEditor/LensDataEditor/TableHeaderItem.cpp index 28ccb20..82a9e16 100644 --- a/geopter/gui/SystemEditor/LensDataEditor/TableHeaderItem.cpp +++ b/geopter/gui/SystemEditor/LensDataEditor/TableHeaderItem.cpp @@ -1,3 +1,6 @@ +//https://stackoverflow.com/questions/46469720/how-to-make-a-qheaderview-multilevel +//https://github.com/eyllanesc/stackoverflow/tree/master/questions/46469720 + #include "TableHeaderItem.h" TableHeaderItem::TableHeaderItem(TableHeaderItem *parent) diff --git a/geopter/gui/SystemEditor/LensDataEditor/TableHeaderItem.h b/geopter/gui/SystemEditor/LensDataEditor/TableHeaderItem.h index 0ccab29..06aa285 100644 --- a/geopter/gui/SystemEditor/LensDataEditor/TableHeaderItem.h +++ b/geopter/gui/SystemEditor/LensDataEditor/TableHeaderItem.h @@ -1,6 +1,9 @@ #ifndef TABLEHEADERITEM_H #define TABLEHEADERITEM_H +//https://stackoverflow.com/questions/46469720/how-to-make-a-qheaderview-multilevel +//https://github.com/eyllanesc/stackoverflow/tree/master/questions/46469720 + #include #include #include