Merge pull request #160 from githubdoe/mirror_config_bug

Mirror config bug

Author: gr5

RevisionHistory.html

@@ -409,7 +409,7 @@
 </ul>
 </ul>
 
-<ul><li>Version 7.2.2</li>
+<ul><li>Version 7.2.3</li>
 <ul>
 <li>Improved DLL dependencies behavior for developers</li>
 <li>Fixed a bug in mirror config when switching between inch and millimeter</li>

mirrordlg.cpp

@@ -305,10 +305,10 @@ void mirrorDlg::loadFile(QString & fileName){
         m_verticalAxis = QJsonValue(Ellipse["ellipse vert axis"]).toDouble();
         QJsonObject Annulus = loadDoc["Annulus"].toObject();
         m_useAnnular = QJsonValue(Annulus["use annular Zernike values"]).toBool();
-        m_annularObsPercent = QJsonValue(Annulus["obs percentage"]).toDouble() * 100.;
+        m_annularObsPercent = QJsonValue(Annulus["obs percentage"]).toDouble();
         ui->useAnnulus->setChecked(m_useAnnular);
-        ui->annulusPercent->setValue(m_annularObsPercent);
-        on_annulusPercent_valueChanged(m_annularObsPercent);
+        ui->annulusPercent->setValue(m_annularObsPercent * 100);
+        on_annulusPercent_valueChanged(m_annularObsPercent * 100);
         enableAnnular(m_useAnnular);
 
         ui->fringeSpacingEdit->blockSignals(true);

mirrordlg.h

@@ -53,7 +53,7 @@ class mirrorDlg : public QDialog
     bool fliph;
     bool m_useAnnular;
     bool m_connectAnnulusToObs;
-    double m_annularObsPercent;
+    double m_annularObsPercent; // a value from 0 to 1 (not 0 to 100)
     double m_clearAperature;
     double aperatureReduction;
     static QString m_projectPath;