Add more tooltips for output results

Closes #17

Author: stfnp

gui/CMakeLists.txt

@@ -218,8 +218,8 @@ add_executable(
     source/post/DrawForcePlot.hpp
     source/post/EnergyPlot.cpp
     source/post/EnergyPlot.hpp
-    source/post/NumberGrid.cpp
-    source/post/NumberGrid.hpp
+    source/post/OutputGrid.cpp
+    source/post/OutputGrid.hpp
     source/post/OutputWidget.cpp
     source/post/OutputWidget.hpp
     source/post/ShapePlot.cpp

gui/source/post/ComboPlot.cpp

@@ -1,11 +1,16 @@
 #include "ComboPlot.hpp"
+#include "pre/Language.hpp"
 
 ComboPlot::ComboPlot()
-    : combo_x(new QComboBox()),
-      combo_y(new QComboBox()),
-      plot(new PlotWidget()),
+    : plot(new PlotWidget()),
       curve(new QCPCurve(plot->xAxis, plot->yAxis))
 {    
+    combo_x = new QComboBox();
+    combo_x->setToolTip(Tooltips::SelectPlotChannelX);
+
+    combo_y = new QComboBox();
+    combo_y->setToolTip(Tooltips::SelectPlotChannelY);
+
     curve->setName("Line");
     curve->setPen({Qt::blue, 2.0});
 

gui/source/post/NumberGrid.hpp

@@ -1,4 +1,4 @@
-#include "NumberGrid.hpp"
+#include "OutputGrid.hpp"
 #include "pre/widgets/DoubleOutput.hpp"
 #include "pre/models/units/Quantity.hpp"
 #include <QHBoxLayout>
@@ -8,7 +8,7 @@
 #include <QLineEdit>
 #include <QLabel>
 
-NumberGrid::NumberGrid()
+OutputGrid::OutputGrid()
     : columnLayout(new QHBoxLayout()),
       currentColumn(nullptr),
       currentGrid(nullptr)
@@ -19,7 +19,7 @@ NumberGrid::NumberGrid()
     this->setLayout(columnLayout);
 }
 
-void NumberGrid::addColumn() {
+void OutputGrid::addColumn() {
     // Create new column
     currentColumn = new QVBoxLayout();
     currentColumn->addStretch();
@@ -32,7 +32,7 @@ void NumberGrid::addColumn() {
     columnLayout->insertLayout(i, currentColumn);
 }
 
-void NumberGrid::addGroup(const QString& name) {
+void OutputGrid::addGroup(const QString& name) {
     if(currentColumn == nullptr) {
         addColumn();
     }
@@ -46,7 +46,7 @@ void NumberGrid::addGroup(const QString& name) {
     currentColumn->insertWidget(i, group);
 }
 
-void NumberGrid::addHeaders(const QStringList& headers) {
+void OutputGrid::addHeaders(const QStringList& headers) {
     if(currentColumn == nullptr) {
         addColumn();
     }
@@ -63,7 +63,11 @@ void NumberGrid::addHeaders(const QStringList& headers) {
     }
 }
 
-void NumberGrid::addValues(const QString& name, const QList<double>& values, const QList<const Quantity*> quantities, const QList<double>& allowed, const QList<double>& maximum, int decimals) {
+void OutputGrid::addValue(const QString& name, QWidget* widget) {
+    addValues(name, {widget});
+}
+
+void OutputGrid::addValues(const QString& name, QList<QWidget*> widgets) {
     if(currentColumn == nullptr) {
         addColumn();
     }
@@ -74,20 +78,10 @@ void NumberGrid::addValues(const QString& name, const QList<double>& values, con
 
     int row = currentGrid->rowCount();
     auto label = new QLabel(name);
-    currentGrid->addWidget(label, row, 0);
 
-    for(int col = 0; col < values.size(); ++col) {
-        auto output = new DoubleOutput(values[col], *quantities[col], decimals);
-        currentGrid->addWidget(output, row, col + 1);
-
-        // Set warning limits if nonzero ones are given
-        if(col < allowed.size() && col < maximum.size() && allowed[col] != 0.0 && maximum[col] != 0.0) {
-            output->setAllowedLimit(allowed[col]);
-            output->setMaximumLimit(maximum[col]);
-        }
+    currentGrid->addWidget(label, row, 0);
+    for(int col = 0; col < widgets.size(); ++col) {
+        currentGrid->addWidget(widgets[col], row, col + 1);
     }
 }
 
-void NumberGrid::addValue(const QString& name, double value, const Quantity& quantity, int decimals) {
-    addValues(name, {value}, {&quantity}, {}, {}, decimals);
-}

gui/source/post/NumberGrid.cpp gui/source/post/OutputGrid.cppgui/source/post/NumberGrid.cpp renamed to gui/source/post/OutputGrid.cpp

@@ -0,0 +1,27 @@
+#pragma once
+#include <QWidget>
+
+class Quantity;
+class QHBoxLayout;
+class QVBoxLayout;
+class QGridLayout;
+
+class OutputGrid : public QWidget {
+public:
+    OutputGrid();
+
+    void addColumn();
+    void addGroup(const QString& name);
+    void addHeaders(const QStringList& headers);
+
+    void addValue(const QString& name, QWidget* widget);
+    void addValues(const QString& name, QList<QWidget*> widgets);
+
+    //void addValues(const QString& name, const QList<double>& values, const QList<const Quantity*> quantities, const QList<double>& allowed = {}, const QList<double>& maximum = {}, int decimals = 2);
+    //void addValue(const QString& name, double value, const Quantity& quantity, int decimals = 2);
+
+private:
+    QHBoxLayout* columnLayout;
+    QVBoxLayout* currentColumn;
+    QGridLayout* currentGrid;
+};