Skip to content

Commit 161d8aa

Browse files
authored
Merge pull request #768 from ourairquality/nmea-nma
rtkplot: recognise file extension nma as nmea
2 parents 2919afd + 10fc00e commit 161d8aa

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

app/qtapp/rtkplot_qt/fileseldlg.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
</property>
8383
<item>
8484
<property name="text">
85-
<string>Position File (*.pos *.nmea)</string>
85+
<string>Position File (*.pos *.nmea *.nma)</string>
8686
</property>
8787
</item>
8888
<item>

app/qtapp/rtkplot_qt/plotmain.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -670,14 +670,14 @@ void Plot::openSolution1()
670670
{
671671
trace(3, "openSolution1\n");
672672

673-
readSolution(QStringList(QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open Solution 1"), solutionFiles[0].value(0), tr("Solution File (*.pos *.stat *.nmea *.txt *.ubx);;All (*.*)")))), 0);
673+
readSolution(QStringList(QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open Solution 1"), solutionFiles[0].value(0), tr("Solution File (*.pos *.stat *.nmea *.nma *.txt *.ubx);;All (*.*)")))), 0);
674674
}
675675
// callback on menu-open-solution-2 -----------------------------------------
676676
void Plot::openSolution2()
677677
{
678678
trace(3, "openSolution2\n");
679679

680-
readSolution(QStringList(QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open Solution 2"), solutionFiles[1].value(0), tr("Solution File (*.pos *.stat *.nmea *.txt *.ubx);;All (*.*)")))), 1);
680+
readSolution(QStringList(QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open Solution 2"), solutionFiles[1].value(0), tr("Solution File (*.pos *.stat *.nmea *.nma *.txt *.ubx);;All (*.*)")))), 1);
681681
}
682682
// callback on menu-open-map-image ------------------------------------------
683683
void Plot::openMapImage()

app/qtapp/rtkplot_qt/plotmain.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,7 @@
984984
<widget class="QComboBox" name="cBFilter">
985985
<item>
986986
<property name="text">
987-
<string>Position File (*.pos *.nmea)</string>
987+
<string>Position File (*.pos *.nmea *.nma)</string>
988988
</property>
989989
</item>
990990
<item>

app/winapp/rtkplot/fileseldlg.dfm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ object FileSelDialog: TFileSelDialog
129129
Height = 21
130130
Align = alClient
131131
FileList = FileList
132-
Filter = 'All (*.*)|*.*|Position File (*.pos, *.nmea)|*.pos;*.nmea'
132+
Filter = 'All (*.*)|*.*|Position File (*.pos, *.nmea, *.nma)|*.pos;*.nmea;*.nma'
133133
TabOrder = 0
134134
OnClick = FilterClick
135135
end

app/winapp/rtkplot/plotmain.dfm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ object Plot: TPlot
192192
OnChange = FileMaskChange
193193
Items.Strings = (
194194
'Solution (*.pos)'
195-
'NMEA (*.nmea)'
195+
'NMEA (*.nmea *.nma)'
196196
'Solution Status (*.stat)'
197197
'All (*.*)')
198198
end
@@ -1745,8 +1745,8 @@ object Plot: TPlot
17451745
end
17461746
object OpenSolDialog: TOpenDialog
17471747
Filter =
1748-
'Solution File (*.pos, *.stat, *.nmea, *.txt, *.ubx))|*.pos;*.sta' +
1749-
't;*.nmea;*.txt;*.ubx|All (*.*)|*.*'
1748+
'Solution File (*.pos, *.stat, *.nmea, *.nma, *.txt, *.ubx))|*.pos;*.sta' +
1749+
't;*.nmea;*.nma;*.txt;*.ubx|All (*.*)|*.*'
17501750
Options = [ofHideReadOnly, ofNoChangeDir, ofAllowMultiSelect, ofEnableSizing]
17511751
Title = 'Open Solution'
17521752
Left = 274

0 commit comments

Comments
 (0)