Merge branch 'FER_7857' into amdadev

Benjamin Renard
2 parents 03be5cc7 97ecb114
Showing 3 changed files with 28 additions and 15 deletions Show diff stats
src/ParamOutputImpl/Plot/AxisLegendManager.cc
src/ParamOutputImpl/Plot/AxisLegendManager.hh
src/ParamOutputImpl/Plot/InstantPlot/InstantPlot.cc
@@ -13,7 +13,8 @@ namespace plot
     {
         // Build list of all indexes used by each parameters for each x axes
         std::map<std::string, AxisParamsComponents> axesParamsComponents;
-
+        // Keep an order of the legends
+        std::vector<std::string> insertionOrder;
         // Compute nb series to draw by y axis
         std::map<std::string, int> nbSeriesByYAxisMap = plot->getNbSeriesByYAxis();
  
@@ -53,6 +54,7 @@ namespace plot
                         compLegendColor = pHistogramProperties->getColor();
                     ParameterIndexComponentColor xIndex = ParameterIndexComponentColor(xIndexComp, compLegendColor);
                     pushComponentInList(xParamId, xIndex, axesParamsComponents[xAxisId]);
+                    insertionOrder.push_back(xParamId);
                 }
             }
  
@@ -83,6 +85,7 @@ namespace plot
  
                 ParameterIndexComponentColor xIndex = ParameterIndexComponentColor(xSerie.getIndex(), compLegendColor);
                 pushComponentInList(xSerie.getParamId(), xIndex, axesParamsComponents[xAxisId]);
+                insertionOrder.push_back(xSerie.getParamId());
             }
         }
  
@@ -95,7 +98,7 @@ namespace plot
         for (auto axisParamsComponents : axesParamsComponents)
         {
             boost::shared_ptr<Axis> lXAxis = plot->_panel->getAxis(axisParamsComponents.first);
-            setAxisLegendForSeries(plot, lXAxis, axisParamsComponents.second);
+            setAxisLegendForSeries(plot, lXAxis, axisParamsComponents.second, insertionOrder);
         }
     }
  
@@ -136,6 +139,9 @@ namespace plot
         std::map<std::string, AxisParamsComponents> axesParamsComponents;
         std::map<std::string, AxisParamsComponents> axesHistoParamsComponents;
         std::map<std::string,std::string> yAxisTextLegendHisto;
+
+        // Keeping the order of the legends
+        std::vector<std::string> insertionOrder;
         if (!plot->_panel->_page->_superposeMode)
         {
             plot->resetAutomaticSerieColorCursor();
@@ -179,6 +185,7 @@ namespace plot
                         compLegendColor = pHistogramProperties->getColor();
                     ParameterIndexComponentColor yIndex = ParameterIndexComponentColor(yIndexComp, compLegendColor);
                     pushComponentInList(yParamId, yIndex, axesHistoParamsComponents[yAxisId]);
+                    insertionOrder.push_back(yParamId);
                 }
             }
             for (auto lSeriesProperties : param.getYSeriePropertiesList())
@@ -204,6 +211,7 @@ namespace plot
                     }
                     ParameterIndexComponentColor yIndex = ParameterIndexComponentColor(index, compLegendColor);
                     pushComponentInList(lSeriesProperties.getParamId(), yIndex, axesParamsComponents[yAxisId]);
+                    insertionOrder.push_back(lSeriesProperties.getParamId());
                 }
             }
         }
@@ -216,12 +224,12 @@ namespace plot
         for (auto axisParamsComponents : axesParamsComponents)
         {
             boost::shared_ptr<Axis> lYAxis = plot->_panel->getAxis(axisParamsComponents.first);
-            setAxisLegendForSeries(plot, lYAxis, axisParamsComponents.second,yAxisTextLegend);
+            setAxisLegendForSeries(plot, lYAxis, axisParamsComponents.second,insertionOrder, yAxisTextLegend);
         }
         for (auto axisHistoParamsComponents : axesHistoParamsComponents)
         {
             boost::shared_ptr<Axis> lYAxis = plot->_panel->getAxis(axisHistoParamsComponents.first);
-            setAxisLegendForSeries(plot, lYAxis, axisHistoParamsComponents.second, yAxisTextLegendHisto[axisHistoParamsComponents.first] );
+            setAxisLegendForSeries(plot, lYAxis, axisHistoParamsComponents.second, insertionOrder, yAxisTextLegendHisto[axisHistoParamsComponents.first] );
  
         }
     }
@@ -241,6 +249,7 @@ namespace plot
  
         // Build list of all indexes used by each parameters for each y axes
         AxisParamsComponents axisParamsComponents;
