Commit 18b4a2ee authored by Stefan Gerlach's avatar Stefan Gerlach

Merge branch 'master' into frameworks

parents b79f66d1 7f7219c4
......@@ -18,7 +18,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wundef -Wpointer-arith -W
add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS})
include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
add_definitions (-DLVERSION=\"2.2.0\")
add_definitions (-DLVERSION=\"2.3.0\")
# add_definitions (-DLDEBUG='1')
set(BUILD_SHARED_LIBS true)
add_definitions(-fvisibility=default)
......
......@@ -158,7 +158,7 @@ void Axis::init() {
d->title->graphicsItem()->setFlag(QGraphicsItem::ItemIsMovable, false);
d->title->graphicsItem()->setAcceptHoverEvents(false);
d->title->setText(this->name());
if (d->orientation == AxisVertical) d->title->setRotationAngle(270);
if (d->orientation == AxisVertical) d->title->setRotationAngle(90);
d->titleOffsetX = Worksheet::convertToSceneUnits(2, Worksheet::Point); //distance to the axis tick labels
d->titleOffsetY = Worksheet::convertToSceneUnits(2, Worksheet::Point); //distance to the axis tick labels
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment