X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2FpPlotter.cxx;h=c6d803e05e23014b2513cfbe8f2c00c944754fb8;hb=80b04dc9e3b981e24fe9ae0d81cdeb8af6e6f8c1;hp=bddea2312257675dda70286dd5bfa5fd0ab74590;hpb=63a0a21e6736a800c58442edd531c91d75e71694;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotter.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotter.cxx index bddea23..c6d803e 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotter.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotter.cxx @@ -219,46 +219,49 @@ END_EVENT_TABLE() Set the bars according to the actual function */ - void pPlotter::setAll() +void pPlotter::setAll() { actualFunction = m_plot->getActualFunction(); - if (actualFunction != NULL) { barrange -> setActiveStateTo(true); color_bar -> setActiveStateTo(true); - text.Clear(); text = _T("minX="); double realMin_X = actualFunction->getMinX(); +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 text = text + realMin_X; +#else + text = text + wxString::FromDouble( realMin_X ); +#endif text = text + _T(" maxX="); double realMax_X = actualFunction->getMaxX(); +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 text = text + realMax_X; - +#else + text = text + wxString::FromDouble( realMax_X ); +#endif int minShowed = actualFunction->getMinXShowed(); int maxShowed = actualFunction->getMaxXShowed(); - barrange -> setRepresentedValues (realMin_X, realMax_X); barrange->SetStart( minShowed ); barrange->SetEnd( maxShowed ); - - std::vector actualColorPoints; - actualFunction -> getColorPoints(actualColorPoints); + actualFunction->getColorPoints(actualColorPoints); if(actualColorPoints.empty()) - color_bar ->reinitiateColorBar (realMin_X, realMax_X); - else - color_bar ->reinitiateColorBarTo(actualColorPoints); - - color_bar -> setVisibleRange (minShowed, maxShowed); - + { + color_bar->reinitiateColorBar (realMin_X, realMax_X); + } else { + color_bar->reinitiateColorBarTo(actualColorPoints); + } + color_bar->setVisibleRange (minShowed, maxShowed); // Refresh - color_bar -> RefreshForce(); - barrange -> RefreshForce(); - + color_bar->RefreshForce(); + barrange->RefreshForce(); sendTMessage(text); - } + } // if actualFunction } @@ -269,11 +272,10 @@ Set the bars according to the actual function //----------------------------------------------------------------------------------------------------- // Updating methods for occured events in the color bar //----------------------------------------------------------------------------------------------------- -void pPlotter :: onAdded_ColorPoint(wxCommandEvent& event) +void pPlotter::onAdded_ColorPoint(wxCommandEvent& event) { text.Clear(); text = _T( "Last event was on color bar: Color point added, total#"); - actualFunction = m_plot->getActualFunction(); if(actualFunction!=NULL) { @@ -281,41 +283,38 @@ void pPlotter :: onAdded_ColorPoint(wxCommandEvent& event) color_bar ->getAddedColorsPointsList(actualColorPoints); actualFunction -> setColorPoints(actualColorPoints); text << actualColorPoints.size(); - sendTMessage(text); } } + void pPlotter :: onRemoved_ColorPoint(wxCommandEvent& event) { text.Clear(); text = _T( "Last event on color bar: Color point removed total#"); - actualFunction = m_plot->getActualFunction(); std::vector actualColorPoints; color_bar ->getAddedColorsPointsList(actualColorPoints); actualFunction -> setColorPoints(actualColorPoints); text << actualColorPoints.size(); - sendTMessage(text); } + void pPlotter :: onMoved_ColorPoint(wxCommandEvent& event) { text.Clear(); text = _T( "Last event was on color bar: Color point moved to: "); int lastReal_X = (int)(color_bar->getLastMovedColorPoint())->getRealX(); text << lastReal_X; - barrange ->setRealX_vertical_line (lastReal_X); barrange -> RefreshForce(); - m_plot->setRealGuideX (lastReal_X); m_plot->UpdateAll(); - sendTMessage(text); } + void pPlotter:: onChanged_ColorPoint(wxCommandEvent& event) { - text.Clear(); + text.Clear(); sendTMessage(_T("Last event was on color bar: Color point changed color")); } @@ -367,20 +366,21 @@ void pPlotter :: onChangeFunction (wxCommandEvent& event) barrange->SetEnd( maxShowed ); std::vector actualColorPoints; - actualFunction -> getColorPoints(actualColorPoints); + actualFunction->getColorPoints(actualColorPoints); if(actualColorPoints.empty()) - color_bar ->reinitiateColorBar (realMin_X, realMax_X); - else - color_bar ->reinitiateColorBarTo(actualColorPoints); - - color_bar -> setVisibleRange ((int)realMin_X, maxShowed); + { + color_bar->reinitiateColorBar (realMin_X, realMax_X); + } else { + color_bar->reinitiateColorBarTo(actualColorPoints); + } + color_bar->setVisibleRange ((int)realMin_X, maxShowed); // Refresh - color_bar -> RefreshForce(); - barrange -> RefreshForce(); + color_bar->RefreshForce(); + barrange->RefreshForce(); sendTMessage(text); - } + } // if actualFunction } @@ -444,7 +444,7 @@ void pPlotter::onActualChange_Bar(wxCommandEvent& event) color_bar ->setRealX_vertical_line (lastActual_X); color_bar -> RefreshForce(); - m_plot->setRealGuideX (lastActual_X); + m_plot->setRealGuideX(lastActual_X); m_plot->UpdateAll(); text.Clear(); @@ -472,8 +472,8 @@ void pPlotter::onStartChange_Bar(wxCommandEvent& event) //setting the plotter for draw the functions that //it has to move. - float startP=(float)barrange->getStartShowPorcentage(); - float endP=(float)barrange->getEndShowPorcentage(); + float startP = (float)barrange->getStartShowPorcentage(); + float endP = (float)barrange->getEndShowPorcentage(); m_plot->moveFunctions(startP,endP); //Updating @@ -486,19 +486,16 @@ void pPlotter::onEndChange_Bar(wxCommandEvent& event) { text.Clear(); text += _T("Last event was on min-max bar: End triangle moved to: "); - int realMax_X = barrange->GetEnd(); + int realMax_X = barrange->GetEnd(); text += wxString::Format(_T("%d"),realMax_X); - double realMin_X = m_plot->getMinScrX(); + double realMin_X = m_plot->getMinScrX(); color_bar -> setVisibleRange ((int)realMin_X, realMax_X); m_plot->actualizeViewRange((int)realMin_X,realMax_X); - - float startP=(float)barrange->getStartShowPorcentage(); - float endP=(float)barrange->getEndShowPorcentage(); + float startP = (float)barrange->getStartShowPorcentage(); + float endP = (float)barrange->getEndShowPorcentage(); m_plot->moveFunctions(startP,endP); - color_bar -> RefreshForce(); m_plot -> UpdateAll(); - sendTMessage(text); } @@ -670,10 +667,12 @@ void pPlotter :: sendTMessage(wxString theText) { return barrange->getEndShowPorcentage(); } + float pPlotter::getMinShowedPorcentage() { return barrange->getStartShowPorcentage(); } + float pPlotter::getActualShowedPorcentage() { return barrange->getActualShowPorcentage(); @@ -747,16 +746,17 @@ void pPlotter :: sendTMessage(wxString theText) **/ void pPlotter::GetValuesPointsFunction(std::vector& greylevel,std::vector& value, int histogramsize) { - if(actualFunction != NULL){ + if(actualFunction != NULL) + { double* xval = actualFunction->getX_RealValues(); double* yval = actualFunction->getY_RealValues(); - actualFunction->getScaleY(); - for(int i = 0; i < actualFunction->getSizePoints();i++){ + for(int i = 0; i < actualFunction->getSizePoints();i++) + { greylevel.push_back(xval[i]); value.push_back(yval[i]/histogramsize); - } - } + } // for + } // if } /** @@ -768,27 +768,23 @@ void pPlotter::GetValuesColorPointsFunction(std::vector& greylevel, std::vector& green, std::vector& blue) { - - if(color_bar != NULL){ - + if(color_bar != NULL) + { std::vector colors; - color_bar->getAddedColorsPointsList(colors); - - for(int i = 0; i < colors.size();i++){ - pColorPoint* pcolor = colors[i]; - + color_bar->getAddedColorsPointsList(colors); + for(int i = 0; i < colors.size();i++) + { + pColorPoint* pcolor = colors[i]; greylevel.push_back(pcolor->getRealX()); - wxColour colour = pcolor->getColor(); - - double _red = (double)(colour.Red())/255.0; - double _green = (double)(colour.Green())/255.0; - double _blue = (double)(colour.Blue())/255.0; - + wxColour colour = pcolor->getColor(); + double _red = (double)(colour.Red())/255.0; + double _green = (double)(colour.Green())/255.0; + double _blue = (double)(colour.Blue())/255.0; red.push_back(_red); green.push_back(_green); blue.push_back(_blue); - } - } + } // for + } // if }