no message

diff --git a/bbtk/src/bbmaracasvisuTransferFunctionView.cxx b/bbtk/src/bbmaracasvisuTransferFunctionView.cxx
index cef78ac1773d70427ed140a63dcaa8a80390a23c..c02ccc6f7820ea06211bb84a7b8cb2a80cceebab 100644 (file)
--- a/bbtk/src/bbmaracasvisuTransferFunctionView.cxx
+++ b/bbtk/src/bbmaracasvisuTransferFunctionView.cxx
@@ -94,12 +94,14 @@ void TransferFunctionView::onColorChange(){
        bbSetOutputColorFunction(_ctfun);
 }
 
-void TransferFunctionView::onSliderChange(){
+void TransferFunctionView::onSliderChange()
+       {
        
-//EED
-onColorChange();
+               //EED
+               onColorChange();
+
+               bbSignalOutputModification();
 
-       bbSignalOutputModification();
 
 //     bbSetOutputWindowLevel(mwxwidget->GetWindowLevel());
 //     bbSetOutputColorLevel(mwxwidget->GetColorLevel());
@@ -157,16 +159,22 @@ void TransferFunctionView::bbUserSetDefaultValues()
        //-----------------------------------------------------------------     
        
 
-       HandlerTransferFunctionView::HandlerTransferFunctionView(TransferFunctionView* box){
+       HandlerTransferFunctionView::HandlerTransferFunctionView(TransferFunctionView* box)
+       {
                _box = box;             
        }
-       HandlerTransferFunctionView::~HandlerTransferFunctionView(){
-
+       
+       HandlerTransferFunctionView::~HandlerTransferFunctionView()
+       {
        }       
-       void HandlerTransferFunctionView::onColorChange(wxCommandEvent& event){
+       
+       void HandlerTransferFunctionView::onColorChange(wxCommandEvent& event)
+       {
                _box->onColorChange();
        }
-       void HandlerTransferFunctionView::onSliderChange(wxCommandEvent& event){
+       
+       void HandlerTransferFunctionView::onSliderChange(wxCommandEvent& event)
+       {
                _box->onSliderChange();
        }
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
index 88ebdd363493988a80a2a33ca16b8ad48f556e05..9d8ac5193a24788520d6f5353eaead108a86c3c5 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
@@ -37,7 +37,12 @@ namespace creaMaracasVisuKernel{
 
                        if (FD->ShowModal()==wxID_OK)
                        {
+<<<<<<< OpenImageDialog.cxx
+//                             std::string  path= FD->GetPath();
+                               std::string  path= (const char*) (FD->GetPath().mb_str()); 
+=======
                                std::string  path= crea::wx2std(FD->GetPath());
+>>>>>>> 1.2
 
                                vtkMetaImageReader *reader =  vtkMetaImageReader::New();
                                reader->SetFileName(path.c_str());

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
index 2809b4e7c5c17c6bd1a99a7fdb8bf7bf3fb0bb98..66400036c60a4c969dbf6acb38cd105dc11ffca2 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
@@ -11,39 +11,38 @@
 HistogramDialogComboBox::HistogramDialogComboBox(wxWindow* parent)
 : wxPanel(parent)
 {
-       _img = NULL;    
-       _bitmapcombo=NULL;
-       _slidercolor=NULL;
-       _sliderwindowlevel=NULL;        
-       colorBar_Bitmap=NULL;
-       _bitmapsizer=NULL;
+       _img                            = NULL; 
+       _bitmapcombo            = NULL;
+       _slidercolor            = NULL;
+       _sliderwindowlevel      = NULL; 
+       colorBar_Bitmap         = NULL;
+       _bitmapsizer            = NULL;
 
        this->SetSizer(getBitmapCombo());
-       _img = NULL;
-       _currentitem = -1;
-       _maxgreyvalue=0;
+       _img                            = NULL;
+       _currentitem            = -1;
+       _maxgreyvalue           = 0;
+printf("EED HistogramDialogComboBox\n");       
 }
 
-HistogramDialogComboBox::~HistogramDialogComboBox(){   
+HistogramDialogComboBox::~HistogramDialogComboBox()
+{      
 }
 
-void HistogramDialogComboBox::SetColors(std::vector<double> greyvect, std::vector<double> redvect, std::vector<double> greenvect, std::vector<double> bluevect){
-
-       _greyvect=greyvect;
-       _redvect=redvect;
-       _greenvect=greenvect;
-       _bluevect=bluevect;
-       
+void HistogramDialogComboBox::SetColors(std::vector<double> greyvect, std::vector<double> redvect, std::vector<double> greenvect, std::vector<double> bluevect)
+{
+       _greyvect       = greyvect;
+       _redvect        = redvect;
+       _greenvect      = greenvect;
+       _bluevect       = bluevect;     
 }
 
-wxSizer* HistogramDialogComboBox::getBitmapCombo(){
+wxSizer* HistogramDialogComboBox::getBitmapCombo()
+{
        //_bitmapsizer = new wxBoxSizer(wxVERTICAL);
        _bitmapsizer = new wxBoxSizer(wxVERTICAL);
 
-       
-
        wxBoxSizer* comboeditsizer = new wxBoxSizer(wxHORIZONTAL);
-
        _bitmapcombo = getBitmapComboElements();
 
        wxBitmap bitmap1(Edit_xpm);
@@ -59,8 +58,8 @@ wxSizer* HistogramDialogComboBox::getBitmapCombo(){
        _bitmapsizer->Add(getSlidersWlCo(),wxSizerFlags().Expand().Center());
 
        return _bitmapsizer;
-       
 }
+
 wxSizer* HistogramDialogComboBox::getSlidersWlCo(){
        wxBoxSizer* sizersliders = new wxBoxSizer(wxVERTICAL);
 
@@ -76,42 +75,45 @@ wxSizer* HistogramDialogComboBox::getSlidersWlCo(){
        return sizersliders;
 }
 
-double HistogramDialogComboBox::GetWindowLevel(){
-       if(_sliderwindowlevel != NULL){
+double HistogramDialogComboBox::GetWindowLevel()
+{
+       if(_sliderwindowlevel != NULL)
+       {
                return _sliderwindowlevel->GetValue();
        }
 }
 
-double HistogramDialogComboBox::GetColorLevel(){
-    if(_slidercolor != NULL){
+double HistogramDialogComboBox::GetColorLevel()
+{
+    if(_slidercolor != NULL)
+       {
                return _slidercolor->GetValue();
        }    
 }
 
-void HistogramDialogComboBox::OnColorLevelChanged(wxCommandEvent& event){
+void HistogramDialogComboBox::OnColorLevelChanged(wxCommandEvent& event)
+{
        _slidercolor->GetValue();
-
        wxCommandEvent newevent(wxEVT_SCROLL_THUMBTRACK,this->GetId());
        ProcessEvent(newevent);
-
 }
-void HistogramDialogComboBox::OnWindowLevelChanged(wxCommandEvent& event){
-       _sliderwindowlevel->GetValue();
 
+void HistogramDialogComboBox::OnWindowLevelChanged(wxCommandEvent& event)
+{
+       _sliderwindowlevel->GetValue();
        wxCommandEvent newevent(wxEVT_SCROLL_THUMBTRACK,this->GetId());
     ProcessEvent(newevent);
-
 }
 
-void HistogramDialogComboBox::setImageData(vtkImageData* img){
+void HistogramDialogComboBox::setImageData(vtkImageData* img)
+{
        _maxgreyvalue = img->GetScalarRange()[1];
        _img = img;
-
        setSlidersValue();
-
 }
 
-void HistogramDialogComboBox::setSlidersValue(){
+void HistogramDialogComboBox::setSlidersValue()
+{
        if(_img!=NULL){
                if(_slidercolor!=NULL){
                        _slidercolor->SetRange(_img->GetScalarRange()[0],_img->GetScalarRange()[1]);
@@ -124,16 +126,17 @@ void HistogramDialogComboBox::setSlidersValue(){
        }
 }
 
-void HistogramDialogComboBox::OnEditBitmapCombo(wxCommandEvent& event){
-       
-       if(_img!=NULL){
-
+void HistogramDialogComboBox::OnEditBitmapCombo(wxCommandEvent& event)
+{      
+       if(_img!=NULL)
+       {
                bool createaddandremovecontrols = true;
                HistogramDialog* dialog = new HistogramDialog(this,_T("Color Configuration"),createaddandremovecontrols);
                dialog->initializeHistogram(_img);              
                dialog->setInfoPanExtraControls(_bitmapsitems);
 
-               if(dialog->ShowModal()==wxID_OK){
+               if(dialog->ShowModal()==wxID_OK)
+               {
                        
                        dialog->UpdateCurrentComboElement();
                        _bitmapsitems = dialog->getComboBoxItems();
@@ -162,8 +165,8 @@ void HistogramDialogComboBox::OnEditBitmapCombo(wxCommandEvent& event){
        }
 }
 
-void HistogramDialogComboBox::saveCurrentConfiguration(std::vector<HistogramDialogComboBoxItem*>& itembitmaps,std::string filename){
-
+void HistogramDialogComboBox::saveCurrentConfiguration(std::vector<HistogramDialogComboBoxItem*>& itembitmaps,std::string filename)
+{
        std::ofstream file;     
        file.open(  (const char*) (filename.c_str()) ); 
        double gv=-1,red=-1,gr=-1,bl=-1;
@@ -172,13 +175,15 @@ void HistogramDialogComboBox::saveCurrentConfiguration(std::vector<HistogramDial
        if(file.is_open())
        {
                file << "<ComboBoxData>" << std::endl;
-               for(int i = 0; i < itembitmaps.size();i++){
+               for(int i = 0; i < itembitmaps.size();i++)
+               {
                        HistogramDialogComboBoxItem* item = itembitmaps[i];
                        std::vector<double> vecttransfer = item->getGreyVectorTransfer();
                        std::vector<double> value = item->getValueVector();
 
                        file << " <ComboBoxItem>"<< std::endl;
-                       for(int j = 0; j < vecttransfer.size();j++){
+                       for(int j = 0; j < vecttransfer.size();j++)
+                       {
                                if(j==0){
                                        file << " <TransferenceFunction>"<< std::endl;
                                }
@@ -214,10 +219,10 @@ void HistogramDialogComboBox::saveCurrentConfiguration(std::vector<HistogramDial
                file << "</ComboBoxData>" << std::endl; 
        }
        file.close();
-
 }
 
-wxBitmapComboBox* HistogramDialogComboBox::getBitmapComboElements(){
+wxBitmapComboBox* HistogramDialogComboBox::getBitmapComboElements()
+{
        std::string currentpath = crea::System::GetDllAppPath("bbcreaMaracasVisu");     
        currentpath.append(FILENAME);
 
@@ -226,7 +231,8 @@ wxBitmapComboBox* HistogramDialogComboBox::getBitmapComboElements(){
        _bitmapsitems = bitmapsitems;
        wxString* choices;
        choices = new wxString[bitmapsitems.size()];
-       for(int i = 0; i < bitmapsitems.size();i++){
+       for(int i = 0; i < bitmapsitems.size();i++)
+       {
                choices[i] = _T("");
        }
        wxBitmapComboBox* bitmapcombo = new wxBitmapComboBox(this, -1, _T(""), wxDefaultPosition, wxDefaultSize, bitmapsitems.size(),choices);
@@ -234,22 +240,25 @@ wxBitmapComboBox* HistogramDialogComboBox::getBitmapComboElements(){
 
        Connect(bitmapcombo->GetId(), wxEVT_COMMAND_COMBOBOX_SELECTED, (wxObjectEventFunction)&HistogramDialogComboBox::OnBitmapComboItemSelected);                     
 
-       for(int i = 0; i < bitmapsitems.size(); i++){
+       for(int i = 0; i < bitmapsitems.size(); i++)
+       {
         bitmapcombo->SetItemBitmap(i, bitmapsitems[i]->GetBitmap());
        }
        return  bitmapcombo;
 }
-void HistogramDialogComboBox::OnBitmapComboItemSelected(wxCommandEvent& event){
-               
-       if(_bitmapcombo!=NULL){
+
+void HistogramDialogComboBox::OnBitmapComboItemSelected(wxCommandEvent& event)
+{              
+       if(_bitmapcombo!=NULL)
+       {
                _currentitem = event.GetInt();
-               if(_bitmapsitems.size()>_currentitem){
+               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();
                        wxCommandEvent newevent(wxEVT_COMMAND_COMBOBOX_SELECTED,this->GetId());

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
index fd6463b8b8b17a90615aac22737a93ad95912d55..88d9d4b65e9e8bcac9364a05ae5a774556801b53 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
@@ -116,7 +116,12 @@ void wxMaracasRenderTabbedPanel::createControls(vtkImageData* inImg, std::string
                        addSurface2(img, filename);
                        addSurface3(img, filename);     
                        addMPROptions();
+<<<<<<< wxMaracasRenderTabbedPanel.cpp
+//                     volname = (wxString) filename;
+                       volname = wxString(filename.c_str(),wxConvUTF8);
+=======
                        volname = crea::std2wx(filename);
+>>>>>>> 1.16
                        wxtabs->Refresh();
                }
        }