#11379 - Done

Erdogan Furkan
1 parent 476afccf
Showing 2 changed files with 24 additions and 15 deletions Show diff stats
src/ParamOutputImpl/Plot/HistoPlot/Histo1DFunction.cc
src/ParamOutputImpl/Plot/HistoPlot/HistoPlot.cc
@@ -36,12 +36,17 @@ std::map&lt;int,std::vector&lt;double&gt;&gt; Histo1DFunction::getGridValues(double* xData, 
 void Density1DFunction::apply(std::vector<std::pair<double,double>> &grid,  double* xData, int nbData, Range xRange, 
 								double& xBinSize, bool yIsLog, double& yMin, double& yMax)
 {
+	bool yMaxToModify=true;
 	if(!_cacheGrid.empty()){
 		grid = _cacheGrid;
 		return;
 	}
-	yMin = (yIsLog) ? 1 : 0;
-	yMax = 0;
+	if(std::isnan(yMin))
+		yMin = (yIsLog) ? 1 : 0;
+	if(std::isnan(yMax))
+		yMax = 0;
+	else
+		yMaxToModify = false;
 	std::map<int,std::vector<double>> allValues;
  
 	allValues = getGridValues(xData,nbData,xRange,xBinSize);
@@ -50,11 +55,11 @@ void Density1DFunction::apply(std::vector&lt;std::pair&lt;double,double&gt;&gt; &amp;grid,  doub
 		if (allValues[i].size() > 0)
 			_cacheGrid.push_back(std::make_pair(xRange.getMin()+xBinSize*i,
 								(yIsLog) ? log10(allValues[i].size()) : allValues[i].size() ));
-		
-		if(yMax < allValues[i].size())
-			yMax = allValues[i].size();
+		if(yMaxToModify)
+			if(yMax < allValues[i].size())
+				yMax = allValues[i].size();
 	}
-
+	
 	grid = _cacheGrid;
 }
  
@@ -64,13 +69,17 @@ void NormDensity1DFunction::apply(std::vector&lt;std::pair&lt;double,double&gt;&gt; &amp;grid,  
 								double& xBinSize, bool yIsLog, double& yMin, double& yMax)
 {
  
+	bool yMaxToModify=true;
 	if(!_cacheGrid.empty()){
 		grid = _cacheGrid;
 		return;
 	}
-
-	yMin = (yIsLog) ? 1 : 0;
-	yMax = 0;
+	if(std::isnan(yMin))
+		yMin = (yIsLog) ? 1 : 0;
+	if(std::isnan(yMax))
+		yMax = 0;
+	else
+		yMaxToModify = false;
 	std::map<int,std::vector<double>> allValues;
  
 	allValues = getGridValues(xData,nbData,xRange,xBinSize);
@@ -266,7 +266,7 @@ void HistoPlot::configureSeriesAxis(double startDate, double stopDate) {
 				std::vector<std::pair<double,double>> grid;
 				double xBinSize = 0;
  
-				// Call histo1DUtils to get yMin/yMax dans send these to PanelPlotOutput::drawHistogram to draw the y axis
+				// Call histo1DUtils to get yMin/yMax and send these to PanelPlotOutput::drawHistogram to draw the y axis
 				histo1DUtils(startDate, stopDate,*pHistogramProperties.get(), grid, xBinSize);
 			}
  
@@ -304,9 +304,9 @@ void HistoPlot::histo1DUtils(double startDate, double stopDate, HistogramSeriesP
 	if(std::isnan(lXRange.getMin()) || std::isnan(lXRange.getMax()))
 		return;
     Range lYRange = lYAxis->Axis::getRange();
-
-	double yMin = NAN ; 
-	double yMax = NAN ;
+	std::cout << lYRange.getMin() << " ----- " << lYRange.getMax() << std::endl;
+	double yMin = lYRange.getMin() ; 
+	double yMax = lYRange.getMax() ;
  
 	unsigned int xBinNumber = pHistogramProperties.getManualProperties().getXBinNumber();
  
@@ -326,7 +326,7 @@ void HistoPlot::histo1DUtils(double startDate, double stopDate, HistogramSeriesP
 		xValues = xData.getValues(pHistogramProperties.getIndex(), xStartIndex);
  
     pHistogramProperties.getHistotypeProperties().getHisto1DFunction()->apply(grid,xValues,xNbValues,lXRange, xBinSize, 
-													(lYAxis->_scale==Axis::Scale::LOGARITHMIC) ? true : false,yMin, yMax);
+													(lYAxis->_scale==Axis::Scale::LOGARITHMIC) ,yMin, yMax);
  
 	if(lXAxis->_scale==Axis::Scale::LOGARITHMIC)
 		free(xValues);
@@ -334,7 +334,7 @@ void HistoPlot::histo1DUtils(double startDate, double stopDate, HistogramSeriesP
 	if(!std::isnan(yMin))
 		lYRange.setMin(yMin);
 	if(!std::isnan(yMax))
-		lYRange.setMax(yMax*1.05);
+		lYRange.setMax(yMax);
 	lYRange._extend = lYAxis->isExtended();
 	lYAxis->setRange(lYRange);
 }