+        std::vector<std::string> insertionOrder;
         for (auto param : plot->_parameterAxesList)
         {
             for (auto pHistogramProperties : param.getHistogramSeriesPropertiesList())
@@ -265,6 +274,7 @@ namespace plot
                     if (pHistogramProperties->getHistotypeProperties().getIndex() > -1)
                         colorSerieIndex = ParameterIndexComponentColor(pHistogramProperties->getHistotypeProperties().getIndex(), -1, lZAxis->_color);
                     pushComponentInList(pHistogramProperties->getHistotypeProperties().getParamId(), colorSerieIndex, axisParamsComponents);
+                    insertionOrder.push_back(pHistogramProperties->getHistotypeProperties().getParamId());
                 }
             }
             for (auto lSeriesProperties : param.getYSeriePropertiesList())
@@ -289,10 +299,11 @@ namespace plot
                 if (lColorSerieProperties.getIndex() > -1)
                     colorSerieIndex = ParameterIndexComponentColor(lColorSerieProperties.getIndex(), -1, lZAxis->_color);
                 pushComponentInList(lColorSerieProperties.getColorParamIds()[yParamId], colorSerieIndex, axisParamsComponents);
+                insertionOrder.push_back(lColorSerieProperties.getColorParamIds()[yParamId]);
             }
         }
  
-        setAxisLegendForSeries(plot, lZAxis, axisParamsComponents, zAxisTextLegend);
+        setAxisLegendForSeries(plot, lZAxis, axisParamsComponents, insertionOrder,zAxisTextLegend);
     }
  
     void AxisLegendManager::configureColorAxisLegendForSpectro(
@@ -364,7 +375,7 @@ namespace plot
     }
  
     void AxisLegendManager::setAxisLegendForSeries(PanelPlotOutput *plot, boost::shared_ptr<Axis> &pAxis, AxisParamsComponents &axisParamsComponents, 
-                                                    std::string legendPrefix)
+                                                    std::vector<std::string> insertionOrder, std::string legendPrefix)
     {
         if (pAxis == nullptr || !pAxis->_legend.isEmpty())
         {
@@ -374,21 +385,21 @@ namespace plot
         // Retrieve ParamInfo Manager
         ParamMgr *piMgr = ParamMgr::getInstance();
  
-        for (auto paramsComponents : axisParamsComponents)
+        for (auto paramsComponents : insertionOrder)
         {
-            ParameterSPtr p = plot->_parameterManager.getParameter(paramsComponents.first);
+            ParameterSPtr p = plot->_parameterManager.getParameter(paramsComponents);
             if (p == nullptr)
                 continue;
             ParamInfoSPtr paramInfo = piMgr->getParamInfoFromId(p->getInfoId());
-            if (paramsComponents.second.size() == p->getDataWriterTemplate()->getParamData()->getDim1() * p->getDataWriterTemplate()->getParamData()->getDim2())
+            if (axisParamsComponents[paramsComponents].size() == p->getDataWriterTemplate()->getParamData()->getDim1() * p->getDataWriterTemplate()->getParamData()->getDim2())
             {
                 // All components of this parameter are used by this axis => merge
-                Color color = paramsComponents.second.front().getColor();
-                paramsComponents.second.clear();
-                paramsComponents.second.push_back(ParameterIndexComponentColor(-1, -1, color));
+                Color color = axisParamsComponents[paramsComponents].front().getColor();
+                axisParamsComponents[paramsComponents].clear();
+                axisParamsComponents[paramsComponents].push_back(ParameterIndexComponentColor(-1, -1, color));
             }
             bool isFirstComponent = true;
-            for (auto components : paramsComponents.second)
+            for (auto components : axisParamsComponents[paramsComponents])
             {
                 if (paramInfo == nullptr)
                     continue;
@@ -75,7 +75,7 @@ namespace plot
  
 		static void configureXAxisLegendForSeries(PanelPlotOutput *plot);
  
-		static void setAxisLegendForSeries(PanelPlotOutput *plot, boost::shared_ptr<Axis> &pAxis, AxisParamsComponents &axisParamsComponents, std::string legendPrefix="");
+		static void setAxisLegendForSeries(PanelPlotOutput *plot, boost::shared_ptr<Axis> &pAxis, AxisParamsComponents &axisParamsComponents, std::vector<std::string> insertionOrder, std::string legendPrefix="");
  
 		static void setAxisLegendForSpectro(PanelPlotOutput *plot, boost::shared_ptr<Axis> &pAxis, std::string originalParamId);
  
@@ -968,8 +968,10 @@ void InstantPlot::configureDataAxisLegend(boost::shared_ptr&lt;Axis&gt; axisSPtr, bool
 	else
 	{
 		AxisLegendManager::AxisParamsComponents axisParamsComponents;
+		std::vector<std::string> insertionOrder;
 		axisParamsComponents[_originalParamId].push_back(ParameterIndexComponentColor(-1,-1, axisSPtr->_color));
-		AxisLegendManager::setAxisLegendForSeries(this, axisSPtr, axisParamsComponents);
+		insertionOrder.push_back(_originalParamId);
+		AxisLegendManager::setAxisLegendForSeries(this, axisSPtr, axisParamsComponents, insertionOrder);
 	}
 }