*** empty log message ***

[creaContours.git] / lib / Interface_Icons_NDimensions / interfToolsPanels.cxx

diff --git a/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx b/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx
index 5b2b1c29b241c53dceda1b6d718795c17a46899a..24c79394bd34dab16d40f445e9ab665717c97554 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx
+++ b/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx
@@ -76,7 +76,6 @@ void interfConfigurationPanel::onBrigthnessColorWindowLevel(wxScrollEvent& event
        int colorwindow                         = _brithtnessColorLevel->GetValue();
        int windowlevel                         = _brithtnessWindowLevel->GetValue();
 
-
        interfMainPanel::getInstance()->onBrigthnessColorWindowLevel(colorwindow, windowlevel);
 
 }
@@ -189,15 +188,19 @@ interfInformationPanel::interfInformationPanel(wxWindow * parent)
        lstOptions[0]=_T("Current Slice");
        lstOptions[1]=_T("Range Slices");
 //     lstOptions[2]=_T("All Slices");
-       _informationRadiobox                                                    = new wxRadioBox(this, -1, _T("Slice analysis"), wxDefaultPosition, wxSize(270,45), 2 , lstOptions,  2, wxRA_SPECIFY_COLS);
+       _informationRadiobox                                                    = new wxRadioBox(this, -1, _T("Slice analysis"), wxDefaultPosition, wxSize(270,45), 2 , lstOptions,  2, wxRA_SPECIFY_COLS);     
 
+       
        wxString lstOptContOperation[5];
        lstOptContOperation[0]=_T("AND");
        lstOptContOperation[1]=_T("OR");
        lstOptContOperation[2]=_T("XOR");
        lstOptContOperation[3]=_T("ALL");
        _radiolstboxContourGroup                                                = new wxRadioBox(this, -1, _T("Contour group"), wxDefaultPosition, wxSize(270,45), 4 , lstOptContOperation,  4, wxRA_SPECIFY_COLS);
-
+       _radiolstboxContourGroup->SetSelection(1);
+       Connect( _radiolstboxContourGroup->GetId(), wxEVT_COMMAND_RADIOBOX_SELECTED , (wxObjectEventFunction) &interfInformationPanel::onContourGroup );
+       
+       
        _XYZValues = new wxCheckBox(this, -1, _T("Save Contour Values") );
        _XYZValues->SetValue(true);
 
@@ -240,6 +243,8 @@ interfInformationPanel::interfInformationPanel(wxWindow * parent)
        _mbarrangeSliceInformation-> SetStart( 0 );
        _mbarrangeSliceInformation-> SetEnd( sizeZ-1 );  
 
+
+
        double range[2];
        interfMainPanel::getInstance()->getImageRange(range);
 
@@ -249,15 +254,24 @@ interfInformationPanel::interfInformationPanel(wxWindow * parent)
        _mbarrangeRangeInformation      =  new mBarRange(this,65,65);
        _mbarrangeRangeInformation->SetMin(0);
        _mbarrangeRangeInformation->SetStart(0);
-       _mbarrangeRangeInformation-> SetOrientation( true );
-       _mbarrangeRangeInformation-> setActiveStateTo(true);
-       _mbarrangeRangeInformation-> setVisibleLabels( true );
-       _mbarrangeRangeInformation-> setDeviceEndMargin(10);
-       _mbarrangeRangeInformation-> setRepresentedValues( min , max );
-       _mbarrangeRangeInformation-> setDeviceBlitStart(10,10); 
-       _mbarrangeRangeInformation-> setIfWithActualDrawed( false );
-       _mbarrangeRangeInformation-> SetStart( min );
-       _mbarrangeRangeInformation-> SetEnd( max );  
+       _mbarrangeRangeInformation->SetOrientation( true );
+       _mbarrangeRangeInformation->setActiveStateTo(true);
+       _mbarrangeRangeInformation->setVisibleLabels( true );
+       _mbarrangeRangeInformation->setDeviceEndMargin(10);
+       _mbarrangeRangeInformation->setRepresentedValues( min , max );
+       _mbarrangeRangeInformation->setDeviceBlitStart(10,10); 
+       _mbarrangeRangeInformation->setIfWithActualDrawed( false );
+       _mbarrangeRangeInformation->SetStart( min );
+       _mbarrangeRangeInformation->SetEnd( max );  
+
+//     _mbarrangeSliceInformation->PushEventHandler(this);
+//     Connect(_mbarrangeRangeInformation->GetId(),wxEVT_TSBAR,(wxObjectEventFunction) (wxCommandEventFunction) &interfInformationPanel::onRangeSliceInformation );
+//     Connect(_mbarrangeRangeInformation->GetId(),wxEVT_TSBAR_ACTUAL,(wxObjectEventFunction) (wxCommandEventFunction)  &interfInformationPanel::onRangeSliceInformation );
+       Connect(_mbarrangeRangeInformation->GetId(),wxEVT_TSBAR_START,(wxObjectEventFunction) (wxCommandEventFunction)  &interfInformationPanel::onRangeSliceInformation );             
+       Connect(_mbarrangeRangeInformation->GetId(),wxEVT_TSBAR_END,(wxObjectEventFunction) (wxCommandEventFunction)  &interfInformationPanel::onRangeSliceInformation );
+//     Connect(_mbarrangeRangeInformation->GetId(),wxEVT_SELECTION_END,(wxObjectEventFunction) (wxCommandEventFunction)  &interfInformationPanel::onRangeSliceInformation );
+       Connect(_mbarrangeRangeInformation->GetId(),wxEVT_TSBAR_MOVED,(wxObjectEventFunction) (wxCommandEventFunction)  &interfInformationPanel::onRangeSliceInformation );             
+
 
        _staticTextInformation  = new wxStaticText(this,-1,_T("    "));
 
