WIP: Implement new handle and draw length definitions

Author: stfnp

gui/CMakeLists.txt

@@ -67,8 +67,8 @@ add_executable(
     source/pre/models/CommentsModel.hpp
     source/pre/models/DampingModel.cpp
     source/pre/models/DampingModel.hpp
-    source/pre/models/DimensionsModel.cpp
-    source/pre/models/DimensionsModel.hpp
+    source/pre/models/DrawModel.cpp
+    source/pre/models/DrawModel.hpp
     source/pre/models/LayerModel.cpp
     source/pre/models/LayerModel.hpp
     source/pre/models/LayersModel.cpp
@@ -119,8 +119,8 @@ add_executable(
     source/pre/views/CommentsView.hpp
     source/pre/views/DampingView.cpp
     source/pre/views/DampingView.hpp
-    source/pre/views/DimensionsView.cpp
-    source/pre/views/DimensionsView.hpp
+    source/pre/views/DrawView.cpp
+    source/pre/views/DrawView.hpp
     source/pre/views/docks/EditDock.cpp
     source/pre/views/docks/EditDock.hpp
     source/pre/views/docks/PlotDock.cpp
@@ -153,6 +153,8 @@ add_executable(
     source/pre/views/MassesView.hpp
     source/pre/views/ArrowMassView.cpp
     source/pre/views/ArrowMassView.hpp
+    source/pre/views/DrawLengthView.cpp
+    source/pre/views/DrawLengthView.hpp
     source/pre/views/MaterialView.cpp
     source/pre/views/MaterialView.hpp
     source/pre/views/primitive/ColorView.cpp

gui/source/pre/Language.hpp

@@ -21,6 +21,9 @@ namespace Tooltips {
     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 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");
 
     inline const QString LayerMaterialSelection = QStringLiteral("Material assigned to this layer");
     inline const QString LayerMaterialItem = QStringLiteral("Assign \"%1\" to this layer");

gui/source/pre/Main.cpp

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

gui/source/pre/models/DimensionsModel.cpp

@@ -0,0 +1,7 @@
+#include "DrawModel.hpp"
+#include "solver/BowModel.hpp"
+
+DrawModel::DrawModel(Draw& draw) {
+    BRACE_HEIGHT = addDouble(draw.brace_height);
+    DRAW_LENGTH = addCustom(draw.draw_length);
+}

gui/source/pre/models/DimensionsModel.hpp

@@ -0,0 +1,12 @@
+#pragma once
+#include "pre/models/PropertyListModel.hpp"
+
+struct Draw;
+
+class DrawModel: public PropertyListModel {
+public:
+    QPersistentModelIndex BRACE_HEIGHT;
+    QPersistentModelIndex DRAW_LENGTH;
+
+    DrawModel(Draw& draw);
+};

gui/source/pre/models/DrawModel.cpp

@@ -2,7 +2,7 @@
 #include "MainTreeModel.hpp"
 #include "CommentsModel.hpp"
 #include "SettingsModel.hpp"
-#include "DimensionsModel.hpp"
+#include "DrawModel.hpp"
 #include "MaterialModel.hpp"
 #include "LayerModel.hpp"
 #include "StringModel.hpp"
@@ -121,9 +121,9 @@ SettingsModel* MainModel::getSettingsModel() {
     return nullptr;
 }
 
-DimensionsModel* MainModel::getDimensionsModel() {
+DrawModel* MainModel::getDrawModel() {
     if(bow.has_value()) {
-        auto model = new DimensionsModel(bow->dimensions);
+        auto model = new DrawModel(bow->draw);
         connectSubModel(model);
         return model;
     }
@@ -250,8 +250,8 @@ TableModel* MainModel::getSplineModel(int index) {
 }
 
 void MainModel::newFile() {
-    // Create  default bow data, which is not linked to any file yet
-    this->bow = new_model();
+    // Create default bow data, which is not linked to any file yet
+    this->bow = BowModel::example();
     this->modelTreeSelectionModel->clearSelection();    // Needs to be done before resetting the model in order to get a selection changed signal
     this->mainTreeModel->setBowModel(&bow.value());
     this->path = "";

gui/source/pre/models/DrawModel.hpp

@@ -13,7 +13,7 @@
 class MainTreeModel;
 class CommentsModel;
 class SettingsModel;
-class DimensionsModel;
+class DrawModel;
 class MaterialModel;
 class LayerModel;
 class StringModel;
@@ -54,7 +54,7 @@ class MainModel: public QObject {
 
     CommentsModel* getCommentsModel();
     SettingsModel* getSettingsModel();
-    DimensionsModel* getDimensionsModel();
+    DrawModel* getDrawModel();
     MaterialModel* getMaterialModel(int index);
     LayerModel* getLayerModel(int index);
     TableModel* getLayerHeightModel(int index);

gui/source/pre/models/MainModel.cpp

@@ -547,7 +547,7 @@ QString MainTreeModel::topLevelItemName(int row) const {
     switch(row) {
         case TopLevelItem::COMMENTS: return "Comments";
         case TopLevelItem::SETTINGS: return "Settings";
-        case TopLevelItem::DIMENSIONS: return "Dimensions";
+        case TopLevelItem::DRAW: return "Draw";
         case TopLevelItem::MATERIALS: return "Materials";
         case TopLevelItem::LAYERS: return "Layers";
         case TopLevelItem::PROFILE: return "Profile";
@@ -563,7 +563,7 @@ QString MainTreeModel::topLevelToolTip(int row) const {
     switch(row) {
         case TopLevelItem::COMMENTS: return "Comments about this bow";
         case TopLevelItem::SETTINGS: return "Settings for the simulation";
-        case TopLevelItem::DIMENSIONS: return "Brace height, draw length and handle geometry";
+        case TopLevelItem::DRAW: return "Brace height, draw length and handle geometry";
         case TopLevelItem::MATERIALS: return "Materials that can be assigned to the layers";
         case TopLevelItem::LAYERS: return "Layers that make up the bow limbs";
         case TopLevelItem::PROFILE: return "Initial profile shape of the bow";
@@ -579,7 +579,7 @@ QIcon MainTreeModel::topLevelItemIcon(int row) const {
     switch(row) {
         case TopLevelItem::COMMENTS: return QIcon(":/icons/model-comments.svg");
         case TopLevelItem::SETTINGS: return QIcon(":/icons/model-settings.svg");
-        case TopLevelItem::DIMENSIONS: return QIcon(":/icons/model-dimensions.svg");
+        case TopLevelItem::DRAW: return QIcon(":/icons/model-dimensions.svg");
         case TopLevelItem::MATERIALS: return QIcon(":/icons/model-materials.svg");
         case TopLevelItem::LAYERS: return QIcon(":/icons/model-layers.svg");
         case TopLevelItem::PROFILE: return QIcon(":/icons/model-profile.svg");