Implement new handle and draw length inputs in the UI

Closes #203

Author: stfnp

gui/CMakeLists.txt

@@ -67,6 +67,8 @@ add_executable(
     source/pre/models/CommentsModel.hpp
     source/pre/models/DampingModel.cpp
     source/pre/models/DampingModel.hpp
+    source/pre/models/HandleModel.cpp
+    source/pre/models/HandleModel.hpp
     source/pre/models/DrawModel.cpp
     source/pre/models/DrawModel.hpp
     source/pre/models/LayerModel.cpp
@@ -121,6 +123,8 @@ add_executable(
     source/pre/views/CommentsView.hpp
     source/pre/views/DampingView.cpp
     source/pre/views/DampingView.hpp
+    source/pre/views/HandleView.cpp
+    source/pre/views/HandleView.hpp
     source/pre/views/DrawView.cpp
     source/pre/views/DrawView.hpp
     source/pre/views/docks/EditDock.cpp

gui/resources/icons/model-handle.svg

@@ -52,6 +52,11 @@ ShapePlot::ShapePlot(const Common& common, const States& states, int background_
     string_left.back()->setPen({Qt::blue, 2.0});
     string_left.back()->setScatterSkip(0);
 
+    pivot = new QCPCurve(this->xAxis, this->yAxis);
+    pivot->setName("Pivot");
+    pivot->setLineStyle(QCPCurve::lsNone);
+    pivot->setScatterStyle({QCPScatterStyle::ssCross, Qt::blue, 10});
+
     arrow = new QCPCurve(this->xAxis, this->yAxis);
     arrow->setName("Arrow");
     arrow->setLineStyle(QCPCurve::lsNone);
@@ -95,6 +100,7 @@ void ShapePlot::updateCurrentState() {
     plotLimbOutline(limb_left.back(), limb_right.back(), states.limb_pos[index]);
     plotString(string_left.back(), string_right.back(), states.string_pos[index]);
     plotArrow(states.arrow_pos[index]);
+    plotPivot();
 }
 
 void ShapePlot::updateAxes() {
@@ -193,3 +199,11 @@ void ShapePlot::plotArrow(double position) {
         quantity.getUnit().fromBase(position)
     );
 }
+
+void ShapePlot::plotPivot() {
+    pivot->data()->clear();
+    pivot->addData(
+        quantity.getUnit().fromBase(0.0),
+        quantity.getUnit().fromBase(common.limb.pivot_point)
+    );
+}

gui/source/post/ShapePlot.cpp

@@ -20,6 +20,7 @@ class ShapePlot: public PlotWidget {
     QList<QCPCurve*> limb_left;
     QList<QCPCurve*> string_right;
     QList<QCPCurve*> string_left;
+    QCPCurve* pivot;    // Todo: Replace with other QCustomPlot object?
     QCPCurve* arrow;    // Todo: Replace with other QCustomPlot object?
 
     void updatePlot();
@@ -31,4 +32,5 @@ class ShapePlot: public PlotWidget {
     void plotLimbOutline(QCPCurve* left, QCPCurve* right, const std::vector<std::array<double, 3>>& position);
     void plotString(QCPCurve* left, QCPCurve* right, const std::vector<std::array<double, 2>>& position);
     void plotArrow(double position);
+    void plotPivot();
 };

gui/source/post/ShapePlot.hpp

@@ -3,25 +3,36 @@
 
 // Constants for all texts shown throughout the application
 // TODO: Actually pull all texts into here, not only tooltips
+// TODO: Put actual strings into a *.cpp file to reduce compile times
 
 namespace Tooltips {
     inline const QString EnergiesStacked = QStringLiteral("If selected, the energies are plotted as areas stacked on top of each other.\nOtherwise each energy is drawn as an individual line.");
     inline const QString EnergiesByPart = QStringLiteral("Group energies by the component they belong to (limbs, string, arrow)");
     inline const QString EnergiesByType = QStringLiteral("Group enegies by the type they belong to (potential, kinetic, damping)");
 
+    inline const QString HandleTypeDefinition = QStringLiteral("Selects the type of handle for this bow");
+    inline const QString HandleTypeFlexible = QStringLiteral("The handle is flexible and modelled as part of the bow limbs");
+    inline const QString HandleTypeRigid = QStringLiteral("The handle is modelled as a separate rigid section between the bow limbs");
+    inline const QString HandleLength = QStringLiteral("Length of the handle section");
+    inline const QString HandleAngle = QStringLiteral("Attachment angle of the limbs (positive = reflex, negative = deflex)");
+    inline const QString HandlePivot = QStringLiteral("Position of the pivot point (positive = reflex, negative = deflex)");
+
+    inline const QString BraceHeight = QStringLiteral("Brace height of the bow, i.e. distance between string and the handle's pivot point in the braced state");
+    inline const QString DrawLength = QStringLiteral("Draw length of the bow, i.e. distance between string and the handle's pivot point in the fully drawn state");
+
     inline const QString DrawForceShowLine = QStringLiteral("Show a hypothetical line connecting the start- and endpoint of the draw force curve");
     inline const QString DrawForceShowStiffness = QStringLiteral("Show the stiffness of the draw force curve, i.e. force increase per length increase");
 
-    inline const QString ArrowMassDefinition = QStringLiteral("Select how the arrow mass is to be defined");
-    inline const QString ArrowMassAbsolute = QStringLiteral("Arrow mass (absolute value)");
+    inline const QString ArrowMassDefinition = QStringLiteral("Selects how the arrow mass is specified");
+    inline const QString ArrowMassAbsolute = QStringLiteral("Arrow mass as an absolute value");
     inline const QString ArrowMassPerForce = QStringLiteral("Arrow mass relative to the final draw force of the bow");
-    inline const QString ArrowMassPerEnergy = QStringLiteral("Arrow mass relative to the input energy of the bow");
+    inline const QString ArrowMassPerEnergy = QStringLiteral("Arrow mass relative to the stored energy of the bow");
 
     inline const QString MassStringCenter = QStringLiteral("Additional mass(es) at the string center (e.g. serving, nocking point)");
     inline const QString MassStringTip = QStringLiteral("Additional mass(es) at the string tip (e.g. serving)");
     inline const QString MassLimbTip = QStringLiteral("Additional mass(es) at the limb tip (e.g. tip overlay)");
 
-    inline const QString DrawLengthDefinition = QStringLiteral("Select how the draw length is to be defined");
+    inline const QString DrawLengthDefinition = QStringLiteral("Selects the draw length definition to be used");
     inline const QString DrawLengthStandard = QStringLiteral("Draw length as measured from the pivot point of the handle");
     inline const QString DrawLengthAMO = QStringLiteral("Draw length as measured from the pivot point of the handle + 1.75\" according to the AMO definition");
 
@@ -76,17 +87,4 @@ namespace Tooltips {
 
     inline const QString DampingRatioLimbs = QStringLiteral("Damping ratio of the limbs");
     inline const QString DampingRatioString = QStringLiteral("Damping ratio of the string");
-
-    inline const QString HandleReference = QStringLiteral("Reference point at the limb base from which the handle dimensions as well as the brace height and draw length are measured");
-    inline const QString HandleReferenceBack = QStringLiteral("Measure from the back of the bow");
-    inline const QString HandleReferenceBelly = QStringLiteral("Measure from the belly of the bow");
-    inline const QString HandleReferenceProfile = QStringLiteral("Measure from the profile curve");
-
-    inline const QString HandleLength = QStringLiteral("Length of the handle, i.e. distance between the upper and lower limb as measured by the reference points");
-    inline const QString HandleOffset = QStringLiteral("Offset of the handle's pivot point in the direction of draw");
-    inline const QString HandleAngle = QStringLiteral("Angle at which the limbs are attached to the handle");
-    inline const QString BraceHeight = QStringLiteral("Brace height of the bow, i.e. distance between string and the handle's pivot point in the braced state");
-    inline const QString DrawLength = QStringLiteral("Draw length of the bow, i.e. distance between string and the handle's pivot point in the fully drawn state");
-
-
 }

gui/source/pre/Language.hpp

@@ -10,6 +10,7 @@
 Q_DECLARE_METATYPE(LayerAlignment)
 Q_DECLARE_METATYPE(ArrowMass)
 Q_DECLARE_METATYPE(DrawLength)
+Q_DECLARE_METATYPE(Handle)
 
 int main(int argc, char* argv[]) {   
     QApplication::setOrganizationName(Config::ORGANIZATION_NAME);
@@ -22,6 +23,7 @@ int main(int argc, char* argv[]) {
     qRegisterMetaType<LayerAlignment>("LayerAlignment");
     qRegisterMetaType<ArrowMass>("ArrowMass");
     qRegisterMetaType<DrawLength>("DrawLength");
+    qRegisterMetaType<Handle>("Handle");
 
     QApplication application(argc, argv);
     application.installEventFilter(new KeyEventFilter());

gui/source/pre/Main.cpp

@@ -0,0 +1,6 @@
+#include "HandleModel.hpp"
+#include "solver/BowModel.hpp"
+
+HandleModel::HandleModel(Handle& handle) {
+    HANDLE = addCustom(handle);
+}

gui/source/pre/models/HandleModel.cpp

@@ -0,0 +1,9 @@
+#pragma once
+#include "pre/models/PropertyListModel.hpp"
+
+class HandleModel: public PropertyListModel {
+public:
+    QPersistentModelIndex HANDLE;
+
+    HandleModel(Handle& handle);
+};

gui/source/pre/models/HandleModel.hpp

@@ -2,6 +2,7 @@
 #include "MainTreeModel.hpp"
 #include "CommentsModel.hpp"
 #include "SettingsModel.hpp"
+#include "HandleModel.hpp"
 #include "DrawModel.hpp"
 #include "MaterialModel.hpp"
 #include "LayerModel.hpp"
@@ -121,6 +122,16 @@ SettingsModel* MainModel::getSettingsModel() {
     return nullptr;
 }
 
+HandleModel* MainModel::getHandleModel() {
+    if(bow.has_value()) {
+        auto model = new HandleModel(bow->handle);
+        connectSubModel(model);
+        return model;
+    }
+
+    return nullptr;
+}
+
 DrawModel* MainModel::getDrawModel() {
     if(bow.has_value()) {
         auto model = new DrawModel(bow->draw);

gui/source/pre/models/MainModel.cpp

@@ -13,6 +13,7 @@
 class MainTreeModel;
 class CommentsModel;
 class SettingsModel;
+class HandleModel;
 class DrawModel;
 class MaterialModel;
 class LayerModel;
@@ -54,6 +55,7 @@ class MainModel: public QObject {
 
     CommentsModel* getCommentsModel();
     SettingsModel* getSettingsModel();
+    HandleModel* getHandleModel();
     DrawModel* getDrawModel();
     MaterialModel* getMaterialModel(int index);
     LayerModel* getLayerModel(int index);