Commit 58b353d59a820e2650cc2db235aeadbdaff46efb
1 parent
f6eaec4e
Exists in
master
and in
100 other branches
Set to version 3.4.0
Showing
6 changed files
with
17 additions
and
24 deletions
Show diff stats
CMakeLists.txt
| ... | ... | @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.6) |
| 3 | 3 | PROJECT(AMDA-Kernel) |
| 4 | 4 | |
| 5 | 5 | SET(CPACK_PACKAGE_VERSION_MAJOR "3") |
| 6 | -SET(CPACK_PACKAGE_VERSION_MINOR "3") | |
| 6 | +SET(CPACK_PACKAGE_VERSION_MINOR "4") | |
| 7 | 7 | SET(CPACK_PACKAGE_VERSION_PATCH "0") |
| 8 | 8 | |
| 9 | 9 | # configure a header file to pass some of the CMake settings to the source code | ... | ... |
sonar-project.properties
| ... | ... | @@ -15,8 +15,8 @@ sonar.sourceEncoding=UTF-8 |
| 15 | 15 | # required metadata |
| 16 | 16 | sonar.projectKey=AKKA:AMDA-Kernel |
| 17 | 17 | sonar.projectName=AMDA-Kernel |
| 18 | -sonar.projectVersion=3.3.0 | |
| 19 | -sonar.branch=3.3 | |
| 18 | +sonar.projectVersion=3.4.0 | |
| 19 | +sonar.branch=3.4 | |
| 20 | 20 | |
| 21 | 21 | # path to source directories (required) |
| 22 | 22 | #sources=/var/lib/jenkins/.jenkins/workspace/AMDA_FitnesseTest/AMDA_Kernel | ... | ... |
src/Doxyfile
| ... | ... | @@ -32,7 +32,7 @@ PROJECT_NAME = AMDA-Kernel |
| 32 | 32 | # This could be handy for archiving the generated documentation or |
| 33 | 33 | # if some version control system is used. |
| 34 | 34 | |
| 35 | -PROJECT_NUMBER = V3.3.0 | |
| 35 | +PROJECT_NUMBER = V3.4.0 | |
| 36 | 36 | |
| 37 | 37 | # Using the PROJECT_BRIEF tag one can provide an optional one line description |
| 38 | 38 | # for a project that appears at the top of each page and should give viewer | ... | ... |
src/ParamOutputImpl/Plot/PanelPlotOutput.cc
| ... | ... | @@ -111,7 +111,7 @@ void PanelPlotOutput::calculatePlotArea(Bounds& bounds_) { |
| 111 | 111 | boost::shared_ptr<Axis> lAxis = it->second; |
| 112 | 112 | if ((lAxis == nullptr) || (lAxis->_isZAxis)) |
| 113 | 113 | continue; |
| 114 | - reserveSpaceForAxis(lAxis, topSpace, bottomSpace, leftSpace, rightSpace); | |
| 114 | + reserveSpaceForAxis(lAxis, titleHeight, topSpace, bottomSpace, leftSpace, rightSpace); | |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | for (Axes::iterator it = _panel->_axes.begin(); it != _panel->_axes.end(); ++it) |
| ... | ... | @@ -120,7 +120,7 @@ void PanelPlotOutput::calculatePlotArea(Bounds& bounds_) { |
| 120 | 120 | boost::shared_ptr<Axis> lAxis = it->second; |
| 121 | 121 | if ((lAxis == nullptr) || (!lAxis->_isZAxis)) |
| 122 | 122 | continue; |
| 123 | - reserveSpaceForAxis(lAxis, topSpace, bottomSpace, leftSpace, rightSpace); | |
| 123 | + reserveSpaceForAxis(lAxis, titleHeight, topSpace, bottomSpace, leftSpace, rightSpace); | |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | // Get character size for panel. |
| ... | ... | @@ -129,16 +129,6 @@ void PanelPlotOutput::calculatePlotArea(Bounds& bounds_) { |
| 129 | 129 | double panelCharWidth = lCharSizePanel.first; |
| 130 | 130 | double panelCharHeight = lCharSizePanel.second; |
| 131 | 131 | |
| 132 | - int topTickMarkCharHeight = 0; | |
| 133 | - int bottomTickMarkCharHeight = 0; | |
| 134 | - int leftTickMarkCharWidth = 0; | |
| 135 | - int rightTickMarkCharWidth = 0; | |
| 136 | - | |
| 137 | - float topTickMarkSpace = 0; | |
| 138 | - float bottomTickMarkSpace = 0; | |
| 139 | - float leftTickMarkSpace = 0; | |
| 140 | - float rightTickMarkSpace = 0; | |
| 141 | - | |
| 142 | 132 | //add params legend right space when outside |
| 143 | 133 | if (!_panel->_paramsLegendProperties.getLegendLines().empty() && |
| 144 | 134 | _panel->_paramsLegendProperties.isVisible() && |
| ... | ... | @@ -221,7 +211,7 @@ void PanelPlotOutput::calculatePlotArea(Bounds& bounds_) { |
| 221 | 211 | bounds_._height -= (bottomSpace + topSpace); |
| 222 | 212 | } |
| 223 | 213 | |
| 224 | -void PanelPlotOutput::reserveSpaceForAxis (boost::shared_ptr<Axis>& pAxis, double& topSpace, double& bottomSpace, double& leftSpace, double& rightSpace) { | |
| 214 | +void PanelPlotOutput::reserveSpaceForAxis (boost::shared_ptr<Axis>& pAxis, double titleHeight, double& topSpace, double& bottomSpace, double& leftSpace, double& rightSpace) { | |
| 225 | 215 | if (pAxis == nullptr || !pAxis->_used || !pAxis->_visible) |
| 226 | 216 | return; |
| 227 | 217 | |
| ... | ... | @@ -263,7 +253,10 @@ void PanelPlotOutput::reserveSpaceForAxis (boost::shared_ptr<Axis>& pAxis, doubl |
| 263 | 253 | // Reserve space for legend |
| 264 | 254 | if ((pAxis->_showLegend == true) && (nbLegendRows != 0)) { |
| 265 | 255 | bottomSpace += PlPlotUtil::LINE_SPACE_TITLE * legendCharSizePanel.second; |
| 266 | - pAxis->setLegendOffset(bottomSpace + 0.5 * legendCharSizePanel.second); | |
| 256 | + double legendOffset = bottomSpace + 0.5 * legendCharSizePanel.second; | |
| 257 | + if (!_panel->getTitle()->_text.empty() && (_panel->_titlePosition == PlotCommon::Position::POS_BOTTOM)) | |
| 258 | + legendOffset -= titleHeight; | |
| 259 | + pAxis->setLegendOffset(legendOffset); | |
| 267 | 260 | bottomSpace += (lAxisLegendRowInfo->size() + PlPlotUtil::LINE_SPACE_TITLE * (nbLegendRows + 1)) * legendCharSizePanel.second; |
| 268 | 261 | } |
| 269 | 262 | |
| ... | ... | @@ -291,7 +284,10 @@ void PanelPlotOutput::reserveSpaceForAxis (boost::shared_ptr<Axis>& pAxis, doubl |
| 291 | 284 | // Reserve space for legend |
| 292 | 285 | if ((pAxis->_showLegend == true) && (nbLegendRows != 0)) { |
| 293 | 286 | topSpace += PlPlotUtil::LINE_SPACE_TITLE * legendCharSizePanel.second; |
| 294 | - pAxis->setLegendOffset(topSpace - 0.5 * legendCharSizePanel.second); | |
| 287 | + double legendOffset = topSpace - 0.5 * legendCharSizePanel.second; | |
| 288 | + if (!_panel->getTitle()->_text.empty() && (_panel->_titlePosition == PlotCommon::Position::POS_TOP)) | |
| 289 | + legendOffset += titleHeight; | |
| 290 | + pAxis->setLegendOffset(legendOffset); | |
| 295 | 291 | topSpace += (nbLegendRows + PlPlotUtil::LINE_SPACE_TITLE * (nbLegendRows + 1)) * legendCharSizePanel.second; |
| 296 | 292 | } |
| 297 | 293 | |
| ... | ... | @@ -418,9 +414,6 @@ void PanelPlotOutput::computePanelPlotXYRatio (void) { |
| 418 | 414 | void PanelPlotOutput::drawLegends(boost::shared_ptr<Axis>& pAxis, PlWindow& pPlWindow, Bounds& pPlotAreaSize) { |
| 419 | 415 | LOG4CXX_DEBUG(gLogger, "Drawing legend for axis "<< pAxis->_id << " : " << pAxis->_legend._text); |
| 420 | 416 | |
| 421 | - // Get axis offset in case of multi-axes | |
| 422 | - double axisOffset = pAxis->getAxisOffset(); | |
| 423 | - | |
| 424 | 417 | // Set legend font |
| 425 | 418 | Font legendFont(pAxis->getLegendFont(this->_panel.get())); |
| 426 | 419 | PlPlotUtil::setPlFont(legendFont, &pAxis->_legend._style); | ... | ... |
src/ParamOutputImpl/Plot/PanelPlotOutput.hh
| ... | ... | @@ -528,7 +528,7 @@ private: |
| 528 | 528 | */ |
| 529 | 529 | int _automaticSerieColorCursor; |
| 530 | 530 | |
| 531 | - void reserveSpaceForAxis (boost::shared_ptr<Axis>& pAxis, double& topSpace, double& bottomSpace, double& leftSpace, double& rightSpace); | |
| 531 | + void reserveSpaceForAxis (boost::shared_ptr<Axis>& pAxis, double titleHeight, double& topSpace, double& bottomSpace, double& leftSpace, double& rightSpace); | |
| 532 | 532 | |
| 533 | 533 | void reserveSpaceForTextLegend (boost::shared_ptr<TextLegendProperties>& pTextLegendProp, double titleHeight, double& topSpace, double& bottomSpace, double& leftSpace, double& rightSpace); |
| 534 | 534 | }; | ... | ... |