]> Creatis software - creaContours.git/blobdiff - lib/Interface_Icons_NDimensions/interfSegmentationPanels.cxx
git://git.creatis.insa-lyon.fr / creaContours.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
no message
[creaContours.git] / lib / Interface_Icons_NDimensions / interfSegmentationPanels.cxx
diff --git a/lib/Interface_Icons_NDimensions/interfSegmentationPanels.cxx b/lib/Interface_Icons_NDimensions/interfSegmentationPanels.cxx
index edb257c80ca7721ea6f89964ee2d298c387d9482..0d4c590e6cacf1ae323b7e43c1227736c73bad16 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfSegmentationPanels.cxx
+++ b/lib/Interface_Icons_NDimensions/interfSegmentationPanels.cxx
@@ -5,14 +5,16 @@ interfSegmentationPanelVTK::interfSegmentationPanelVTK(wxWindow * parent)
 : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN)
 {
        int sizeZ = interfMainPanel::getInstance()->GetImageDataSizeZ();
-       //int sizeZ = _theViewPanel->getSceneManager()->GetImageDataSizeZ();
+
        double range[2];
-       //_theViewPanel->getSceneManager()->GetImageDataRange(range);
-       interfMainPanel::getInstance()->GetImageDataRange(range);
+       interfMainPanel::getInstance()->getImageRange(range);
+
+       int min = (int)floor (range[0]);
+       int max = (int)ceil (range[1]);
 
        wxButton *segmentationOneSliceBtn   = new wxButton(this,-1,_T("Current slice"), wxDefaultPosition, wxSize(200,35) );
        wxButton *segmentationAllSliceBtn   = new wxButton(this,-1,_T("All slices") ,wxDefaultPosition, wxSize(200,35) );
-       _isovalue                           = new wxSlider(this, -1, 40 , (int)(range[0]), (int)(range[1]), wxDefaultPosition, wxSize(200,35), wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
+       _isovalue                           = new wxSlider(this, -1, 40 , min, max, wxDefaultPosition, wxSize(200,35), wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
        _sampling                           = new wxSlider(this, -1, 20 , 4, 50, wxDefaultPosition, wxSize(200,35), wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
        wxString lstOptions[3];
        lstOptions[0]=_T("A");
@@ -22,7 +24,7 @@ interfSegmentationPanelVTK::interfSegmentationPanelVTK(wxWindow * parent)
        methodRadiobox->SetSelection(2);
        _staticTextSegmentation             = new wxStaticText(this,-1,_T("    "));
 
-       _mbarrange                          =  new mBarRange(this,70, 65);
+       _mbarrange                          = new mBarRange(this,70, 65);
        _mbarrange->SetMin(0);
        _mbarrange->SetStart(0);
 
@@ -126,20 +128,27 @@ void interfSegmentationPanelVTK::setLabel(wxString tmpString){
 interfSegmentationPanelITK::interfSegmentationPanelITK(wxWindow * parent)
 : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN)
 {
-       int sizeZ = interfMainPanel::getInstance()->GetImageDataSizeZ();
-       //int sizeZ = _theViewPanel->getSceneManager()->GetImageDataSizeZ();
        double range[2];
-       //_theViewPanel->getSceneManager()->GetImageDataRange(range);
-       interfMainPanel::getInstance()->GetImageDataRange(range);
+       interfMainPanel::getInstance()->getImageRange(range);
+
+//     int min = (int)floor (range[0]);
+//     int max = (int)ceil (range[1]);
        
        //The labels
-       wxStaticText * distance =    new wxStaticText(this, wxID_ANY, wxT("Initial Distance"),   wxPoint(5, 5));
-       wxStaticText * sigma =       new wxStaticText(this, wxID_ANY, wxT("Sigma"),              wxPoint(5, 30));
-       wxStaticText * alfa =        new wxStaticText(this, wxID_ANY, wxT("Sigmoid Alfa"),       wxPoint(5, 55));
-       wxStaticText * beta =        new wxStaticText(this, wxID_ANY, wxT("Sigmoid Beta"),       wxPoint(5, 80));
-       wxStaticText * propagation = new wxStaticText(this, wxID_ANY, wxT("Propagation Scaling"),wxPoint(5, 105));
-       wxStaticText * iterations =  new wxStaticText(this, wxID_ANY, wxT("Iterations"),         wxPoint(5, 130));
-       wxStaticText * infStrength = new wxStaticText(this, wxID_ANY, wxT("Inflation Strength"), wxPoint(5, 155));
+       //wxStaticText * distance =    
+       new wxStaticText(this, wxID_ANY, wxT("Initial Distance"),   wxPoint(5, 5));
+       //wxStaticText * sigma =       
+       new wxStaticText(this, wxID_ANY, wxT("Sigma"),              wxPoint(5, 30));
+       //wxStaticText * alfa =        
+       new wxStaticText(this, wxID_ANY, wxT("Sigmoid Alfa"),       wxPoint(5, 55));
+       //wxStaticText * beta =        
+       new wxStaticText(this, wxID_ANY, wxT("Sigmoid Beta"),       wxPoint(5, 80));
+       //wxStaticText * propagation = 
+       new wxStaticText(this, wxID_ANY, wxT("Propagation Scaling"),wxPoint(5, 105));
+       //wxStaticText * iterations =  
+       new wxStaticText(this, wxID_ANY, wxT("Iterations"),         wxPoint(5, 130));
+       //wxStaticText * infStrength = 
+       new wxStaticText(this, wxID_ANY, wxT("Inflation Strength"), wxPoint(5, 155));
 
        //Text Controls
 
@@ -152,7 +161,8 @@ interfSegmentationPanelITK::interfSegmentationPanelITK(wxWindow * parent)
        _infStrength =   new wxTextCtrl(this, wxID_ANY, wxT("3.0"),  wxPoint(98,155), wxSize(80, 20), 0, wxDefaultValidator, wxTextCtrlNameStr);
        
        //El boton
-       wxButton * bot = new wxButton(this, 6, wxT("One Slice"), wxPoint(98, 180), wxSize(70, 25), 0, wxDefaultValidator, wxT("button"));
+       //wxButton * bot = 
+       new wxButton(this, 6, wxT("One Slice"), wxPoint(98, 180), wxSize(70, 25), 0, wxDefaultValidator, wxT("button"));
 
        //Conexion del boton con su respectivo manejador
        Connect(6, wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction) &interfSegmentationPanelITK::onSegmentationOneSlice);
@@ -201,18 +211,17 @@ void interfSegmentationPanelITK::onSegmentationAllSlice( wxCommandEvent& event )
 interfMirrorPanel::interfMirrorPanel(wxWindow* parent)
 : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN)
 {
-       wxButton *axisShowBtn = new wxButton(this,wxID_ANY,_T("Show Axis"), wxDefaultPosition, wxSize(200,35) );
-       wxButton *axisHideBtn = new wxButton(this,wxID_ANY,_T("Hide Axis"), wxDefaultPosition, wxSize(200,35) );
+       _axisStatus = true;
+
+       wxButton *axisShowBtn = new wxButton(this,wxID_ANY,_T("Show/Hide Axis"), wxDefaultPosition, wxSize(200,35) );
        wxButton *mirrorGoBtn = new wxButton(this,wxID_ANY,_T("Mirror Contour"), wxDefaultPosition, wxSize(200,35) );
        _thickness = new wxSlider(this, -1, 4, 1, 10, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
        
        Connect( axisShowBtn->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfMirrorPanel::onAxisShow );
-       Connect( axisHideBtn->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfMirrorPanel::onAxisHide ); 
        Connect( mirrorGoBtn->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfMirrorPanel::onMirrorGo ); 
 
        wxFlexGridSizer * sizer         = new wxFlexGridSizer(1);
        sizer -> Add( axisShowBtn, 1, wxGROW );
-       sizer -> Add( axisHideBtn, 1, wxGROW );
        sizer -> Add( new wxStaticText(this,-1,_T(" "))  , 1, wxGROW );
        sizer -> Add( new wxStaticText(this,-1,_T("Thickness"))  , 1, wxGROW );
        sizer -> Add( _thickness, 1, wxGROW );
@@ -228,17 +237,25 @@ interfMirrorPanel::~interfMirrorPanel(){
 
 void interfMirrorPanel::onAxisShow(wxCommandEvent& event)
 {
-       interfMainPanel::getInstance()->onMirrorAxisShow();
-}
-
-void interfMirrorPanel::onAxisHide(wxCommandEvent& event)
-{
-       interfMainPanel::getInstance()->onMirrorAxisHide();
+       
+       if (!_axisStatus)
+       {
+               interfMainPanel::getInstance()->onMirrorAxisShow();
+               _axisStatus=true;
+       }
+       else
+       {       
+               interfMainPanel::getInstance()->onMirrorAxisHide();
+               _axisStatus=false;              
+       }
 }
 
 void interfMirrorPanel::onMirrorGo(wxCommandEvent& event)
 {
-       interfMainPanel::getInstance()->onMirror();
+       if (_axisStatus)
+       {
+               interfMainPanel::getInstance()->onMirror();
+       }
 }
 
 void interfMirrorPanel::onChangeWidth(wxScrollEvent& event)
@@ -255,8 +272,7 @@ void interfMirrorPanel::onChangeWidth(wxScrollEvent& event)
 interfThresholdPanel::interfThresholdPanel(wxWindow* parent)
 : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN)
 {
-       wxButton *thresholdGoBtn = new wxButton(this,wxID_ANY,_T("Add Fake Color"), wxDefaultPosition, wxSize(200,30) );
-       wxButton *thresholdRemoveBtn = new wxButton(this,wxID_ANY,_T("Remove Fake Color"), wxDefaultPosition, wxSize(200,30) );
+       wxButton *thresholdGoBtn = new wxButton(this,wxID_ANY,_T("Show/Hide Color"), wxDefaultPosition, wxSize(200,30) );
        _interpolationCheckBox = new wxCheckBox(this, -1, _T("Image interpolation") );
        _interpolationCheckBox->SetValue(true); 
        _opacity = new wxSlider(this, wxID_ANY, 6, 1, 10, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
@@ -265,8 +281,8 @@ interfThresholdPanel::interfThresholdPanel(wxWindow* parent)
        double range[2];
        interfMainPanel::getInstance()->getImageRange(range);
        
-       int min = floor (range[0]);
-       int max = ceil (range[1]);
+       int min = (int)floor (range[0]);
+       int max = (int)ceil (range[1]);
 
        _mBarThreshold  =  new mBarRange(this,70,65);
        _mBarThreshold->SetMin(0);
@@ -282,7 +298,6 @@ interfThresholdPanel::interfThresholdPanel(wxWindow* parent)
        _mBarThreshold-> SetEnd( max );  
        
        Connect( thresholdGoBtn->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfThresholdPanel::onThresholdGo ); 
-       Connect( thresholdRemoveBtn->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfThresholdPanel::onThresholdRemove );
        Connect( _interpolationCheckBox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &interfThresholdPanel::onThresholdInterpolation );
 
        wxFlexGridSizer * sizer         = new wxFlexGridSizer(1);
@@ -293,7 +308,6 @@ interfThresholdPanel::interfThresholdPanel(wxWindow* parent)
        sizer -> Add( _opacity, 1, wxGROW );
        sizer -> Add( new wxStaticText(this,-1,_T(" "))  , 1, wxGROW );
        sizer -> Add( thresholdGoBtn, 1, wxGROW );
-       sizer -> Add( thresholdRemoveBtn, 1, wxGROW );
        sizer -> Add( new wxStaticText(this,-1,_T(" "))  , 1, wxGROW );
        sizer -> Add( _interpolationCheckBox, 1, wxGROW );
 
@@ -311,10 +325,7 @@ void interfThresholdPanel::onThresholdChange(wxCommandEvent& event)
 {
        if (_thresholdGo)
        {
-               int minVal = _mBarThreshold->GetStart();
-               int maxVal = _mBarThreshold->GetEnd();
-
-               interfMainPanel::getInstance()->onThresholdChange(minVal, maxVal);
+               interfMainPanel::getInstance()->onThresholdChange();
 
                //std::cout<< "Valor Min: " << minVal << " & Valor Max: " << maxVal  << std::endl;
        }
@@ -324,27 +335,26 @@ void interfThresholdPanel::onThresholdGo(wxCommandEvent& event)
 {
        if (!_thresholdGo)
        {
-               int minVal = _mBarThreshold->GetStart();
-               int maxVal = _mBarThreshold->GetEnd();
-
-               interfMainPanel::getInstance()->onThreshold(minVal, maxVal);
+               interfMainPanel::getInstance()->onThreshold();
                _thresholdGo=true;
        }
-}
-
-void interfThresholdPanel::onThresholdRemove(wxCommandEvent& event)
-{
-       interfMainPanel::getInstance()->onThresholdRemove( );
-       _thresholdGo=false;
+       else
+       {       
+               interfMainPanel::getInstance()->onThresholdRemove( );
+               _thresholdGo=false;             
+       }
 }
 
 void interfThresholdPanel::onThresholdStop()
 {
-       interfMainPanel::getInstance()->onThresholdRemove( );
-       _thresholdGo=false;
+       if (_thresholdGo)
+       {       
+               interfMainPanel::getInstance()->onThresholdRemove( );
+               _thresholdGo=false;             
+       }
 }
 
-void interfThresholdPanel::onThresholdInstantChange(int range[])
+void interfThresholdPanel::onThresholdInstantChange(double range[])
 {
        range[0] = _mBarThreshold->GetStart();
        range[1] = _mBarThreshold->GetEnd();
Application to draw contours manually