X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2FHistogramDialogComboBox.cxx;h=15d4495e401a6649a3f87145554f3c633854fcd7;hb=659bcd2c2a608cfb8c5854ffe84e9248871df9a1;hp=19cbf847bdf706a946971beb4e213cb6293e7e88;hpb=9dd39f42ca5abd6ce26dccc8617e5edd30517587;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx index 19cbf84..15d4495 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx @@ -1,3 +1,28 @@ +/*# --------------------------------------------------------------------- +# +# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +# pour la Sant�) +# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +# Previous Authors : Laurent Guigues, Jean-Pierre Roux +# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil +# +# This software is governed by the CeCILL-B license under French law and +# abiding by the rules of distribution of free software. You can use, +# modify and/ or redistribute the software under the terms of the CeCILL-B +# license as circulated by CEA, CNRS and INRIA at the following URL +# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +# or in the file LICENSE.txt. +# +# As a counterpart to the access to the source code and rights to copy, +# modify and redistribute granted by the license, users are provided only +# with a limited warranty and the software's author, the holder of the +# economic rights, and the successive licensors have only limited +# liability. +# +# The fact that you are presently reading this means that you have had +# knowledge of the CeCILL-B license and that you accept its terms. +# ------------------------------------------------------------------------ */ + #include "HistogramDialogComboBox.h" #include @@ -11,22 +36,23 @@ HistogramDialogComboBox::HistogramDialogComboBox(wxWindow* parent) : wxPanel(parent) { - _img = NULL; + _img = NULL; _bitmapcombo = NULL; _slidercolor = NULL; - _sliderwindowlevel = NULL; + _sliderwindowlevel = NULL; + _ckboxActive = NULL; colorBar_Bitmap = NULL; _bitmapsizer = NULL; - + InitCurrentPathColorsFuntion(); this->SetSizer(getBitmapCombo()); - _img = NULL; - _currentitem = -1; + _img = NULL; + _currentitem = -1; _maxgreyvalue = 0; -printf("EED HistogramDialogComboBox\n"); } + HistogramDialogComboBox::~HistogramDialogComboBox() -{ +{ } void HistogramDialogComboBox::SetColors(std::vector greyvect, std::vector redvect, std::vector greenvect, std::vector bluevect) @@ -34,7 +60,7 @@ void HistogramDialogComboBox::SetColors(std::vector greyvect, std::vecto _greyvect = greyvect; _redvect = redvect; _greenvect = greenvect; - _bluevect = bluevect; + _bluevect = bluevect; } wxSizer* HistogramDialogComboBox::getBitmapCombo() @@ -44,34 +70,39 @@ wxSizer* HistogramDialogComboBox::getBitmapCombo() wxBoxSizer* comboeditsizer = new wxBoxSizer(wxHORIZONTAL); _bitmapcombo = getBitmapComboElements(); - + 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); - + 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; } @@ -79,7 +110,9 @@ double HistogramDialogComboBox::GetWindowLevel() { double val(0.0); if(_sliderwindowlevel != NULL) - val= _sliderwindowlevel->GetValue(); + { + val= _sliderwindowlevel->GetValue(); + } return val; // JPR } @@ -87,10 +120,31 @@ double HistogramDialogComboBox::GetColorLevel() { double val(0.0); if(_slidercolor != NULL) + { val = _slidercolor->GetValue(); - return val; // JPR + } + 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(); @@ -132,43 +186,45 @@ void HistogramDialogComboBox::OnEditBitmapCombo(wxCommandEvent& event) { bool createaddandremovecontrols = true; HistogramDialog* dialog = new HistogramDialog(this,_T("Color Configuration"),createaddandremovecontrols); - dialog->initializeHistogram(_img); + dialog->initializeHistogram(_img); dialog->setInfoPanExtraControls(_bitmapsitems); if(dialog->ShowModal()==wxID_OK) { dialog->UpdateCurrentComboElement(); _bitmapsitems = dialog->getComboBoxItems(); - - //std::string currentpath = crea::System::GetDllAppPath("bbcreaMaracasVisu"); // JPR - std::string dllLastName("bbcreaMaracasVisu"); - std::string currentpath = crea::System::GetDllAppPath(dllLastName); - currentpath.append(FILENAME); std::vector redvect,greenvect,bluevect; std::vector greyvect; - saveCurrentConfiguration(_bitmapsitems, currentpath); + saveCurrentConfiguration(_bitmapsitems, GetFileNameOfColorsFunction() ); wxBitmapComboBox* tempbitmapcombo = _bitmapcombo; - for(int i = 0; i < _bitmapsitems.size();i++){ + for(int i = 0; i < _bitmapsitems.size();i++) + { delete _bitmapsitems[i]; } _bitmapsitems.clear(); _bitmapcombo = getBitmapComboElements(); - if(_bitmapsizer->Replace(tempbitmapcombo,_bitmapcombo)){ - - tempbitmapcombo->Destroy(); - } + +// EED Eraseme +// if(_bitmapsizer->Replace(tempbitmapcombo,_bitmapcombo)) +// { +// tempbitmapcombo->Destroy(); +// } else { +// printf ("EED ERROR HistogramDialogComboBox::OnEditBitmapCombo. Can't replace bitmapcombo \n"); +// } + this->Layout(); - } + } dialog->Destroy(); } } + void HistogramDialogComboBox::saveCurrentConfiguration(std::vector& itembitmaps,std::string filename) { - std::ofstream file; - file.open( (const char*) (filename.c_str()) ); + std::ofstream file; + file.open( (const char*) (filename.c_str()) ); double gv=-1,red=-1,gr=-1,bl=-1; int in=-1; @@ -187,8 +243,8 @@ void HistogramDialogComboBox::saveCurrentConfiguration(std::vector"<< std::endl; } - file << " " << std::endl; - file << " " << vecttransfer[j] << "" <" << std::endl; + file << " " << vecttransfer[j] << "" <" << value[j] << " "<" << std::endl; if(j==vecttransfer.size()-1){ @@ -200,7 +256,7 @@ void HistogramDialogComboBox::saveCurrentConfiguration(std::vector green = item->getGreenVector(); std::vector blue = item->getBlueVector(); for(int j = 0; j < greyv.size();j++) - { + { if(j==0){ file << " " << std::endl; } @@ -209,90 +265,129 @@ void HistogramDialogComboBox::saveCurrentConfiguration(std::vector" << red[j] << "" <" << green[j] << "" <" << blue[j] << "" <" << std::endl; + file << " " << std::endl; if(j==greyv.size()-1){ file << " " << std::endl; } } - file << " "<< std::endl; + file << " "<< std::endl; } - file << "" << std::endl; + file << "" << std::endl; } file.close(); } -wxBitmapComboBox* HistogramDialogComboBox::getBitmapComboElements() +void HistogramDialogComboBox::InitCurrentPathColorsFuntion() { - std::string currentpath = ""; + _currentpathColorsFuntion = ""; #ifdef WIN32 - currentpath = crea::System::GetDllAppPath("bbcreaMaracasVisu"); + _currentpathColorsFuntion = crea::System::GetDllAppPath("bbcreaMaracasVisu"); + _currentpathColorsFuntion.append("/data/"); #endif - currentpath.append(FILENAME); - - std::cout<<"current file name " < bitmapsitems; - OnLoadComboBoxData(bitmapsitems, currentpath); + OnLoadComboBoxData(bitmapsitems, GetFileNameOfColorsFunction() ); _bitmapsitems = bitmapsitems; wxString* choices; choices = new wxString[bitmapsitems.size()]; for(int i = 0; i < bitmapsitems.size();i++) { - choices[i] = _T(""); + choices[i] = _T("Color Function"); + } + + wxBitmapComboBox* bitmapcombo; +//EED wxBitmapComboBox* bitmapcombo = new wxBitmapComboBox(this, -1, _T(""), wxDefaultPosition, wxDefaultSize, bitmapsitems.size(),choices); + if (_bitmapcombo!=NULL) + { + _bitmapcombo->Clear(); + bitmapcombo=_bitmapcombo; + } else { + bitmapcombo = new wxBitmapComboBox(this, -1, _T("")); } - wxBitmapComboBox* bitmapcombo = new wxBitmapComboBox(this, -1, _T(""), wxDefaultPosition, wxDefaultSize, bitmapsitems.size(),choices); - bitmapcombo->SetSize(65,30); +// wxBitmapComboBox* bitmapcombo = new wxBitmapComboBox(this, -1, _T("")); + bitmapcombo->SetSize(165,30); - Connect(bitmapcombo->GetId(), wxEVT_COMMAND_COMBOBOX_SELECTED, (wxObjectEventFunction)&HistogramDialogComboBox::OnBitmapComboItemSelected); + Connect(bitmapcombo->GetId(), wxEVT_COMMAND_COMBOBOX_SELECTED, (wxObjectEventFunction)&HistogramDialogComboBox::OnBitmapComboItemSelected); for(int i = 0; i < bitmapsitems.size(); i++) { - bitmapcombo->SetItemBitmap(i, bitmapsitems[i]->GetBitmap()); + bitmapcombo->Append(_T("ColorFunction"), bitmapsitems[i]->GetBitmap() ); +// bitmapcombo->SetItemBitmap(i, bitmapsitems[i]->GetBitmap()); } + BitmapComboItemSelect(0); return bitmapcombo; } -void HistogramDialogComboBox::OnBitmapComboItemSelected(wxCommandEvent& event) -{ + +void HistogramDialogComboBox::BitmapComboItemSelect(int value) +{ + HistogramDialogComboBoxItem* currentconfig; if(_bitmapcombo!=NULL) { - _currentitem = event.GetInt(); + _currentitem = value; + _bitmapcombo->Select(value); if(_bitmapsitems.size()>_currentitem) { - HistogramDialogComboBoxItem* currentconfig = _bitmapsitems[_currentitem]; - _greyvect = currentconfig->getGreyVector(); - _redvect = currentconfig->getRedVector(); - _greenvect = currentconfig->getGreenVector(); - _bluevect= currentconfig->getBlueVector(); - _greyvecttransfer = currentconfig->getGreyVectorTransfer(); - _value = currentconfig->getValueVector(); + currentconfig = _bitmapsitems[_currentitem]; + _greyvect = currentconfig->getGreyVector(); + _redvect = currentconfig->getRedVector(); + _greenvect = currentconfig->getGreenVector(); + _bluevect = currentconfig->getBlueVector(); + _greyvecttransfer = currentconfig->getGreyVectorTransfer(); + _value = currentconfig->getValueVector(); wxCommandEvent newevent(wxEVT_COMMAND_COMBOBOX_SELECTED,this->GetId()); ProcessEvent(newevent); - } - } + } // if size + } // _bitmapcombo +} + + +void HistogramDialogComboBox::OnBitmapComboItemSelected(wxCommandEvent& event) +{ + BitmapComboItemSelect( event.GetInt() ); } void HistogramDialogComboBox::OnLoadComboBoxData(std::vector& itembitmaps, std::string filename) -{ +{ std::vector redvect, greenvect, bluevect; std::vector greyvect, greyvecttransfunct, value; - redvect.clear(); - greenvect.clear(); + redvect.clear(); + greenvect.clear(); bluevect.clear(); - greyvect.clear(); - greyvecttransfunct.clear(); + greyvect.clear(); + greyvecttransfunct.clear(); value.clear(); - std::ifstream file; - file.open( (const char*) (filename.c_str()) ); + std::ifstream file; + file.open( (const char*) (filename.c_str()) ); double gv=-1,gvtransfer=-1,intensity=-1,red=-1,gr=-1,bl=-1; int in=-1; //std::cout<"))!=-1) { - int pos1=line.find(">"); + int pos1=line.find(">"); int pos2=line.find("<",pos1+1); std::string x=line.substr(pos1+1,pos2-pos1-1); - gvtransfer=atof(x.c_str()); + gvtransfer=atof(x.c_str()); greyvecttransfunct.push_back(gvtransfer); }else if((int)(line.find(""))!=-1) { - int pos1=line.find(">"); + int pos1=line.find(">"); int pos2=line.find("<",pos1+1); std::string x=line.substr(pos1+1,pos2-pos1-1); - intensity=atof(x.c_str()); + intensity=atof(x.c_str()); value.push_back(intensity); } else if( (int)(line.find(""))!=-1) @@ -321,8 +416,8 @@ void HistogramDialogComboBox::OnLoadComboBoxData(std::vector"); int pos2=line.find("<",pos1+1); std::string x=line.substr(pos1+1,pos2-pos1-1); - gv=atof(x.c_str()); - greyvect.push_back(gv); + gv=atof(x.c_str()); + greyvect.push_back(gv); } else if( (int)(line.find(""))!=-1) { @@ -330,7 +425,7 @@ void HistogramDialogComboBox::OnLoadComboBoxData(std::vector"))!=-1) { @@ -345,9 +440,9 @@ void HistogramDialogComboBox::OnLoadComboBoxData(std::vector"); int pos2=line.find("<",pos1+1); std::string x=line.substr(pos1+1,pos2-pos1-1); - bl=atof(x.c_str()); + bl=atof(x.c_str()); bluevect.push_back(bl); - + }else if( (int)(line.find(""))!=-1 ) { item->SetColors(greyvect,redvect,greenvect,bluevect); @@ -362,7 +457,7 @@ void HistogramDialogComboBox::OnLoadComboBoxData(std::vector& greylevel,std::vector& value) -{ - for(int i = 0; i < _greyvecttransfer.size();i++) { +{ + for(int i = 0; i < _greyvecttransfer.size();i++) + { greylevel.push_back(_greyvecttransfer[i]*_maxgreyvalue); - value.push_back(_value[i]); - } + value.push_back(_value[i]); + } // for i } /** @@ -398,11 +494,13 @@ void HistogramDialogComboBox::GetValuesColorPointsFunction(std::vector& std::vector& red, std::vector& green, std::vector& blue) -{ - for(int i = 0; i < _greyvect.size();i++) { +{ + for(int i = 0; i < _greyvect.size();i++) + { greylevel.push_back(_greyvect[i]*_maxgreyvalue); red.push_back(_redvect[i]); green.push_back(_greenvect[i]); - blue.push_back(_bluevect[i]); - } + blue.push_back(_bluevect[i]); + } // for i } +