Bug found in CutModule, not setting the output as NULL in the black box

[creaMaracasVisu.git] / lib / maracasVisuLib / src / CutModule / kernel / CutModelData.h

diff --git a/lib/maracasVisuLib/src/CutModule/kernel/CutModelData.h b/lib/maracasVisuLib/src/CutModule/kernel/CutModelData.h
index 84d4e0bd1b8477eb2cdc06caf63bc165ec72673c..eb82e8dc4a584b76500e2f99d4c7b0de352b16e9 100644 (file)
--- a/lib/maracasVisuLib/src/CutModule/kernel/CutModelData.h
+++ b/lib/maracasVisuLib/src/CutModule/kernel/CutModelData.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: CutModelData.h,v $
   Language:  C++
-  Date:      $Date: 2009/09/01 14:01:36 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2009/09/08 08:14:27 $
+  Version:   $Revision: 1.3 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -42,8 +42,11 @@
 class CutModelData  {
 
 public:
+       CutModelData();
        CutModelData(int id, vtkRenderWindowInteractor* interactor, vtkCommand* observer, vtkImageData* img);
        ~CutModelData();
+       void initializeData(int id, vtkRenderWindowInteractor* interactor, vtkCommand* observer, vtkImageData* img);
+
 
        int getId(){
                return _id;
@@ -56,6 +59,8 @@ public:
        void ChangeShape(int selection)throw( CutModelException);
 
        vtkActor* getActor()throw( CutModelException);
+
+       vtkPolyData* getPolyData()throw( CutModelException);
        
        void changeColor(double r,double g,double b)throw( CutModelException);
 
@@ -63,7 +68,23 @@ public:
 
        void ExecuteCut( double* range, bool isinside, vtkImageData* copyimage)throw( CutModelException);
 
+       void ExecuteUnCut(  bool isinside, vtkImageData* image, vtkImageData* copyimage)throw( CutModelException);
+
        void RefreshViewBox();
+
+       vtkTransform* getCurrentMatrix(){
+               return currentmatrix;
+       }
+
+       int getCurrentShape(){
+               return _currentshape;
+       }
+
+       void setCurrentShape(int currentshape){
+               _currentshape = currentshape;
+       }
+
+       void setTransform(vtkTransform* transform,vtkImageData* img)throw( CutModelException);
 private:       
        
        void checkInvariant()throw( CutModelException);
@@ -71,7 +92,7 @@ private:
        void createBoxWidget(vtkRenderWindowInteractor* interactor, vtkCommand* observer);
        void createActor();
        void setTransform(vtkImageData* img)throw( CutModelException);
-       void createShapes();
+       void createShapes();    
 
        vtkBoxWidget* _boxWidgetVolume;
        vtkPolyDataMapper* _Mapper;     
@@ -87,6 +108,7 @@ private:
        vtkTransform* modeltransform;
        vtkTransform* inversModel;
 
+
        CutModelFigure* getCurentCuttingModel();
 
        vtkTransform* getModelTransform(vtkImageData* copyimage);