Changeset 3249 in ntrip

Timestamp:

Apr 3, 2011, 10:46:03 AM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncwindow.cpp (modified) (6 diffs)
• bncwindow.h (modified) (2 diffs)
• upload/bncephuploadcaster.cpp (modified) (1 diff)
• upload/bncephuploadcaster.h (modified) (1 diff)

trunk/BNC/bncwindow.cpp

@@ -59 +59 @@
 #include "bncbytescounter.h"
 #include "upload/bnccustomtrafo.h"
+#include "upload/bncephuploadcaster.h"
 
 using namespace std;
@@ -66 +67 @@
 bncWindow::bncWindow() {
 
-  _caster = 0;
+  _caster    = 0;
+  _casterEph = 0;
 
   _bncFigure = new bncFigure(this);
@@ -1036 +1038 @@
 bncWindow::~bncWindow() {
   delete _caster;
+  delete _casterEph;
 }
 
@@ -1448 +1451 @@
 void bncWindow::slotGetThreadsFinished() {
   ((bncApp*)qApp)->slotMessage("All Get Threads Terminated", true);
-  delete _caster; _caster = 0;
+  delete _caster;    _caster    = 0;
+  delete _casterEph; _casterEph = 0;
   _actGetData->setEnabled(true);
   _actStop->setEnabled(false);
@@ -1509 +1513 @@
 
   _caster->slotReadMountPoints();
+
+  ///  _casterEph = new bncEphUploadCaster();
 }
 
@@ -1519 +1525 @@
   if (iRet == QMessageBox::Yes) {
     ((bncApp*)qApp)->stopCombination();
-    delete _caster; _caster = 0;
+    delete _caster;    _caster    = 0;
+    delete _casterEph; _casterEph = 0;
     _actGetData->setEnabled(true);
     _actStop->setEnabled(false);

trunk/BNC/bncwindow.h

@@ -51 +51 @@
 class bncFigurePPP;
 class bncBytesCounter;
+class bncEphUploadCaster;
 
 class bncWindow : public QMainWindow {
@@ -210 +211 @@
 
     bncCaster* _caster;
+
+    bncEphUploadCaster* _casterEph;
 };
 #endif

trunk/BNC/upload/bncephuploadcaster.cpp

@@ -22 +22 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-bncEphUploadCaster::bncEphUploadCaster(const QString& mountpoint,
-                                       const QString& outHost, int outPort,
-                                       const QString& password) {
+bncEphUploadCaster::bncEphUploadCaster() {
+  QString mountpoint;
+  QString outHost;
+  int     outPort;
+  QString password;
   _ephUploadCaster = new bncUploadCaster(mountpoint, outHost, outPort, 
                                          password, -1);

trunk/BNC/upload/bncephuploadcaster.h

@@ -9 +9 @@
  Q_OBJECT
  public:
-  bncEphUploadCaster(const QString& mountpoint,
-                     const QString& outHost, int outPort,
-                     const QString& password); 
+  bncEphUploadCaster();
   virtual ~bncEphUploadCaster();
  protected: