Reimplement profile view

Author: stfnp

gui/CMakeLists.txt

@@ -136,12 +136,6 @@ add_executable(
     source/pre/views/docks/EditDock.hpp
     source/pre/views/docks/PlotDock.cpp
     source/pre/views/docks/PlotDock.hpp
-    source/pre/views/limb2d/ProfileView.cpp
-    source/pre/views/limb2d/ProfileView.hpp
-    source/pre/views/limb2d/WidthPlotView.cpp
-    source/pre/views/limb2d/WidthPlotView.hpp
-    source/pre/views/limb2d/HeightPlotView.cpp
-    source/pre/views/limb2d/HeightPlotView.hpp
     source/pre/views/primitive/DoubleView.hpp
     source/pre/views/primitive/DoubleView.cpp
     source/pre/views/primitive/ColorView.hpp
@@ -182,6 +176,12 @@ add_executable(
     source/pre/views/MassesView.cpp
     source/pre/views/DampingView.hpp
     source/pre/views/DampingView.cpp
+    source/pre/views/limb2d/ProfilePlotView.cpp
+    source/pre/views/limb2d/ProfilePlotView.hpp
+    source/pre/views/limb2d/WidthPlotView.cpp
+    source/pre/views/limb2d/WidthPlotView.hpp
+    source/pre/views/limb2d/HeightPlotView.cpp
+    source/pre/views/limb2d/HeightPlotView.hpp
     source/pre/views/limb3d/ErrorLabel.cpp
     source/pre/views/limb3d/ErrorLabel.hpp
     source/pre/views/limb3d/LayerColors.cpp

gui/source/post/ShapePlot.cpp

@@ -87,7 +87,7 @@ void ShapePlot::updateBackgroundStates() {
 
     if(intermediate_states >= 0) {
         // Unbraced state
-        plotLimbOutline(limb_left[intermediate_states], limb_right[intermediate_states], common.limb.position);
+        plotLimbOutline(limb_left[intermediate_states], limb_right[intermediate_states], common.limb.position_eval);
     }
 }
 
@@ -120,7 +120,7 @@ void ShapePlot::updateAxes() {
         }
     };
 
-    expand3(common.limb.position);
+    expand3(common.limb.position_eval);
     for(size_t i = 0; i < states.time.size(); ++i) {
         // Add 0.5*height as an estimated upper bound
         //expand(states.x_pos_limb[i] + 0.5*limb.height, states.y_pos_limb[i] + 0.5*limb.height);

gui/source/pre/views/SpiralView.cpp

@@ -12,12 +12,12 @@ SpiralView::SpiralView(SpiralModel* model) {
 
     addProperty(
         "Radius (start)",
-        new DoubleView(model, model->RADIUS_START, Quantities::length, DoubleRange::unrestricted(1e-3), "Start radius of the spiral segment")
+        new DoubleView(model, model->RADIUS_START, Quantities::length, DoubleRange::unrestricted(1e-3), "Start radius of the spiral segment (or zero for no radius)")
     );
 
     addProperty(
         "Radius (end)",
-        new DoubleView(model, model->RADIUS_END, Quantities::length, DoubleRange::unrestricted(1e-3), "End radius of the spiral segment")
+        new DoubleView(model, model->RADIUS_END, Quantities::length, DoubleRange::unrestricted(1e-3), "End radius of the spiral segment (or zero for no radius)")
     );
 
     addStretch();

gui/source/pre/views/docks/PlotDock.cpp

@@ -3,6 +3,7 @@
 #include "pre/models/MainTreeModel.hpp"
 #include "pre/views/limb2d/WidthPlotView.hpp"
 #include "pre/views/limb2d/HeightPlotView.hpp"
+#include "pre/views/limb2d/ProfilePlotView.hpp"
 #include <QItemSelectionModel>
 #include <QLabel>
 
@@ -18,32 +19,32 @@ class PlaceholderLabel: public QLabel {
     }
 };
 
-PlotDock::PlotDock(MainModel* viewModel) {
+PlotDock::PlotDock(MainModel* model) {
     placeholder = new PlaceholderLabel();
 
     this->setWindowTitle("Graph");
     this->setObjectName("PlotView");    // Required to save state of main window
     this->setFeatures(QDockWidget::NoDockWidgetFeatures);
     this->setWidget(placeholder);
 
-    auto selectionModel = viewModel->getModelTreeSelectionModel();
+    auto selectionModel = model->getModelTreeSelectionModel();
     QObject::connect(selectionModel, &QItemSelectionModel::selectionChanged, this, [=] {
         QModelIndexList selection = selectionModel->selectedIndexes();
         if(selection.size() == 1) {
             QPersistentModelIndex index(selection.first());
 
             if(index.internalId() == ItemType::LAYER) {
-                showPlot(index, [=]{ return new HeightPlotView(viewModel, index); });
+                showPlot(index, [=]{ return new HeightPlotView(model, index); });
                 return;
             }
 
-            if(index.internalId() == ItemType::SEGMENT) {
-                showPlot(index, [=]{ return new QLabel("Profile"); });
+            if(index.internalId() == ItemType::TOPLEVEL && index.row() == TopLevelItem::WIDTH) {
+                showPlot(index, [=]{ return new WidthPlotView(model); });
                 return;
             }
 
-            if(index.internalId() == ItemType::TOPLEVEL && index.row() == TopLevelItem::WIDTH) {
-                showPlot(index, [=]{ return new WidthPlotView(viewModel); });
+            if((index.internalId() == ItemType::TOPLEVEL && index.row() == TopLevelItem::PROFILE) || index.internalId() == ItemType::SEGMENT) {
+                showPlot(index, [=]{ return new ProfilePlotView(model); });
                 return;
             }
         }

gui/source/pre/views/docks/PlotDock.hpp

@@ -9,23 +9,11 @@ class MainModel;
 
 class PlotDock: public QDockWidget {
 public:
-    PlotDock(MainModel* viewModel);
+    PlotDock(MainModel* model);
 
     void showPlaceholder();
     void showPlot(QPersistentModelIndex index, const std::function<QWidget*()>& create);
 
-    /*
-    template<typename F>
-    void showPlot(QPersistentModelIndex index, const F& f) {
-        if(!plots.contains(index)) {
-            qInfo() << "Construct " << index;
-            plots.insert(index, f());
-        }
-
-        setWidget(plots[index]);
-    }
-    */
-
 private:
     QLabel* placeholder;
     QMap<QPersistentModelIndex, QWidget*> plots;

…/source/pre/views/limb2d/ProfileView.cpp …rce/pre/views/limb2d/ProfilePlotView.cppgui/source/pre/views/limb2d/ProfileView.cpp renamed to gui/source/pre/views/limb2d/ProfilePlotView.cpp gui/source/pre/views/limb2d/ProfileView.cpp renamed to gui/source/pre/views/limb2d/ProfilePlotView.cpp

@@ -1,16 +1,34 @@
-#include "ProfileView.hpp"
-#include "solver/BowModel.hpp"
+#include "ProfilePlotView.hpp"
+#include "pre/models/MainModel.hpp"
+#include "pre/models/units/UnitSystem.hpp"
 
 // Magic numbers
 const size_t N_SEGMENT_POINTS   = 100;
 const size_t N_CURVATURE_POINTS = 200;
 const double CURVATURE_SCALING  = 0.05;
 
-ProfileView::ProfileView(const Quantity& quantity)
-    : quantity(quantity)
+ProfilePlotView::ProfilePlotView(MainModel* model):
+    model(model)
 {
     this->setAspectPolicy(PlotWidget::SCALE_Y);
 
+    // Line
+    curveLine = new QCPCurve(this->xAxis, this->yAxis);
+    curveLine->setName("Line");
+    curveLine->setPen({Qt::blue, 2});
+
+    // Control points
+    curvePoints = new QCPCurve(this->xAxis, this->yAxis);
+    curvePoints->setName("Points");
+    curvePoints->setScatterStyle({QCPScatterStyle::ssSquare, Qt::blue, 8});
+    curvePoints->setLineStyle(QCPCurve::lsNone);
+
+    // Selected points
+    curveSelected = new QCPCurve(this->xAxis, this->yAxis);
+    curveSelected->setName("Selected");
+    curveSelected->setScatterStyle({QCPScatterStyle::ssSquare, Qt::red, Qt::red, 8});
+    curveSelected->setLineStyle(QCPCurve::lsNone);
+
     // Menu actions
 
     action_show_curvature = new QAction("Show curvature", this);
@@ -35,28 +53,57 @@ ProfileView::ProfileView(const Quantity& quantity)
     this->contextMenu()->insertSeparator(before);
 
     // Update on unit changes
-    QObject::connect(&quantity, &Quantity::unitChanged, this, &ProfileView::updatePlot);
+    //QObject::connect(&quantity, &Quantity::unitChanged, this, &ProfilePlotView::updatePlot);
+
+    // Update on unit and geometry changes
+    QObject::connect(&Quantities::length, &Quantity::unitChanged, this, &ProfilePlotView::updatePlot);
+    QObject::connect(model, &MainModel::geometryChanged, this, &ProfilePlotView::updatePlot);
+
+    // Initial update
+    updatePlot();
 }
 
-void ProfileView::setData(const Profile& data) {
+/*
+void ProfilePlotView::setData(const Profile& data) {
     input = data;
     updatePlot();
 }
 
-void ProfileView::setSelection(const QList<int>& indices) {
+void ProfilePlotView::setSelection(const QList<int>& indices) {
     selection = indices;
     updateSelection();
     this->replot();
 }
+*/
 
-void ProfileView::updatePlot() {
-    //throw std::invalid_argument("Removed code");
-    /*
-    this->xAxis->setLabel("X " + quantity.getUnit().getLabel());
-    this->yAxis->setLabel("Y " + quantity.getUnit().getLabel());
+void ProfilePlotView::updatePlot() {
+    this->xAxis->setLabel("X " + Quantities::length.getUnit().getSuffix());
+    this->yAxis->setLabel("Y " + Quantities::length.getUnit().getSuffix());
 
-    this->clearPlottables();
+    curveLine->data()->clear();
+    curvePoints->data()->clear();
+    curveSelected->data()->clear();
 
+    if(model->hasGeometry()) {
+        for(auto& point: model->getGeometry().position_eval) {
+            curveLine->addData(
+                Quantities::length.getUnit().fromBase(point[0]),
+                Quantities::length.getUnit().fromBase(point[1])
+            );
+        }
+
+        for(auto& point: model->getGeometry().position_control) {
+            curvePoints->addData(
+                Quantities::length.getUnit().fromBase(point[0]),
+                Quantities::length.getUnit().fromBase(point[1])
+            );
+        }
+    }
+
+    this->rescaleAxes();
+    this->replot();
+
+    /*
     // Construct profile curve segment by segment, stop on first error
     ProfileCurve profile;
     try {
@@ -147,13 +194,11 @@ void ProfileView::updatePlot() {
 
     updateSelection();
     updateVisibility();
-
-    this->rescaleAxes();
-    this->replot();
     */
 }
 
-void ProfileView::updateSelection() {
+void ProfilePlotView::updateSelection() {
+    /*
     for(int i = 0; i < segment_curves.size(); ++i) {
         if(selection.contains(i)) {
             segment_curves[i]->setPen({Qt::red, 2});
@@ -177,14 +222,17 @@ void ProfileView::updateSelection() {
             segment_nodes[i]->setScatterSkip(0);
         }
     }
+    */
 }
 
-void ProfileView::updateVisibility() {
+void ProfilePlotView::updateVisibility() {
+    /*
     for(auto line: curvature_lines) {
         line->setVisible(action_show_curvature->isChecked());
     }
 
     for(auto segment_node: segment_nodes) {
         segment_node->setVisible(action_show_nodes->isChecked());
     }
+    */
 }

…/source/pre/views/limb2d/ProfileView.hpp …rce/pre/views/limb2d/ProfilePlotView.hppgui/source/pre/views/limb2d/ProfileView.hpp renamed to gui/source/pre/views/limb2d/ProfilePlotView.hpp gui/source/pre/views/limb2d/ProfileView.hpp renamed to gui/source/pre/views/limb2d/ProfilePlotView.hpp

@@ -1,27 +1,26 @@
 #pragma once
 #include "pre/widgets/PlotWidget.hpp"
-#include "pre/models/units/Quantity.hpp"
-#include "solver/BowModel.hpp"
 
-class ProfileView: public PlotWidget
+class MainModel;
+
+class ProfilePlotView: public PlotWidget
 {
 public:
-    ProfileView(const Quantity& xy_quantity);
+    ProfilePlotView(MainModel* model);
+    /*
     void setData(const Profile& data);
     void setSelection(const QList<int>& indices);
+    */
 
 private:
-    const Quantity& quantity;
+    MainModel* model;
 
     QAction* action_show_curvature;
     QAction* action_show_nodes;
 
-    Profile input;
-    QList<int> selection;
-
-    QList<QCPCurve*> segment_curves;
-    QList<QCPCurve*> segment_nodes;    // TODO: Use some item type for this?
-    QList<QCPCurve*> curvature_lines;
+    QCPCurve* curveLine;
+    QCPCurve* curvePoints;
+    QCPCurve* curveSelected;
 
     void updatePlot();
     void updateSelection();

gui/source/pre/views/limb3d/LimbMesh.cpp

@@ -26,8 +26,8 @@ LimbMesh::LimbMesh(const BowModel& bow, const LimbInfo& geometry)
 
     // Iterate over segments, i.e. pairs of a previous and a next cross section
     for(size_t iSegment = 0; iSegment < nSegments; ++iSegment) {
-        std::array<double, 3> profile_prev = geometry.position[iSegment];
-        std::array<double, 3> profile_next = geometry.position[iSegment + 1];
+        std::array<double, 3> profile_prev = geometry.position_eval[iSegment];
+        std::array<double, 3> profile_next = geometry.position_eval[iSegment + 1];
 
         QVector3D center_prev  ( profile_prev[0], profile_prev[1], 0.0 );
         QVector3D normal_w_prev( 0.0, 0.0, 1.0 );

gui/source/solver/BowResult.hpp

@@ -35,7 +35,8 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(
 
 struct LimbInfo {
     std::vector<double> length;
-    std::vector<std::array<double, 3>> position;
+    std::vector<std::array<double, 3>> position_eval;
+    std::vector<std::array<double, 3>> position_control;
     std::vector<double> width;
     std::vector<double> height;
     std::vector<std::vector<double>> bounds;
@@ -47,7 +48,8 @@ struct LimbInfo {
 NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(
     LimbInfo,
     length,
-    position,
+    position_eval,
+    position_control,
     width,
     height,
     bounds,

rust/virtualbow/src/geometry.rs

@@ -25,6 +25,8 @@ pub struct DiscreteLimbGeometry {
     pub y_nodes: Vec<DVector<f64>>,          // Layer bounds at nodes (y in cross section coordinates)
     pub h_nodes: Vec<DVector<f64>>,          // Layer heights at nodes
 
+    pub p_control: Vec<SVector<f64, 3>>,     // Positions (x, y, φ) of the control points
+
     pub n_eval: Vec<f64>,                    // Relative lengths at which the limb quantities are evaluated
     pub s_eval: Vec<f64>,                    // Arc lengths at which the limb quantities are evaluated
     pub p_eval: Vec<SVector<f64, 3>>,        // Positions (x, y, φ) of the evaluation points
@@ -87,6 +89,9 @@ impl LimbGeometry {
         let y_nodes = n_nodes.iter().map(|&n| self.section.layer_bounds(n).0).collect_vec();
         let h_nodes = n_nodes.iter().map(|&n| self.section.layer_bounds(n).1).collect_vec();    // TODO: Collect in one step
 
+        // Control points of the profile curve
+        let p_control = self.profile.get_nodes().iter().map(|node| vector![node.r[0], node.r[1], node.φ]).collect();    // TODO: Make those conversions unnecessary by using a single format for curve points
+
         // Equidistant evaluation points along the length of the limb
         let s_eval = lin_space(self.profile.s_start()..=self.profile.s_end(), n_eval_points).collect_vec();
         let n_eval = s_eval.iter().map(|&s| self.profile.normalize(s)).collect_vec();
@@ -124,6 +129,7 @@ impl LimbGeometry {
             p_nodes,
             y_nodes,
             h_nodes,
+            p_control,
             n_eval,
             s_eval,
             y_eval,
@@ -140,7 +146,8 @@ impl DiscreteLimbGeometry {
     pub fn to_limb_info(&self) -> LimbInfo {
         LimbInfo {
             length: self.s_eval.clone(),
-            position: self.p_eval.clone(),
+            position_eval: self.p_eval.clone(),
+            position_control: self.p_control.clone(),
             width: self.w_eval.clone(),
             height: self.h_eval.iter().map(|h| h.sum()).collect(),
             bounds: self.y_eval.iter().map(|y| y.data.clone().into()).collect(),