Working on wizard

Author: dcwhite

src/Interface/Application/MainWindowCollaborators.cc

@@ -26,9 +26,9 @@
    DEALINGS IN THE SOFTWARE.
 */
 
-#include <iostream>
 #include <QtGui>
 #include <Interface/Application/MainWindowCollaborators.h>
+#include <Interface/Application/SCIRunMainWindow.h>
 #include <Core/Logging/Log.h>
 
 using namespace SCIRun::Gui;
@@ -159,64 +159,61 @@ void WidgetDisablingService::temporarilyEnableService()
   serviceEnabled_ = true;
 }
 
-namespace {
+NewUserWizard::NewUserWizard(QWidget* parent) : QWizard(parent)
+{
+  addPage(createIntroPage());
+  addPage(createPathSettingPage());
+
+  setWindowTitle("SCIRun Tutorial Wizard");
+}
 
-QWizardPage *createIntroPage()
+QWizardPage* NewUserWizard::createIntroPage()
 {
-  QWizardPage *page = new QWizardPage;
+  auto page = new QWizardPage;
   page->setTitle("Introduction");
 
-  QLabel *label = new QLabel("This wizard will help you set up SCIRun for the first time and learn the basic SCIRun operations and hotkeys.");
+  auto label = new QLabel("This wizard will help you set up SCIRun for the first time and learn the basic SCIRun operations and hotkeys. All of these settings are available at any time in the Preferences window.");
   label->setWordWrap(true);
 
-  QVBoxLayout *layout = new QVBoxLayout;
+  auto layout = new QVBoxLayout;
   layout->addWidget(label);
   page->setLayout(layout);
 
   return page;
 }
 
-QWizardPage *createPathSettingPage()
+QWizardPage* NewUserWizard::createPathSettingPage()
 {
-  QWizardPage *page = new QWizardPage;
-  page->setTitle("Set Data Path");
+  auto page = new QWizardPage;
+  page->setTitle("Configuring Paths");
 
-  QLabel *label = new QLabel("Specify the location of SCIRun's data folder. This path is referenced in modules using the code %SCIRUNDATADIR%.");
+  auto label = new QLabel("Specify the location of SCIRun's data folder. This path is referenced in network files and modules using the code %SCIRUNDATADIR%.");
   label->setWordWrap(true);
 
-  auto classNameLabel = new QLabel("Data path:");
-  auto classNameLineEdit = new QLineEdit;
-  
+  pathLabel_ = new QLabel("Data path:");
+
   //page->registerField("className*", classNameLineEdit);
 
-  QVBoxLayout *layout = new QVBoxLayout;
+  auto layout = new QVBoxLayout;
   layout->addWidget(label);
 
-  auto hbox = new QHBoxLayout;
-  hbox->addWidget(classNameLabel);
-  hbox->addWidget(classNameLineEdit);
-  hbox->addWidget(new QPushButton("Set Path..."));
-  layout->addLayout(hbox);
+  layout->addWidget(pathLabel_);
+  auto button = new QPushButton("Set Path...");
+  layout->addWidget(button);
+  connect(button, SIGNAL(clicked()), SCIRunMainWindow::Instance(), SLOT(setDataDirectoryFromGUI()));
+  connect(SCIRunMainWindow::Instance(), SIGNAL(dataDirectorySet(const QString&)), this, SLOT(updatePathLabel(const QString&)));
 
   page->setLayout(layout);
 
   return page;
 }
 
-QWizardPage *createConclusionPage()
+QWizardPage* NewUserWizard::createConclusionPage()
 {
   return nullptr;
 }
 
-}
-
-void SCIRun::Gui::newUserWizard(QWidget* parent)
+void NewUserWizard::updatePathLabel(const QString& dir)
 {
-  auto wizard = new QWizard(parent);
-  wizard->addPage(createIntroPage());
-  wizard->addPage(createPathSettingPage());
-  //wizard.addPage(createConclusionPage());
-
-  wizard->setWindowTitle("SCIRun Tutorial Wizard");
-  wizard->exec();
+  pathLabel_->setText("Data path: " + dir);
 }

