X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmickView.h;h=347471561d4dffdf660f05fa2be4eb880aa7ea4c;hb=4e686df72aa8d0c59509195d173fd37acbd636b1;hp=57faaa73d161399dbafabaa530f3f05e21f6d20a;hpb=0475a9d0f4623a7ce65d1f8b0c14e53b305b1c10;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmickView.h b/src2/creaImageIOGimmickView.h
index 57faaa7..3474715 100644
--- a/src2/creaImageIOGimmickView.h
+++ b/src2/creaImageIOGimmickView.h
@@ -4,6 +4,7 @@
 #include <creaImageIOGimmick.h>
 #include <creaImageIOTreeView.h>
 #include <creaImageIOSystem.h>
+#include <creaImageIOImagePointerHolder.h>
 
 //#include <map>
 #include <vtkImageData.h>
@@ -28,6 +29,8 @@ namespace creaImageIO
 	/**
 	* \ingroup View
 	*/
+	 
+	class ImageExtent;
     //=====================================================================
     
     //=====================================================================
@@ -66,42 +69,42 @@ namespace creaImageIO
 
       virtual void GetSelectedFiles(std::vector<std::string>& s)
       { GimmickError("INTERNAL ERROR : GetSelectedFiles not implemented"); }
-      virtual void OnSelectionChange(std::vector<tree::Node*>& s)
+
+	  virtual void GetImages(int dim, std::vector<std::string> files, std::vector<vtkImageData*>& s) 
+	  { GimmickError("INTERNAL ERROR : GetImages not implemented"); }
+
+      virtual void OnSelectionChange(const std::vector<tree::Node*>& s, bool isSelection, int selection, bool mProcess)
       { GimmickError("INTERNAL ERROR : OnSelectionChange not implemented"); }
+
+	   virtual void ClearSelection()
+      { GimmickError("INTERNAL ERROR : ClearSelection not implemented"); }
+      
       
       ///Validates the dimension compliance of the images with the maximum and minimum given, and between their sizes
-      bool ValidateSelected (std::vector<tree::Node*>& sel, int min_dim, int max_dim);
+      bool ValidateSelected (tree::Node* sel, int min_dim, int max_dim);
       
-      ///Reads the vector of nodes, builds images in the dimension required and returns them in the supplied vector.
-      void ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vector<tree::Node*> im, int dim);
+      ///Reads the vector of images, builds it in the dimension required and returns them in the supplied vector.
+	  void ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vector<std::string> files, int dim);
       ///Requests the reading of an image with priority and index in the 
       /// current selection (-1 if not in selection)
-      void RequestReading(tree::Node* n, int prio, int selection_index);
-
-      ///Returns true if the ImageEventQueue is empty
-      bool IsQueueEmpty(){return mImageEventQueue.empty();}
-      ///Clears the queue
-      void ClearQueue(){mImageEventQueue.clear();}
-      ///Returns the next in line EventType's image
-      vtkImageData* GetNextImageQueued(){return mImageEventQueue.front().image;}
-      ///Returns the next in line EventType's node
-      tree::Node* GetNextNodeQueued(){return mImageEventQueue.front().node;}
-      ///Returns the next in line EventType's index in selection
-      int GetNextSelectionIndexQueued(){return mImageEventQueue.front().index;}
-      ///Unqueus the next in line EventType
-      void UnqueueNext(){mImageEventQueue.pop_front();}
-      
+      void RequestReading(tree::Node* n, int prio, int selection_index , ImagePointerHolder *p);
+     
       
       ///Obtains the message of the state
       std::string GetMessage(){return mMess;}
       ///Obtains the message of the state
       void SetMessage(std::string mess){mMess=mess;}
+	  ///Resets the data of the extent and begins a new selection
+	  void ResetExtent();
 
       /// Create the tree views 
       void CreateTreeViews();
 
+	  /// Create a tree view with a given name
+	  void CreateSingleTreeView(std::string &i_name);
+
       /// Create the tree view for TreeHandler provided
-      virtual void CreateTreeView( TreeHandler*) 
+      virtual void CreateTreeView( TreeHandler*, TimestampDatabaseHandler* ) 
       { GimmickError("INTERNAL ERROR : CreateTreeView not implemented"); }
 
       /// Updates the TreeView of given name from level l to bottom
@@ -131,8 +134,10 @@ namespace creaImageIO
       void ConnectValidationObserver(ValidationCallbackType callback);
      //==================================================================
 
+	void modifyValidationSignal(bool ivalid);
 
     private:
+	
       /// Controller which manages the interaction with the model
       Gimmick* mGimmick;
       /// The views 
@@ -147,15 +152,16 @@ namespace creaImageIO
       /// else it has been unloaded
       struct ImageEventType
       {
-	ImageEventType( tree::Node* no = 0,  
-			vtkImageData* im = 0, 
-			int sel_index = -1)
-	  : node(no), image(im), index(sel_index) {}
+	ImageEventType( tree::Node* no = 0,   
+			int sel_index = -1,
+			ImagePointerHolder* ph= 0)
+	  : node(no), index(sel_index),  pointerHolder(ph){}
         ImageEventType(vtkImageData* im )
 	  : image(im) {}
         tree::Node* node;
         vtkImageData* image;
-	int index;
+		int index;
+		ImagePointerHolder* pointerHolder;
       };
       typedef std::map<std::string,ImageEventType> ImageEventTypeMap;
       /// Map of images' names to ImageEventType
@@ -163,9 +169,16 @@ namespace creaImageIO
       ImageEventTypeMap mImageEventMap;
       // queue of image event 
       typedef std::deque<ImageEventType> ImageEventQueueType;
-      ImageEventQueueType mImageEventQueue;
+      //ImageEventQueueType mImageEventQueue;
 
+	  ///The current image extent
+	  ImageExtent* mImageExtent;
+	  ///The validation signal
 	  ValidationSignalType mValidationSignal;
+	  ///Boolean that determines if the selection is valid
+	  bool valid;
+	  ///Boolean that determines if the reader has been started
+	  bool mReaderStarted;
       
 	};
   // EO class GimmickView
@@ -319,4 +332,4 @@ namespace creaImageIO
 } // EO namespace creaImageIO
 
 // EOF
-#endif  
+#endif