Index: trunk/BNC/bncwindow.cpp
===================================================================
--- trunk/BNC/bncwindow.cpp (revision 3597)
+++ trunk/BNC/bncwindow.cpp (revision 3598)
@@ -910,49 +910,46 @@
_pppSPPComboBox->setMaximumWidth(8*ww);
_pppNMEAPortLineEdit->setMaximumWidth(6*ww);
- pppLayout->addWidget(new QLabel("Obs Mountpoint"), 0, 0);
- pppLayout->addWidget(_pppMountLineEdit, 0, 1);
- pppLayout->addWidget(_pppSPPComboBox, 0, 2);
- pppLayout->addWidget(new QLabel(" X "), 0, 3, Qt::AlignRight);
- pppLayout->addWidget(_pppRefCrdXLineEdit, 0, 4);
- pppLayout->addWidget(new QLabel(" Y "), 0, 5, Qt::AlignRight);
- pppLayout->addWidget(_pppRefCrdYLineEdit, 0, 6);
- pppLayout->addWidget(new QLabel(" Z "), 0, 7, Qt::AlignRight);
- pppLayout->addWidget(_pppRefCrdZLineEdit, 0, 8);
- pppLayout->addWidget(new QLabel("Corr Mountpoint "), 1, 0);
- pppLayout->addWidget(_pppCorrMountLineEdit, 1, 1);
- pppLayout->addWidget(new QLabel(" dN "), 1, 3, Qt::AlignRight);
- pppLayout->addWidget(_pppRefdNLineEdit, 1, 4);
- pppLayout->addWidget(new QLabel(" dE "), 1, 5, Qt::AlignRight);
- pppLayout->addWidget(_pppRefdELineEdit, 1, 6);
- pppLayout->addWidget(new QLabel(" dU "), 1, 7, Qt::AlignRight);
- pppLayout->addWidget(_pppRefdULineEdit, 1, 8);
- pppLayout->addWidget(new QLabel("Options"), 2, 0, 1, 5);
- pppLayout->addWidget(_pppUsePhaseCheckBox, 2, 1, Qt::AlignRight);
- pppLayout->addWidget(new QLabel("Use phase obs"), 2, 2);
- pppLayout->addWidget(_pppEstTropoCheckBox, 2, 3, Qt::AlignRight);
- pppLayout->addWidget(new QLabel("Estimate tropo"), 2, 4);
- pppLayout->addWidget(_pppGLONASSCheckBox, 2, 5, Qt::AlignRight);
- pppLayout->addWidget(new QLabel("Use GLONASS"), 2, 6);
- pppLayout->addWidget(_pppGalileoCheckBox, 2, 7, Qt::AlignRight);
- pppLayout->addWidget(new QLabel("Use Galileo "), 2, 8);
- pppLayout->addWidget(new QLabel("Options cont'd"), 3, 0);
- pppLayout->addWidget(_pppSigCrd0, 3, 1, Qt::AlignRight);
- pppLayout->addWidget(new QLabel("Sigma XYZ Init "), 3, 2);
- pppLayout->addWidget(_pppSigCrdP, 3, 3, Qt::AlignRight);
- pppLayout->addWidget(new QLabel("Sigma XYZ Noise "), 3, 4);
- pppLayout->addWidget(_pppQuickStartLineEdit, 3, 5, Qt::AlignRight);
- pppLayout->addWidget(new QLabel("Quick-Start (sec) "), 3, 6);
- pppLayout->addWidget(_pppMaxSolGapLineEdit, 3, 7, Qt::AlignRight);
- pppLayout->addWidget(new QLabel("Max Sol. Gap (sec)"), 3, 8);
- pppLayout->addWidget(new QLabel("Output"), 4, 0);
- pppLayout->addWidget(_pppNMEALineEdit, 4, 1, 1, 3);
- pppLayout->addWidget(new QLabel("NMEA File"), 4, 4);
- pppLayout->addWidget(_pppNMEAPortLineEdit, 4, 5, Qt::AlignRight);
- pppLayout->addWidget(new QLabel("NMEA Port"), 4, 6);
- pppLayout->addWidget(_pppPlotCoordinates, 4, 7, Qt::AlignRight);
- pppLayout->addWidget(new QLabel("PPP Plot"), 4, 8);
-
-
- pppLayout->addWidget(new QLabel("Coordinates from Precise Point Positioning (PPP)."),5, 0,1,5);
+ int ir = 0;
+ pppLayout->addWidget(new QLabel("Precise Point Positioning (Panel 1)"), ir, 0);
+ ++ir;
+ pppLayout->addWidget(new QLabel("Obs Mountpoint"), ir, 0);
+ pppLayout->addWidget(_pppMountLineEdit, ir, 1);
+ pppLayout->addWidget(_pppSPPComboBox, ir, 2);
+ pppLayout->addWidget(new QLabel(" X "), ir, 3, Qt::AlignRight);
+ pppLayout->addWidget(_pppRefCrdXLineEdit, ir, 4);
+ pppLayout->addWidget(new QLabel(" Y "), ir, 5, Qt::AlignRight);
+ pppLayout->addWidget(_pppRefCrdYLineEdit, ir, 6);
+ pppLayout->addWidget(new QLabel(" Z "), ir, 7, Qt::AlignRight);
+ pppLayout->addWidget(_pppRefCrdZLineEdit, ir, 8);
+ ++ir;
+ pppLayout->addWidget(new QLabel("Corr Mountpoint "), ir, 0);
+ pppLayout->addWidget(_pppCorrMountLineEdit, ir, 1);
+ pppLayout->addWidget(new QLabel(" dN "), ir, 3, Qt::AlignRight);
+ pppLayout->addWidget(_pppRefdNLineEdit, ir, 4);
+ pppLayout->addWidget(new QLabel(" dE "), ir, 5, Qt::AlignRight);
+ pppLayout->addWidget(_pppRefdELineEdit, ir, 6);
+ pppLayout->addWidget(new QLabel(" dU "), ir, 7, Qt::AlignRight);
+ pppLayout->addWidget(_pppRefdULineEdit, ir, 8);
+ ++ir;
+ pppLayout->addWidget(new QLabel("Options"), ir, 0, 1, 5);
+ pppLayout->addWidget(_pppUsePhaseCheckBox, ir, 1, Qt::AlignRight);
+ pppLayout->addWidget(new QLabel("Use phase obs"), ir, 2);
+ pppLayout->addWidget(_pppEstTropoCheckBox, ir, 3, Qt::AlignRight);
+ pppLayout->addWidget(new QLabel("Estimate tropo"), ir, 4);
+ pppLayout->addWidget(_pppGLONASSCheckBox, ir, 5, Qt::AlignRight);
+ pppLayout->addWidget(new QLabel("Use GLONASS"), ir, 6);
+ pppLayout->addWidget(_pppGalileoCheckBox, ir, 7, Qt::AlignRight);
+ ++ir;
+ pppLayout->addWidget(new QLabel("Use Galileo "), ir, 8);
+ pppLayout->addWidget(new QLabel("Output"), ir, 0);
+ pppLayout->addWidget(_pppNMEALineEdit, ir, 1, 1, 3);
+ pppLayout->addWidget(new QLabel("NMEA File"), ir, 4);
+ pppLayout->addWidget(_pppNMEAPortLineEdit, ir, 5, Qt::AlignRight);
+ pppLayout->addWidget(new QLabel("NMEA Port"), ir, 6);
+ pppLayout->addWidget(_pppPlotCoordinates, ir, 7, Qt::AlignRight);
+ pppLayout->addWidget(new QLabel("PPP Plot"), ir, 8);
+ ++ir;
+ pppLayout->addWidget(new QLabel(" "), ir, 0);
+ pppLayout->setRowStretch(ir, 99);
pppgroup->setLayout(pppLayout);
@@ -961,29 +958,45 @@
// -------------------------
QGridLayout* ppp2Layout = new QGridLayout;
-
- ppp2Layout->addWidget(new QLabel("Antennas"), 0, 0);
- ppp2Layout->addWidget(_pppAntexLineEdit, 0, 1, 1, 3);
- ppp2Layout->addWidget(new QLabel("ANTEX File "), 0, 4);
- ppp2Layout->addWidget(_pppAntennaLineEdit, 0, 5, 1, 3);
- ppp2Layout->addWidget(new QLabel("Rec. Ant. Name"), 0, 8);
- ppp2Layout->addWidget(new QLabel("Satellite Antenna "), 1, 0);
- ppp2Layout->addWidget(_pppApplySatAntCheckBox, 1, 1, Qt::AlignRight);
- ppp2Layout->addWidget(new QLabel("Apply Offsets"), 1, 2, Qt::AlignLeft);
- ppp2Layout->addWidget(new QLabel("Sigmas"), 2, 0);
- ppp2Layout->addWidget(_pppSigCLineEdit, 2, 1, Qt::AlignRight);
- ppp2Layout->addWidget(new QLabel("Code"), 2, 2);
- ppp2Layout->addWidget(_pppSigPLineEdit, 2, 3);
- ppp2Layout->addWidget(new QLabel("Phase"), 2, 4);
- ppp2Layout->addWidget(_pppSigTrp0, 2, 5, Qt::AlignRight);
- ppp2Layout->addWidget(new QLabel("Tropo Init "), 2, 6);
- ppp2Layout->addWidget(_pppSigTrpP, 2, 7);
- ppp2Layout->addWidget(new QLabel("Tropo White Noise"), 2, 8);
- ppp2Layout->addWidget(new QLabel("Options cont'd"), 3, 0);
- ppp2Layout->addWidget(_pppSync, 3, 1);
- ppp2Layout->addWidget(new QLabel("Sync Corr (sec) "), 3, 2);
- ppp2Layout->addWidget(_pppAverageLineEdit, 3, 3, Qt::AlignRight);
- ppp2Layout->addWidget(new QLabel("Averaging (min)") , 3, 4);
- ppp2Layout->addWidget(new QLabel("Coordinates from Precise Point Positioning (PPP), continued."), 4, 0, 1, 6);
- ppp2Layout->addWidget(new QLabel(" "), 5, 0);
+ ir = 0;
+ ppp2Layout->addWidget(new QLabel("Precise Point Positioning (Panel 2)"), 0, 0);
+ ++ir;
+ ppp2Layout->addWidget(new QLabel("Antennas"), ir, 0);
+ ppp2Layout->addWidget(_pppAntexLineEdit, ir, 1, 1, 3);
+ ppp2Layout->addWidget(new QLabel("ANTEX File "), ir, 4);
+ ppp2Layout->addWidget(_pppAntennaLineEdit, ir, 5, 1, 3);
+ ppp2Layout->addWidget(new QLabel("Rec. Ant. Name"), ir, 8);
+ ++ir;
+ ppp2Layout->addWidget(new QLabel("Satellite Antenna "), ir, 0);
+ ppp2Layout->addWidget(_pppApplySatAntCheckBox, ir, 1, Qt::AlignRight);
+ ppp2Layout->addWidget(new QLabel("Apply Offsets"), ir, 2, Qt::AlignLeft);
+ ++ir;
+ ppp2Layout->addWidget(new QLabel("Sigmas"), ir, 0);
+ ppp2Layout->addWidget(_pppSigCLineEdit, ir, 1, Qt::AlignRight);
+ ppp2Layout->addWidget(new QLabel("Code"), ir, 2);
+ ppp2Layout->addWidget(_pppSigPLineEdit, ir, 3);
+ ppp2Layout->addWidget(new QLabel("Phase"), ir, 4);
+ ppp2Layout->addWidget(_pppSigTrp0, ir, 5, Qt::AlignRight);
+ ppp2Layout->addWidget(new QLabel("Tropo Init "), ir, 6);
+ ppp2Layout->addWidget(_pppSigTrpP, ir, 7);
+ ppp2Layout->addWidget(new QLabel("Tropo White Noise"), ir, 8);
+ ++ir;
+ ppp2Layout->addWidget(new QLabel("Options cont'd"), ir, 0);
+ ppp2Layout->addWidget(_pppSigCrd0, ir, 1, Qt::AlignRight);
+ ppp2Layout->addWidget(new QLabel("Sigma XYZ Init "), ir, 2);
+ ppp2Layout->addWidget(_pppSigCrdP, ir, 3, Qt::AlignRight);
+ ppp2Layout->addWidget(new QLabel("Sigma XYZ Noise "), ir, 4);
+ ppp2Layout->addWidget(_pppQuickStartLineEdit, ir, 5, Qt::AlignRight);
+ ppp2Layout->addWidget(new QLabel("Quick-Start (sec) "), ir, 6);
+ ppp2Layout->addWidget(_pppMaxSolGapLineEdit, ir, 7, Qt::AlignRight);
+ ++ir;
+ ppp2Layout->addWidget(new QLabel("Max Sol. Gap (sec)"), ir, 8);
+ ppp2Layout->addWidget(new QLabel("Options cont'd"), ir, 0);
+ ppp2Layout->addWidget(_pppSync, ir, 1);
+ ppp2Layout->addWidget(new QLabel("Sync Corr (sec) "), ir, 2);
+ ppp2Layout->addWidget(_pppAverageLineEdit, ir, 3, Qt::AlignRight);
+ ppp2Layout->addWidget(new QLabel("Averaging (min)") , ir, 4);
+ ++ir;
+ ppp2Layout->addWidget(new QLabel(" "), ir, 0);
+ ppp2Layout->setRowStretch(ir, 99);
ppp2group->setLayout(ppp2Layout);