src/Interface/Application/MainWindowCollaborators.h

@@ -40,7 +40,9 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QDir>
+#include <QLabel>
 #include <QMutex>
+#include <QWizard>
 
 class QTextEdit;
 class QTreeWidget;
@@ -172,7 +174,20 @@ namespace Gui {
     QStatusBar* statusBar_;
   };
 
-  void newUserWizard(QWidget* parent);
+  class NewUserWizard : public QWizard
+  {
+    Q_OBJECT
+  public:
+    explicit NewUserWizard(QWidget* parent);
+
+  private Q_SLOTS:
+    void updatePathLabel(const QString& dir);
+  private:
+    QLabel* pathLabel_;
+    QWizardPage* createIntroPage();
+    QWizardPage* createPathSettingPage();
+    QWizardPage *createConclusionPage();
+  };
 }
 }
 #endif

src/Interface/Application/SCIRunMainWindow.cc

@@ -1169,6 +1169,7 @@ namespace {
     addSnippet("[ReadField*->ShowField->ViewScene]", snips);
     addSnippet("[CreateLatVol->ShowField->ViewScene]", snips);
     addSnippet("[ReadField*->ReportFieldInfo]", snips);
+    addSnippet("[ReadMatrix*->ReportMatrixInfo]", snips);
     addSnippet("[CreateStandardColorMap->RescaleColorMap->ShowField->ViewScene]", snips);
     addSnippet("[GetFieldBoundary->FairMesh->ShowField]", snips);
 
@@ -1448,6 +1449,7 @@ void SCIRunMainWindow::setDataDirectory(const QString& dir)
 
     RemembersFileDialogDirectory::setStartingDir(dir);
     Preferences::Instance().setDataDirectory(dir.toStdString());
+    Q_EMIT dataDirectorySet(dir);
   }
 }
 
@@ -1480,13 +1482,13 @@ void SCIRunMainWindow::addToDataDirectory(const QString& dir)
 
 void SCIRunMainWindow::setDataDirectoryFromGUI()
 {
-  QString dir = QFileDialog::getExistingDirectory(this, tr("Choose Data Directory"), ".");
+  auto dir = QFileDialog::getExistingDirectory(this, tr("Choose Data Directory"), ".");
   setDataDirectory(dir);
 }
 
 void SCIRunMainWindow::addToPathFromGUI()
 {
-	QString dir = QFileDialog::getExistingDirectory(this, tr("Add Directory to Data Path"), ".");
+  auto dir = QFileDialog::getExistingDirectory(this, tr("Add Directory to Data Path"), ".");
 	addToDataDirectory(dir);
 }
 
@@ -1586,7 +1588,8 @@ void SCIRunMainWindow::hideNonfunctioningWidgets()
 
 void SCIRunMainWindow::launchNewUserWizard()
 {
-  newUserWizard(this);
+  NewUserWizard wiz(this);
+  wiz.exec();
 }
 
 void SCIRunMainWindow::adjustModuleDock(int state)

src/Interface/Application/SCIRunMainWindow.h

@@ -97,6 +97,7 @@ class SCIRunMainWindow : public QMainWindow, public Ui::SCIRunMainWindow
 public Q_SLOTS:
   void executeAll();
   void showZoomStatusMessage(int zoomLevel);
+  void setDataDirectoryFromGUI();
 protected:
   virtual void closeEvent(QCloseEvent* event) override;
   virtual void keyPressEvent(QKeyEvent *event) override;
@@ -167,6 +168,7 @@ public Q_SLOTS:
 Q_SIGNALS:
   void moduleItemDoubleClicked();
   void defaultNotePositionChanged(NotePosition position);
+  void dataDirectorySet(const QString& dir);
 private Q_SLOTS:
   void saveNetworkAs();
   void saveNetwork();
@@ -192,7 +194,6 @@ private Q_SLOTS:
   void updateMiniView();
   void alertForNetworkCycles(int code);
   void updateDockWidgetProperties(bool isFloating);
-  void setDataDirectoryFromGUI();
   void toolkitDownload();
   void addToPathFromGUI();
   void removeSavedSubnetwork();