put experimental tools in the experimental menu

diff --git a/vv/vvMainWindow.cxx b/vv/vvMainWindow.cxx
index 36b7db0c9c18e4b7cfa7f34f19e7b99a082eecb4..722c923aa3512f47cade4906d499913bf5fb7fea 100644 (file)
--- a/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@ -3,8 +3,8 @@
   Program:   vv
   Module:    $RCSfile: vvMainWindow.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/03/24 10:48:18 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2010/03/24 13:37:34 $
+  Version:   $Revision: 1.18 $
   Author :   Pierre Seroul (pierre.seroul@gmail.com)
 
   Copyright (C) 200COLUMN_IMAGE_NAME
@@ -112,6 +112,7 @@ vvMainWindow::vvMainWindow():vvMainWindowBase() {
 
   mInputPathName = "";
   mMenuTools = menuTools;
+  mMenuExperimentalTools = menuExperimental;
   mMainWidget = this;
 
   //Init the contextMenu

diff --git a/vv/vvMainWindowBase.h b/vv/vvMainWindowBase.h
index 1c10d5efd015158400cf3bcbdbc00210d640bbd5..f1a24e924bb187b1641e8d099508b7f12b5b8b6f 100644 (file)
--- a/vv/vvMainWindowBase.h
+++ b/vv/vvMainWindowBase.h
@@ -45,7 +45,8 @@ public:
   virtual void AddImage(vvImage::Pointer image,std::string filename) = 0;
   virtual void UpdateCurrentSlicer() = 0;
   const std::vector<vvSlicerManager*> & GetSlicerManagers() const { return mSlicerManagers; }
-  QMenu * GetMenu() const { return mMenuTools; }
+  QMenu * GetToolMenu() const { return mMenuTools; }
+  QMenu * GetExperimentalToolMenu() const { return mMenuExperimentalTools; }
   int GetSlicerManagerCurrentIndex() const { return mSlicerManagerCurrentIndex; }
   QWidget * GetMainWidget() { return mMainWidget; }
 
@@ -55,6 +56,7 @@ signals:
 protected:
   std::vector<vvSlicerManager*> mSlicerManagers;
   QMenu * mMenuTools;
+  QMenu * mMenuExperimentalTools;
   int mSlicerManagerCurrentIndex;
   QWidget* mMainWidget;
 };

diff --git a/vv/vvToolBase.h b/vv/vvToolBase.h
index e86b0407df78d6657e7f1ec7511a11d46203f6e0..4599cef4ce625ed9ab31c9bdf4cfcd203317194f 100644 (file)
--- a/vv/vvToolBase.h
+++ b/vv/vvToolBase.h
@@ -3,8 +3,8 @@
   Program:   vv
   Module:    $RCSfile: vvToolBase.h,v $
   Language:  C++
-  Date:      $Date: 2010/03/01 07:37:25 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2010/03/24 13:37:34 $
+  Version:   $Revision: 1.5 $
   Author :   David Sarrut (david.sarrut@creatis.insa-lyon.fr)
 
   Copyright (C) 2008
@@ -42,6 +42,7 @@ public:
   static void SetToolMenuName(QString n) { vvToolCreator<ToolType>::mSingleton->mToolMenuName = n; }
   static void SetToolIconFilename(QString n) { vvToolCreator<ToolType>::mSingleton->mToolIconFilename = n; }
   static void SetToolTip(QString n) { vvToolCreator<ToolType>::mSingleton->mToolTip = n; }
+  static void SetToolExperimental(bool exp) { vvToolCreator<ToolType>::mSingleton->mExperimental = exp; }
 
   void AddImage(vvImage::Pointer image,std::string filename) {
     CREATOR(ToolType)->GetMainWindow()->AddImage(image,filename); 

diff --git a/vv/vvToolCreatorBase.cxx b/vv/vvToolCreatorBase.cxx
index 57a1d9f24b358c2584cf06ff7a31cb27fab3ed4d..b2b834c4290416c96ddaf7fa273d79d39df4f05b 100644 (file)
--- a/vv/vvToolCreatorBase.cxx
+++ b/vv/vvToolCreatorBase.cxx
@@ -3,8 +3,8 @@
   Program:   vv
   Module:    $RCSfile: vvToolCreatorBase.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/02/24 11:42:42 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2010/03/24 13:37:34 $
+  Version:   $Revision: 1.3 $
   Author :   David Sarrut (david.sarrut@creatis.insa-lyon.fr)
 
   Copyright (C) 2008
@@ -31,7 +31,7 @@
 #include <QMenu>
 
 //------------------------------------------------------------------------------
-vvToolCreatorBase::vvToolCreatorBase(QString name) { 
+vvToolCreatorBase::vvToolCreatorBase(QString name): mExperimental(false) { 
   mToolName = name;
   vvToolManager::GetInstance()->AddTool(this); 
 }
@@ -50,7 +50,10 @@ void vvToolCreatorBase::InsertToolInMenu(vvMainWindowBase * m) {
   mAction->setStatusTip(mToolTip);
   // Connect the action
   connect(mAction, SIGNAL(triggered()), this, SLOT(MenuToolSlot()));
-  mMainWindow->GetMenu()->addAction(mAction);
+  if (mExperimental)
+      mMainWindow->GetExperimentalToolMenu()->addAction(mAction);
+  else
+      mMainWindow->GetToolMenu()->addAction(mAction);
 } 
 //------------------------------------------------------------------------------
 

diff --git a/vv/vvToolCreatorBase.h b/vv/vvToolCreatorBase.h
index 2143239f57d991f25e86a8c98379254da0cc46e1..24d0e453adbbd09468c9ea2f0f67fab5bfd3b631 100644 (file)
--- a/vv/vvToolCreatorBase.h
+++ b/vv/vvToolCreatorBase.h
@@ -3,8 +3,8 @@
   Program:   vv
   Module:    $RCSfile: vvToolCreatorBase.h,v $
   Language:  C++
-  Date:      $Date: 2010/02/24 11:42:42 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2010/03/24 13:37:34 $
+  Version:   $Revision: 1.3 $
   Author :   David Sarrut (david.sarrut@creatis.insa-lyon.fr)
 
   Copyright (C) 2008
@@ -52,6 +52,7 @@ class vvToolCreatorBase: public QObject {
   QString mToolIconFilename;
   QString mToolTip;
   QAction * mAction;
+  bool mExperimental;
 
 public slots:
   virtual void MenuToolSlot() { MenuSpecificToolSlot(); }

diff --git a/vv/vvToolImageArithm.cxx b/vv/vvToolImageArithm.cxx
index 107973085d921ad3f79dbc25501502749de2b250..8a508e4ea6c9e53d4f47aae2bb5b60b1fdd276c5 100644 (file)
--- a/vv/vvToolImageArithm.cxx
+++ b/vv/vvToolImageArithm.cxx
@@ -3,8 +3,8 @@
   Program:   vv
   Module:    $RCSfile: vvToolImageArithm.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/03/24 13:02:59 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2010/03/24 13:37:34 $
+  Version:   $Revision: 1.2 $
   Author :   David Sarrut (david.sarrut@creatis.insa-lyon.fr)
 
   Copyright (C) 2010
@@ -66,6 +66,7 @@ void vvToolImageArithm::Initialize() {
   SetToolMenuName("ImageArithm");
   SetToolIconFilename(":/new/prefix1/icons/cross.png");
   SetToolTip("Perform simple arithmetic operations on one or two images.");
+  SetToolExperimental(true);
 }
 //------------------------------------------------------------------------------