: 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");
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 =
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 );
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)
-/**
-** Begin of the threshold panel
-**/
-interfThresholdPanel::interfThresholdPanel(wxWindow* parent)
+
+
+
+
+BEGIN_EVENT_TABLE(interfMirrorPanel, wxPanel)
+EVT_SCROLL(interfMirrorPanel :: onChangeWidth)
+END_EVENT_TABLE()
+
+//////////////////////////////////////////////////////////////
+
+interfTestPanel::interfTestPanel(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) );
- _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);
- _thresholdGo = false;
-
- double range[2];
- interfMainPanel::getInstance()->getImageRange(range);
+ wxButton *button1 = new wxButton(this,wxID_ANY,_T("Button 1"), wxDefaultPosition, wxSize(200,35) );
+ wxButton *button2 = new wxButton(this,wxID_ANY,_T("Button 2"), wxDefaultPosition, wxSize(200,35) );
- int min = (int)floor (range[0]);
- int max = (int)ceil (range[1]);
-
- _mBarThreshold = new mBarRange(this,70,65);
- _mBarThreshold->SetMin(0);
- _mBarThreshold->SetStart(0);
- _mBarThreshold-> SetOrientation( true );
- _mBarThreshold-> setActiveStateTo(true);
- _mBarThreshold-> setVisibleLabels( true );
- _mBarThreshold-> setDeviceEndMargin(10);
- _mBarThreshold-> setRepresentedValues( min , max );
- _mBarThreshold-> setDeviceBlitStart(10,10);
- _mBarThreshold-> setIfWithActualDrawed( false );
- _mBarThreshold-> SetStart( min );
- _mBarThreshold-> SetEnd( max );
+ Connect( button1->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfTestPanel::onButton1Pressed );
+ Connect( button2->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfTestPanel::onButton2Pressed );
- 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);
- sizer -> Add( new wxStaticText(this,-1,_T("Image Threshold")) , 1, wxGROW );
- sizer -> Add( _mBarThreshold, 1, wxGROW );
- sizer -> Add( new wxStaticText(this,-1,_T(" ")) , 1, wxGROW );
- sizer -> Add( new wxStaticText(this,-1,_T("Opacity Level")) , 1, wxGROW );
- 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 );
+ sizer -> Add( button1, 1, wxGROW );
+ sizer -> Add( button2, 1, wxGROW );
this->SetSizer( sizer );
this->SetAutoLayout( true );
this->Layout();
}
-interfThresholdPanel::~interfThresholdPanel(){
-}
-
-
-
-void interfThresholdPanel::onThresholdChange(wxCommandEvent& event)
-{
- if (_thresholdGo)
- {
- int minVal = _mBarThreshold->GetStart();
- int maxVal = _mBarThreshold->GetEnd();
-
- interfMainPanel::getInstance()->onThresholdChange(minVal, maxVal);
-
- //std::cout<< "Valor Min: " << minVal << " & Valor Max: " << maxVal << std::endl;
- }
-}
-
-void interfThresholdPanel::onThresholdGo(wxCommandEvent& event)
-{
- if (!_thresholdGo)
- {
- int minVal = _mBarThreshold->GetStart();
- int maxVal = _mBarThreshold->GetEnd();
-
- interfMainPanel::getInstance()->onThreshold(minVal, maxVal);
- _thresholdGo=true;
- }
+interfTestPanel::~interfTestPanel(){
}
-void interfThresholdPanel::onThresholdRemove(wxCommandEvent& event)
+void interfTestPanel::onButton1Pressed(wxCommandEvent& event)
{
- interfMainPanel::getInstance()->onThresholdRemove( );
- _thresholdGo=false;
+ std::cout << "Button 1 has been pressed" << std::endl;
}
-void interfThresholdPanel::onThresholdStop()
+void interfTestPanel::onButton2Pressed(wxCommandEvent& event)
{
- interfMainPanel::getInstance()->onThresholdRemove( );
- _thresholdGo=false;
-}
-
-void interfThresholdPanel::onThresholdInstantChange(int range[])
-{
- range[0] = _mBarThreshold->GetStart();
- range[1] = _mBarThreshold->GetEnd();
-}
-
-void interfThresholdPanel::onThresholdInterpolation(wxCommandEvent& event)
-{
- interfMainPanel::getInstance()->onThresholdInterpolation(_interpolationCheckBox->GetValue());
-}
-
-void interfThresholdPanel::onChangeOpacity(wxScrollEvent& event)
-{
- int opacity = _opacity->GetValue();
- interfMainPanel::getInstance()->onThresholdChangeOpacity(opacity);
-}
-
-
-BEGIN_EVENT_TABLE(interfMirrorPanel, wxPanel)
- EVT_SCROLL(interfMirrorPanel :: onChangeWidth)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(interfThresholdPanel, wxPanel)
- EVT_COMMAND(wxID_ANY, wxEVT_TSBAR_START, interfThresholdPanel :: onThresholdChange)
- EVT_COMMAND(wxID_ANY, wxEVT_TSBAR_END, interfThresholdPanel :: onThresholdChange)
- EVT_COMMAND(wxID_ANY, wxEVT_TSBAR_MOVED, interfThresholdPanel :: onThresholdChange)
- EVT_SCROLL(interfThresholdPanel :: onChangeOpacity)
-END_EVENT_TABLE()
-
-
+ std::cout << "Button 2 has been pressed" << std::endl;
+}
\ No newline at end of file
git://git.creatis.insa-lyon.fr / creaContours.git / blobdiff