X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolROIManager.h;h=8ad4a1c65ece4c5393460804b03715f18248cbae;hb=9c5f0e4d3d6b33e09d0413439ed7a867e3d85faa;hp=4bbf39493a0e111dab74185e189422f981a22b44;hpb=5312281fb385245fff3d64693e1549ffc27206e4;p=clitk.git

diff --git a/vv/vvToolROIManager.h b/vv/vvToolROIManager.h
index 4bbf394..8ad4a1c 100644
--- a/vv/vvToolROIManager.h
+++ b/vv/vvToolROIManager.h
@@ -43,14 +43,18 @@ class vvToolROIManager:
   static void Initialize();
   virtual void InputIsSelected(vvSlicerManager *m);
 
-  void AddImage(vvImage * binaryImage, std::string filename, double BG, bool m_modeBG=true);
+  void AddImage(vvImage * binaryImage, std::string name, std::string filename, double BG, bool m_modeBG=true);
   void UpdateAllContours();
   void UpdateAllROIStatus();
+  virtual void SaveState(std::auto_ptr<QXmlStreamWriter> & m_XmlWriter);
+  virtual void InitializeNewTool(bool ReadStateFlag);
 
   public slots:
   void AnImageIsBeingClosed(vvSlicerManager *);
   void SelectedImageHasChanged(vvSlicerManager *);
-  void OpenBinaryImage();
+  void Open();
+  void OpenBinaryImage(QStringList & filenames);
+  void OpenDicomImage(std::string filaneme);
   void SelectedItemChangedInTree();
   void VisibleROIToggled(bool b);
   void VisibleContourROIToggled(bool b);
@@ -63,20 +67,22 @@ class vvToolROIManager:
   void AllVisibleContourROIToggled(bool b);
   void ReloadCurrentROI();  
   void close();
+  vvSlicerManager * GetCurrentSlicerManager() { return mCurrentSlicerManager; }
 
 protected:
   Ui::vvToolROIManager ui;
-  vvSlicerManager * mSlicerManager;
+  vvSlicerManager * mCurrentSlicerManager; // need it because do not inherit from vvToolWidgetBase
   vvImage * mCurrentImage;
   vvMainWindowBase * mMainWindow;
   int mIndexFirstTab;
+  bool mOpenFileBrowserFlag;
   
   int mNumberOfVisibleROI;
   int mNumberOfVisibleContourROI;
 
   vtkSmartPointer<vtkLookupTable> mDefaultLUTColor;
 
-  std::vector<vvImage::Pointer> mOpenedBinaryImage;
+  QStringList mOpenedBinaryImageFilenames;
   std::vector<clitk::DicomRT_ROI::Pointer> mROIList;
   std::vector<QSharedPointer<vvROIActor> > mROIActorsList;
 
@@ -88,6 +94,13 @@ protected:
   // Data for current selected roi
   clitk::DicomRT_ROI::Pointer mCurrentROI;
   QSharedPointer<vvROIActor> mCurrentROIActor;
+  
+  // Data for XML Reader
+  void ReadXMLInformation();
+  void ReadXMLInformation_ROI();
+  uint mInitialImageIndex;
+  QStringList mROIFilenames;
+  std::vector<QSharedPointer<vvROIActor> > mROIActorsParamList;
  
 }; // end class vvToolROIManager
 //------------------------------------------------------------------------------