Index: trunk/BNC/src/bncwindow.cpp
===================================================================
--- trunk/BNC/src/bncwindow.cpp (revision 6661)
+++ trunk/BNC/src/bncwindow.cpp (revision 6662)
@@ -643,5 +643,5 @@
gLayout->addWidget(new QLabel("General settings for logfile, file handling, configuration on-the-fly, and auto-start."),0, 0, 1, 50);
gLayout->addWidget(new QLabel("Logfile (full path)"), 1, 0);
- gLayout->addWidget(_logFileLineEdit, 1, 1, 1,30);
+ gLayout->addWidget(_logFileLineEdit, 1, 1, 1,20);
gLayout->addWidget(new QLabel("Append files"), 2, 0);
gLayout->addWidget(_rnxAppendCheckBox, 2, 1);
@@ -651,5 +651,5 @@
gLayout->addWidget(_autoStartCheckBox, 4, 1);
gLayout->addWidget(new QLabel("Raw output file (full path)"), 5, 0);
- gLayout->addWidget(_rawOutFileLineEdit, 5, 1, 1,30);
+ gLayout->addWidget(_rawOutFileLineEdit, 5, 1, 1,20);
gLayout->addWidget(new QLabel(""), 6, 1);
gLayout->setRowStretch(7, 999);
@@ -666,5 +666,5 @@
oLayout->addWidget(new QLabel("Saving RINEX observation files."),0, 0, 1,50);
oLayout->addWidget(new QLabel("Directory"), 1, 0);
- oLayout->addWidget(_rnxPathLineEdit, 1, 1, 1, 20);
+ oLayout->addWidget(_rnxPathLineEdit, 1, 1, 1, 15);
oLayout->addWidget(new QLabel("Interval"), 2, 0);
oLayout->addWidget(_rnxIntrComboBox, 2, 1);
@@ -674,5 +674,5 @@
oLayout->addWidget(_rnxSkelLineEdit, 3, 1, Qt::AlignLeft);
oLayout->addWidget(new QLabel("Script (full path)"), 4, 0);
- oLayout->addWidget(_rnxScrpLineEdit, 4, 1, 1, 20);
+ oLayout->addWidget(_rnxScrpLineEdit, 4, 1, 1, 15);
oLayout->addWidget(new QLabel("Version 2"), 5, 0);
oLayout->addWidget(_rnxV2Priority, 5, 1, 1, 2);
@@ -715,5 +715,5 @@
cLayout->addWidget(new QLabel("Saving Broadcast Ephemeris correction files and correction output through IP port."),0,0,1,70);
cLayout->addWidget(new QLabel("Directory, ASCII"), 1, 0);
- cLayout->addWidget(_corrPathLineEdit, 1, 1, 1,20);
+ cLayout->addWidget(_corrPathLineEdit, 1, 1, 1,30);
cLayout->addWidget(new QLabel("Interval"), 2, 0);
cLayout->addWidget(_corrIntrComboBox, 2, 1);
@@ -741,5 +741,5 @@
sLayout->addWidget(_binSamplSpinBox, 2, 1, Qt::AlignLeft);
sLayout->addWidget(new QLabel("File (full path)"), 3, 0);
- sLayout->addWidget(_outFileLineEdit, 3, 1, 1, 20);
+ sLayout->addWidget(_outFileLineEdit, 3, 1, 1, 10);
sLayout->addWidget(new QLabel("Port (unsynchronized)"), 4, 0);
sLayout->addWidget(_outUPortLineEdit, 4, 1);
@@ -862,5 +862,5 @@
pppLayout1->addWidget(_pppWidgets._logFile, ir, 4);
++ir;
- pppLayout1->addWidget(new QLabel("ANTEX"), ir, 0);
+ pppLayout1->addWidget(new QLabel("ANTEX file"), ir, 0);
pppLayout1->addWidget(_pppWidgets._antexFile, ir, 1);
@@ -874,5 +874,6 @@
pppLayout1->addWidget(new QLabel(" Sampling"), ir, 5);
pppLayout1->addWidget(_pppWidgets._snxtroSampl, ir, 6);
-
+ pppLayout1->addWidget(new QLabel(""), ir, 7);
+ ++ir;
++ir;
pppLayout1->setRowStretch(ir, 999);
@@ -1064,5 +1065,5 @@
_sp3CompFileChooser->setWhatsThis(tr("Specify the full path to two files with orbits and clocks in SP3 format, separate them by comma."));
_sp3CompFileChooser->setMinimumWidth(15*ww);
- _sp3CompFileChooser->setMaximumWidth(50*ww);
+ _sp3CompFileChooser->setMaximumWidth(40*ww);
_sp3CompExclude = new QLineEdit(settings.value("sp3CompExclude").toString());
@@ -1105,24 +1106,19 @@
populateCmbTable();
- cmbLayout->addWidget(_cmbTable, 0, 0, 6, 3);
- cmbLayout->addWidget(new QLabel(" "), 0, 5);
- cmbLayout->addWidget(new QLabel("Combine Broadcast Correction streams."), 0, 6, 1, 10);
- cmbLayout->addWidget(new QLabel(" "), 1, 5);
- cmbLayout->addWidget(addCmbRowButton, 1, 6);
- cmbLayout->addWidget(delCmbRowButton, 1, 7);
- cmbLayout->addWidget(new QLabel(" "), 2, 5);
- cmbLayout->addWidget(new QLabel("Method"), 2, 6, Qt::AlignRight);
- cmbLayout->addWidget(_cmbMethodComboBox, 2, 7, Qt::AlignRight);
- cmbLayout->addWidget(new QLabel(" "), 3, 5);
- cmbLayout->addWidget(new QLabel("Maximal residuum"), 3, 6, Qt::AlignRight);
- cmbLayout->addWidget(_cmbMaxresLineEdit, 3, 7, Qt::AlignRight);
- cmbLayout->addWidget(new QLabel("ANTEX"), 3, 9, Qt::AlignRight);
- cmbLayout->addWidget(_cmbAntexFile, 3, 10);
- cmbLayout->addWidget(new QLabel(" "), 4, 5);
- cmbLayout->addWidget(new QLabel("Sampling"), 4, 6, Qt::AlignRight);
- cmbLayout->addWidget(_cmbSamplSpinBox, 4, 7, Qt::AlignRight);
- cmbLayout->addWidget(new QLabel("Use Glonass"), 4, 9, Qt::AlignRight);
- cmbLayout->addWidget(_cmbUseGlonass, 4, 10);
- cmbLayout->addWidget(new QLabel(" "), 5, 0);
+ cmbLayout->addWidget(_cmbTable, 0, 0, 7, 3);
+ cmbLayout->addWidget(new QLabel(" Combine Broadcast Correction streams."), 1, 6, 1, 10);
+ cmbLayout->addWidget(addCmbRowButton, 2, 6);
+ cmbLayout->addWidget(delCmbRowButton, 2, 7);
+ cmbLayout->addWidget(new QLabel("Method"), 3, 6, Qt::AlignRight);
+ cmbLayout->addWidget(_cmbMethodComboBox, 3, 7, Qt::AlignRight);
+ cmbLayout->addWidget(new QLabel(" Maximal residuum"), 4, 6, Qt::AlignRight);
+ cmbLayout->addWidget(_cmbMaxresLineEdit, 4, 7, Qt::AlignRight);
+ cmbLayout->addWidget(new QLabel("ANTEX file"), 4, 8, Qt::AlignRight);
+ cmbLayout->addWidget(_cmbAntexFile, 4, 9, 1, 7);
+ cmbLayout->addWidget(new QLabel("Sampling"), 5, 6, Qt::AlignRight);
+ cmbLayout->addWidget(_cmbSamplSpinBox, 5, 7, Qt::AlignRight);
+ cmbLayout->addWidget(new QLabel(" Use GLONASS"), 5, 8, Qt::AlignRight);
+ cmbLayout->addWidget(_cmbUseGlonass, 5, 9);
+ cmbLayout->setRowStretch(6, 999);
connect(addCmbRowButton, SIGNAL(clicked()), this, SLOT(slotAddCmbRow()));
@@ -1182,6 +1178,5 @@
uploadLayoutEph->addWidget(new QLabel("Uploaded"), 4, 0);
uploadLayoutEph->addWidget(_uploadEphBytesCounter, 4, 1);
- uploadLayoutEph->addWidget(new QLabel(" "), 5, 0);
- uploadLayoutEph->addWidget(new QLabel(" "), 6, 0);
+ uploadLayoutEph->setRowStretch(5, 999);
uploadEphgroup->setLayout(uploadLayoutEph);
@@ -1281,5 +1276,4 @@
_actStart->setWhatsThis(tr(" Start running BNC.
"));
_actStop->setWhatsThis(tr(" Stop running BNC.
"));
-// Weber
// Enable/Disable all Widgets