Skip to content

Commit c26ea0b

Browse files
committed
winapp rtknavi: remove dup labels, update tab order, fix some options
Remove some duplicate labels or unused labels. Improve the tab orderings. Reorganise the GUI layout descriptions to be closer to the order of presentation, closer to the tab ordering. The development tools do not maintain an order, but it is tedious to try to use the graphical development tools to obtain consistent layout. Improve the layout alignments. Add file loading for the BLQ file. Fix the loading and saving of the BLQ and proxy address config options. Fix viewing of the DCB file. The method was missing and it was using the station position file. Add rtklib.h to a few header files. Correct solution sstat and trace options. The state for these was duplicated in other variables and not always being set in the solopt_t object. Remove this duplication to resolve this. rtkconv: default to RINEX 3.04, and enable all signal types rtkpost: increase the number of input files from 6 to 10, matching the qt app. Update the frequency dialog to include the 6th index and BDS B2ab. srvtblbrows: Expand the cast list width to better view long URLs. Strip trailing carriage returns from URLs. Remove some unused variables, to quieten compiler warnings.
1 parent 14dd080 commit c26ea0b

32 files changed

Lines changed: 3173 additions & 2730 deletions

app/qtapp/rtkconv_qt/convopt.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ void ConvOptDialog::loadOptions(QSettings &ini)
248248
{
249249
QString mask = "1111111111111111111111111111111111111111111111111111111111111111111111";
250250

251-
rinexVersion = ini.value("opt/rnxver", 6).toInt();
251+
rinexVersion = ini.value("opt/rnxver", 7).toInt();
252252
rinexFile = ini.value("opt/rnxfile", 0).toInt();
253253
rinexStationCode = ini.value("opt/rnxcode", "0000").toString();
254254
runBy = ini.value("opt/runby", "").toString();
@@ -273,8 +273,8 @@ void ConvOptDialog::loadOptions(QSettings &ini)
273273
comment[1] = ini.value("opt/comment1", "").toString();
274274
receiverOptions = ini.value("opt/rcvoption", "").toString();
275275
navSys = ini.value("opt/navsys", 0xff).toInt();
276-
observationType = ini.value("opt/obstype", 0xF).toInt();
277-
frequencyType = ini.value("opt/freqtype", 0x7).toInt();
276+
observationType = ini.value("opt/obstype", OBSTYPE_ALL).toInt();
277+
frequencyType = ini.value("opt/freqtype", FREQTYPE_ALL).toInt();
278278
excludedSatellites = ini.value("opt/exsats", "").toString();
279279
traceLevel = ini.value("opt/tracelevel", 0).toInt();
280280
rinexTime.time = ini.value("opt/rnxtime", 0).toInt();

app/qtapp/rtkconv_qt/convopt.ui

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,27 +764,39 @@
764764
<property name="text">
765765
<string>L3</string>
766766
</property>
767+
<property name="checked">
768+
<bool>true</bool>
769+
</property>
767770
</widget>
768771
</item>
769772
<item>
770773
<widget class="QCheckBox" name="cBFreq4">
771774
<property name="text">
772775
<string>L4</string>
773776
</property>
777+
<property name="checked">
778+
<bool>true</bool>
779+
</property>
774780
</widget>
775781
</item>
776782
<item>
777783
<widget class="QCheckBox" name="cBFreq5">
778784
<property name="text">
779785
<string>L5</string>
780786
</property>
787+
<property name="checked">
788+
<bool>true</bool>
789+
</property>
781790
</widget>
782791
</item>
783792
<item>
784793
<widget class="QCheckBox" name="cBFreq6">
785794
<property name="text">
786795
<string>L6</string>
787796
</property>
797+
<property name="checked">
798+
<bool>true</bool>
799+
</property>
788800
</widget>
789801
</item>
790802
<item>

0 commit comments

Comments
 (0)