X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvMainWindow.h;h=df525fc1020a54b4f59442de68246d13aae4da25;hb=98bdb72d057c122863776f8c3fb74659e8c87beb;hp=b3d60313ffa09a5b070231543ae2a01e2d4027e3;hpb=f7dee5f397e4efa933ef32507698ff1c1e573c2e;p=clitk.git

diff --git a/vv/vvMainWindow.h b/vv/vvMainWindow.h
index b3d6031..df525fc 100644
--- a/vv/vvMainWindow.h
+++ b/vv/vvMainWindow.h
@@ -29,12 +29,10 @@ GNU General Public License for more details.
 #include <vector>
 
 #include "ui_vvMainWindow.h"
-
+#include "vvMainWindowBase.h"
+#include "vvToolManager.h"
 #include "vvConstants.h"
-#include "vvImage.h"
 #include "vvMesh.h"
-#include "vvToolManager.h"
-#include "clitkCommon.h"
 
 class vvSlicerManager;
 class vvHelpDialog;
@@ -45,16 +43,8 @@ class vtkRenderer;
 class vvDicomSeriesSelector;
 
 //------------------------------------------------------------------------------
-struct vvMainWindowToolInfo {
-  QMenu * mMenuTools;
-  std::vector<vvSlicerManager*> * mSlicerManagers;
-  int mSlicerManagerCurrentIndex;
-};
-//------------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------------
-class vvMainWindow : public QMainWindow, private Ui::vvMainWindow
+class vvMainWindow: public vvMainWindowBase,
+                    private Ui::vvMainWindow
 {
   Q_OBJECT
 
@@ -71,7 +61,9 @@ class vvMainWindow : public QMainWindow, private Ui::vvMainWindow
   ///This is used to show an image when opened or computed
   void ShowLastImage();
 
-  vvMainWindowToolInfo * GetInfoForTool();
+  virtual void UpdateCurrentSlicer();
+  //vvMainWindowToolInfo * GetInfoForTool();
+//   void AddRunningTool(vvToolCreatorBase * tool);
 
 public slots:
   ///Allows the user to open and select various surfaces contained in a dicom-struct file
@@ -139,7 +131,7 @@ public slots:
   void SaveSOScreenshot();
 
   void ShowContextMenu(QPoint point);
-  void CropImage();
+  //  void CropImage();
   void SplitImage();
   void CloseImage();
   void ReloadImage();
@@ -165,7 +157,7 @@ public slots:
 private:
 
   //variables
-  std::vector<vvSlicerManager*> mSlicerManagers;
+  // std::vector<vvSlicerManager*> mSlicerManagers;
   vvHelpDialog *help_dialog;
   vvDocumentation *documentation;
   vvDicomSeriesSelector *dicomSeriesSelector;
@@ -197,7 +189,8 @@ private:
   std::vector<QSlider*> verticalSliders;
   int mFrameRate;
 
-  vvMainWindowToolInfo * mCurrentToolInfo;
+  // vvMainWindowToolInfo * mCurrentToolInfo;
+  // std::vector<vvToolCreatorBase*> mListOfRunningTool;
 
   static vvMainWindow * mSingleton;
 };