Changeset 5015 in ntrip for trunk

Timestamp:

Mar 28, 2013, 2:32:27 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/GnssCenter/src

Files:

• inpedit/inpedit.cpp (moved) (moved from trunk/GnssCenter/src/inpedit/inpfile.cpp ) (4 diffs)
• inpedit/inpedit.h (moved) (moved from trunk/GnssCenter/src/inpedit/inpfile.h ) (2 diffs)
• mainwin.cpp (modified) (2 diffs)
• src.pro (modified) (1 diff)

trunk/GnssCenter/src/inpedit/inpedit.cpp

@@ -4 +4 @@
  * -------------------------------------------------------------------------
  *
- * Class:      t_inpFile
+ * Class:      t_inpEdit
  *
  * Purpose:    RTNet Input File
@@ -16 +16 @@
  * -----------------------------------------------------------------------*/
 
-#include "inpfile.h" 
+#include "inpedit.h" 
 #include "keyword.h" 
 #include "panel.h" 
@@ -25 +25 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-t_inpFile::t_inpFile(const QString& fileName) : QTabWidget(0) {
-  _fileName = fileName;
-  readFile();
+t_inpEdit::t_inpEdit() : QTabWidget(), t_pluginInterface() {
 }
 
 // Destructor
 ////////////////////////////////////////////////////////////////////////////
-t_inpFile::~t_inpFile() {
+t_inpEdit::~t_inpEdit() {
   QMapIterator<QString, t_keyword*> it(_keywords); 
   while (it.hasNext()) {
@@ -42 +40 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_inpFile::readFile() {
+void t_inpEdit::setInputFile(const QString& fileName) {
+  _fileName = fileName;
+  readFile();
+}
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void t_inpEdit::readFile() {
 
   QFile file(_fileName);

trunk/GnssCenter/src/inpedit/inpedit.h

@@ -1 @@
-#ifndef GnssCenter_INPFILE_H
-#define GnssCenter_INPFILE_H
+#ifndef GnssCenter_INPEDIT_H
+#define GnssCenter_INPEDIT_H
 
 #include <QtGui>
+#include "plugininterface.h"
 
 namespace GnssCenter {
@@ -9 +10 @@
 class t_panel;
 
-class t_inpFile : public QTabWidget {
+class t_inpEdit : public QTabWidget, public t_pluginInterface {
+ Q_OBJECT
+ Q_INTERFACES(GnssCenter::t_pluginInterface)
+
  public:
-  t_inpFile(const QString& fileName);
-  ~t_inpFile();
+  t_inpEdit();
+  ~t_inpEdit();
+  virtual bool expectInputFile() const {return true;}
+  virtual void setInputFile(const QString&);
+  virtual void show() {QTabWidget::show();}   
 
  private:

trunk/GnssCenter/src/mainwin.cpp

@@ -21 +21 @@
 #include "plugininterface.h" 
 #include "map/svgmap.h"
-#include "inpedit/inpfile.h"
+#include "inpedit/inpedit.h"
 
 using namespace std;
@@ -126 +126 @@
   QString fileName = QFileDialog::getOpenFileName(this);
   if (!fileName.isEmpty()) {
-    t_inpFile* inpFile = new t_inpFile(fileName);
-    QMdiSubWindow* win = _mdi->addSubWindow(inpFile);
+    t_inpEdit* inpEdit = new t_inpEdit();
+    inpEdit->setInputFile(fileName);
+    QMdiSubWindow* win = _mdi->addSubWindow(inpEdit);
     win->show();
   }

trunk/GnssCenter/src/src.pro

@@ -32 +32 @@
   INCLUDEPATH += inpedit
 
-  HEADERS += inpedit/keyword.h   inpedit/panel.h      inpedit/inpfile.h   \
+  HEADERS += inpedit/keyword.h   inpedit/panel.h      inpedit/inpedit.h   \
              inpedit/selwin.h    inpedit/lineedit.h   inpedit/uniline.h
 
-  SOURCES += inpedit/keyword.cpp inpedit/panel.cpp    inpedit/inpfile.cpp \
+  SOURCES += inpedit/keyword.cpp inpedit/panel.cpp    inpedit/inpedit.cpp \
              inpedit/selwin.cpp  inpedit/lineedit.cpp inpedit/uniline.cpp
 }