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

[Mike Fenton]

SVN commit 732089 by fenton:

Addition of DataWizard.  Includes all function GUI aspects as well as
object creations as much as they are currently working.


 A             datawizard.cpp   [License: GPL (v2+)]
 A             datawizard.h   [License: GPL (v2+)]
 A             datawizardpagedatapresentation.ui  
 A             datawizardpagedatasource.ui  
 A             datawizardpagefilters.ui  
 A             datawizardpageplot.ui  
 A             datawizardpagevectors.ui  
 M  +7 -0      libkstapp.pro  
 M  +13 -0     mainwindow.cpp  
 M  +2 -0      mainwindow.h  
 M  +2 -1      vectordialog.cpp  


--- branches/work/kst/portto4/kst/src/libkstapp/libkstapp.pro #732088:732089
@@ -40,6 +40,7 @@
     datamanager.cpp \
     datasourcedialog.cpp \
     datatab.cpp \
+    datawizard.cpp \
     debugdialog.cpp \
     debugnotifier.cpp \
     dialog.cpp \
@@ -126,6 +127,7 @@
     dataref.h \
     datasourcedialog.h \
     datatab.h \
+    datawizard.h \
     debugdialog.h \
     debugnotifier.h \
     dialog.h \
@@ -200,6 +202,11 @@
     csdtab.ui \
     curvetab.ui \
     datamanager.ui \
+    datawizardpagedatapresentation.ui \
+    datawizardpagedatasource.ui \
+    datawizardpagefilters.ui \
+    datawizardpageplot.ui \
+    datawizardpagevectors.ui \
     debugdialog.ui \
     dialog.ui \
     differentiatecurvesdialog.ui \
--- branches/work/kst/portto4/kst/src/libkstapp/mainwindow.cpp #732088:732089
@@ -41,6 +41,7 @@
 #include "choosecolordialog.h"
 #include "changedatasampledialog.h"
 #include "changefiledialog.h"
+#include "datawizard.h"
 
 #include <QtGui>
 
@@ -555,6 +556,11 @@
   _changeFileDialogAct->setStatusTip(tr("Show Kst's Change Data File Dialog"));
   connect(_changeFileDialogAct, SIGNAL(triggered()), this, SLOT(showChangeFileDialog()));
 
+  _dataWizardAct = new QAction(tr("&Data Wizard"), this);
+  _dataWizardAct->setStatusTip(tr("Show Kst's Data Wizard"));
+  connect(_dataWizardAct, SIGNAL(triggered()), this, SLOT(showDataWizard()));
+
+
 }
 
 
@@ -603,6 +609,7 @@
   _layoutMenu->addAction(_createSvgAct);
 
   _toolsMenu = menuBar()->addMenu(tr("&Tools"));
+  _toolsMenu->addAction(_dataWizardAct);
   _toolsMenu->addAction(_changeFileDialogAct);
   _toolsMenu->addAction(_changeDataSampleDialogAct);
   _toolsMenu->addAction(_chooseColorDialogAct);
@@ -766,6 +773,12 @@
 }
 
 
+void MainWindow::showDataWizard() {
+  DataWizard dataWizard(this);
+  dataWizard.exec();
+}
+
+
 void MainWindow::showChangeFileDialog() {
   ChangeFileDialog changeFileDialog(this);
   changeFileDialog.exec();
--- branches/work/kst/portto4/kst/src/libkstapp/mainwindow.h #732088:732089
@@ -60,6 +60,7 @@
     void showChooseColorDialog();
     void showChangeDataSampleDialog();
     void showChangeFileDialog();
+    void showDataWizard();
 
     void save();
     void saveAs();
@@ -173,6 +174,7 @@
     QAction *_chooseColorDialogAct;
     QAction *_changeDataSampleDialogAct;
     QAction *_changeFileDialogAct;
+    QAction *_dataWizardAct;
 
 };
 
--- branches/work/kst/portto4/kst/src/libkstapp/vectordialog.cpp #732088:732089
@@ -304,6 +304,8 @@
 //            << endl;
 
   DataVectorPtr vector = _document->objectStore()->createObject<DataVector>(tag);
+
+  vector->writeLock();
   vector->change(dataSource, field,
       dataRange->countFromEnd() ? -1 : int(dataRange->start()),
       dataRange->readToEnd() ? -1 : int(dataRange->range()),
@@ -322,7 +324,6 @@
       dataRange->doFilter());
 #endif
 
-  vector->writeLock();
   vector->update(0);
   vector->unlock();