*** empty log message ***

[creaMaracasVisu.git] / lib / maracasVisuLib / src / CutModule / interface / CutModel2MainPanel.cxx

diff --git a/lib/maracasVisuLib/src/CutModule/interface/CutModel2MainPanel.cxx b/lib/maracasVisuLib/src/CutModule/interface/CutModel2MainPanel.cxx
index a953a03db570a3e33276a9ff8ff16f500442ed76..4b0367f44635ced747494caaba81d9ebb6252e5e 100644 (file)
--- a/lib/maracasVisuLib/src/CutModule/interface/CutModel2MainPanel.cxx
+++ b/lib/maracasVisuLib/src/CutModule/interface/CutModel2MainPanel.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: CutModel2MainPanel.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/11/19 15:00:32 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2009/11/19 16:34:43 $
+  Version:   $Revision: 1.3 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -50,7 +50,7 @@ CutModel2MainPanel::~CutModel2MainPanel( ){
 
 void CutModel2MainPanel::initialize(std::string path){
        
-       cutmanager = new CutModel2Manager(path);
+       cutmanager = new CutModelManager(path);
 
        _panelid = 0;
        _wxauimanager = new wxAuiManager(this); 
@@ -88,7 +88,7 @@ void CutModel2MainPanel::setInteractor(vtkRenderWindowInteractor* interactor){
        try{
                checkInvariant();
                cutmanager->setInteractor(interactor);
-       }catch(CutModel2Exception e){
+       }catch(CutModelException e){
                showErrorDialog(e.getCause());
        }
 }
@@ -102,9 +102,9 @@ void CutModel2MainPanel::setRenderer(vtkRenderer* renderer){
        }
 }
 
-void CutModel2MainPanel::checkInvariant()throw (CutModel2Exception){
+void CutModel2MainPanel::checkInvariant()throw (CutModelException){
        if(cutmanager==NULL){
-               throw CutModel2Exception("The manager is not initialize");
+               throw CutModelException("The manager is not initialize");
        }       
 }
 
@@ -140,7 +140,7 @@ void CutModel2MainPanel::onAddCutModel2(){
                checkInvariant();
 
                int id = addNewViewPanel();             
-               cutmanager->onAddCutModel2(id, getModelView(id));
+               cutmanager->onAddCutModel(id, getModelView(id));
 
                _panelid++;
 
@@ -161,9 +161,9 @@ void CutModel2MainPanel::ShowCurrentPanel(int id){
        }
        _wxauimanager->Update();
 }
-int CutModel2MainPanel::addNewViewPanel()throw( CutModel2Exception){
+int CutModel2MainPanel::addNewViewPanel()throw( CutModelException){
        
-       CutModel2View* viewpanel = new CutModel2View(this,cutmanager->getImageRange());
+       CutModelView* viewpanel = new CutModelView(this,cutmanager->getImageRange());
 
        wxAuiPaneInfo paneinfo0;
        _wxauimanager->AddPane(viewpanel, paneinfo0.DefaultPane().DestroyOnClose().Centre());   
@@ -178,7 +178,7 @@ int CutModel2MainPanel::addNewViewPanel()throw( CutModel2Exception){
 }
 CutModel2View* CutModel2MainPanel::getModelView(int id)throw( CutModel2Exception){
 
-       CutModel2View* current = NULL;
+       CutModelView* current = NULL;
        for(int i = 0; i < viewpanels.size();i++){
                if(viewpanels[i]->getId()==id){
             current = viewpanels[i];
@@ -195,7 +195,7 @@ void CutModel2MainPanel::onUndo(){
                checkInvariant();               
                int result = cutmanager->Undo();
 
-       }catch(CutModel2Exception e){
+       }catch(CutModelException e){
                showErrorDialog(e.getCause());
        }
        
@@ -207,7 +207,7 @@ void CutModel2MainPanel::onRedo(){
                checkInvariant();               
                int result = cutmanager->Redo();
 
-       }catch(CutModel2Exception e){
+       }catch(CutModelException e){
                showErrorDialog(e.getCause());
        }
        
@@ -218,7 +218,7 @@ void CutModel2MainPanel::changeOpacity(int id,int opacity){
                checkInvariant();               
                cutmanager->changeOpacity(id, opacity);
 
-       }catch(CutModel2Exception e){
+       }catch(CutModelException e){
                showErrorDialog(e.getCause());
        }
 }
@@ -228,7 +228,7 @@ void CutModel2MainPanel::ShowViewBox(int id,bool check){
                checkInvariant();               
                cutmanager->ShowViewBox(id, check);
 
-       }catch(CutModel2Exception e){
+       }catch(CutModelException e){
                showErrorDialog(e.getCause());
        }
 }
@@ -272,7 +272,7 @@ void CutModel2MainPanel::ExecuteCut(int id, double* range, bool isinside){
                checkInvariant();               
 
                cutmanager->ExecuteCut(id, range, isinside);
-       }catch(CutModel2Exception e){
+       }catch(CutModelException e){
                showErrorDialog(e.getCause());
        }
 }
@@ -306,11 +306,11 @@ void CutModel2MainPanel::ShowStatistics(int id){
 }
 
 void CutModel2MainPanel::SaveCutModel2Data(std::string filename){
-       cutmanager->SaveCutModel2Data(filename);
+       cutmanager->SaveCutModelData(filename);
 }
 
 void CutModel2MainPanel::LoadCutModel2Data(std::string filename){
-    cutmanager->LoadCutModel2Data(filename);
+    cutmanager->LoadCutModelData(filename);
 }
 /**
 **