Changeset 5059 in ntrip

Timestamp:

Mar 28, 2013, 7:40:12 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/GnssCenter

Files:

• inpedit/inpedit.cpp (modified) (1 diff)
• inpedit/inpedit.h (modified) (2 diffs)
• main/mainwin.cpp (modified) (1 diff)
• main/plugininterface.h (modified) (1 diff)
• svgmap/svgmap.cpp (modified) (1 diff)
• svgmap/svgmap.h (modified) (2 diffs)

trunk/GnssCenter/inpedit/inpedit.cpp

@@ -27 +27 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-t_inpEdit::t_inpEdit() : QTabWidget(), t_pluginInterface() {
+t_inpEdit::t_inpEdit() : QTabWidget() {
 }
 

trunk/GnssCenter/inpedit/inpedit.h

@@ -10 +10 @@
 class t_panel;
 
-class t_inpEdit : public QTabWidget, public t_pluginInterface {
+class t_inpEdit : public QTabWidget {
  public:
   t_inpEdit();
   ~t_inpEdit();
-  virtual bool expectInputFile() const {return true;}
-  virtual void setInputFile(const QString&);
-  virtual void show() {QTabWidget::show();}   
+  void setInputFile(const QString&);
  private:
   void readFile();
@@ -27 +25 @@
  Q_INTERFACES(GnssCenter::t_pluginFactoryInterface)
  public:
-  virtual t_pluginInterface* create() {return new t_inpEdit();} 
+  virtual QWidget* create() {return new t_inpEdit();} 
   virtual QString getName() const {return QString("Edit Input");}
 };

trunk/GnssCenter/main/mainwin.cpp

@@ -136 +136 @@
   t_pluginAction* action = dynamic_cast<t_pluginAction*>(sender());
   qDebug() << "Action" << action;
-  t_pluginInterface* widget = action->_factIface->create();
-//  QMdiSubWindow* win = _mdi->addSubWindow(svgMap);
-  widget->show();
+  QWidget* widget = action->_factIface->create();
+  QMdiSubWindow* subWindow = _mdi->addSubWindow((QWidget*) widget);
+  subWindow->show();
 }
 

trunk/GnssCenter/main/plugininterface.h

@@ -2 +2 @@
 #define GnssCenter_PLUGININTERFACE_H
 
+#include <QtGui>
 #include <QtPlugin>
 
 namespace GnssCenter {
 
-class t_pluginInterface {
- public:
-  virtual void show() = 0;
-};
-
 class t_pluginFactoryInterface {
  public:
-  virtual t_pluginInterface* create() = 0;
+  virtual QWidget* create() = 0;
   virtual QString getName() const = 0;
 };

trunk/GnssCenter/svgmap/svgmap.cpp

@@ -36 +36 @@
 // Constructor
 /////////////////////////////////////////////////////////////////////////////
-t_svgMap::t_svgMap() : QDialog(), t_pluginInterface() {
+t_svgMap::t_svgMap() : QDialog() {
 
   // Map in Scalable Vector Graphics (svg) Format

trunk/GnssCenter/svgmap/svgmap.h

@@ -11 +11 @@
 namespace GnssCenter {
 
-class t_svgMap : public QDialog, public t_pluginInterface {
+class t_svgMap : public QDialog {
  Q_OBJECT
  public:
   t_svgMap();
   ~t_svgMap();
-  virtual bool expectInputFile() const {return false;}
-  virtual void setInputFile(const QString&) {}
-  virtual void show() {QDialog::show();}   
 
  public slots:
@@ -49 +46 @@
  Q_INTERFACES(GnssCenter::t_pluginFactoryInterface)
  public:
-  virtual t_pluginInterface* create() {return new t_svgMap();} 
+  virtual QWidget* create() {return new t_svgMap();} 
   virtual QString getName() const {return QString("Map");}
 };