X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmickView.h;h=4621dbd6a3b727b2c53b08dc1cd78115ae521d5c;hb=595926ac27740a8822b6de9579e2e148c59f469c;hp=a87602a8bcd28c41b973b89287a8ca018985f5a5;hpb=4f05b9a3ab42185e11fdcc3d55d71a5111ef9c2a;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmickView.h b/src2/creaImageIOGimmickView.h
index a87602a..4621dbd 100644
--- a/src2/creaImageIOGimmickView.h
+++ b/src2/creaImageIOGimmickView.h
@@ -69,17 +69,29 @@ namespace creaImageIO
 
       virtual void GetSelectedFiles(std::vector<std::string>& s)
       { GimmickError("INTERNAL ERROR : GetSelectedFiles not implemented"); }
-      virtual void OnSelectionChange(std::vector<tree::Node*>& s, bool isSelection, int selection, bool mProcess)
+
+	  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"); }
+
+	  ///Adds a file to ignore
+	  virtual void AddIgnoreFile(tree::Node* toRemove)
+	  { GimmickError("INTERNAL ERROR : AddIgnoreFile not implemented"); }
       
+	  ///Copies selected files
+	  virtual void CopyFiles(const std::vector<std::string>& filenames)
+	  { GimmickError("INTERNAL ERROR : CopyFiles not implemented"); }
       
       ///Validates the dimension compliance of the images with the maximum and minimum given, and between their sizes
       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 , ImagePointerHolder *p);
@@ -95,8 +107,11 @@ namespace creaImageIO
       /// 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* ) 
       { GimmickError("INTERNAL ERROR : CreateTreeView not implemented"); }
 
       /// Updates the TreeView of given name from level l to bottom
@@ -126,6 +141,9 @@ namespace creaImageIO
       void ConnectValidationObserver(ValidationCallbackType callback);
      //==================================================================
 
+	  
+
+	void modifyValidationSignal(bool ivalid);
 
     private:
 	
@@ -162,9 +180,14 @@ namespace creaImageIO
       typedef std::deque<ImageEventType> ImageEventQueueType;
       //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