HistogramDialogComboBox::HistogramDialogComboBox(wxWindow* parent)
: wxPanel(parent)
{
- _img = NULL;
+ _img = NULL;
_bitmapcombo = NULL;
_slidercolor = NULL;
_sliderwindowlevel = NULL;
+ _ckboxActive = NULL;
colorBar_Bitmap = NULL;
_bitmapsizer = NULL;
-
InitCurrentPathColorsFuntion();
this->SetSizer(getBitmapCombo());
- _img = NULL;
+ _img = NULL;
_currentitem = -1;
_maxgreyvalue = 0;
-
-
}
-
-
HistogramDialogComboBox::~HistogramDialogComboBox()
{
}
wxBoxSizer* comboeditsizer = new wxBoxSizer(wxHORIZONTAL);
_bitmapcombo = getBitmapComboElements();
- BitmapComboItemSelect(0);
-
+ BitmapComboItemSelect(0);
wxBitmap bitmap1(Edit_xpm);
wxBitmapButton* edit = new wxBitmapButton(this, -1, bitmap1,wxDefaultPosition,wxSize(30,30));
Connect(edit->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&HistogramDialogComboBox::OnEditBitmapCombo);
-
+ _ckboxActive= new wxCheckBox( this,
+ -1,
+ _T(" "),
+ wxDefaultPosition,
+ //wxSize(sizeX,sizeY),
+ wxDefaultSize,
+ wxCHK_2STATE | wxALIGN_RIGHT);
+ _ckboxActive->SetValue(false);
+
+ Connect( _ckboxActive->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) (void (wxPanel::*)(wxScrollEvent&)) &HistogramDialogComboBox::OnChkBoxActive);
+
+ comboeditsizer->Add(_ckboxActive,wxSizerFlags().Center().FixedMinSize());
comboeditsizer->Add(_bitmapcombo,wxSizerFlags().Center().FixedMinSize());
comboeditsizer->Add(edit,wxSizerFlags().Center());
-
_bitmapsizer->Add(comboeditsizer,wxSizerFlags().FixedMinSize().Center());
_bitmapsizer->AddSpacer(5);
_bitmapsizer->Add(getSlidersWlCo(),wxSizerFlags().Expand().Center());
-
return _bitmapsizer;
}
wxSizer* HistogramDialogComboBox::getSlidersWlCo()
{
- wxBoxSizer* sizersliders = new wxBoxSizer(wxVERTICAL);
-
- _slidercolor = new wxSlider(this, -1,1,0,1,wxDefaultPosition,wxDefaultSize,wxSL_LABELS);
- _sliderwindowlevel = new wxSlider(this, -1,1,0,1,wxDefaultPosition,wxDefaultSize,wxSL_LABELS);
-
+ wxBoxSizer* sizersliders = new wxBoxSizer(wxVERTICAL);
+ _slidercolor = new wxSlider(this, -1,1,0,1,wxDefaultPosition,wxDefaultSize,wxSL_LABELS);
+ _sliderwindowlevel = new wxSlider(this, -1,1,0,1,wxDefaultPosition,wxDefaultSize,wxSL_LABELS);
sizersliders->Add(_slidercolor,wxSizerFlags().Expand().Center());
sizersliders->Add(_sliderwindowlevel,wxSizerFlags().Expand().Center());
-
- Connect(_slidercolor->GetId(), wxEVT_SCROLL_THUMBTRACK, (wxObjectEventFunction)&HistogramDialogComboBox::OnColorLevelChanged);
+ Connect(_slidercolor->GetId(), wxEVT_SCROLL_THUMBTRACK, (wxObjectEventFunction)&HistogramDialogComboBox::OnColorLevelChanged);
Connect(_sliderwindowlevel->GetId(), wxEVT_SCROLL_THUMBTRACK, (wxObjectEventFunction)&HistogramDialogComboBox::OnWindowLevelChanged);
-
return sizersliders;
}
{
double val(0.0);
if(_sliderwindowlevel != NULL)
+ {
val= _sliderwindowlevel->GetValue();
+ }
return val; // JPR
}
{
double val(0.0);
if(_slidercolor != NULL)
+ {
val = _slidercolor->GetValue();
+ }
return val; // JPR
}
+
+bool HistogramDialogComboBox::GetActive()
+{
+ bool result = false;
+ if (_ckboxActive!=NULL)
+ {
+ result = _ckboxActive->GetValue();
+ }
+ return result;
+}
+
+
+void HistogramDialogComboBox::OnChkBoxActive(wxCommandEvent& event)
+{
+ wxCommandEvent newevent(wxEVT_COMMAND_COMBOBOX_SELECTED,this->GetId());
+ ProcessEvent(newevent);
+}
+
+
void HistogramDialogComboBox::OnColorLevelChanged(wxCommandEvent& event)
{
_slidercolor->GetValue();