X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxGimmick.h;h=9673b5cca0f4086415ff0857d705a68691f15f75;hb=26963d13f31f98807176a062b1d2c209df9c7869;hp=13cdaf8e3109fc01749d4877339eaf98f5b0ef7f;hpb=29cfc2f238ce7c522d3c878e032982d3a52d1044;p=creaImageIO.git

diff --git a/src/creaImageIOWxGimmick.h b/src/creaImageIOWxGimmick.h
index 13cdaf8..9673b5c 100644
--- a/src/creaImageIOWxGimmick.h
+++ b/src/creaImageIOWxGimmick.h
@@ -6,10 +6,11 @@
 #include <creaImageIODicomDatabase.h>
 
 // wx
-#include "wx/wx.h"
-#include "wx/image.h"
-#include "wx/imaglist.h"
+#include <creaWx.h>
+#include <wx/image.h>
+#include <wx/imaglist.h>
 #include <wx/splitter.h>
+#include <wx/notebook.h>
 #include "treelistctrl.h"
 
 // dicom fields view panel
@@ -19,7 +20,7 @@
 
 // For image preview 
 // vtk and wxvtk classes
-#include "wxVTKRenderWindowInteractor.h"
+#include "creawxVTKRenderWindowInteractor.h"
 #include "vtkImageViewer2.h"
 // multi-thread image reader
 #include <creaImageIOMultiThreadImageReader.h>
@@ -105,6 +106,8 @@ namespace creaImageIO
     void LoadChildren( wxTreeItemId& id );
     friend class WxGimmickEvent;
 
+    void ShowHelp();
+
   private:
 
     WxGimmick() { }
@@ -132,8 +135,16 @@ namespace creaImageIO
     const std::string& GetDatabaseExtension() { return mDatabaseExtension; }
     void SetDatabaseExtension(const std::string& ext) 
     { mDatabaseExtension = ext; }
+
+
+    /// Settings
     Settings mSettings;
 
+
+    // Help 
+    WxGimmickHelp* mHelp;
+    bool mJustStarted;
+
     int  mFirstDicomDatabaseIconIndex;
     // Id of the item which activated the popup menu 
     wxTreeItemId mItemOfMenu;
@@ -145,6 +156,8 @@ namespace creaImageIO
 
     WxGimmickFieldsView* mFieldsView;
 
+    wxNotebook* mwxNotebook;
+
     wxSplitterWindow		*mSplitter1;
     wxSplitterWindow		*mSplitter2;
     
@@ -153,7 +166,7 @@ namespace creaImageIO
    // Previewer
     vtkImageViewer2* mViewer;
     // Associated wxvtk interactor
-    crea::wxVTKRenderWindowInteractor  *mInteractor;
+	crea::creawxVTKRenderWindowInteractor  *mInteractor;
   
     int mx1,mx2,my1,my2,mz1,mz2;
     double mspx,mspy,mspz;