CDPP / AMDA_Kernel

Commit d1a921d326990cd775ddeb896512f7977fa2f2bd

Authored by Benjamin Renard
Committed by Erdogan Furkan
1 parent 630ce80f
Exists in master and in 12 other branches AllLegends, FER_11242, FER_11500, FER_11537, FER_11651, FER_5344, FER_7318, FER_9629, SpeasyGet, amdadev, das2, ubuntu

For now

Showing 26 changed files with 9 additions and 5 deletions   Show diff stats
Inline Side-by-side
config/app/plotConfig.xml
  Diff comments   View file @d1a921d
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <root>
3 3 <default>
4   - <page dimension="ISO A4" orientation="landscape" mode="color" dpi="300">
  4 + <page dimension="ISO A4" orientation="landscape" mode="color" dpi="90">
5 5 <font name="sans-serif" size="8" />
6   - <margin x="15" y="20" /> <!-- in mm -->
  6 + <margin x="5" y="5" /> <!-- in mm -->
7 7 </page>
8 8 <panel resolution="3000" backgroundColor="[255,255,255]"> <!-- charSizeUnits defines space to set all around plot area -->
9 9 <title position="top" align="center" />
... ...
src/ParamOutputImpl/Plot/PanelPlotOutput.cc
  Diff comments   View file @d1a921d
... ... @@ -286,7 +286,7 @@ namespace plot
286 286 _plotAreaSideSet[pAxis->_position] = true;
287 287  
288 288 // Reserve space for ticks
289   - if (pAxis->_tick._position == Tick::TickPosition::OUTWARDS)
  289 + if (pAxis->_tick._position == Tick::TickPosition::OUTWARDS || _isHeightFixed)
290 290 {
291 291 double tickSize = getVerticalTickLength(pAxis.get(), legendCharSizePanel.second);
292 292 bottomSpace += tickSize;
... ... @@ -413,7 +413,7 @@ namespace plot
413 413 {
414 414 rightSpace += PlPlotUtil::LINE_SPACE_TITLE * legendCharSizePanel.second * std::get<1>(pageSize) / std::get<0>(pageSize);
415 415 pAxis->setLegendOffset(rightSpace + 0.3 * legendCharSizePanel.second * std::get<1>(pageSize) / std::get<0>(pageSize));
416   - rightSpace += (2*nbLegendRows + PlPlotUtil::LINE_SPACE_TITLE * (nbLegendRows + 1)) * legendCharSizePanel.second * std::get<1>(pageSize) / std::get<0>(pageSize);
  416 + rightSpace += (0.5+nbLegendRows + PlPlotUtil::LINE_SPACE_TITLE * (nbLegendRows + 1)) * legendCharSizePanel.second * std::get<1>(pageSize) / std::get<0>(pageSize);
417 417 }
418 418  
419 419 break;
... ... @@ -976,6 +976,10 @@ namespace plot
976 976 }
977 977 }
978 978  
  979 + if (pYAxis->_tick._position == Tick::TickPosition::INWARDS)
  980 + if ((lAxisOption.find("v")) == std::string::npos)
  981 + lAxisOption+="v";
  982 +
979 983 // Set plot area used to draw tick
980 984 if (pYAxis->_position == PlotCommon::Position::POS_LEFT)
981 985 {
... ...
test/DD_Client/CSlimFixtures/ScriptTestAmdaCommandLine.cpp
  Diff comments   View file @d1a921d
... ... @@ -681,7 +681,7 @@ static char* compareImg1Img2ImgDiff(void */*fixture*/, SlimList *args) {
681 681 }
682 682  
683 683 char command [2048];
684   - sprintf (command, "compare %s %s %s",
  684 + sprintf (command, "compare -metric AE %s %s %s",
685 685 SlimList_GetStringAt(args, 0),
686 686 SlimList_GetStringAt(args, 1),
687 687 SlimList_GetStringAt(args, 2));
... ...
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT4/UserStory16/plot_portrait_REF.pdf
View file @d1a921d
No preview for this file type
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT4/UserStory16/plot_portrait_REF.png
View file @d1a921d

132 KB | W: | H:

36.2 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT5/UserStory17/axis_31_REF.png
View file @d1a921d

60.7 KB | W: | H:

14.3 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT5/UserStory17/axis_32_REF.png
View file @d1a921d

71.5 KB | W: | H:

18.9 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT5/UserStory17/axis_33_1_REF.png
View file @d1a921d

69.4 KB | W: | H:

16.2 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT5/UserStory17/axis_33_2_REF.png
View file @d1a921d

68.5 KB | W: | H:

15.9 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT5/UserStory17/axis_34_1_REF.png
View file @d1a921d

66.1 KB | W: | H:

15.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT5/UserStory17/axis_34_2_REF.png
View file @d1a921d

69.7 KB | W: | H:

15.9 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT5/UserStory17/axis_34_3_REF.png
View file @d1a921d

68.7 KB | W: | H:

15.7 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT5/UserStory17/axis_34_4_REF.png
View file @d1a921d

69.1 KB | W: | H:

15.8 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT5/UserStory17/axis_34_5_REF.png
View file @d1a921d

70.4 KB | W: | H:

16.7 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT5/UserStory17/axis_35_1_REF.png
View file @d1a921d

67.6 KB | W: | H:

15.5 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT5/UserStory17/axis_35_2_REF.png
View file @d1a921d

68.5 KB | W: | H:

15.7 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT5/UserStory17/axis_35_3_REF.png
View file @d1a921d

66.7 KB | W: | H:

15.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT5/UserStory17/axis_36_1_REF.png
View file @d1a921d

73.9 KB | W: | H:

19.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT5/UserStory17/axis_36_2_REF.png
View file @d1a921d

85.4 KB | W: | H:

23.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT5/UserStory17/axis_36_3_REF.png
View file @d1a921d

60.7 KB | W: | H:

12.9 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT5/UserStory17/axis_37_REF.png
View file @d1a921d

58.9 KB | W: | H:

14.2 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT5/UserStory17/axis_38_1_REF.png
View file @d1a921d

105 KB | W: | H:

25 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT5/UserStory17/axis_38_2_REF.png
View file @d1a921d

92.9 KB | W: | H:

22.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT5/UserStory17/axis_39_1_REF.png
View file @d1a921d

73.4 KB | W: | H:

17.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT5/UserStory17/axis_39_2_REF.png
View file @d1a921d

77.7 KB | W: | H:

17.5 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/plots_ref/centos-7/SecondPart/ReLease1/SprinT5/UserStory17/axis_40_REF.png
View file @d1a921d

69.3 KB | W: | H:

16.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin