fix :

- no newline at end of file
- wxString pb

diff --git a/lib/Interface_Icons_NDimensions/interfSegmentationPanels.cxx b/lib/Interface_Icons_NDimensions/interfSegmentationPanels.cxx
index 306370d4af8a886afb2a5c9b38ca86135413d645..feea22133a9ef91dce437639b3b2a1b7b05b7321 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfSegmentationPanels.cxx
+++ b/lib/Interface_Icons_NDimensions/interfSegmentationPanels.cxx
@@ -10,44 +10,43 @@ interfSegmentationPanelVTK::interfSegmentationPanelVTK(wxWindow * parent)
        //_theViewPanel->getSceneManager()->GetImageDataRange(range);
        interfMainPanel::getInstance()->GetImageDataRange(range);
 
-       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);
-       _sampling                                                       = new wxSlider(this, -1, 20 , 4, 50, wxDefaultPosition, wxSize(200,35), wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
+       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);
+       _sampling                           = new wxSlider(this, -1, 20 , 4, 50, wxDefaultPosition, wxSize(200,35), wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
        wxString lstOptions[3];
        lstOptions[0]=_T("A");
        lstOptions[1]=_T("B");
        lstOptions[2]=_T("C");
-       methodRadiobox                                          = new wxRadioBox(this, -1, _T("Method (find ctrl. Points)"), wxDefaultPosition, wxSize(200,45), 3 , lstOptions,  3, wxRA_SPECIFY_COLS);
+       methodRadiobox                      = new wxRadioBox(this, -1, _T("Method (find ctrl. Points)"), wxDefaultPosition, wxSize(200,45), 3 , lstOptions,  3, wxRA_SPECIFY_COLS);
        methodRadiobox->SetSelection(2);
-       _staticTextSegmentation                         = new wxStaticText(this,-1,_T("    "));
+       _staticTextSegmentation             = new wxStaticText(this,-1,_T("    "));
 
-       _mbarrange                                      =  new mBarRange(this,70, 65);
+       _mbarrange                          =  new mBarRange(this,70, 65);
        _mbarrange->SetMin(0);
        _mbarrange->SetStart(0);
 
-       _mbarrange-> SetOrientation( true );
-       _mbarrange-> setActiveStateTo(true);
-       _mbarrange-> setVisibleLabels( true );
-       _mbarrange-> setDeviceEndMargin(10);
-       _mbarrange-> setRepresentedValues( 0 , sizeZ );
-       _mbarrange-> setDeviceBlitStart(10,10); 
-       _mbarrange-> setIfWithActualDrawed( false );
-       _mbarrange-> SetStart( 0 );
-       _mbarrange-> SetEnd( sizeZ );  
-
-
-       wxFlexGridSizer * sizer                         = new wxFlexGridSizer(1);
-       sizer -> Add( new wxStaticText(this,-1,_T("Isovalue (Gray level)"))  , 1, wxGROW );
-       sizer -> Add( _isovalue , 1, wxGROW );
-       sizer -> Add( methodRadiobox , 1, wxGROW );
-       sizer -> Add( new wxStaticText(this,-1,_T("Sampling (%)"))  , 1, wxGROW );
-       sizer -> Add( _sampling , 1, wxGROW );
-       sizer -> Add( segmentationOneSliceBtn , 1, wxGROW );
-       sizer -> Add( new wxStaticText(this,-1,_T(" "))  , 1, wxGROW );
-       sizer -> Add( _staticTextSegmentation  , 1, wxGROW );
-       sizer -> Add( segmentationAllSliceBtn , 1, wxGROW );
-       sizer -> Add( _mbarrange  , 1, wxGROW );
+       _mbarrange->SetOrientation( true );
+       _mbarrange->setActiveStateTo(true);
+       _mbarrange->setVisibleLabels( true );
+       _mbarrange->setDeviceEndMargin(10);
+       _mbarrange->setRepresentedValues( 0 , sizeZ );
+       _mbarrange->setDeviceBlitStart(10,10); 
+       _mbarrange->setIfWithActualDrawed( false );
+       _mbarrange->SetStart( 0 );
+       _mbarrange->SetEnd( sizeZ );  
+
+       wxFlexGridSizer * sizer             = new wxFlexGridSizer(1);
+       sizer->Add( new wxStaticText(this, -1, _T("Isovalue (Gray level)")), 1, wxGROW );
+       sizer->Add( _isovalue, 1, wxGROW );
+       sizer->Add( methodRadiobox , 1, wxGROW );
+       sizer->Add( new wxStaticText(this, -1 ,_T("Sampling (%)")), 1, wxGROW );
+       sizer->Add( _sampling, 1, wxGROW );
+       sizer->Add( segmentationOneSliceBtn, 1, wxGROW );
+       sizer->Add( new wxStaticText(this, -1, _T(" ")), 1, wxGROW );
+       sizer->Add( _staticTextSegmentation, 1, wxGROW );
+       sizer->Add( segmentationAllSliceBtn, 1, wxGROW );
+       sizer->Add( _mbarrange, 1, wxGROW );
 
        this->SetSizer( sizer );
 //             panel->SetSize( sizePanel );
@@ -59,8 +58,8 @@ interfSegmentationPanelVTK::interfSegmentationPanelVTK(wxWindow * parent)
        //segmentationOneSliceBtn->SetEventHandler( this );
        //segmentationAllSliceBtn->SetEventHandler( this );
        //panel->SetEventHandler(this);
-       Connect( segmentationOneSliceBtn->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfSegmentationPanelVTK::onSegmentationOneSlice); 
-       Connect( segmentationAllSliceBtn->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfSegmentationPanelVTK::onSegmentationAllSlice); 
+       Connect( segmentationOneSliceBtn->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction) &interfSegmentationPanelVTK::onSegmentationOneSlice); 
+       Connect( segmentationAllSliceBtn->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction) &interfSegmentationPanelVTK::onSegmentationAllSlice); 
 }
 
 
@@ -76,9 +75,8 @@ interfSegmentationPanelVTK::~interfSegmentationPanelVTK()
        **/
 
 void  interfSegmentationPanelVTK::onSegmentationPressedITK(wxCommandEvent& event){
-    if(segmentPanelITK == NULL){
-               segmentPanelITK = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxBORDER_STATIC, wxString(_T("")));
-                       
+   if(segmentPanelITK == NULL) {
+               segmentPanelITK = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxBORDER_STATIC, wxString(_T("")));                 
 
                wxFlexGridSizer* flexsizer = new wxFlexGridSizer(1);    
                segmentPanelITK->SetSizer(flexsizer, true);
@@ -86,14 +84,13 @@ void  interfSegmentationPanelVTK::onSegmentationPressedITK(wxCommandEvent& event
                                
                wxPanel* panel = new wxPanel(this, -1);//contourevent->getSegmentationPanelITK(segmentPanelITK);
        
-
                wxStaticText* stattext = new wxStaticText(segmentPanelITK, -1, wxString(_T("   Automatic ITK Segmentation   ")), wxDefaultPosition,
                        wxDefaultSize, wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T("")));
 
-               flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
+               flexsizer->Add(stattext, wxALIGN_CENTER | wxALIGN_CENTRE);
                flexsizer->Add(panel, wxEXPAND);
                segmentPanelITK->Layout();
-       }
+   }
        interfMainPanel::getInstance()->showPanel(segmentPanelITK);
        //contourevent->showAxis(true);
        //axisshown = true;
@@ -101,27 +98,22 @@ void  interfSegmentationPanelVTK::onSegmentationPressedITK(wxCommandEvent& event
 
 void interfSegmentationPanelVTK::onSegmentationOneSlice( wxCommandEvent& event )
 {
-
-
-       int     isovalue = _isovalue->GetValue();
-       int     sampling = _sampling->GetValue();
+       int isovalue = _isovalue->GetValue();
+       int sampling = _sampling->GetValue();
        int method = methodRadiobox->GetSelection();
        interfMainPanel::getInstance()->onSegmentationOneSlice(isovalue, sampling, method);
        
 }
 void interfSegmentationPanelVTK::onSegmentationAllSlice( wxCommandEvent& event )
 {
-
        int minZ=_mbarrange->GetStart();
        int maxZ=_mbarrange->GetEnd();
 
-       int                             isovalue        = _isovalue->GetValue();
-       int                             sampling        = _sampling->GetValue();
-       int method = methodRadiobox->GetSelection();
-
+       int isovalue = _isovalue->GetValue();
+       int sampling = _sampling->GetValue();
+       int method   = methodRadiobox->GetSelection();
 
-       interfMainPanel::getInstance()->onSegmentationAllSlice(minZ, maxZ, isovalue, sampling, method);
-       
+       interfMainPanel::getInstance()->onSegmentationAllSlice(minZ, maxZ, isovalue, sampling, method); 
 }
 
 void interfSegmentationPanelVTK::setLabel(wxString tmpString){
@@ -141,32 +133,26 @@ interfSegmentationPanelITK::interfSegmentationPanelITK(wxWindow * parent)
        interfMainPanel::getInstance()->GetImageDataRange(range);
        
        //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 * 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 * 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
 
-       _distance= new wxTextCtrl(this, wxID_ANY, "5.0", wxPoint(98,5), wxSize(80, 20), 0, wxDefaultValidator, wxTextCtrlNameStr);
-
-       _sigma= new wxTextCtrl(this, wxID_ANY, "1.2", wxPoint(98,30), wxSize(80, 20), 0, wxDefaultValidator, wxTextCtrlNameStr);
-
-       _alfa= new wxTextCtrl(this, wxID_ANY, "-1.0", wxPoint(98,55), wxSize(80, 20), 0, wxDefaultValidator, wxTextCtrlNameStr);
-       
-       _beta= new wxTextCtrl(this, wxID_ANY, "5.0", wxPoint(98,80), wxSize(80, 20), 0, wxDefaultValidator, wxTextCtrlNameStr);
-       
-       _propagation= new wxTextCtrl(this, wxID_ANY, "6.0", wxPoint(98,105), wxSize(80, 20), 0, wxDefaultValidator, wxTextCtrlNameStr);
-       
-       _iterations= new wxTextCtrl(this, wxID_ANY, "800", wxPoint(98,130), wxSize(80, 20), 0, wxDefaultValidator, wxTextCtrlNameStr);
-       
-       _infStrength= new wxTextCtrl(this, wxID_ANY, "3.0", wxPoint(98,155), wxSize(80, 20), 0, wxDefaultValidator, wxTextCtrlNameStr);
+       _distance =      new wxTextCtrl(this, wxID_ANY, wxT("5.0"),  wxPoint(98,5),   wxSize(80, 20), 0, wxDefaultValidator, wxTextCtrlNameStr);
+       _sigma =         new wxTextCtrl(this, wxID_ANY, wxT("1.2"),  wxPoint(98,30),  wxSize(80, 20), 0, wxDefaultValidator, wxTextCtrlNameStr);
+       _alfa =          new wxTextCtrl(this, wxID_ANY, wxT("-1.0"), wxPoint(98,55),  wxSize(80, 20), 0, wxDefaultValidator, wxTextCtrlNameStr);        
+       _beta =          new wxTextCtrl(this, wxID_ANY, wxT("5.0"),  wxPoint(98,80),  wxSize(80, 20), 0, wxDefaultValidator, wxTextCtrlNameStr);        
+       _propagation =   new wxTextCtrl(this, wxID_ANY, wxT("6.0"),  wxPoint(98,105), wxSize(80, 20), 0, wxDefaultValidator, wxTextCtrlNameStr);        
+       _iterations =    new wxTextCtrl(this, wxID_ANY, wxT("800"),  wxPoint(98,130), wxSize(80, 20), 0, wxDefaultValidator, wxTextCtrlNameStr);        
+       _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, "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);

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index 6259baff6ae56dbe6f5fbcd6f9dddf2cda2742c0..1a2a54234102d9e0aa9b372e401b44b7026df7b4 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -146,19 +146,12 @@ class wxContourMainFrame : public wxPanel {
        void setInstantChooserPanel(  wxInstantChooserPanel * theInstantChooserPanel );
 
 //     void setButtonsBar(  wxContour_ButtonsBar * theButtonsBar );
-
 //     void setGrid(  wxContour_Grid * theGridPanel );
-
 //     void setDrawToolsPanel(  wxContour_DrawToolsPanel * theDrawToolsPanel );
-
 //     void setOperationsToolsPanel(  wxContour_OperationsToolsPanel * theDrawToolsPanel );
-
 //     void setAutomaticFormsPanel(  wxContour_AutomaticFormsToolsPanel * theAutoFormsPanel );
-
 //     void setStandardToolsPanel(  wxContour_StandardToolsPanel * theStandardToolsPanel );
-
 //     void setEditionToolsPanel(  wxContour_EdtionToolsPanel * theEditionToolsPanel );
-
 //     void setListViewPanel(  wxContour_ListViewPanel * theListViewPanel );
 
 
@@ -212,7 +205,6 @@ class wxContourMainFrame : public wxPanel {
 
        std::string getNameWrapping(int i);
 
-
        void updateInstantOutlines();
        void updateInstantImageData();
        void updateInstantAxes();
@@ -237,19 +229,12 @@ class wxContourMainFrame : public wxPanel {
        vtkImageData* getImageData();
 
        void onSegmentationOneSlice(int isovalue,int sampling,int method);
-
        void onSegmentationOneSliceITK(wxString distance, wxString sigma, wxString alfa, wxString beta, wxString propagation, wxString iterations, wxString inflation);
-
        void SegmentationOneSlice( int x, int y, int z, int isovalue, int sampling, int method );
-
        void SegmentationOneSliceITK(int x, int y, int z, wxString distance, wxString sigma, wxString alfa, wxString beta, wxString propagation, wxString iterations, wxString inflation);
-
        void Mirror( int x, int y, int z, int isovalue, int sampling, int method );
-
-       int GetImageDataSizeZ();
-
+       int  GetImageDataSizeZ();
        void GetImageDataRange(double *range);
-
        void onSegmentationAllSlice(int minZ,int maxZ,int isovalue,int sampling,int method);
 
        //AD
@@ -318,20 +303,20 @@ private:
        wxInstantChooserPanel * _instantPanel;
 
        //AD: 03-09: This attributes represents the reference line that is going to be used for the mirroring
-       manualLineControler             * _refLineControl;
-       manualContourModelLine  * _refLineModel;
-       manualViewLine                  * _refLineView;
+       manualLineControler     * _refLineControl;
+       manualContourModelLine  * _refLineModel;
+       manualViewLine          * _refLineView;
 
 
 
        wxAuiManager m_mgr;
     /*
        wxArrayString m_perspectives;
-    wxMenu* m_perspectives_menu;
-       */
-    long m_notebook_style;
-    long m_notebook_theme;
-       int _numberOfVariablesStatistics;
+        wxMenu* m_perspectives_menu;
+   */
+        long m_notebook_style;
+        long m_notebook_theme;
+        int _numberOfVariablesStatistics;
 
        //OutlineModelManager * _modelManager;
 

diff --git a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx
index 8322259efe595f5fdfe3f2c3ee49f75f522c900e..24307db8f8a38c16da8466286620a8f0d25c2dd2 100644 (file)
--- a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx
+++ b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx
@@ -448,4 +448,6 @@ std::string KernelManagerContour::getCurrentFileName(){
 
 void KernelManagerContour::setCurrentFileName(std::string filenam){
        this->filename = filenam;
-}
\ No newline at end of file
+}
+
+