CDPP / AMDA_Kernel

Commit 2ad6d916b9d2423aa00580b84d6f3ac3aea7205d

Authored by Benjamin Renard
1 parent cfe8df50
Exists in master and in 100 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, SolarOrbiter, SpeasyGet, add_path, akka-centos7, akka-scatter-multi-xparams, amdadev, amdadev_test, centos7, cu2022, das2, density_maps, develop, evol-5638, evol-6371, evol_9042, expression-parser-bre, feature/9259, frames-transformation, livraison-akka, 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 DDClient lib dir in library path for login script 

Fix a bug with title position
Showing 2 changed files with 25 additions and 6 deletions   Show diff stats
Inline Side-by-side
script/loginDD_Server.sh.in
  Diff comments   View file @2ad6d91
1 1 #!/bin/sh
2 2 [ ! -z "$BUILD_TYPE" ] || export BUILD_TYPE=Debug
  3 +export LD_LIBRARY_PATH=@DDCLIENTLIB_DIR@:$LD_LIBRARY_PATH
3 4 @DDCLIENTLIB_DIR@/../bin/DDLogin testKernel amda
4 5 ret=$?
5 6 echo $ret
... ...
src/ParamOutputImpl/Plot/PanelPlotOutput.cc
  Diff comments   View file @2ad6d91
... ... @@ -157,12 +157,24 @@ void PanelPlotOutput::calculatePlotArea(Bounds& bounds_) {
157 157 // Next operand of addition is to set space as many as title is requested to be down.
158 158 // we add 0.5 because when using plmtex with disposition value of 0,
159 159 // text is drawn on edge.
160   - topSpace += panelTitleCharHeight * (-_panel->getTitlePositionUnits() - 0.5);
161   - topSpace += (panelTitleCharHeight * ((1 + Panel::LINE_SPACE_TITLE) * splittedLegend->size()));
  160 + titleSpace += panelTitleCharHeight * (-_panel->getTitlePositionUnits() - 0.5);
  161 + titleSpace += (panelTitleCharHeight * ((1 + Panel::LINE_SPACE_TITLE) * splittedLegend->size()));
162 162 // Set rest of full character height under title.
163   - topSpace += panelTitleCharHeight * (1 - Panel::LINE_SPACE_TITLE);
164   - titleSpace = topSpace;
  163 + titleSpace += panelTitleCharHeight * (1 - Panel::LINE_SPACE_TITLE);
  164 +
  165 + switch (_panel->_titlePosition)
  166 + {
  167 + case PlotCommon::Position::POS_TOP :
  168 + topSpace += titleSpace;
  169 + break;
  170 + case PlotCommon::Position::POS_BOTTOM :
  171 + bottomSpace += titleSpace;
  172 + break;
  173 + default :
  174 + //Not possible - Nothing to do
  175 + titleSpace = 0;
165 176 }
  177 + }
166 178  
167 179 // Get character size for panel.
168 180 double lFontFactorPanel = getPlFontScaleFactor(_panel->_font);
... ... @@ -510,7 +522,10 @@ void PanelPlotOutput::calculatePlotArea(Bounds& bounds_) {
510 522  
511 523 case TextLegendPosition::POS_TOP :
512 524 if (topTextLegendFound == false) {
513   - textLegendProp->setOffset (topSpace - titleSpace);
  525 + if (_panel->_titlePosition == PlotCommon::Position::POS_TOP)
  526 + textLegendProp->setOffset (topSpace - titleSpace);
  527 + else
  528 + textLegendProp->setOffset (topSpace);
514 529 topSpace += (1.5 * textLegendLinesNb + 0.5) * legendCharHeight;
515 530 topTextLegendFound = true;
516 531 }
... ... @@ -518,7 +533,10 @@ void PanelPlotOutput::calculatePlotArea(Bounds& bounds_) {
518 533  
519 534 case TextLegendPosition::POS_BOTTOM :
520 535 if (bottomTextLegendFound == false) {
521   - textLegendProp->setOffset (bottomSpace);
  536 + if (_panel->_titlePosition == PlotCommon::Position::POS_BOTTOM)
  537 + textLegendProp->setOffset (bottomSpace - titleSpace);
  538 + else
  539 + textLegendProp->setOffset (bottomSpace);
522 540 bottomSpace += (1.5 * textLegendLinesNb + 0.5) * legendCharHeight;
523 541 bottomTextLegendFound = true;
524 542 }
... ...