Fix orbitserie in relation with the new series management

Benjamin Renard
1 parent cc495d54
Showing 4 changed files with 6 additions and 3 deletions Show diff stats
src/ParamOutputImpl/Plot/PanelPlotOutput.cc
src/ParamOutputImpl/Plot/SeriesNode.hh
src/ParamOutputImpl/Plot/SeriesProperties.cc
src/ParamOutputImpl/Plot/SeriesProperties.hh
@@ -2574,9 +2574,6 @@ ParameterAxes* PanelPlotOutput::getParameterAxesByColorSerieId(int colorSerieId)
  
 ParameterAxes* PanelPlotOutput::getParameterAxesByXSerieId(int xSerieId)
 {
-	if (xSerieId < 0)
-		return NULL;
-
 	for (ParameterAxesList::iterator it = _parameterAxesList.begin();
 		it != _parameterAxesList.end(); ++it)
 	{
@@ -229,12 +229,15 @@ public:
  
 		SeriesProperties yserie(defaultProps);
 		XSeriesProperties xserie;
+		xserie.setId(SeriesProperties::AUTO_SERIES_ID);
+		++SeriesProperties::AUTO_SERIES_ID;
  
 		// parse attributes for ySerie
 		// ---------------------------------------------------------------------
  
 		// read parent attributes
 		DrawingPropertiesNode<PlotType>::parseAttributes(pNode_, yserie);
+		yserie.setXId(xserie.getId());
  
 		// specific series node attributes :
 		xmlChar * value = NULL;
@@ -13,6 +13,8 @@
  
 namespace plot {
  
+int SeriesProperties::AUTO_SERIES_ID = -10000;
+
 std::vector<AMDA::Common::ParameterIndexComponent> SeriesProperties::getIndexList(std::map<std::string, ParameterData> *pParameterValues) {
 	std::vector<AMDA::Common::ParameterIndexComponent> indexes;
 	if (_index == AMDA::Common::ParameterIndexComponent(-1,-1))
@@ -26,6 +26,7 @@ namespace plot {
  */
 class SeriesProperties: public DrawingProperties {
 public:
+	static int AUTO_SERIES_ID;
  
 	friend std::ostream& operator<<(std::ostream& out_,
 			const SeriesProperties& lprop_);