Fix

Benjamin Renard
1 parent 6c4b6a4f
Showing 2 changed files with 13 additions and 14 deletions Show diff stats
src/ParamOutputImpl/Plot/AxisLegendManager.cc
src/ParamOutputImpl/Plot/AxisLegendManager.hh
@@ -53,8 +53,7 @@ namespace plot
                     if(param.getHistogramSeriesPropertiesList().size() > 0)
                         compLegendColor = pHistogramProperties->getColor();
                     ParameterIndexComponentColor xIndex = ParameterIndexComponentColor(xIndexComp, compLegendColor);
-                    pushComponentInList(xParamId, xIndex, axesParamsComponents[xAxisId]);
-                    insertionOrder.push_back(xParamId);
+                    pushComponentInList(xParamId, xIndex, axesParamsComponents[xAxisId], insertionOrder);
                 }
             }
  
@@ -84,8 +83,7 @@ namespace plot
                 }
  
                 ParameterIndexComponentColor xIndex = ParameterIndexComponentColor(xSerie.getIndex(), compLegendColor);
-                pushComponentInList(xSerie.getParamId(), xIndex, axesParamsComponents[xAxisId]);
-                insertionOrder.push_back(xSerie.getParamId());
+                pushComponentInList(xSerie.getParamId(), xIndex, axesParamsComponents[xAxisId], insertionOrder);
             }
         }
  
@@ -184,8 +182,7 @@ namespace plot
                     if(param.getHistogramSeriesPropertiesList().size() > 0)
                         compLegendColor = pHistogramProperties->getColor();
                     ParameterIndexComponentColor yIndex = ParameterIndexComponentColor(yIndexComp, compLegendColor);
-                    pushComponentInList(yParamId, yIndex, axesHistoParamsComponents[yAxisId]);
-                    insertionOrder.push_back(yParamId);
+                    pushComponentInList(yParamId, yIndex, axesHistoParamsComponents[yAxisId], insertionOrder);
                 }
             }
             for (auto lSeriesProperties : param.getYSeriePropertiesList())
@@ -210,8 +207,7 @@ namespace plot
                         compLegendColor = plot->getSerieLineColor(lSeriesProperties, moreThanOneSerieForAxis);
                     }
                     ParameterIndexComponentColor yIndex = ParameterIndexComponentColor(index, compLegendColor);
-                    pushComponentInList(lSeriesProperties.getParamId(), yIndex, axesParamsComponents[yAxisId]);
-                    insertionOrder.push_back(lSeriesProperties.getParamId());
+                    pushComponentInList(lSeriesProperties.getParamId(), yIndex, axesParamsComponents[yAxisId], insertionOrder);
                 }
             }
         }
@@ -273,8 +269,7 @@ namespace plot
                     ParameterIndexComponentColor colorSerieIndex = ParameterIndexComponentColor(-1, -1, lZAxis->_color);
                     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());
+                    pushComponentInList(pHistogramProperties->getHistotypeProperties().getParamId(), colorSerieIndex, axisParamsComponents, insertionOrder);
                 }
             }
             for (auto lSeriesProperties : param.getYSeriePropertiesList())
@@ -298,8 +293,7 @@ namespace plot
                 ParameterIndexComponentColor colorSerieIndex = ParameterIndexComponentColor(-1, -1, lZAxis->_color);
                 if (lColorSerieProperties.getIndex() > -1)
                     colorSerieIndex = ParameterIndexComponentColor(lColorSerieProperties.getIndex(), -1, lZAxis->_color);
-                pushComponentInList(lColorSerieProperties.getColorParamIds()[yParamId], colorSerieIndex, axisParamsComponents);
-                insertionOrder.push_back(lColorSerieProperties.getColorParamIds()[yParamId]);
+                pushComponentInList(lColorSerieProperties.getColorParamIds()[yParamId], colorSerieIndex, axisParamsComponents, insertionOrder);
             }
         }
  
@@ -343,13 +337,16 @@ namespace plot
         }
     }
  
-    void AxisLegendManager::pushComponentInList(std::string paramId, ParameterIndexComponentColor &index, AxisParamsComponents &axisParamsComponents)
+    void AxisLegendManager::pushComponentInList(std::string paramId, ParameterIndexComponentColor &index, AxisParamsComponents &axisParamsComponents,
+                                                std::vector<std::string> &insertionOrder)
     {
         if (index.getDim1Index() == -1 && index.getDim2Index() == -1)
         {
             // All indexes of this parameter are used
             axisParamsComponents[paramId].clear();
             axisParamsComponents[paramId].push_back(index);
+            if (std::find(insertionOrder.begin(), insertionOrder.end(), paramId) == insertionOrder.end())
+                insertionOrder.push_back(paramId);
         }
         else
         {
@@ -371,6 +368,8 @@ namespace plot
             }
             // Add this components for this axis
             axisParamsComponents[paramId].push_back(index);
+            if (std::find(insertionOrder.begin(), insertionOrder.end(), paramId) == insertionOrder.end())
+                insertionOrder.push_back(paramId);
         }
     }
  
@@ -93,7 +93,7 @@ namespace plot
  
 		static void addBreakLine(std::string &legend);
  
-		static void pushComponentInList(std::string paramId, ParameterIndexComponentColor &index, AxisParamsComponents &axisParamsComponents);
+		static void pushComponentInList(std::string paramId, ParameterIndexComponentColor &index, AxisParamsComponents &axisParamsComponents, std::vector<std::string> &insertionOrder);
  
 		static std::string getParamLegend(AMDA::Info::ParamInfoSPtr paramInfo, ParameterIndexComponentColor &index);