Changeset 2796 in ntrip for trunk/BNC/bnctabledlg.cpp

Timestamp:

Dec 14, 2010, 3:47:20 PM (13 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/bnctabledlg.cpp (modified) (10 diffs)

trunk/BNC/bnctabledlg.cpp

@@ -145 +145 @@
   connect(_buttonMap, SIGNAL(clicked()), this, SLOT(slotShowMap()));
  
-  _buttonCancel = new QPushButton(tr("Cancel"), this);
-  connect(_buttonCancel, SIGNAL(clicked()), this, SLOT(reject()));
-
-  _buttonOK = new QPushButton(tr("OK"), this);
-  connect(_buttonOK, SIGNAL(clicked()), this, SLOT(accept()));
+  _buttonClose = new QPushButton(tr("Close"), this);
+  connect(_buttonClose, SIGNAL(clicked()), this, SLOT(close()));
+
+  _buttonSelect = new QPushButton(tr("Select"), this);
+  connect(_buttonSelect, SIGNAL(clicked()), this, SLOT(select()));
 
   QHBoxLayout* buttonLayout = new QHBoxLayout;
@@ -156 +156 @@
   buttonLayout->addWidget(_buttonMap);
   buttonLayout->addWidget(_buttonGet);
-  buttonLayout->addWidget(_buttonCancel);
-  buttonLayout->addWidget(_buttonOK);
+  buttonLayout->addWidget(_buttonSelect);
+  buttonLayout->addWidget(_buttonClose);
 
   mainLayout->addLayout(buttonLayout);
@@ -171 +171 @@
   delete _ntripVersionComboBox;
   delete _buttonGet;
-  delete _buttonCancel;
-  delete _buttonOK;
+  delete _buttonClose;
+  delete _buttonSelect;
   delete _buttonWhatsThis;
   delete _buttonCasterTable;
@@ -303 +303 @@
 
   bncMap* winMap = new bncMap(this);
-  winMap->setGeometry( x(), int(y()+height()*1.2), 860, 400 );
+  winMap->setGeometry( x(), int(y()+height()*1.3), 880, 440 );
 
   connect(this, SIGNAL(newPoint(QPointF, QString, QPen)),
           winMap, SLOT(slotNewPoint(QPointF, QString, QPen)));
-  connect(this, SIGNAL(resetMap()), winMap, SLOT(slotResetMap()));
+      
+  connect(this, SIGNAL(fitMap()),
+          winMap, SLOT(slotFitMap() ));
       
   _buttonMap->setEnabled(false);
@@ -316 +318 @@
   disconnect(this, SIGNAL(newPoint(QPointF, QString, QPen)),
              winMap, SLOT(slotNewPoint(QPointF, QString, QPen)));
-  disconnect(this, SIGNAL(resetMap()), winMap, SLOT(slotResetMap()));
+   
+  disconnect(this, SIGNAL(fitMap()),
+             winMap, SLOT(slotFitMap() ));
    
   delete winMap;
@@ -335 +339 @@
                  point.setY( tmp.at(9).toDouble() );
                  point.setX( tmp.at(10).toDouble() );
+
          QString site = tmp.at(1);
                  site.resize(4);
 
-         emit newPoint(point, site, QPen(QBrush(QColor(0,0,255,180)), 5) );
-       }             
+         emit newPoint(point, site, QPen(QBrush(QColor(0,0,255,200)), 1.5) );
+       }
      }
    }
-}
-
-
-// Accept slot
-////////////////////////////////////////////////////////////////////////////
-void bncTableDlg::accept() {
+   emit fitMap();
+}
+
+
+// Select slot
+////////////////////////////////////////////////////////////////////////////
+void bncTableDlg::select() {
 
   bncSettings settings;
@@ -361 +367 @@
   QStringList* mountPoints = new QStringList;
   if (_table) {
-//  emit resetMap();
     for (int ir = 0; ir < _table->rowCount(); ir++) {
       QTableWidgetItem* item   = _table->item(ir,0);
@@ -373 +378 @@
       if (_table->isItemSelected(item)) {
         url.setPath(item->text());
-        mountPoints->push_back(url.toString() + " " + format + " " + latitude 
+        mountPoints->push_back(url.toString() + " " + format + " " + latitude
                         + " " + longitude + " " + nmea + " " + ntripVersion);
          
+        site.resize(4);
         emit newPoint(QPointF(longitude.toDouble(),latitude.toDouble()), site,
-                      QPen(QBrush(QColor(255,0,0,180)), 13) );
-
+                      QPen(QBrush(QColor(255,0,0,200)), 3) );
       }
     }
   }
   emit newMountPoints(mountPoints);
-
-  QDialog::accept();
 }
 
@@ -411 +414 @@
   _buttonWhatsThis->setEnabled(false);
   _buttonGet->setEnabled(false);
-  _buttonCancel->setEnabled(false);
-  _buttonOK->setEnabled(false);
+  _buttonClose->setEnabled(false);
+  _buttonSelect->setEnabled(false);
 
   bncCasterTableDlg* dlg = new bncCasterTableDlg(this);
@@ -429 +432 @@
   _buttonWhatsThis->setEnabled(true);
   _buttonGet->setEnabled(true);
-  _buttonCancel->setEnabled(true);
-  _buttonOK->setEnabled(true);
+  _buttonClose->setEnabled(true);
+  _buttonSelect->setEnabled(true);
 
 }