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

[Mike Fenton]

SVN commit 726723 by fenton:

Port of FFTOptions widget and addition of PowerSpectrumDialog in stub
form.


 M  +4 -4      libkstapp/datamanager.cpp  
 M  +4 -2      libkstapp/dialoglaunchergui.cpp  
 M  +1 -1      libkstapp/dialoglaunchergui.h  
 M  +3 -0      libkstapp/libkstapp.pro  
 A             libkstapp/powerspectrumdialog.cpp   [License: GPL (v2+)]
 A             libkstapp/powerspectrumdialog.h   [License: GPL (v2+)]
 A             libkstapp/powerspectrumtab.ui  
 M  +1 -1      libkstmath/dialoglauncher.cpp  
 M  +1 -1      libkstmath/dialoglauncher.h  
 M  +2 -2      libkstmath/psd.cpp  
 A             widgets/fftoptions.cpp   [License: GPL (v2+)]
 A             widgets/fftoptions.h   [License: GPL (v2+)]
 A             widgets/fftoptions.ui  
 M  +1 -0      widgets/widgets.cpp  
 M  +14 -0     widgets/widgets.h  
 M  +3 -0      widgets/widgets.pro  


--- branches/work/kst/portto4/kst/src/libkstapp/datamanager.cpp #726722:726723
@@ -83,10 +83,10 @@
    connect(action, SIGNAL(triggered()), DialogLauncher::self(), SLOT(showHistogramDialog()));
    _dataObjects->addAction(action);
  
-//   action = new DataButtonAction(tr("Power Spectrum"));
-//   connect(action, SIGNAL(triggered()), DialogLauncher::self(), SLOT(showPowerSpectrumDialog()));
-//   _dataObjects->addAction(action);
-// 
+   action = new DataButtonAction(tr("Power Spectrum"));
+   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);
--- branches/work/kst/portto4/kst/src/libkstapp/dialoglaunchergui.cpp #726722:726723
@@ -18,6 +18,7 @@
 #include "vectordialog.h"
 #include "scalardialog.h"
 #include "matrixdialog.h"
+#include "powerspectrumdialog.h"
 
 namespace Kst {
 
@@ -74,8 +75,9 @@
 }
 
 
-void DialogLauncherGui::showPSDDialog(ObjectPtr objectPtr) {
-  Q_UNUSED(objectPtr);
+void DialogLauncherGui::showPowerSpectrumDialog(ObjectPtr objectPtr) {
+  PowerSpectrumDialog dialog(objectPtr, kstApp->mainWindow());
+  dialog.exec();
 }
 
 
--- branches/work/kst/portto4/kst/src/libkstapp/dialoglaunchergui.h #726722:726723
@@ -42,7 +42,7 @@
 
     virtual void showHistogramDialog(ObjectPtr objectPtr = 0);
 
-    virtual void showPSDDialog(ObjectPtr objectPtr = 0);
+    virtual void showPowerSpectrumDialog(ObjectPtr objectPtr = 0);
 
     virtual void showCSDDialog(ObjectPtr objectPtr = 0);
 
--- branches/work/kst/portto4/kst/src/libkstapp/libkstapp.pro #726722:726723
@@ -66,6 +66,7 @@
     plotitem.cpp \
     plotitemmanager.cpp \
     plotrenderitem.cpp \
+    powerspectrumdialog.cpp \
     qgetoptions.cpp \
     scene.cpp \
     selectionrect.cpp \
@@ -133,6 +134,7 @@
     plotitem.h \
     plotitemmanager.h \
     plotrenderitem.h \
+    powerspectrumdialog.h \
     qgetoptions.h \
     scene.h \
     selectionrect.h \
@@ -168,6 +170,7 @@
     histogramtab.ui \
     layouttab.ui \
     matrixtab.ui \
+    powerspectrumtab.ui \
     scalartab.ui \
     stroketab.ui \
     vectoreditordialog.ui \
--- branches/work/kst/portto4/kst/src/libkstmath/dialoglauncher.cpp #726722:726723
@@ -92,7 +92,7 @@
 }
 
 
-void DialogLauncher::showPSDDialog(ObjectPtr objectPtr) {
+void DialogLauncher::showPowerSpectrumDialog(ObjectPtr objectPtr) {
   Q_UNUSED(objectPtr);
 }
 
--- branches/work/kst/portto4/kst/src/libkstmath/dialoglauncher.h #726722:726723
@@ -58,7 +58,7 @@
 
     virtual void showHistogramDialog(ObjectPtr objectPtr = 0);
 
-    virtual void showPSDDialog(ObjectPtr objectPtr = 0);
+    virtual void showPowerSpectrumDialog(ObjectPtr objectPtr = 0);
 
     virtual void showCSDDialog(ObjectPtr objectPtr = 0);
 
--- branches/work/kst/portto4/kst/src/libkstmath/psd.cpp #726722:726723
@@ -397,12 +397,12 @@
 
 
 void PSD::showNewDialog() {
-  DialogLauncher::self()->showPSDDialog();
+  DialogLauncher::self()->showPowerSpectrumDialog();
 }
 
 
 void PSD::showEditDialog() {
-  DialogLauncher::self()->showPSDDialog(this);
+  DialogLauncher::self()->showPowerSpectrumDialog(this);
 }
 
 
--- branches/work/kst/portto4/kst/src/widgets/widgets.cpp #726722:726723
@@ -26,6 +26,7 @@
   _plugins.append(new StringSelectorPlugin(this));
   _plugins.append(new CurvePlacementPlugin(this));
   _plugins.append(new CurveAppearancePlugin(this));
+  _plugins.append(new FFTOptionsPlugin(this));
 }
 
 
--- branches/work/kst/portto4/kst/src/widgets/widgets.h #726722:726723
@@ -28,6 +28,7 @@
 #include "stringselector.h"
 #include "curveappearance.h"
 #include "curveplacement.h"
+#include "fftoptions.h"
 
 namespace Kst {
 
@@ -208,6 +209,19 @@
     }
 };
 
+class FFTOptionsPlugin : public WidgetPlugin {
+  Q_OBJECT
+  Q_INTERFACES(QDesignerCustomWidgetInterface)
+  public:
+    FFTOptionsPlugin(QObject *parent = 0) : WidgetPlugin(parent) {}
+    QString name() const {
+      return QLatin1String("FFTOptions");
+    } //do not translate
+    QWidget *createWidget(QWidget *parent) {
+      return new FFTOptions(parent);
+    }
+};
+
 }
 
 #endif
--- branches/work/kst/portto4/kst/src/widgets/widgets.pro #726722:726723
@@ -28,6 +28,7 @@
     curveappearance.cpp \
     curveplacement.cpp \
     datarange.cpp \
+    fftoptions.cpp \
     filerequester.cpp \
     gradienteditor.cpp \
     matrixselector.cpp \
@@ -42,6 +43,7 @@
     curveappearance.h \
     curveplacement.h \
     datarange.h \
+    fftoptions.h \
     filerequester.h \
     gradienteditor.h \
     matrixselector.h \
@@ -54,6 +56,7 @@
     datarange.ui \
     curveappearance.ui \
     curveplacement.ui \
+    fftoptions.ui \
     matrixselector.ui \
     scalarselector.ui \
     stringselector.ui \