Remove enum and change naming conventions.

Author: jswift-stfc

examples/basic/mainwindow.h

@@ -14,9 +14,9 @@ class MainWindow : public QMainWindow
      * UI
      */
     private slots:
-    void on_XLabelAlignmentCombo_currentIndexChanged(int index);
-    void on_YLabelAlignmentCombo_currentIndexChanged(int index);
-    void on_ZLabelAlignmentCombo_currentIndexChanged(int index);
+    void on_XLabelRotationCombo_currentIndexChanged(int index);
+    void on_YLabelRotationCombo_currentIndexChanged(int index);
+    void on_ZLabelRotationCombo_currentIndexChanged(int index);
 
     private:
     // Main form declaration

examples/basic/mainwindow.ui

@@ -124,7 +124,7 @@
              </widget>
             </item>
             <item>
-             <widget class="QComboBox" name="XLabelAlignmentCombo"/>
+             <widget class="QComboBox" name="XLabelRotationCombo"/>
             </item>
            </layout>
           </item>
@@ -155,7 +155,7 @@
              </widget>
             </item>
             <item>
-             <widget class="QComboBox" name="YLabelAlignmentCombo"/>
+             <widget class="QComboBox" name="YLabelRotationCombo"/>
             </item>
            </layout>
           </item>
@@ -186,7 +186,7 @@
              </widget>
             </item>
             <item>
-             <widget class="QComboBox" name="ZLabelAlignmentCombo"/>
+             <widget class="QComboBox" name="ZLabelRotationCombo"/>
             </item>
            </layout>
           </item>

examples/basic/mainwindow_funcs.cpp

@@ -27,12 +27,12 @@ MainWindow::MainWindow() : QMainWindow()
     ui_.ZVisibleCheck->setChecked(ui_.TestingWidget->zAxis()->isEnabled());
     connect(ui_.ZVisibleCheck, SIGNAL(toggled(bool)), ui_.TestingWidget->zAxis(), SLOT(setEnabled(bool)));
 
-    ui_.XLabelAlignmentCombo->addItem(QString("Horizontal"));
-    ui_.XLabelAlignmentCombo->addItem(QString("Vertical"));
-    ui_.YLabelAlignmentCombo->addItem(QString("Horizontal"));
-    ui_.YLabelAlignmentCombo->addItem(QString("Vertical"));
-    ui_.ZLabelAlignmentCombo->addItem(QString("Horizontal"));
-    ui_.ZLabelAlignmentCombo->addItem(QString("Vertical"));
+    ui_.XLabelRotationCombo->addItem(QString("Horizontal"));
+    ui_.XLabelRotationCombo->addItem(QString("Vertical"));
+    ui_.YLabelRotationCombo->addItem(QString("Horizontal"));
+    ui_.YLabelRotationCombo->addItem(QString("Vertical"));
+    ui_.ZLabelRotationCombo->addItem(QString("Horizontal"));
+    ui_.ZLabelRotationCombo->addItem(QString("Vertical"));
 
     // Data
     const auto nPoints = 1000;
@@ -52,47 +52,47 @@ MainWindow::MainWindow() : QMainWindow()
     ui_.TestingWidget->showAllData();
 };
 
-void MainWindow::on_XLabelAlignmentCombo_currentIndexChanged(int index)
+void MainWindow::on_XLabelRotationCombo_currentIndexChanged(int index)
 {
     switch (index)
     {
         case 0:
-            ui_.TestingWidget->xAxis()->setTitleLabelAlignment(Mildred::TextAlignment::Horizontal);
+            ui_.TestingWidget->xAxis()->setTitleLabelRotation(0.0);
             break;
         case 1:
-            ui_.TestingWidget->xAxis()->setTitleLabelAlignment(Mildred::TextAlignment::Vertical);
+            ui_.TestingWidget->xAxis()->setTitleLabelRotation(90.0);
             break;
         default:
-            throw(std::runtime_error("Unhandled text alignment mode."));
+            throw(std::runtime_error("Unhandled text rotation."));
     }
 }
 
-void MainWindow::on_YLabelAlignmentCombo_currentIndexChanged(int index)
+void MainWindow::on_YLabelRotationCombo_currentIndexChanged(int index)
 {
     switch (index)
     {
         case 0:
-            ui_.TestingWidget->yAxis()->setTitleLabelAlignment(Mildred::TextAlignment::Horizontal);
+            ui_.TestingWidget->yAxis()->setTitleLabelRotation(0.0);
             break;
         case 1:
-            ui_.TestingWidget->yAxis()->setTitleLabelAlignment(Mildred::TextAlignment::Vertical);
+            ui_.TestingWidget->yAxis()->setTitleLabelRotation(90.0);
             break;
         default:
-            throw(std::runtime_error("Unhandled text alignment mode."));
+            throw(std::runtime_error("Unhandled text rotation."));
     }
 }
 
-void MainWindow::on_ZLabelAlignmentCombo_currentIndexChanged(int index)
+void MainWindow::on_ZLabelRotationCombo_currentIndexChanged(int index)
 {
     switch (index)
     {
         case 0:
-            ui_.TestingWidget->zAxis()->setTitleLabelAlignment(Mildred::TextAlignment::Horizontal);
+            ui_.TestingWidget->zAxis()->setTitleLabelRotation(0.0);
             break;
         case 1:
-            ui_.TestingWidget->zAxis()->setTitleLabelAlignment(Mildred::TextAlignment::Vertical);
+            ui_.TestingWidget->zAxis()->setTitleLabelRotation(90.0);
             break;
         default:
-            throw(std::runtime_error("Unhandled text alignment mode."));
+            throw(std::runtime_error("Unhandled text Rotation mode."));
     }
 }

