Skip to content

Commit 5da5645

Browse files
committed
end support of saving .ini file format for mirror configs
1 parent cc239b2 commit 5da5645

File tree

3 files changed

+14
-56
lines changed

3 files changed

+14
-56
lines changed

dftfringe_fr.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2473,7 +2473,7 @@ Wave Length nm</source>
24732473
</message>
24742474
<message>
24752475
<location filename="mirrordlg.cpp" line="335"/>
2476-
<source>Read mirror configuratoin file</source>
2476+
<source>Read mirror configuration file</source>
24772477
<translation type="unfinished"></translation>
24782478
</message>
24792479
</context>

metricsdisplay.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ Conic:</string>
188188
<bool>false</bool>
189189
</property>
190190
<property name="toolTip">
191-
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Only computed if Artificial null is checked in Mirror Configuratoin.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
191+
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Only computed if Artificial null is checked in Mirror Configuration.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
192192
</property>
193193
<property name="frameShape">
194194
<enum>QFrame::Panel</enum>

mirrordlg.cpp

Lines changed: 12 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -185,65 +185,23 @@ void mirrorDlg:: on_saveBtn_clicked()
185185
{
186186
QSettings settings;
187187
QString path = settings.value("mirrorConfigFile").toString();
188-
if (m_useAnnular){
189-
path.replace(".ini",".json");
190-
}
191-
QString extensionTypes(tr((m_useAnnular)? "config file (*.json)" : "config file (*.ini *.json)"));
192-
QString fileName = QFileDialog::getSaveFileName(0,
188+
QString extensionTypes("config file (*.json)");
189+
QString fileName = QFileDialog::getSaveFileName(this,
193190
tr("Save config file"), path,
194191
extensionTypes);
195-
if (fileName.isEmpty())
196-
return;
197-
if (QFileInfo(fileName).suffix().isEmpty()) { fileName.append(".json"); }
198-
std::ofstream file(fileName.toStdString().c_str(),std::ios_base::out|std::ios_base::binary);
199-
if (!file.is_open()) {
200-
QMessageBox::warning(0, tr("Save mirror config."),
201-
tr("Cannot write file %1: ")
202-
.arg(fileName));
192+
if (fileName.isEmpty()){
193+
// cancel has been pressed
203194
return;
204195
}
205-
if (fileName.endsWith(".json" )){
206-
saveJson(fileName);
207-
}
208-
else {
209-
if (m_useAnnular){
210-
QMessageBox::warning(0, tr("Save Mirror config."),
211-
tr(".ini file can not save annular data. Chose file type of .json instead"));
212-
return;
213-
}
214-
const unsigned char flag[] = {0xFF,0xFE,0xFF};
215-
const unsigned char zeros[] = {0,0,0,0};
216-
file.write((char*)flag,3);
217-
218-
int cnt = m_name.length();
219-
220-
file.write((char*)(&cnt),1);
221-
const ushort *m = m_name.utf16();
222-
file.write((char*)m,2 * cnt);
223-
file.write((char *)&doNull, 1); // OpenFringe size of bool was 4 bytes but modern size is 1;
224-
file.write((char *)zeros, 3); // fill out to size of 4 bytes;
225-
226-
file.write((char*)&fringeSpacing,8);
227-
file.write((char*)&diameter,8);
228-
file.write((char*)&lambda,8);
229-
file.write((char*)&mm,4);
230-
file.write((char*)&obs,8);
231-
file.write((char*)&roc,8);
232-
file.write((char*)&cc,8);
233-
file.write((char*)&z8,8);
234-
file.write((char*)&zeros,4); // double pass
235-
file.write((char*)&zeros,4); // two colors traced
236-
file.write((char*)&fliph,1); // flip lr
237-
file.write((char*)&zeros,3); // remainder of flip
238-
file.write((char*)&flipv,1);
239-
file.write((char*)&zeros,3); // remainder vr
240-
file.write((char*)&m_outlineShape,4); // use ellipse
241-
file.write((char*)&m_verticalAxis,8); // minor axis
242-
243-
file.close();
196+
if (!fileName.endsWith(".json" )){
197+
// filename.extension => filename.extension.json
198+
// filename => filename.json
199+
// filename.json => filename.json (unchanged)
200+
fileName.append(".json");
244201
}
202+
saveJson(fileName);
245203
QFileInfo info(fileName);
246-
settings.setValue("mirrorConfigFile",fileName);
204+
settings.setValue("mirrorConfigFile", fileName);
247205
settings.setValue("projectPath", info.absolutePath());
248206
m_projectPath = info.absolutePath();
249207
}
@@ -484,7 +442,7 @@ void mirrorDlg::on_ReadBtn_clicked()
484442
QSettings settings;
485443
QString lastPath = settings.value("lastPath",".").toString();
486444
QString fileName = QFileDialog::getOpenFileName(this,
487-
tr("Read mirror configuratoin file"), lastPath,
445+
tr("Read mirror configuration file"), lastPath,
488446
tr("ini (*.ini *.json)"));
489447
if (fileName.isEmpty())
490448
return;

0 commit comments

Comments
 (0)