Made ISolver* solver() const a pure virtual method.

This change allows the OptimisationWidget to call the interface (AbstractSpliceModel) instead of the implementation (SpliceCalculator).

Author: setvisible

src/core/abstractsplicemodel.h

@@ -28,6 +28,7 @@
 class DesignSpace;
 class Fastener;
 class Tensor;
+class ISolver;
 enum class SolverParameters;
 
 class AbstractSpliceModel : public QObject
@@ -52,6 +53,7 @@ class AbstractSpliceModel : public QObject
  Q_INVOKABLE virtual Tensor resultAt(const int index) const = 0;
  Q_INVOKABLE virtual SolverParameters solverParameters() const = 0;
 
+ virtual ISolver* solver() const = 0;
 
 Q_SIGNALS:
 

src/core/splicecalculator.h

@@ -67,7 +67,7 @@ class SpliceCalculator : public AbstractSpliceModel
  virtual QSet<int> selectedDesignSpaceIndexes() const Q_DECL_OVERRIDE;
 
 
- ISolver* solver() const { return m_solver; } /// \todo This is a hack!
+ virtual ISolver* solver() const Q_DECL_OVERRIDE { return m_solver; }
 
 Q_SIGNALS:
  void changed();

src/widgets/optimisationwidget.cpp

@@ -19,7 +19,6 @@
 
 #include <Core/AbstractSpliceModel>
 #include <Core/Splice>
-#include <Core/SpliceCalculator>
 #include <Core/Optimizer/Controller>
 #include <Core/Optimizer/OptimisationSolver>
 
@@ -97,12 +96,12 @@ OptimisationWidget::~OptimisationWidget()
 
 /******************************************************************************
  ******************************************************************************/
-SpliceCalculator *OptimisationWidget::spliceCalculator() const
+AbstractSpliceModel *OptimisationWidget::model() const
 {
  return m_calculator;
 }
 
-void OptimisationWidget::setSpliceCalculator(SpliceCalculator *calculator)
+void OptimisationWidget::setModel(AbstractSpliceModel *calculator)
 {
  m_calculator = calculator;
 }

src/widgets/optimisationwidget.h

@@ -24,7 +24,7 @@
 #include <Core/Optimizer/OptimisationSolver>
 
 class Splice;
-class SpliceCalculator;
+class AbstractSpliceModel;
 class OptimisationSolver;
 
 namespace Ui {
@@ -40,8 +40,8 @@ class OptimisationWidget : public QWidget
  explicit OptimisationWidget(QWidget *parent = Q_NULLPTR);
  virtual ~OptimisationWidget();
 
- SpliceCalculator *spliceCalculator() const;
- void setSpliceCalculator(SpliceCalculator *calculator);
+ AbstractSpliceModel *model() const;
+ void setModel(AbstractSpliceModel *calculator);
 
 private Q_SLOTS:
  void onControllerStarted();
@@ -60,7 +60,7 @@ private Q_SLOTS:
 private:
  Ui::OptimisationWidget *ui;
  Controller *m_controller;
- SpliceCalculator *m_calculator;
+ AbstractSpliceModel *m_calculator;
 
  void log(int type, qint64 timestamp, const QString &message);
 };