Skip to content

Rotate labels #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jswift-stfc wants to merge 16 commits into
base: develop
Choose a base branch
from
Open

Rotate labels #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ba5714c
Add enum for text alignment modes, and implement helper functions to …
jswift-stfc May 20, 2022
5f0b5e5
Default alignment to horizontal.
jswift-stfc May 20, 2022
7ae0370
Disable bounding boxes.
jswift-stfc May 20, 2022
f51e8da
Functions for setting the alignment of tick labels / axis title labels.
jswift-stfc May 20, 2022
0089359
Update basic example to enable rotation of axis labels.
jswift-stfc May 20, 2022
86c1483
Clang format.
jswift-stfc May 20, 2022
c7fe3ac
Include stdexcept?
jswift-stfc May 20, 2022
d9d676f
Update src/entities/text.cpp
jswift-stfc May 21, 2022
b3cded0
Remove enum and change naming conventions.
jswift-stfc May 23, 2022
093c5bc
Add overloaded addVertex() function for convenience.
trisyoungs Aug 28, 2022
ce89120
Fix typo.
trisyoungs Aug 28, 2022
f8eae87
Fix merge errors.
trisyoungs Sep 7, 2022
60f09cc
Partial implementation of rotated labels (bounding cuboid limits stil…
trisyoungs Sep 7, 2022
ad0d55f
Rename axis main label entity and functions.
trisyoungs Sep 7, 2022
db50eb1
Use pass-through on main widget to set axis label rotations.
trisyoungs Sep 7, 2022
1107d31
Rename box for cuboid.
trisyoungs Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
217 changes: 131 additions & 86 deletions examples/basic/mainwindow.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,93 +96,138 @@
<property name="title">
<string>Axes</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>4</number>
</property>
<property name="topMargin">
<number>4</number>
</property>
<property name="rightMargin">
<number>4</number>
</property>
<property name="bottomMargin">
<number>4</number>
</property>
<property name="spacing">
<number>4</number>
</property>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Z</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="ZTitleEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>X</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="XTitleEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Y</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="YTitleEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QCheckBox" name="XVisibleCheck">
<property name="text">
<string>Visible</string>
</property>
</widget>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>X</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="XLabelEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="XVisibleCheck">
<property name="text">
<string>Visible</string>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="XLabelRotationSpin">
<property name="decimals">
<number>0</number>
</property>
<property name="minimum">
<double>-180.000000000000000</double>
</property>
<property name="maximum">
<double>180.000000000000000</double>
</property>
<property name="singleStep">
<double>5.000000000000000</double>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="2">
<widget class="QCheckBox" name="YVisibleCheck">
<property name="text">
<string>Visible</string>
</property>
</widget>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Y</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="YLabelEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="YVisibleCheck">
<property name="text">
<string>Visible</string>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="YLabelRotationSpin">
<property name="decimals">
<number>0</number>
</property>
<property name="minimum">
<double>-180.000000000000000</double>
</property>
<property name="maximum">
<double>180.000000000000000</double>
</property>
<property name="singleStep">
<double>5.000000000000000</double>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="2">
<widget class="QCheckBox" name="ZVisibleCheck">
<property name="text">
<string>Visible</string>
</property>
</widget>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Z</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="ZLabelEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="ZVisibleCheck">
<property name="text">
<string>Visible</string>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="ZLabelRotationSpin">
<property name="decimals">
<number>0</number>
</property>
<property name="minimum">
<double>-180.000000000000000</double>
</property>
<property name="maximum">
<double>180.000000000000000</double>
</property>
<property name="singleStep">
<double>5.000000000000000</double>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
Expand Down Expand Up @@ -241,7 +286,7 @@
<x>0</x>
<y>0</y>
<width>956</width>
<height>22</height>
<height>23</height>
</rect>
</property>
</widget>
Expand Down
22 changes: 14 additions & 8 deletions examples/basic/mainwindow_funcs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,25 @@ MainWindow::MainWindow() : QMainWindow()
connect(ui_.FlatViewCheck, SIGNAL(clicked(bool)), ui_.TestingWidget, SLOT(setFlatView(bool)));

// Axes
ui_.XTitleEdit->setText(ui_.TestingWidget->xAxis()->titleText());
connect(ui_.XTitleEdit, SIGNAL(textChanged(const QString &)), ui_.TestingWidget, SLOT(setXAxisTitle(const QString &)));
ui_.YTitleEdit->setText(ui_.TestingWidget->yAxis()->titleText());
connect(ui_.YTitleEdit, SIGNAL(textChanged(const QString &)), ui_.TestingWidget, SLOT(setYAxisTitle(const QString &)));
ui_.ZTitleEdit->setText(ui_.TestingWidget->zAxis()->titleText());
connect(ui_.ZTitleEdit, SIGNAL(textChanged(const QString &)), ui_.TestingWidget, SLOT(setZAxisTitle(const QString &)));
// -- Titles
ui_.XLabelEdit->setText(ui_.TestingWidget->xAxis()->labelText());
connect(ui_.XLabelEdit, SIGNAL(textChanged(const QString &)), ui_.TestingWidget, SLOT(setXAxisLabel(const QString &)));
ui_.YLabelEdit->setText(ui_.TestingWidget->yAxis()->labelText());
connect(ui_.YLabelEdit, SIGNAL(textChanged(const QString &)), ui_.TestingWidget, SLOT(setYAxisLabel(const QString &)));
ui_.ZLabelEdit->setText(ui_.TestingWidget->zAxis()->labelText());
connect(ui_.ZLabelEdit, SIGNAL(textChanged(const QString &)), ui_.TestingWidget, SLOT(setZAxisLabel(const QString &)));
// -- Visibility
ui_.XVisibleCheck->setChecked(ui_.TestingWidget->xAxis()->isEnabled());
connect(ui_.XVisibleCheck, SIGNAL(toggled(bool)), ui_.TestingWidget->xAxis(), SLOT(setEnabled(bool)));
ui_.YVisibleCheck->setChecked(ui_.TestingWidget->yAxis()->isEnabled());
connect(ui_.YVisibleCheck, SIGNAL(toggled(bool)), ui_.TestingWidget->yAxis(), SLOT(setEnabled(bool)));
ui_.ZVisibleCheck->setChecked(ui_.TestingWidget->zAxis()->isEnabled());
connect(ui_.ZVisibleCheck, SIGNAL(toggled(bool)), ui_.TestingWidget->zAxis(), SLOT(setEnabled(bool)));
// -- Rotation
ui_.XLabelRotationSpin->setValue(ui_.TestingWidget->xAxis()->labelRotation());
connect(ui_.XLabelRotationSpin, SIGNAL(valueChanged(double)), ui_.TestingWidget, SLOT(setXAxisLabelRotation(double)));
connect(ui_.YLabelRotationSpin, SIGNAL(valueChanged(double)), ui_.TestingWidget, SLOT(setYAxisLabelRotation(double)));
connect(ui_.ZLabelRotationSpin, SIGNAL(valueChanged(double)), ui_.TestingWidget, SLOT(setZAxisLabelRotation(double)));

// Mouse Coordinates
ui_.mouseCoordStyleCombo->addItem(QString("Fixed Anchor"));
Expand Down Expand Up @@ -71,11 +78,10 @@ void MainWindow::on_mouseCoordStyleCombo_currentIndexChanged(int index)
break;
default:
throw(std::runtime_error("Unhandled coordinate display style.\n"));
break;
}
}