src/entities/axis.cpp

@@ -466,16 +466,20 @@ void AxisEntity::setType(AxisType type)
     }
 }
 
-//! Define title alignment
+//! Define title rotation
 /*!
- * Set the alignment of the title label to @param alignment.
+ * Set the rotation of the title label to @param rotation.
  */
-void AxisEntity::setTitleLabelAlignment(Mildred::TextAlignment alignment) { axisTitleEntity_->setTextAlignment(alignment); }
+void AxisEntity::setTitleLabelRotation(double rotation) { axisTitleEntity_->setRotation(rotation); }
 
-void AxisEntity::setTickLabelAlignment(Mildred::TextAlignment alignment)
+//! Define tick label rotation
+/*!
+ * Set the rotation of the tick labels to @param rotation.
+ */
+void AxisEntity::setTickLabelRotation(double rotation)
 {
     for (auto &entity : tickLabelEntities_)
-        entity->setTextAlignment(alignment);
+        entity->setRotation(rotation);
 }
 
 //! Define direction

src/entities/axis.h

@@ -114,10 +114,10 @@ class AxisEntity : public Qt3DCore::QEntity
     public:
     // Set axis type
     void setType(AxisType type);
-    // Set title label alignment
-    void setTitleLabelAlignment(Mildred::TextAlignment alignment);
-    // Set tick label alignment
-    void setTickLabelAlignment(Mildred::TextAlignment alignment);
+    // Set title label rotation
+    void setTitleLabelRotation(double rotation);
+    // Set tick label rotation
+    void setTickLabelRotation(double rotation);
     // Set explicit direction
     void setDirection(QVector3D v);
     // Return explicit direction

src/entities/text.cpp

@@ -87,10 +87,10 @@ void TextEntity::updateTranslation()
     positionalTransform_->setTranslation(anchorPosition_);
 
     // Set the rotation about z.
-    positionalTransform_->setRotationZ(rotationZFromAlignment());
+    positionalTransform_->setRotationZ(rotation_);
 
     // Set the text translation vector so that the defined anchor point is located at {0,0,0}
-    auto [textCuboid, translation] = boundingCuboid(textMesh_->font(), textMesh_->text(), {}, anchorPoint_, textMesh_->depth());
+    auto [textCuboid, translation] = boundingCuboid(textMesh_->font(), textMesh_->text(), {}, anchorPoint_, textMesh_->depth(), rotation_);
     auto v = QVector3D(textCuboid.lowerLeftBack().x(), textCuboid.lowerLeftBack().y(), 0.0);
     textTransform_->setTranslation(v + translation);
 
@@ -146,28 +146,14 @@ void TextEntity::setAnchorPosition(QVector3D p)
     updateTranslation();
 }
 
-//! Set alignment of text
-void TextEntity::setTextAlignment(Mildred::TextAlignment alignment)
+//! Set rotation of text
+void TextEntity::setRotation(double rotation)
 {
-    alignment_ = alignment;
+    rotation_ = rotation;
 
     updateTranslation();
 }
 
-//! Gets the required rotation, around z, in degrees, to achieve the current alignment.
-float TextEntity::rotationZFromAlignment()
-{
-    switch (alignment_)
-    {
-        case (Mildred::TextAlignment::Horizontal):
-            return 0.0;
-        case (Mildred::TextAlignment::Vertical):
-            return 90.0;
-        default:
-            throw(std::runtime_error("Unhandled text alignment mode."));
-    }
-}
-
 //! Return simple bounding cuboid for text, along with baseline descent from font metrics
 /*!
  * Calculates a bounding cuboid in the XY plane for the specified @param font and @param text. The @param depth is applied in
@@ -224,4 +210,4 @@ std::pair<Cuboid, QVector3D> TextEntity::boundingCuboid(const QFont &font, const
     cuboid.translate(-QVector3D(cuboid.xExtent() * anchorFrac.x(), cuboid.yExtent() * anchorFrac.y(), 0.0));
 
     return {cuboid, meshTranslation};
-}
+}

src/entities/text.h

@@ -11,12 +11,6 @@
 namespace Mildred
 {
 
-enum class TextAlignment
-{
-    Horizontal,
-    Vertical
-};
-
 //! TextEntity represents a 3D text entity
 /*!
  * TextEntity represents a renderable entity displaying a specified string with a given transform.
@@ -30,8 +24,8 @@ class TextEntity : public Qt3DCore::QEntity
     private:
     // Collective positional transform
     Qt3DCore::QTransform *positionalTransform_{nullptr};
-    // Alignment
-    Mildred::TextAlignment alignment_{Mildred::TextAlignment::Horizontal};
+    // Rotation
+    double rotation_{0.0};
     // Material
     RenderableMaterial *material_{nullptr};
     // Main entity
@@ -74,9 +68,7 @@ class TextEntity : public Qt3DCore::QEntity
     // Set anchor position
     void setAnchorPosition(QVector3D p);
     // Set rotation
-    void setTextAlignment(Mildred::TextAlignment alignment);
-    // Get required rotation in degrees
-    float rotationZFromAlignment();
+    void setRotation(double rotation);
     // Return simple bounding cuboid for text, along with baseline descent from font metrics
     static std::pair<Cuboid, int> boundingCuboid(const QFont &font, const QString &text, float depth = 0.1f);
     // Return bounding cuboid with translation and anchor point applied, and required translation vector for text mesh