[Kst] branches/work/kst/portto4/kst/src

[Mike Fenton]

SVN commit 728246 by fenton:

Initial Stub version of EventMonitorDialog.


 M  +4 -4      libkstapp/datamanager.cpp  
 M  +7 -0      libkstapp/dialoglaunchergui.cpp  
 M  +2 -0      libkstapp/dialoglaunchergui.h  
 A             libkstapp/eventmonitordialog.cpp   [License: GPL (v2+)]
 A             libkstapp/eventmonitordialog.h   [License: GPL (v2+)]
 A             libkstapp/eventmonitortab.ui  
 M  +3 -0      libkstapp/libkstapp.pro  
 M  +5 -0      libkstmath/dialoglauncher.cpp  
 M  +2 -0      libkstmath/dialoglauncher.h  


--- branches/work/kst/portto4/kst/src/libkstapp/datamanager.cpp #728245:728246
@@ -87,10 +87,10 @@
    connect(action, SIGNAL(triggered()), DialogLauncher::self(), SLOT(showPowerSpectrumDialog()));
    _dataObjects->addAction(action);
  
-//   action = new DataButtonAction(tr("Event Monitor")));
-//   connect(action, SIGNAL(triggered()), DialogLauncher::self(), SLOT(showEventMonitorDialog()));
-//   _dataObjects->addAction(action);
-// 
+   action = new DataButtonAction(tr("Event Monitor"));
+   connect(action, SIGNAL(triggered()), DialogLauncher::self(), SLOT(showEventMonitorDialog()));
+   _dataObjects->addAction(action);
+ 
    action = new DataButtonAction(tr("Image"));
    connect(action, SIGNAL(triggered()), DialogLauncher::self(), SLOT(showImageDialog()));
    _dataObjects->addAction(action);
--- branches/work/kst/portto4/kst/src/libkstapp/dialoglaunchergui.cpp #728245:728246
@@ -21,6 +21,7 @@
 #include "powerspectrumdialog.h"
 #include "csddialog.h"
 #include "imagedialog.h"
+#include "eventmonitordialog.h"
 
 namespace Kst {
 
@@ -90,6 +91,12 @@
 }
 
 
+void DialogLauncherGui::showEventMonitorDialog(ObjectPtr objectPtr) {
+  EventMonitorDialog dialog(objectPtr, kstApp->mainWindow());
+  dialog.exec();
+}
+
+
 void DialogLauncherGui::showBasicPluginDialog(ObjectPtr objectPtr) {
   Q_UNUSED(objectPtr);
 }
--- branches/work/kst/portto4/kst/src/libkstapp/dialoglaunchergui.h #728245:728246
@@ -46,6 +46,8 @@
 
     virtual void showCSDDialog(ObjectPtr objectPtr = 0);
 
+    virtual void showEventMonitorDialog(ObjectPtr objectPtr = 0);
+
     //plugins
     virtual void showBasicPluginDialog(ObjectPtr objectPtr = 0);
 };
--- branches/work/kst/portto4/kst/src/libkstapp/libkstapp.pro #728245:728246
@@ -46,6 +46,7 @@
     editmultiplewidget.cpp \
     ellipseitem.cpp \
     equationdialog.cpp \
+    eventmonitordialog.cpp \
     exportgraphicsdialog.cpp \
     filltab.cpp \
     generaltab.cpp \
@@ -119,6 +120,7 @@
     editmultiplewidget.h \
     ellipseitem.h \
     equationdialog.h \
+    eventmonitordialog.h \
     exportgraphicsdialog.h \
     filltab.h \
     generaltab.h \
@@ -174,6 +176,7 @@
     dialog.ui \
     editmultiplewidget.ui \
     equationtab.ui \
+    eventmonitortab.ui \
     exportgraphicsdialog.ui \
     filltab.ui \
     generaltab.ui \
--- branches/work/kst/portto4/kst/src/libkstmath/dialoglauncher.cpp #728245:728246
@@ -87,6 +87,11 @@
 }
 
 
+void DialogLauncher::showEventMonitorDialog(ObjectPtr objectPtr) {
+  Q_UNUSED(objectPtr);
+}
+
+
 void DialogLauncher::showHistogramDialog(ObjectPtr objectPtr) {
   Q_UNUSED(objectPtr);
 }
--- branches/work/kst/portto4/kst/src/libkstmath/dialoglauncher.h #728245:728246
@@ -62,6 +62,8 @@
 
     virtual void showCSDDialog(ObjectPtr objectPtr = 0);
 
+    virtual void showEventMonitorDialog(ObjectPtr objectPtr = 0);
+
     //plugins
     virtual void showBasicPluginDialog(ObjectPtr objectPtr = 0);
 };