X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvMainWindow.h;h=8ee5ab26178adf4d421514e1c9a8a147c79765b9;hb=df1fe7da56a47ca087ca20ff5bb3c5b74abaad01;hp=cc53aa6bf80d151e7c45d605590d415d1962dae6;hpb=451f8e875ec446efa2235abc2085fcf6ec67f523;p=clitk.git

diff --git a/vv/vvMainWindow.h b/vv/vvMainWindow.h
index cc53aa6..8ee5ab2 100644
--- a/vv/vvMainWindow.h
+++ b/vv/vvMainWindow.h
@@ -3,7 +3,7 @@
 
   Authors belong to: 
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 
 #ifndef VVMAINWINDOW_H
 #define VVMAINWINDOW_H
@@ -24,7 +24,7 @@
 #include "ui_vvMainWindow.h"
 #include "vvMainWindowBase.h"
 #include "vvToolManager.h"
-#include "vvConstants.h"
+#include "vvImageReader.h"
 #include "vvMesh.h"
 #include "clitkMemoryUsage.h"
 
@@ -50,7 +50,7 @@ class vvMainWindow: public vvMainWindowBase,
   public:
   vvMainWindow();
   ~vvMainWindow();
-  void LoadImages(std::vector<std::string> filenames, LoadedImageType type);
+  void LoadImages(std::vector<std::string> filenames, vvImageReader::LoadedImageType type);
   vvSlicerManager * AddImage(vvImage::Pointer image,std::string filename);
   void AddField(QString file,int index);
   void AddOverlayImage(int index, QString filename);
@@ -87,6 +87,7 @@ public slots:
   void ImageInfoChanged();
   void ShowHelpDialog();
   void ShowDocumentation();
+  void PopupRegisterForm(bool checkCanPush=false);
   void ComputeDeformableRegistration();
   void WarpImage();
   void ChangeViewMode();
@@ -100,12 +101,12 @@ public slots:
   void SegmentationOnCurrentImage();
   void SurfaceViewerLaunch();
 
-  void WindowsChanged(int window, int view, int slice);
-  void WindowLevelChanged(double window, double level,int preset, int colormap);
+  void WindowLevelChanged();
   void UpdateSlice(int slicer, int slice);
   void UpdateTSlice(int slicer, int slice);
   void UpdateSliceRange(int slicer, int min, int max, int tmin, int tmax);
   void WindowLevelEdited();
+  void SetWindowLevel(double w, double l);
   void UpdateColorMap();
   void UpdateWindowLevel();
   void SwitchWindowLevel();
@@ -139,10 +140,11 @@ public slots:
   void OpenField();
   void SelectOverlayImage();
   void SelectFusionImage();
+  void ResetTransformationToIdentity();
 
   void SetVFProperty(int subsampling,int scale,int lut, int width, double r, double g, double b);
-  void SetOverlayProperty(int color);
-  void SetFusionProperty(int opacity,int colormap,double window,double level);
+  void SetOverlayProperty(int color, int linked, double window, double level);
+  void SetFusionProperty(int opacity, int tresOpacity, int colormap,double window,double level);
 
   void GoToCursor();
   void PlayPause();
@@ -152,7 +154,13 @@ public slots:
   }
   void UpdateRenderWindows();
   void UpdateMemoryUsage();
-
+  void show();
+  
+protected:
+  
+  void createRecentlyOpenedFilesMenu();
+  void updateRecentlyOpenedFilesMenu(const std::list<std::string> &files);
+  
 private:
 
   //variables
@@ -184,6 +192,7 @@ private:
   int GetImageDuplicateFilenameNumber(std::string filename);
 
   QMenu contextMenu;
+  QMenu* recentlyOpenedFilesMenu;
   //QMenu *AddSubImageMenu;
   std::vector<QAction*> contextActions;
   std::vector<QSlider*> horizontalSliders;
@@ -203,6 +212,4 @@ private:
   
 };
 
-#include "vvMainWindow.txx"
-
 #endif