From 58b353d59a820e2650cc2db235aeadbdaff46efb Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Thu, 12 May 2016 10:22:19 +0200 Subject: [PATCH] Set to version 3.4.0 --- CMakeLists.txt | 2 +- sonar-project.properties | 4 ++-- src/Doxyfile | 2 +- src/ParamOutputImpl/Plot/PanelPlotOutput.cc | 29 +++++++++++------------------ src/ParamOutputImpl/Plot/PanelPlotOutput.hh | 2 +- src/amdaXMLRequestorTool/Main.cc | 2 +- 6 files changed, 17 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f8df873..ef7729b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.6) PROJECT(AMDA-Kernel) SET(CPACK_PACKAGE_VERSION_MAJOR "3") -SET(CPACK_PACKAGE_VERSION_MINOR "3") +SET(CPACK_PACKAGE_VERSION_MINOR "4") SET(CPACK_PACKAGE_VERSION_PATCH "0") # configure a header file to pass some of the CMake settings to the source code diff --git a/sonar-project.properties b/sonar-project.properties index b2af1d2..5824141 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -15,8 +15,8 @@ sonar.sourceEncoding=UTF-8 # required metadata sonar.projectKey=AKKA:AMDA-Kernel sonar.projectName=AMDA-Kernel -sonar.projectVersion=3.3.0 -sonar.branch=3.3 +sonar.projectVersion=3.4.0 +sonar.branch=3.4 # path to source directories (required) #sources=/var/lib/jenkins/.jenkins/workspace/AMDA_FitnesseTest/AMDA_Kernel diff --git a/src/Doxyfile b/src/Doxyfile index cb40b49..8677a4b 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -32,7 +32,7 @@ PROJECT_NAME = AMDA-Kernel # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = V3.3.0 +PROJECT_NUMBER = V3.4.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/src/ParamOutputImpl/Plot/PanelPlotOutput.cc b/src/ParamOutputImpl/Plot/PanelPlotOutput.cc index 97932e4..9fca424 100644 --- a/src/ParamOutputImpl/Plot/PanelPlotOutput.cc +++ b/src/ParamOutputImpl/Plot/PanelPlotOutput.cc @@ -111,7 +111,7 @@ void PanelPlotOutput::calculatePlotArea(Bounds& bounds_) { boost::shared_ptr lAxis = it->second; if ((lAxis == nullptr) || (lAxis->_isZAxis)) continue; - reserveSpaceForAxis(lAxis, topSpace, bottomSpace, leftSpace, rightSpace); + reserveSpaceForAxis(lAxis, titleHeight, topSpace, bottomSpace, leftSpace, rightSpace); } for (Axes::iterator it = _panel->_axes.begin(); it != _panel->_axes.end(); ++it) @@ -120,7 +120,7 @@ void PanelPlotOutput::calculatePlotArea(Bounds& bounds_) { boost::shared_ptr lAxis = it->second; if ((lAxis == nullptr) || (!lAxis->_isZAxis)) continue; - reserveSpaceForAxis(lAxis, topSpace, bottomSpace, leftSpace, rightSpace); + reserveSpaceForAxis(lAxis, titleHeight, topSpace, bottomSpace, leftSpace, rightSpace); } // Get character size for panel. @@ -129,16 +129,6 @@ void PanelPlotOutput::calculatePlotArea(Bounds& bounds_) { double panelCharWidth = lCharSizePanel.first; double panelCharHeight = lCharSizePanel.second; - int topTickMarkCharHeight = 0; - int bottomTickMarkCharHeight = 0; - int leftTickMarkCharWidth = 0; - int rightTickMarkCharWidth = 0; - - float topTickMarkSpace = 0; - float bottomTickMarkSpace = 0; - float leftTickMarkSpace = 0; - float rightTickMarkSpace = 0; - //add params legend right space when outside if (!_panel->_paramsLegendProperties.getLegendLines().empty() && _panel->_paramsLegendProperties.isVisible() && @@ -221,7 +211,7 @@ void PanelPlotOutput::calculatePlotArea(Bounds& bounds_) { bounds_._height -= (bottomSpace + topSpace); } -void PanelPlotOutput::reserveSpaceForAxis (boost::shared_ptr& pAxis, double& topSpace, double& bottomSpace, double& leftSpace, double& rightSpace) { +void PanelPlotOutput::reserveSpaceForAxis (boost::shared_ptr& pAxis, double titleHeight, double& topSpace, double& bottomSpace, double& leftSpace, double& rightSpace) { if (pAxis == nullptr || !pAxis->_used || !pAxis->_visible) return; @@ -263,7 +253,10 @@ void PanelPlotOutput::reserveSpaceForAxis (boost::shared_ptr& pAxis, doubl // Reserve space for legend if ((pAxis->_showLegend == true) && (nbLegendRows != 0)) { bottomSpace += PlPlotUtil::LINE_SPACE_TITLE * legendCharSizePanel.second; - pAxis->setLegendOffset(bottomSpace + 0.5 * legendCharSizePanel.second); + double legendOffset = bottomSpace + 0.5 * legendCharSizePanel.second; + if (!_panel->getTitle()->_text.empty() && (_panel->_titlePosition == PlotCommon::Position::POS_BOTTOM)) + legendOffset -= titleHeight; + pAxis->setLegendOffset(legendOffset); bottomSpace += (lAxisLegendRowInfo->size() + PlPlotUtil::LINE_SPACE_TITLE * (nbLegendRows + 1)) * legendCharSizePanel.second; } @@ -291,7 +284,10 @@ void PanelPlotOutput::reserveSpaceForAxis (boost::shared_ptr& pAxis, doubl // Reserve space for legend if ((pAxis->_showLegend == true) && (nbLegendRows != 0)) { topSpace += PlPlotUtil::LINE_SPACE_TITLE * legendCharSizePanel.second; - pAxis->setLegendOffset(topSpace - 0.5 * legendCharSizePanel.second); + double legendOffset = topSpace - 0.5 * legendCharSizePanel.second; + if (!_panel->getTitle()->_text.empty() && (_panel->_titlePosition == PlotCommon::Position::POS_TOP)) + legendOffset += titleHeight; + pAxis->setLegendOffset(legendOffset); topSpace += (nbLegendRows + PlPlotUtil::LINE_SPACE_TITLE * (nbLegendRows + 1)) * legendCharSizePanel.second; } @@ -418,9 +414,6 @@ void PanelPlotOutput::computePanelPlotXYRatio (void) { void PanelPlotOutput::drawLegends(boost::shared_ptr& pAxis, PlWindow& pPlWindow, Bounds& pPlotAreaSize) { LOG4CXX_DEBUG(gLogger, "Drawing legend for axis "<< pAxis->_id << " : " << pAxis->_legend._text); - // Get axis offset in case of multi-axes - double axisOffset = pAxis->getAxisOffset(); - // Set legend font Font legendFont(pAxis->getLegendFont(this->_panel.get())); PlPlotUtil::setPlFont(legendFont, &pAxis->_legend._style); diff --git a/src/ParamOutputImpl/Plot/PanelPlotOutput.hh b/src/ParamOutputImpl/Plot/PanelPlotOutput.hh index 072a46c..06859a2 100644 --- a/src/ParamOutputImpl/Plot/PanelPlotOutput.hh +++ b/src/ParamOutputImpl/Plot/PanelPlotOutput.hh @@ -528,7 +528,7 @@ private: */ int _automaticSerieColorCursor; - void reserveSpaceForAxis (boost::shared_ptr& pAxis, double& topSpace, double& bottomSpace, double& leftSpace, double& rightSpace); + void reserveSpaceForAxis (boost::shared_ptr& pAxis, double titleHeight, double& topSpace, double& bottomSpace, double& leftSpace, double& rightSpace); void reserveSpaceForTextLegend (boost::shared_ptr& pTextLegendProp, double titleHeight, double& topSpace, double& bottomSpace, double& leftSpace, double& rightSpace); }; diff --git a/src/amdaXMLRequestorTool/Main.cc b/src/amdaXMLRequestorTool/Main.cc index 5de35b2..4b31db7 100644 --- a/src/amdaXMLRequestorTool/Main.cc +++ b/src/amdaXMLRequestorTool/Main.cc @@ -69,7 +69,7 @@ * - VOTable format support * *@section References - *@version 3.3.0 + *@version 3.4.0 *@authors AKKA IS, CS. */ #include -- libgit2 0.21.2