@@ -315,9 +329,21 @@ interfInformationPanel::interfInformationPanel(wxWindow * parent)
        this->Layout();
        //return panel;
 }
-interfInformationPanel::~interfInformationPanel(){
+
+interfInformationPanel::~interfInformationPanel()
+{
 }
 
+
+void interfInformationPanel::onRangeSliceInformation(wxCommandEvent& event)
+{      
+       int     grayRangeMin    = _mbarrangeRangeInformation->GetStart();
+       int     grayRangeMax    = _mbarrangeRangeInformation->GetEnd(); 
+       interfMainPanel::getInstance()->SetScalarRange(grayRangeMin,grayRangeMax);      
+       interfMainPanel::getInstance()->RefreshInterface();     
+}
+
+
 void interfInformationPanel::onInformationContourLabels(wxCommandEvent& event){
        wxBusyCursor wait;
        FillGridWithContoursInformation();
@@ -440,3 +466,55 @@ wxString interfInformationPanel::getCellValue(int j,int i){
        return _grid->GetCellValue( j , i );
 }
 
+void interfInformationPanel::onContourGroup(wxCommandEvent& event)
+{
+       printf("EED interfInformationPanel::onContourGroup \n");
+       int contourGroup=_radiolstboxContourGroup->GetSelection();
+       if (contourGroup==3)
+       {
+               contourGroup=0;
+       }
+       interfMainPanel::getInstance()->SetContourGroup( _radiolstboxContourGroup->GetSelection() );    
+}
+
+//CMRU 29-08-09-----------------------------------------------------------------------------------------------
+interfCalibrationPanel:: interfCalibrationPanel(wxWindow * parent)
+: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN)
+{
+       double range[2];
+       interfMainPanel::getInstance()->getImageRange(range);
+
+       //Radio buttons
+       wxString options[3];
+       options[0]=_T("mm");
+       options[1]=_T("cm");
+       options[2]=_T("inch");
+
+       _unitsRadiobox = new wxRadioBox(this, -1, _T("Unit of measurement"), wxPoint(2, 25), wxSize(145,45), 3 , options,  3, wxRA_SPECIFY_COLS);
+       _unitsRadiobox->SetSelection(0);
+       
+       //The label
+       new wxStaticText(this, wxID_ANY, wxT("Real Size: "),   wxPoint(2, 5));
+       
+       //Text Control
+       _size = new wxTextCtrl(this, wxID_ANY, wxT(""),  wxPoint(78,3),   wxSize(70, 20), 0, wxDefaultValidator, wxTextCtrlNameStr);
+       
+       //The button
+       new wxButton(this, 1, wxT("Calibrate"), wxPoint(78, 70), wxSize(70, 25), 0, wxDefaultValidator, wxT("button"));
+
+       //Conexion del boton con su respectivo manejador
+       Connect(1, wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction) &interfCalibrationPanel::onCalibrate);
+       
+}
+
+interfCalibrationPanel:: ~interfCalibrationPanel()
+{
+}
+
+void interfCalibrationPanel::onCalibrate(wxCommandEvent& event)
+{
+       wxString size =_size->GetValue();
+       int unit = _unitsRadiobox->GetSelection();
+       interfMainPanel::getInstance()->onCalibration(size, unit);
+}
+//------------------------------------------------------------------------------------------------------------
\ No newline at end of file