Fix bug in ticks draw along a serie for a scatter plot when a tick is in a NaN value

Benjamin Renard
1 parent 634d98b1
Showing 1 changed file with 48 additions and 6 deletions Show diff stats
src/ParamOutputImpl/Plot/Scatter/XYPlot.cc
@@ -134,7 +134,7 @@ void XYPlot::createParameters(std::list&lt;std::string&gt;&amp; usedParametersId_)
 				boost::replace_all(expr, OrbitParamComponentName, usedXParam->getId());
  
 				//create parameter from expression
-				usedYParam = _parameterManager.getParameterFromExpression(expr);
+				usedYParam = _parameterManager.getParameterFromExpression(expr, usedXParam->getGapThreshold());
  
 				if (usedYParam == nullptr)
 				{
@@ -618,6 +618,12 @@ void XYPlot::drawTimeTicks(SeriesProperties&amp; pSeries, AMDA::Common::ParameterInd
 	}
  
 	// Draw first time tick major symbol, other time tick major Symbols and minor time ticks symbols
+
+	PlWindow lPlWindow = PlWindow(_panel->getAxis(pSeries.getXAxisId())->getRange().getMin(), _panel->getAxis(pSeries.getXAxisId())->getRange().getMax(),
+	_panel->getAxis(pSeries.getYAxisId())->getRange().getMin(), _panel->getAxis(pSeries.getYAxisId())->getRange().getMax());
+
+	_pls->wind(std::get<0>(lPlWindow), std::get<1>(lPlWindow), std::get<2>(lPlWindow), std::get<3>(lPlWindow));
+
 	if (nbTotMajor != 0) {
 		drawSymbols(
 			ttProps.getFirstSymbol().getType(),
@@ -650,13 +656,14 @@ void XYPlot::drawTimeTicks(SeriesProperties&amp; pSeries, AMDA::Common::ParameterInd
 		std::string computedTimeFormat = getPlTimeFormat (std::string("hh:mm"), startTime, stopTime, nbTotMajor);
 //		LOG4CXX_DEBUG(gLogger, "drawTimeTicks computedTimeFormat" << computedTimeFormat);
  
-		Range lXRange = getXAxisRange (pSeries, _panel->getAxis(pSeries.getXAxisId()));
 		Range lYRange = getYAxisRange (pSeries, _panel->getAxis(pSeries.getYAxisId()));
  
 		double deltaX = 0; // (lXRange.getMax () - lXRange.getMin ()) / 80;
 		double deltaY = (lYRange.getMax () - lYRange.getMin ()) / 80;
  
 		for (int g=0; g<nbTotMajor; g++) {
+			if (isNAN(majorX[g]) || isNAN(majorY[g]))
+				continue;
 			boost::shared_ptr<TextPlot> textPlot (new TextPlot (baseTextPlot));
 			textPlot->_x = boost::lexical_cast<std::string>(majorX [g] + deltaX);
 			textPlot->_y = boost::lexical_cast<std::string>(majorY [g] + deltaY);
@@ -665,8 +672,6 @@ void XYPlot::drawTimeTicks(SeriesProperties&amp; pSeries, AMDA::Common::ParameterInd
 			textPlots.push_back (textPlot);
 		}
  
-		PlWindow lPlWindow = PlWindow(lXRange.getMin(), lXRange.getMax(), lYRange.getMin(), lYRange.getMax());
-
 		// Draw textPlots for major graduations
 		drawTextPlots (_panel->getAxis(pSeries.getXAxisId()), _panel->getAxis(pSeries.getYAxisId()), lPlWindow, textPlots);
 	}
@@ -784,7 +789,7 @@ void XYPlot::drawCurvePlot(CurvePlot &amp;curvePlot)
 		for (ity = it->getYSeriePropertiesMap().begin(); ity != it->getYSeriePropertiesMap().end();
 				++ity)
 		{
-			if (curvePlot._serieId == ity->second.getId())
+			if (curvePlot._serieId == ity->second.getId());
 			{
 				//get curve points
 				int resolution = ity->second.getMaxResolution();
@@ -792,8 +797,9 @@ void XYPlot::drawCurvePlot(CurvePlot &amp;curvePlot)
 					resolution = 100;
 				CurveFunctionWriter::CurvePointList pointList = curvePlot.getPointList(resolution);
  
-				if (pointList.empty())
+				if (pointList.empty()) {
 					return; //nothing to plot
+				}
  
 				//prepare data in relation to axis of the associated serie
 				double xData[pointList.size()];
@@ -814,6 +820,16 @@ void XYPlot::drawCurvePlot(CurvePlot &amp;curvePlot)
 					++i;
 				}
  
+				boost::shared_ptr<Axis> lXAxis(_panel->getAxis(ity->second.getXAxisId()));
+
+				if ((lXAxis == nullptr))
+				{
+					std::stringstream lError;
+					lError << "XYPlot::drawCurvePlot : cannot retrieve X Axis";
+					BOOST_THROW_EXCEPTION(
+							PanelPlotOutputException() << AMDA::ex_msg(lError.str()));
+				}
+
 				double* lXData = _panel->getAxis(ity->second.getXAxisId())->getComputedValues(
 									xData,
 									pointList.size(), xMin, xMax);
@@ -826,10 +842,36 @@ void XYPlot::drawCurvePlot(CurvePlot &amp;curvePlot)
 							PanelPlotOutputException() << AMDA::ex_msg(lError.str()));
 				}
  
+				boost::shared_ptr<Axis> lYAxis(_panel->getAxis(ity->second.getYAxisId()));
+
+				if ((lYAxis == nullptr))
+				{
+					std::stringstream lError;
+					lError << "XYPlot::drawCurvePlot : cannot retrieve Y Axis";
+					BOOST_THROW_EXCEPTION(
+							PanelPlotOutputException() << AMDA::ex_msg(lError.str()));
+				}
+
 				double* lYData = _panel->getAxis(ity->second.getYAxisId())->getComputedValues(
 									yData,
 									pointList.size(), yMin, yMax);
  
+				if(lYData == NULL)
+				{
+					std::stringstream lError;
+					lError << "XYPlot::drawCurvePlot : no value for y, check the request y parameter definition";
+					BOOST_THROW_EXCEPTION(
+							PanelPlotOutputException() << AMDA::ex_msg(lError.str()));
+				}
+
+
+				Range lXRange = lXAxis->getRange();
+				Range lYRange = lYAxis->getRange();
+
+				PlWindow lPlWindow = PlWindow(lXRange.getMin(), lXRange.getMax(), lYRange.getMin(), lYRange.getMax());
+
+				_pls->wind(std::get<0>(lPlWindow), std::get<1>(lPlWindow), std::get<2>(lPlWindow), std::get<3>(lPlWindow));
+
 				//draw the curve
 				drawLines(
 					LineType::LINE,