CDPP / AMDA_Kernel

Commit 21ddb9f281fc0c9b36c718177453ff7e62cbb07b

Authored by Benjamin Renard
1 parent 19cbe5ae
Exists in master and in 94 other branches 10038, 10098, 5390, 5770, 6728, 7616, 7811, 7875, 8034_7628, 8038, 8041, 8045_8044, 8295, 8459, 8528, 8928, 9016, 9016Bis, 9017, 9017-new, 9049, 9084, 9259, 9326, 9347, 9383, 9719, 9719.new, AllLegends, CDF_ISTP, CDF_ISTP_HOPEFULLY_ALL_WORKING, FER_10400, FER_10412, FER_10663, FER_10765, FER_11000, FER_11100, FER_11242, FER_11277, FER_11500, FER_11537, FER_11588, FER_11651, FER_19836, FER_5344, FER_6031, FER_6598, FER_6966, FER_7318, FER_7618, FER_7857, FER_8455, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, JUNO_JEDI, MAZ_10936, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, SpeasyGet, amdadev, amdadev_test, cu2022, das2, density_maps, develop, evol-5638, evol-6371, evol_9042, expression-parser-bre, feature/9259, frames-transformation, pickle, rm_5639, rm_5776, rm_6015, rm_6595, rm_6599, rm_6616, rm_6616_bis, rm_6912, rm_7926, rm_8050, rm_8932, shue, shue97, sum-components-indexes, test-merge, tickplot, ubuntu

Set legend color for x axis

Showing 1 changed file with 15 additions and 1 deletions   Show diff stats
Inline Side-by-side
src/ParamOutputImpl/Plot/AxisLegendManager.cc
  Diff comments   View file @21ddb9f
... ... @@ -11,12 +11,17 @@ void AxisLegendManager::configureXAxisLegendForSeries(
11 11 // Build list of all indexes used by each parameters for each x axes
12 12 std::map<std::string, AxisParamsComponents> axesParamsComponents;
13 13  
  14 + // Compute nb series to draw by y axis
  15 + std::map<std::string,int> nbSeriesByYAxisMap = plot->getNbSeriesByYAxis();
  16 +
14 17 SeriesProperties lSeriesProperties;
15 18 for (auto param: plot->_parameterAxesList) {
16 19 for(auto lSeriesProperties : param.getYSeriePropertiesList()) {
17 20 if(!lSeriesProperties.hasYAxis() || !lSeriesProperties.hasXAxis())
18 21 continue;
19 22  
  23 + bool moreThanOneSerieForAxis = (nbSeriesByYAxisMap[lSeriesProperties.getYAxisId()] > 1);
  24 +
20 25 ParameterAxes* xParameter = plot->getParameterAxesByXSerieId(lSeriesProperties.getXId());
21 26  
22 27 XSeriesProperties xSerie = xParameter->getXSeriePropertiesById(lSeriesProperties.getXId());
... ... @@ -28,11 +33,20 @@ void AxisLegendManager::configureXAxisLegendForSeries(
28 33 continue;
29 34 }
30 35  
31   - ParameterIndexComponentColor xIndex = ParameterIndexComponentColor(xSerie.getIndex(), lXAxis->_color);
  36 + Color compLegendColor = lXAxis->_color;
  37 + if (moreThanOneSerieForAxis && (lSeriesProperties.getColorSerieId() == -1) && (!plot->_panel->_page->_superposeMode)) {
  38 + compLegendColor = plot->getSerieLineColor(lSeriesProperties, moreThanOneSerieForAxis);
  39 + }
  40 +
  41 + ParameterIndexComponentColor xIndex = ParameterIndexComponentColor(xSerie.getIndex(), compLegendColor);
32 42 pushComponentInList(xSerie.getParamId(), xIndex, axesParamsComponents[xAxisId]);
33 43 }
34 44 }
35 45  
  46 + if (!plot->_panel->_page->_superposeMode) {
  47 + plot->resetAutomaticSerieColorCursor();
  48 + }
  49 +
36 50 std::list<std::string> legendLines;
37 51 for (auto axisParamsComponents : axesParamsComponents) {
38 52 boost::shared_ptr<Axis> lXAxis = plot->_panel->getAxis(axisParamsComponents.first);
... ...