*** empty log message ***

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxMaracasIRMView.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx
index 2317a81f2fdcb8d9915e5767afa48084b6211625..4610a7b584d4a5ed29c0310b8ffed2ffbc74d156 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasIRMView.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/04/15 12:35:01 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2009/05/04 07:35:42 $
+  Version:   $Revision: 1.6 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -87,7 +87,7 @@ void wxMaracasIRMView::changeOpacity(int _propid, int value){
        irmmanager->changeOpacity(_propid,value);
 }
 
-void wxMaracasIRMView::changeIsoValue(int propid, int value){  
+void wxMaracasIRMView::changeIsoValue(int propid, double value){       
        irmmanager->changeIsoValue(propid, value);
 }
 
@@ -194,7 +194,16 @@ void wxMaracasIRMView::addIRMViewPanel(wxMaracasIRMViewPanel* irmview, std::stri
        wxAuiPaneInfo paneinfo; 
        wxauimanager->AddPane(irmview, paneinfo.DefaultPane().Centre().DestroyOnClose().Caption(s));
        wxauimanager->Update();
+       
+       
+}
 
+void wxMaracasIRMView::deleteActor(int propid){
+       try{
+               irmmanager->deleteActor(propid);
+       }catch(char* e){
+               
+       }
 }
 
 /**
@@ -206,43 +215,47 @@ wxMaracasIRMViewProp3D::wxMaracasIRMViewProp3D(wxWindow* parent,int propid)
        createControls();       
 }
 
-wxMaracasIRMViewProp3D::~wxMaracasIRMViewProp3D(){
-       //this->Show(false);
-       delete _colorchoose;
-       wxMaracasIRMView::getInstance()->addRemoveActor(_propid, false);
+wxMaracasIRMViewProp3D::~wxMaracasIRMViewProp3D(){     
+       //wxMaracasIRMView::getInstance()->addRemoveActor(_propid, false);
+       wxMaracasIRMView::getInstance()->deleteActor(_propid);
 }
 
 void wxMaracasIRMViewProp3D::createControls(){
 
+       wxFlexGridSizer* sizerirmprop = new wxFlexGridSizer(1,1,1);
+       
        wxString choices[2];
        choices[0] = wxString(_T("On"));
        choices[1] = wxString(_T("Off"));
        checkbox = new  wxCheckBox(this,-1,wxString(_T("Show Actor")));
-       this->addControl(checkbox);
-
        Connect(checkbox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasIRMViewProp3D::onCheckBoxChange);   
        checkbox->SetValue(true);       
+
+       sizerirmprop->Add(checkbox,wxFIXED_MINSIZE);
+
+       //this->addControl(checkbox);   
        
-       //std::string iconfile = wxMaracasIRMView::getInstance()->getPath();
-       //iconfile+= "/Data/Icons/Color.png";
-       //wxBitmap* bitmap = new wxBitmap(wxString(iconfile.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);    
        wxBitmap bitmap(Color_xpm);
        _colorchoose = new wxBitmapButton(this, -1, bitmap,wxDefaultPosition,wxSize(30,30));    
-       Connect(_colorchoose->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasIRMViewProp3D::onColorChange);            
-
-       wxBoxSizer* sizercolor = new wxBoxSizer(wxVERTICAL);
-       sizercolor->Add(checkbox,wxFIXED_MINSIZE);
-       sizercolor->Add(_colorchoose,wxFIXED_MINSIZE);
-       this->addControl(sizercolor);
+       Connect(_colorchoose->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasIRMViewProp3D::onColorChange);                    
+       sizerirmprop->Add(_colorchoose,wxFIXED_MINSIZE);        
 
+       //sizercolor->Add(checkbox,wxFIXED_MINSIZE);
+       //sizercolor->Add(_colorchoose,wxFIXED_MINSIZE);
+       //this->addControl(sizercolor);
+       
        
        wxStaticText* label = new wxStaticText(this, -1, wxString(_T("Opacity")));              
        opacity = new wxSlider(this, -1,100,0,100,wxDefaultPosition,wxDefaultSize,wxSL_HORIZONTAL|wxSL_LABELS); 
        Connect(opacity->GetId(), wxEVT_SCROLL_CHANGED, (wxObjectEventFunction)&wxMaracasIRMViewProp3D::onOpacityRelease);      
-       wxBoxSizer* sizeropacity = new wxBoxSizer(wxVERTICAL);  
+       wxFlexGridSizer* sizeropacity = new wxFlexGridSizer(1,1,1);     
        sizeropacity->Add(label,wxFIXED_MINSIZE);
        sizeropacity->Add(opacity,wxFIXED_MINSIZE);
-       this->addControl(sizeropacity);
+
+       sizerirmprop->Add(sizeropacity,wxFIXED_MINSIZE);
+
+       //this->addControl(sizeropacity);
+       this->addControl(sizerirmprop);
        
 }
 void wxMaracasIRMViewProp3D::onCheckBoxChange(wxCommandEvent& event){  
@@ -254,9 +267,9 @@ void wxMaracasIRMViewProp3D::onColorChange(wxCommandEvent& event){
                wxColour colour = colourdiag->GetColourData().GetColour();
                _colorchoose->SetBackgroundColour(colour);
 
-               float r = colour.Red()/255;
-               float g = colour.Green()/255;
-               float b = colour.Blue()/255;
+               double r = (double)(colour.Red())/255.0;
+               double g = (double)(colour.Green())/255.0;
+               double b = (double)(colour.Blue())/255.0;
                
                wxMaracasIRMView::getInstance()->changeColor(this->getPropId(),r,g,b);
        }
@@ -286,8 +299,8 @@ wxMaracasIRMViewProp3DMHD::~wxMaracasIRMViewProp3DMHD(){
        //wxMaracasIRMView::getInstance()->addRemoveActor(_propid, false);
 }
 void wxMaracasIRMViewProp3DMHD::createControls(int maxisovalue){
-
-       wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);
+       
+       wxFlexGridSizer* sizer = new wxFlexGridSizer(1,1,1);
 
        wxStaticText* label = new wxStaticText(this, -1, wxString(_T("IsoValue")));
        sizer->Add(label, wxGROW);
@@ -302,7 +315,7 @@ void wxMaracasIRMViewProp3DMHD::createControls(int maxisovalue){
 
 void wxMaracasIRMViewProp3DMHD::onIsoValueRelease(wxScrollEvent& event ){
 
-       wxMaracasIRMView::getInstance()->changeIsoValue(this->getPropId(), isovalue->GetValue());
+       wxMaracasIRMView::getInstance()->changeIsoValue(this->getPropId(), isovalue->GetValue()/1.0);
        
 }
 /**