aboutsummaryrefslogtreecommitdiff
path: root/projectionhistory.h
diff options
context:
space:
mode:
Diffstat (limited to 'projectionhistory.h')
-rw-r--r--projectionhistory.h29
1 files changed, 10 insertions, 19 deletions
diff --git a/projectionhistory.h b/projectionhistory.h
index 4fc2ef4..d4b0de6 100644
--- a/projectionhistory.h
+++ b/projectionhistory.h
@@ -3,14 +3,11 @@
#include <vector>
-#include <QObject>
-
#include <armadillo>
+#include <nod.hpp>
class ProjectionHistory
- : public QObject
{
- Q_OBJECT
public:
enum ObserverType {
ObserverCurrent,
@@ -34,25 +31,19 @@ public:
void undo();
void reset();
-signals:
- void undoPerformed() const;
- void resetPerformed() const;
+ nod::signal<void()> undoPerformed, resetPerformed;
- void currentMapChanged(const arma::mat &Y) const;
- void valuesChanged(const arma::vec &values, bool rescale) const;
- void cpValuesChanged(const arma::vec &values, bool rescale) const;
- void rpValuesChanged(const arma::vec &values, bool rescale) const;
+ nod::signal<void(const arma::mat &)> currentMapChanged;
+ nod::signal<void(const arma::vec &, bool)> valuesChanged,
+ cpValuesChanged, rpValuesChanged;
- void mapRewound(const arma::mat &Y) const;
- void valuesRewound(const arma::vec &values) const;
- void cpValuesRewound(const arma::vec &values) const;
- void rpValuesRewound(const arma::vec &values) const;
+ nod::signal<void(const arma::mat &)> mapRewound;
+ nod::signal<void(const arma::vec &)> valuesRewound,
+ cpValuesRewound, rpValuesRewound;
- void cpSelectionChanged(const std::vector<bool> &cpSelection) const;
- void rpSelectionChanged(const std::vector<bool> &rpSelection) const;
- void selectionChanged(const std::vector<bool> &selection) const;
+ nod::signal<void(const std::vector<bool> &)> cpSelectionChanged,
+ rpSelectionChanged, selectionChanged;
-public slots:
void addMap(const arma::mat &Y);
bool setType(ObserverType type);