Changeset 3768 in ntrip

Timestamp:

Apr 4, 2012, 9:20:46 AM (13 years ago)

Author:

weber

Message:

Design modified

File:

• trunk/BNC/bncwindow.cpp (modified) (7 diffs)

trunk/BNC/bncwindow.cpp

@@ -859 +859 @@
 
   int ir = 0;
-  pppLayout->addWidget(new QLabel("Precise Point Positioning, Panel 1"), ir, 0, 1, 80);
+  pppLayout->addWidget(new QLabel("Precise Point Positioning, Panel 1."), ir, 0, 1, 80);
   ++ir;
   pppLayout->addWidget(new QLabel("Obs Mountpoint"),   ir, 0, 1, 10);
@@ -908 +908 @@
   QGridLayout* ppp2Layout = new QGridLayout;
   ir = 0;
-  ppp2Layout->addWidget(new QLabel("Precise Point Positioning, Panel 2"), ir, 0, 1, 8);
+  ppp2Layout->addWidget(new QLabel("Precise Point Positioning, Panel 2."), ir, 0, 1, 8);
   ++ir;
   ppp2Layout->addWidget(new QLabel("Antennas"),               ir, 0);
@@ -988 +988 @@
 
   ir = 0;
+  teqcLayout->addWidget(new QLabel("Teqc-processing."),         ir, 0, 1, 10);
+  ++ir;
   teqcLayout->addWidget(new QLabel("Action"),                   ir, 0);
   teqcLayout->addWidget(_teqcActionComboBox,                    ir, 1);
@@ -994 +996 @@
   ++ir;
   teqcLayout->addWidget(new QLabel("Input files (full path)"),  ir, 0);
-  teqcLayout->addWidget(_teqcObsFileChooser,                    ir, 1);
-  teqcLayout->addWidget(new QLabel("Obs   "),                   ir, 2);
-  teqcLayout->addWidget(_teqcNavFileChooser,                    ir, 3);
-  teqcLayout->addWidget(new QLabel("Nav   "),                   ir, 4);
+  teqcLayout->addWidget(_teqcObsFileChooser,                    ir, 1, 1, 4);
+  teqcLayout->addWidget(new QLabel("Obs "),                     ir, 5);
+  teqcLayout->addWidget(_teqcNavFileChooser,                    ir, 6, 1, 5);
+  teqcLayout->addWidget(new QLabel("Nav"),                      ir, 11);
   ++ir;
   teqcLayout->addWidget(new QLabel("Output file (full path)"),  ir, 0);
-  teqcLayout->addWidget(_teqcOutLineEdit,                       ir, 1, 1, 2);
-  teqcLayout->addWidget(new QLabel("Teqc-processing, input, output, options."), 3, 0, 1, 5);
+  teqcLayout->addWidget(_teqcOutLineEdit,                       ir, 1, 1, 4);
+  ++ir;
+  teqcLayout->addWidget(new QLabel(" "),                        ir, 0);
+  ++ir;
+  teqcLayout->addWidget(new QLabel(" "),                        ir, 0);
+  ++ir;
+  teqcLayout->addWidget(new QLabel(" "),                        ir, 0);
 
   teqcgroup->setLayout(teqcLayout);
@@ -1013 +1020 @@
 
   populateCmbTable();
-//cmbLayout->addWidget(new QLabel(" "),                                              0, 0);
   cmbLayout->addWidget(_cmbTable,                                                    0, 0, 6, 3);
   cmbLayout->addWidget(new QLabel("Combine Broadcast Ephemeris correction streams."),0, 5, 1, 5);
@@ -1052 +1058 @@
   populateUploadTable();
 
+  uploadLayout->addWidget(new QLabel("Upload orbit/clock stream coming from Real-time Network Engine or upload orbit/clock combination stream."));
   uploadLayout->addWidget(_uploadTable);
   uploadLayout->addLayout(uploadHlpLayout);
-  uploadLayout->addWidget(new QLabel("Upload orbit/clock stream coming from Real-time Network Engine or upload orbit/clock combination stream."));
 
   uploadgroup->setLayout(uploadLayout);
@@ -1067 +1073 @@
   _uploadEphMountpointLineEdit->setMaximumWidth(12*ww);
 
-  uploadLayoutEph->addWidget(new QLabel("Host"),                  0, 0);
-  uploadLayoutEph->addWidget(_uploadEphHostLineEdit,              0, 1, 1, 3);
-  uploadLayoutEph->addWidget(new QLabel("  Port"),                0, 4, Qt::AlignRight);
-  uploadLayoutEph->addWidget(_uploadEphPortLineEdit,              0, 5, 1, 1);
-  uploadLayoutEph->addWidget(new QLabel("Mountpoint           "), 1, 0);
-  uploadLayoutEph->addWidget(_uploadEphMountpointLineEdit,        1, 1);
-  uploadLayoutEph->addWidget(new QLabel("          Password"),    1, 2, Qt::AlignRight);
-  uploadLayoutEph->addWidget(_uploadEphPasswordLineEdit,          1, 3);
-  uploadLayoutEph->addWidget(new QLabel("Sampling"),              2, 0);
-  uploadLayoutEph->addWidget(_uploadEphSampleSpinBox,             2, 1);
-  uploadLayoutEph->addWidget(new QLabel("Upload concatenated RTCMv3 Broadcast Ephemeris to caster."), 3, 0, 1, 5);
-  uploadLayoutEph->addWidget(_uploadEphBytesCounter, 3, 5); 
+  uploadLayoutEph->addWidget(new QLabel("Upload concatenated RTCMv3 Broadcast Ephemeris to caster."), 0, 0, 1, 18);
+  uploadLayoutEph->addWidget(new QLabel("Host"),                  1, 0);
+  uploadLayoutEph->addWidget(_uploadEphHostLineEdit,              1, 1, 1, 3);
+  uploadLayoutEph->addWidget(new QLabel("  Port"),                1, 4, Qt::AlignRight);
+  uploadLayoutEph->addWidget(_uploadEphPortLineEdit,              1, 5, 1, 1);
+  uploadLayoutEph->addWidget(new QLabel("Mountpoint           "), 2, 0);
+  uploadLayoutEph->addWidget(_uploadEphMountpointLineEdit,        2, 1);
+  uploadLayoutEph->addWidget(new QLabel("          Password"),    2, 2, Qt::AlignRight);
+  uploadLayoutEph->addWidget(_uploadEphPasswordLineEdit,          2, 3);
+  uploadLayoutEph->addWidget(new QLabel("Sampling"),              3, 0);
+  uploadLayoutEph->addWidget(_uploadEphSampleSpinBox,             3, 1);
+  uploadLayoutEph->addWidget(new QLabel("Uploaded"),              4, 0);
+  uploadLayoutEph->addWidget(_uploadEphBytesCounter,              4, 1); 
+  uploadLayoutEph->addWidget(new QLabel(" "),                     5, 0);
+  uploadLayoutEph->addWidget(new QLabel(" "),                     6, 0);
 
   uploadEphgroup->setLayout(uploadLayoutEph);