Changeset 6883 in ntrip for trunk


Ignore:
Timestamp:
Jun 9, 2015, 10:15:31 AM (9 years ago)
Author:
stuerze
Message:

some gui chages regarding planned activities

Location:
trunk/BNC/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bncwindow.cpp

    r6829 r6883  
    852852  // PPP
    853853  // ---
    854   _pppWidgets._nmeaPort->setMaximumWidth(8*ww);
    855854  _pppWidgets._dataSource->setMaximumWidth(20*ww);
    856855  _pppWidgets._corrMount->setMaximumWidth(20*ww);
     
    862861  pppLayout1->addWidget(new QLabel("Data source"),           ir, 0);
    863862  pppLayout1->addWidget(_pppWidgets._dataSource,             ir, 1);
    864 //pppLayout1->addItem(new QSpacerItem(4*ww, 0),              ir, 2);
     863  pppLayout1->addItem(new QSpacerItem(4*ww, 0),              ir, 2);
    865864  pppLayout1->addWidget(new QLabel("   RINEX Obs file(s)"),  ir, 3);
    866865  pppLayout1->addWidget(_pppWidgets._rinexObs,               ir, 4);
     
    884883  pppLayout1->addWidget(new QLabel("   NMEA file"),          ir, 3);
    885884  pppLayout1->addWidget(_pppWidgets._nmeaFile,               ir, 4);
    886   pppLayout1->addWidget(new QLabel("   Port"),               ir, 5);
    887   pppLayout1->addWidget(_pppWidgets._nmeaPort,               ir, 6);
    888885  ++ir;
    889886  pppLayout1->addWidget(new QLabel("   SNX TRO file"),       ir, 3);
     
    915912  _pppWidgets._nmeaFile->setWhatsThis(tr("<p>Specify the path to daily NMEA files using e.g. the following syntax (example):</p><p> ./PPP_$(STATION)_$(DATE).nmea</p><p>BNC will produce one daily NMEA file per station, mainly to save NMEA GGA sentences from the PPP solution. Variable $(STATION) stands for the affected station and $(DATE) stands for the date.</p>"));
    916913
    917   _pppWidgets._nmeaPort->setWhatsThis(tr("<p>Text fehlt</p>"));
    918 
    919914  _pppWidgets._snxtroFile->setWhatsThis(tr("<p>Specify the path to daily SINEX Troposphere files using e.g. the following syntax (example):</p><p> ./PPP_$(STATION)_$(DATE).tro</p><p>BNC will produce one daily troposphere file per station to save troposphere parameters from the PPP solution in SINEX Troposphere format. Variable $(STATION) stands for the affected station and $(DATE) stands for the date.</p>"));
    920915
     
    942937
    943938  _pppWidgets._lcGalileo->setWhatsThis(tr("<p>Specify on which kind of ionosphere-free linear combination of Galileo observations you want to base ambiguity resolutions.</p><p><ul><li>Specifying 'P3' means that you request BNC to use the so-called P3 ionosphere-free linear combination of code observations.</li><li>'L3' means that you request BNC to use the so-called L3 ionosphere-free linear combination of phase observations.</li> <li>'P3&L3' means that you request BNC to use both, P3 and L3 ionosphere-free linear combination of code and phase observations.</li></ul></p><p>Specifying 'no' means that you don't want BNC to estimate ambiguities using linear combinations of Galileo observations.</p>"));
     939
     940  _pppWidgets._lcBDS->setWhatsThis(tr("<p>Specify on which kind of ionosphere-free linear combination of BDS observations you want to base ambiguity resolutions.</p><p><ul><li>Specifying 'P3' means that you request BNC to use the so-called P3 ionosphere-free linear combination of code observations.</li><li>'L3' means that you request BNC to use the so-called L3 ionosphere-free linear combination of phase observations.</li> <li>'P3&L3' means that you request BNC to use both, P3 and L3 ionosphere-free linear combination of code and phase observations.</li></ul></p><p>Specifying 'no' means that you don't want BNC to estimate ambiguities using linear combinations of BDS observations.</p>"));
    944941
    945942  QVBoxLayout* pppLayout2 = new QVBoxLayout();
     
    982979  pppLayout3->addWidget(_pppWidgets._eleWgtPhase,           ir, 7);
    983980  ++ir;
    984   pppLayout3->addWidget(new QLabel("Wait for corrections"), ir, 0, Qt::AlignLeft);
    985   pppLayout3->addWidget(_pppWidgets._corrWaitTime,          ir, 1);
     981  pppLayout3->addWidget(new QLabel("BDS LCs"),              ir, 0, Qt::AlignLeft);
     982  pppLayout3->addWidget(_pppWidgets._lcBDS,                 ir, 1);
    986983  pppLayout3->addWidget(new QLabel("Min # of Obs"),         ir, 3, Qt::AlignLeft);
    987984  pppLayout3->addWidget(_pppWidgets._minObs,                ir, 4);
     
    989986  pppLayout3->addWidget(_pppWidgets._minEle,                ir, 7);
    990987  ++ir;
    991   pppLayout3->addWidget(new QLabel("Seeding (sec)"),        ir, 0, Qt::AlignLeft);
    992   pppLayout3->addWidget(_pppWidgets._seedingTime,           ir, 1);
     988  pppLayout3->addWidget(new QLabel("Wait for corrections"), ir, 0, Qt::AlignLeft);
     989  pppLayout3->addWidget(_pppWidgets._corrWaitTime,          ir, 1);
     990  pppLayout3->addWidget(new QLabel("Seeding (sec)"),        ir, 3, Qt::AlignLeft);
     991  pppLayout3->addWidget(_pppWidgets._seedingTime,           ir, 4);
    993992  ++ir;
    994993  pppLayout3->addWidget(new QLabel(""),                     ir, 8);
  • trunk/BNC/src/pppWidgets.cpp

    r6826 r6883  
    6161  _logFile      = new QLineEdit();     _logFile     ->setObjectName("PPP/logFilePPP");   _widgets << _logFile;     
    6262  _nmeaFile     = new QLineEdit();     _nmeaFile    ->setObjectName("PPP/nmeaFile");     _widgets << _nmeaFile;   
    63   _nmeaPort     = new QLineEdit();     _nmeaPort    ->setObjectName("PPP/nmeaPort");     _widgets << _nmeaPort;
    6463  _snxtroFile   = new QLineEdit();     _snxtroFile  ->setObjectName("PPP/snxtroFile");   _widgets << _snxtroFile;
    6564  _snxtroSampl  = new QSpinBox();      _snxtroSampl ->setObjectName("PPP/snxtroSampl");  _widgets << _snxtroSampl;
     
    6867  _lcGLONASS    = new QComboBox();     _lcGLONASS   ->setObjectName("PPP/lcGLONASS");    _widgets << _lcGLONASS;   
    6968  _lcGalileo    = new QComboBox();     _lcGalileo   ->setObjectName("PPP/lcGalileo");    _widgets << _lcGalileo;   
     69  _lcBDS        = new QComboBox();     _lcBDS       ->setObjectName("PPP/lcBDS");        _widgets << _lcBDS;
    7070  _sigmaC1      = new QLineEdit();     _sigmaC1     ->setObjectName("PPP/sigmaC1");      _widgets << _sigmaC1;     
    7171  _sigmaL1      = new QLineEdit();     _sigmaL1     ->setObjectName("PPP/sigmaL1");      _widgets << _sigmaL1;     
     
    112112  _lcGalileo->addItems(QString("no,P3,L3,P3&L3").split(","));
    113113
     114  _lcBDS->setEditable(false);
     115  _lcBDS->addItems(QString("no,P3,L3,P3&L3").split(","));
     116
    114117  _snxtroSampl->setMinimum(0);
    115118  _snxtroSampl->setMaximum(300);
     
    132135  _corrWaitTime->setSpecialValueText("no");
    133136
    134   _staTable->setColumnCount(9);
     137  _staTable->setColumnCount(10);
    135138  _staTable->setRowCount(0);
    136139  _staTable->setHorizontalHeaderLabels(
    137      QString("Station,Sigma N,Sigma E,Sigma H,Noise N,Noise E,Noise H,Tropo Sigma,Tropo Noise").split(","));
     140     QString("Station,Sigma N,Sigma E,Sigma H,Noise N,Noise E,Noise H,Tropo Sigma,Tropo Noise, NMEA Port").split(","));
    138141  _staTable->setSelectionMode(QAbstractItemView::ExtendedSelection);
    139142  _staTable->setSelectionBehavior(QAbstractItemView::SelectRows);
     
    204207    _lcGalileo->setCurrentIndex(ii);
    205208  }
     209  ii = _lcBDS->findText(settings.value(_lcBDS->objectName()).toString());
     210  if (ii != -1) {
     211    _lcBDS->setCurrentIndex(ii);
     212  }
    206213
    207214  // FileChoosers
     
    218225  _logFile    ->setText(settings.value(_logFile    ->objectName()).toString());
    219226  _nmeaFile   ->setText(settings.value(_nmeaFile   ->objectName()).toString());
    220   _nmeaPort   ->setText(settings.value(_nmeaPort   ->objectName()).toString());
    221227  _snxtroFile ->setText(settings.value(_snxtroFile ->objectName()).toString());
    222228  _sigmaC1    ->setText(settings.value(_sigmaC1    ->objectName()).toString());
     
    287293  settings.setValue(_logFile     ->objectName(), _logFile     ->text());
    288294  settings.setValue(_nmeaFile    ->objectName(), _nmeaFile    ->text());
    289   settings.setValue(_nmeaPort    ->objectName(), _nmeaPort    ->text());
    290295  settings.setValue(_snxtroFile  ->objectName(), _snxtroFile  ->text());
    291296  settings.setValue(_snxtroSampl ->objectName(), _snxtroSampl ->value());
     
    293298  settings.setValue(_lcGLONASS   ->objectName(), _lcGLONASS   ->currentText());
    294299  settings.setValue(_lcGalileo   ->objectName(), _lcGalileo   ->currentText());
     300  settings.setValue(_lcBDS       ->objectName(), _lcBDS       ->currentText());
    295301  settings.setValue(_sigmaC1     ->objectName(), _sigmaC1     ->text());
    296302  settings.setValue(_sigmaL1     ->objectName(), _sigmaL1     ->text());
  • trunk/BNC/src/pppWidgets.h

    r6747 r6883  
    4646  QLineEdit*     _logFile;
    4747  QLineEdit*     _nmeaFile;
    48   QLineEdit*     _nmeaPort;
    4948  QLineEdit*     _snxtroFile;
    5049  QSpinBox*      _snxtroSampl;
     
    5352  QComboBox*     _lcGLONASS;
    5453  QComboBox*     _lcGalileo;
     54  QComboBox*     _lcBDS;
    5555  QLineEdit*     _sigmaC1;
    5656  QLineEdit*     _sigmaL1;
Note: See TracChangeset for help on using the changeset viewer.