void MainWindow::setExternalMouseCoordinatesText(QPointF p)
{
ui_.externalMouseCoordLabel->setText(QString("%1 %2").arg(QString::number(p.x()), QString::number(p.y())));
}
}
30 changes: 30 additions & 0 deletions src/classes/cuboid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "classes/cuboid.h"
#include <QMatrix4x4>

using namespace Mildred;

Expand Down Expand Up @@ -195,3 +196,32 @@ float Cuboid::zExtent() const

//! Return vector of extents
QVector3D Cuboid::extents() const { return {xExtent(), yExtent(), zExtent()}; }

//! Return bounding box cuboid required for rotated original cuboid (in degrees, around z-axis)
/*!
* Returns the bounding cuboid required to contain the original cuboid rotated @param rotation
* @return
*/
Cuboid Cuboid::zRotatedBoundingCuboid(QVector3D rotationOrigin, double thetaZ) const
{
QMatrix4x4 m;
m.rotate(thetaZ, QVector3D{0.0, 0.0, 1.0});
std::array<QPointF, 4> corners;
corners[0] = QPointF(v1x_.value_or(0.0) - rotationOrigin.x(), v1y_.value_or(0.0) - rotationOrigin.y());
corners[1] = QPointF(v2x_.value_or(0.0) - rotationOrigin.x(), v1y_.value_or(0.0) - rotationOrigin.y());
corners[2] = QPointF(v1x_.value_or(0.0) - rotationOrigin.x(), v2y_.value_or(0.0) - rotationOrigin.y());
corners[3] = QPointF(v2x_.value_or(0.0) - rotationOrigin.x(), v2y_.value_or(0.0) - rotationOrigin.y());

Cuboid rotated;
for (const auto &p : corners)
{
auto newP = m.map(p);
rotated.expand(newP.x() + rotationOrigin.x(), newP.y() + rotationOrigin.y(), {});
}

// Set Z extents
rotated.v1z_ = v1z_;
rotated.v2z_ = v2z_;

return rotated;
}
2 changes: 2 additions & 0 deletions src/classes/cuboid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,7 @@ class Cuboid
float zExtent() const;
// Return vector of extents
QVector3D extents() const;
// Return bounding box cuboid required for rotated original cuboid (in degrees, around z-axis)
Cuboid zRotatedBoundingCuboid(QVector3D rotationOrigin, double thetaZ) const;
};
} // namespace Mildred
Loading