Changeset 5027 in ntrip for trunk

Timestamp:

Mar 28, 2013, 3:57:38 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/GnssCenter/main

Files:

• main.pro (modified) (1 diff)
• mainwin.cpp (modified) (3 diffs)

trunk/GnssCenter/main/main.pro

@@ -13 +13 @@
 INCLUDEPATH += ../qwt
 
-unix:LIBS  += -L../qwt -lqwt
-win32:LIBS += -L../qwt/release -lqwt
+LIBS  += -L../qwt     -lqwt
+LIBS  += -L../inpedit -lGnssCenter_inpEdit
+LIBS  += -L../svgmap  -lGnssCenter_svgMap
 
-HEADERS +=                app.h       mdiarea.h   \
-           settings.h     mainwin.h   plugininterface.h
+HEADERS +=              app.h       mdiarea.h   \
+           settings.h   mainwin.h   plugininterface.h
 
-SOURCES += GnssCenter.cpp app.cpp     mdiarea.cpp \
-           settings.cpp   mainwin.cpp
+SOURCES += main.cpp     app.cpp     mdiarea.cpp \
+           settings.cpp mainwin.cpp
 
-exists(map) {
-  INCLUDEPATH += map
-  HEADERS     += map/svgmap.h
-  SOURCES     += map/svgmap.cpp
-  RESOURCES   += map/svgmap.qrc
-}
-
-exists(inpedit) {
-  INCLUDEPATH += inpedit
-
-  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/inpedit.cpp \
-             inpedit/selwin.cpp  inpedit/lineedit.cpp inpedit/uniline.cpp
-}

trunk/GnssCenter/main/mainwin.cpp

@@ -20 +20 @@
 #include "mdiarea.h" 
 #include "plugininterface.h" 
-#include "map/svgmap.h"
-#include "inpedit/inpedit.h"
 
 using namespace std;
@@ -130 +128 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_mainWin::slotEditInput() {
-  QString fileName = QFileDialog::getOpenFileName(this);
-  if (!fileName.isEmpty()) {
-    t_inpEdit* inpEdit = new t_inpEdit();
-    inpEdit->setInputFile(fileName);
-    QMdiSubWindow* win = _mdi->addSubWindow(inpEdit);
-    win->show();
-  }
+//  QString fileName = QFileDialog::getOpenFileName(this);
+//  if (!fileName.isEmpty()) {
+//    t_inpEdit* inpEdit = new t_inpEdit();
+//    inpEdit->setInputFile(fileName);
+//    QMdiSubWindow* win = _mdi->addSubWindow(inpEdit);
+//    win->show();
+//  }
 }
 
@@ -142 +140 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_mainWin::slotMap() {
-  t_svgMap* svgMap = new t_svgMap();
-  QMdiSubWindow* win = _mdi->addSubWindow(svgMap);
-  win->show();
+//  t_svgMap* svgMap = new t_svgMap();
+//  QMdiSubWindow* win = _mdi->addSubWindow(svgMap);
+//  win->show();
 }