From 393af49c04fb77e019068f0f184b3b65e894f2a3 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Sat, 7 Oct 2017 10:42:58 +0200 Subject: [PATCH] #3145 creaContours Bug New Normal - changeWx28to30 --- .../interfMainPanel.cxx | 9 ++- .../wxConceptControl.cxx | 50 +++++++----- .../wxContourMainFrame.cxx | 77 +++++++++---------- .../wxContourViewPanel.cxx | 55 ++++++++----- .../wxInstantChooserPanel.cxx | 23 ++++-- 5 files changed, 127 insertions(+), 87 deletions(-) diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx index dac24f6..06e17aa 100644 --- a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx +++ b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx @@ -32,7 +32,7 @@ wxFrame* interfMainPanel::_newframe=NULL; interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtHandler * evtHandler, std::string datadir) : wxPanel(parent, -1, wxDefaultPosition, wxSize(sizex, sizey), wxBORDER_SUNKEN) { - +printf("EED interfMainPanel::interfMainPanel Start\n"); PANEL = "New Contour"; PANEL1 = "I/O"; PANEL2 = "Edit"; @@ -68,7 +68,12 @@ interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtH wxPanel* toolpanel = new wxPanel(splitterwindow, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_DOUBLE, wxString(_T(""))); +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 wxFlexGridSizer* flexsizer = new wxFlexGridSizer(6,2,1,1); +#else + wxFlexGridSizer* flexsizer = new wxFlexGridSizer(6); +#endif toolpanel->SetSizer(flexsizer, true); toolpanel->SetAutoLayout( true ); @@ -88,7 +93,6 @@ interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtH wxButton* b6 = getButton(toolpanel); b6->SetClientData(&PANEL6); - wxPanel* mentex = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T(""))); wxPanel* mentex1 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T(""))); wxPanel* mentex2 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T(""))); @@ -157,6 +161,7 @@ interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtH Connect(b6->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&interfMainPanel::onActionButtonPressed1); this->Layout(); +printf("EED interfMainPanel::interfMainPanel End\n"); } interfMainPanel::~interfMainPanel(void) diff --git a/lib/Interface_ManagerContour_NDimensions/wxConceptControl.cxx b/lib/Interface_ManagerContour_NDimensions/wxConceptControl.cxx index ceb3f8a..d57743c 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxConceptControl.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxConceptControl.cxx @@ -45,40 +45,44 @@ DEFINE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE ) // Constructors & Destructors //------------------------------------------------------------------------------------------------------------ - wxConceptControl :: wxConceptControl(wxWindow *parent, bool orientation, int minV, int maxV, int actualV, std::string &aConceptName, std::string elementsDef ) + wxConceptControl::wxConceptControl(wxWindow *parent, bool orientation, int minV, int maxV, int actualV, std::string &aConceptName, std::string elementsDef ) :wxPanel(parent, -1, wxDefaultPosition, parent->GetSize(), wxTAB_TRAVERSAL) { - - minValue = minV; - maxValue = maxV; - _numCheckBox = 0; - - showLabels = true; - - wxFlexGridSizer* sizer = new wxFlexGridSizer (1, 3, 15, 15); - +printf("EED wxConceptControl::wxConceptControl Start\n"); + minValue = minV; + maxValue = maxV; + _numCheckBox = 0; + showLabels = true; + +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + wxFlexGridSizer* sizer = new wxFlexGridSizer(1, 3, 15, 15); +#else + wxFlexGridSizer* sizer = new wxFlexGridSizer(3); +#endif conceptName = new wxStaticText(this, -1, wxString(aConceptName.c_str(),wxConvUTF8), wxDefaultPosition, wxSize(90,20), wxALIGN_CENTRE ); +printf("EED wxConceptControl::wxConceptControl 1\n"); sizer->Add( conceptName, 0, wxALIGN_CENTRE |wxALIGN_CENTER_HORIZONTAL); - +printf("EED wxConceptControl::wxConceptControl 2\n"); if(orientation) { sizer->AddGrowableCol(1); conceptSlider = new wxSlider(this, -1, actualV, minV, maxV, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL| wxSL_AUTOTICKS | wxSL_LABELS, wxDefaultValidator, wxString(aConceptName.c_str(),wxConvUTF8)); - } - else - { - sizer->AddGrowableRow(1); + } else { +// sizer->AddGrowableRow(1); conceptSlider = new wxSlider(this, -1, actualV, minV, maxV, wxDefaultPosition, wxDefaultSize, wxSL_LEFT| wxSL_AUTOTICKS | wxSL_LABELS, wxDefaultValidator, wxString(aConceptName.c_str(),wxConvUTF8) ); } +printf("EED wxConceptControl::wxConceptControl 3\n"); sizer->Add(conceptSlider, 0, wxGROW |wxALL ); +printf("EED wxConceptControl::wxConceptControl 4\n"); createElements( sizer, elementsDef ); SetSizer( sizer ); - Connect( conceptSlider->GetId(), wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler(wxConceptControl::onSliderTrack));//(wxObjectEventFunction) &wxConceptControl :: onSliderRelease ); Connect( conceptSlider->GetId(), wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler(wxConceptControl::onSliderRelease));//(wxObjectEventFunction) &wxConceptControl :: onSliderTrack ); - this->SetAutoLayout( true ); +printf("EED wxConceptControl::wxConceptControl 5\n"); this->Layout(); +printf("EED wxConceptControl::wxConceptControl End\n"); } wxConceptControl :: ~wxConceptControl() @@ -232,11 +236,16 @@ DEFINE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE ) //------------------------------------------------------------------------------------------------------------ // Creational and initialization methods //------------------------------------------------------------------------------------------------------------ - void wxConceptControl :: createElements(wxSizer *sizer , std::string elementsDef ) + void wxConceptControl::createElements(wxSizer *sizer , std::string elementsDef ) { const char * elements = elementsDef.c_str(); int elementsNum = elementsDef.size(); - wxFlexGridSizer* checkSizer = new wxFlexGridSizer (1, elementsNum, 5, 5); +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + wxFlexGridSizer* checkSizer = new wxFlexGridSizer(1, elementsNum, 5, 5); +#else + wxFlexGridSizer* checkSizer = new wxFlexGridSizer(elementsNum); +#endif int i,ckecks = 0; for( i = 0;*elements!= 0; elements++) { @@ -250,8 +259,7 @@ DEFINE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE ) }*/ createCheckBoxAndAddToSizer( checkSizer, "X", -1, ckecks); ckecks++; - } - else if ( a == 84 || a==116 )// Including T:84 or t t:116 as textCtrl (ASCII) + } else if ( a == 84 || a==116 )// Including T:84 or t t:116 as textCtrl (ASCII) { } diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx index 96049d3..2c37a7f 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx @@ -60,6 +60,7 @@ char wxContourMainFrame::COPY = 'C'; //: wxWindow(parent, id, pos, size, style) : wxPanel(parent, id, pos, size, style) { +printf("EED wxContourMainFrame :: wxContourMainFrame Start 1\n"); m_mgr.SetManagedWindow(this); _contourGroup = 1; _creatingContoursActive = false; @@ -70,13 +71,13 @@ char wxContourMainFrame::COPY = 'C'; // _gridPanel = NULL; // _drawToolsPanel = NULL; // _operationsToolsPanel = NULL; - //_autoFormsPanel = NULL; + //_autoFormsPanel = NULL; // _standardToolsPanel = NULL; // _editionToolsPanel = NULL; // _listViewPanel = NULL; // _sceneManager = NULL; - //_actualInstant = NULL; - _numberOfVariablesStatistics = 6+1; + //_actualInstant = NULL; + _numberOfVariablesStatistics= 6+1; _refLineControl = NULL; _refLineModel = NULL; @@ -92,13 +93,15 @@ char wxContourMainFrame::COPY = 'C'; _viewMaskImage = NULL; _viewMaskImagePanel = NULL; _viewThresholdImage = NULL; - _viewThresholdImagePanel = NULL; - _viewColorLayerImagePanel = NULL; + _viewThresholdImagePanel = NULL; + _viewColorLayerImagePanel = NULL; +printf("EED wxContourMainFrame :: wxContourMainFrame End 1\n"); } wxContourMainFrame :: wxContourMainFrame(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector images, long style,std::string datadir) : wxPanel(parent, id, pos, size, style) { +printf("EED wxContourMainFrame :: wxContourMainFrame Start 2\n"); m_mgr.SetManagedWindow(this); _contourGroup = 1; _creatingContoursActive = false; @@ -112,70 +115,66 @@ char wxContourMainFrame::COPY = 'C'; _viewMaskImage = NULL; _viewMaskImagePanel = NULL; _viewThresholdImage = NULL; - _viewThresholdImagePanel = NULL; - _viewColorLayerImagePanel = NULL; - + _viewThresholdImagePanel = NULL; + _viewColorLayerImagePanel = NULL; +printf("EED wxContourMainFrame :: wxContourMainFrame A\n"); // set up default notebook style - m_notebook_style =wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER; - m_notebook_theme = 0; + m_notebook_style = wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER; + m_notebook_theme = 0; //wxContour_ActionCommandsID a; - _numberOfVariablesStatistics = 7; - - _datadir = datadir; - - - inredo = 0; - inundo = 0; - + _numberOfVariablesStatistics= 7; + _datadir = datadir; + inredo = 0; + inundo = 0; +printf("EED wxContourMainFrame :: wxContourMainFrame B\n"); _pannew = interfMainPanel::getInstance(this,datadir+"/data/Icons");//, eventHandler); - _performingOperation = new PerformingOperation(); - +printf("EED wxContourMainFrame :: wxContourMainFrame C\n"); + _performingOperation = new PerformingOperation(); +printf("EED wxContourMainFrame :: wxContourMainFrame C.1\n"); if(images.size() > 0) { +printf("EED wxContourMainFrame :: wxContourMainFrame C.2\n"); this->setVectImages(images); +printf("EED wxContourMainFrame :: wxContourMainFrame C.3\n"); } - _contourextractdata = NULL; +printf("EED wxContourMainFrame :: wxContourMainFrame End 2\n"); } void wxContourMainFrame::setVectImages(std::vector imgs) { - +printf("EED wxContourMainFrame::setVectImages Start\n"); _images = imgs; - #if defined(__GNUC__) std::string str_home(getenv("HOME")); #elif defined(_WIN32) - std::string str_home(getenv("USERPROFILE")); + std::string str_home(getenv("USERPROFILE")); #endif - std::string strCreaContourDataTmp = str_home + "/.creaContourDataTemp/"; - + std::string strCreaContourDataTmp = str_home + "/.creaContourDataTemp/"; std::vector conceptNameVect; std::vector conceptSizeVect; - +printf("EED wxContourMainFrame::setVectImages Start 01\n"); notebook = this->createNotebook(); - - - kernelManager = new KernelManagerContour( imgs , _datadir+"/data/" , strCreaContourDataTmp ); - - - _instantPanel = new wxInstantChooserPanel( notebook, "Instant Chooser", true, false, "c" ); - _theViewPanel = new wxContourViewPanel( kernelManager->getSourceImage(), notebook ); - +printf("EED wxContourMainFrame::setVectImages Start 02\n"); + kernelManager = new KernelManagerContour( imgs , _datadir+"/data/" , strCreaContourDataTmp ); +printf("EED wxContourMainFrame::setVectImages Start 03\n"); + _instantPanel = new wxInstantChooserPanel( notebook, "Instant Chooser", true, false, "c" ); +printf("EED wxContourMainFrame::setVectImages Start 04\n"); + _theViewPanel = new wxContourViewPanel( kernelManager->getSourceImage(), notebook ); +printf("EED wxContourMainFrame::setVectImages Start 05\n"); //------------------------------------------------------------- kernelManager->getConceptsInformation(conceptNameVect, conceptSizeVect); +printf("EED wxContourMainFrame::setVectImages 1\n"); _instantPanel->addConcepts(conceptNameVect, conceptSizeVect); - - +printf("EED wxContourMainFrame::setVectImages 2\n"); double val = _theViewPanel->getCurrentDeep(); _instantPanel->setConceptValue( "Axe Depth", (int)val ); //JCP _instantPanel->setConceptValue("time", num de imagenes); ConceptDataWrap * data = _instantPanel->getConceptDataOf( "Axe Depth" ); //*******************changeInstant(); _theViewPanel->setVerticalConcept( "Axe Depth", data->getMinValue(), data->getMaxValue(), data->getMinShowedValue(), data->getMaxShowedValue(), data->getActualValue() ); - this->configurePanels( ); - +printf("EED wxContourMainFrame::setVectImages End\n"); } diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx index a7e8716..a501b91 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx @@ -112,31 +112,51 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) }*/ //:wxScrolledWindow(parent, -1, pos, size, style) - wxContourViewPanel :: wxContourViewPanel ( vtkImageData * theShowingImage, wxWindow *parent, const wxPoint& pos, const wxSize& size,long style, int vertStart, int vertEnd, int horzStart, int horzEnd ) + wxContourViewPanel::wxContourViewPanel ( vtkImageData * theShowingImage, wxWindow *parent, const wxPoint& pos, const wxSize& size,long style, int vertStart, int vertEnd, int horzStart, int horzEnd ) :wxPanel(parent, -1, pos, size, style) { +printf("EED wxContourViewPanel::wxContourViewPanel Start\n"); theShowingImage->GetSpacing(last_spacing); - showingVID = theShowingImage; - int gapH = 20; - int gapV = 10; - _verticalConceptName = ""; - _horizontalConceptName = ""; + showingVID = theShowingImage; + int gapH = 20; + int gapV = 10; + _verticalConceptName = ""; + _horizontalConceptName = ""; createHorizontalBar(1,80); createVerticalBar(1,200); createViewPanel(); - _eventHandler = NULL; + _eventHandler = NULL; - wxFlexGridSizer * panelSizer = new wxFlexGridSizer(1, 4, gapV, gapH); +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + wxFlexGridSizer * panelSizer = new wxFlexGridSizer(1,4, gapV, gapH); panelSizer -> AddGrowableCol(2); panelSizer -> AddGrowableRow(2); +#else + wxFlexGridSizer * panelSizer = new wxFlexGridSizer(4); + panelSizer -> AddGrowableCol(2); +#endif +printf("EED wxContourViewPanel::wxContourViewPanel 01\n"); +printf("EED wxContourViewPanel::wxContourViewPanel 1\n"); panelSizer->Add(_verticalBar, 1, wxGROW); +printf("EED wxContourViewPanel::wxContourViewPanel 2\n"); panelSizer->AddSpacer(gapV); +printf("EED wxContourViewPanel::wxContourViewPanel 3\n"); panelSizer->Add(theViewPanel, 1, wxGROW); +printf("EED wxContourViewPanel::wxContourViewPanel 4\n"); panelSizer->AddSpacer(gapV); +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 outSizer = new wxFlexGridSizer(3, 1, gapH, gapV); outSizer -> AddGrowableCol(1); outSizer -> AddGrowableRow(1); +#else + outSizer = new wxFlexGridSizer(3); + outSizer -> AddGrowableCol(1); +#endif +printf("EED wxContourViewPanel::wxContourViewPanel 5\n"); +printf("EED wxContourViewPanel::wxContourViewPanel 7\n"); outSizer->Add( _horizontalBar, 1, wxGROW); outSizer->Add( panelSizer, 1, wxGROW); outSizer->AddSpacer(gapH); @@ -144,6 +164,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) _horizontalBar->setDeviceBlitStart( _verticalBar->GetWidth() + 2*gapH, gapV); _horizontalBar->setDeviceEndMargin( 2*gapH+10 ); +printf("EED wxContourViewPanel::wxContourViewPanel 8\n"); //Connecting the events to the horizontal bar Connect(_horizontalBar->GetId(),wxEVT_TSBAR,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onBarrange_Horizontal ); Connect(_horizontalBar->GetId(),wxEVT_TSBAR_ACTUAL,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onActualChange_Bar_Horizontal ); @@ -151,6 +172,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) Connect(_horizontalBar->GetId(),wxEVT_TSBAR_END,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onEndChange_Bar_Horizontal ); Connect(_horizontalBar->GetId(),wxEVT_SELECTION_END,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onSelectionEnd_Horizontal ); Connect(_horizontalBar->GetId(),wxEVT_TSBAR_MOVED,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onMovedBar_Horizontal ); +printf("EED wxContourViewPanel::wxContourViewPanel 9\n"); //Connecting the events to the vertical bar Connect(_verticalBar->GetId(),wxEVT_TSBAR,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onBarrange_Vertical ); @@ -159,19 +181,19 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) Connect(_verticalBar->GetId(),wxEVT_TSBAR_END,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onEndChange_Bar_Vertical ); Connect(_verticalBar->GetId(),wxEVT_SELECTION_END,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onSelectionEnd_Vertical ); Connect(_verticalBar->GetId(),wxEVT_TSBAR_MOVED,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onMovedBar_Vertical ); - - +printf("EED wxContourViewPanel::wxContourViewPanel 9.1\n"); this->SetSizer( outSizer ); +printf("EED wxContourViewPanel::wxContourViewPanel 9.2\n"); this->SetAutoLayout( true ); +printf("EED wxContourViewPanel::wxContourViewPanel 9.3\n"); this->Layout(); - //SetSize(1900,1900); //theViewPanel->SetSize(800,600); //theViewPanel->GetWindow(1)->SetSize(800,600); - //outSizer->Fit( this ); - +printf("EED wxContourViewPanel::wxContourViewPanel 10\n"); initializeScenceManager(); +printf("EED wxContourViewPanel::wxContourViewPanel End\n"); } @@ -180,22 +202,19 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) delete _sceneManager; } - void wxContourViewPanel::initializeScenceManager(){ - + void wxContourViewPanel::initializeScenceManager() + { //_theViewPanel = theViewPanel; //_theViewPanel->setWxEventHandler( this ); - double spc[3]; this->getSpacing(spc); _sceneManager = new wxVtkBaseView_SceneManager ( this->getWxVtkBaseView(), this, spc ); - Connect( this->GetId(), wxINSTANT_CHANGE, (wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onChangeInstant ); Connect( wxID_ANY, wxEVT_START_CREATE_MULT_ROI, (wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onCreateMultipleROI ); Connect( wxID_ANY, wxEVT_START_CREATE_ROI, (wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onCreateROI ); Connect( wxID_ANY, wxEVT_STOP_CREATE_ROI, (wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onStopCreateROI ); Connect( wxID_ANY, wxEVT_CHANGED_DEEP, (wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onChangedDeep ); Connect( wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContourViewPanel :: onActionButtonPressed ); - } wxVtkBaseView_SceneManager* wxContourViewPanel::getSceneManager(){ diff --git a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx index a4de255..dc5ff99 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx @@ -96,7 +96,12 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE ) setVerticalMaxSelectedNums( groupConfig ); SetSize(size); +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 _outSizer = new wxFlexGridSizer ( 1, 10, 10); +#else + _outSizer = new wxFlexGridSizer ( 10); +#endif _orientation = theOrientation; initializeResolutionSlider(); _actualInstant=new std::map(); @@ -138,11 +143,15 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE ) */ void wxInstantChooserPanel :: addConcept(std::string aConceptName, int minV, int maxV, int actualV) { +printf("EED wxInstantChooserPanel :: addConcept Start\n"); wxConceptControl * nwConcept = new wxConceptControl(this, _orientation, minV, maxV, actualV, aConceptName, _configuration); _concepts->push_back( nwConcept ); _lastConceptUpdated = nwConcept; +printf("EED wxInstantChooserPanel :: addConcept 1\n"); _outSizer->Add(nwConcept, wxEXPAND); +printf("EED wxInstantChooserPanel :: addConcept 2\n"); Connect(nwConcept->GetId(), wxEVT_CONCEPT_RELEASE, (wxObjectEventFunction) (wxCommandEventFunction) &wxInstantChooserPanel::onConceptRelease ); +printf("EED wxInstantChooserPanel :: addConcept End\n"); } void wxInstantChooserPanel :: setWxEventHandler( wxEvtHandler * theEventHandler ) @@ -155,13 +164,13 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE ) //------------------------------------------------------------------------------------------------------------ void wxInstantChooserPanel :: onResolutionSlider(wxScrollEvent& event) { - std::string lasConcept = _lastConceptUpdated->getName(); - int value = _lastConceptUpdated->getActualValue(); - int min = _lastConceptUpdated->getMinValue(); - int max = _lastConceptUpdated->getMaxValue(); - int delta = (int) (pow((double) 2, _resolutionSlider->GetValue() )); - int minTmp = value - delta/2; - int maxTmp = value + delta/2; + std::string lasConcept = _lastConceptUpdated->getName(); + int value = _lastConceptUpdated->getActualValue(); + int min = _lastConceptUpdated->getMinValue(); + int max = _lastConceptUpdated->getMaxValue(); + int delta = (int) (pow((double) 2, _resolutionSlider->GetValue() )); + int minTmp = value - delta/2; + int maxTmp = value + delta/2; if (minTmp