From 5c26dd04dd171112d14bfb24db96cf286566e19b Mon Sep 17 00:00:00 2001 From: Samuel Fadel Date: Tue, 9 Feb 2016 21:36:34 -0200 Subject: Slightly reworked rewinding; added values rewinding. Needs a solution to the problem of which values must be displayed and/or interpolated. Currently, whenever the user rewinds, the current error measure is displayed, regardless of what was being displayed before. This will probably be trivial to solve once we have a nice way of changing the current measure. * Also changed all OpenMP-powered for loops to use signed integers, requirements of OMP2.x (which is what MSVC supports currently) * The above change comes with a new header for utility functions --- projectionobserver.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'projectionobserver.h') diff --git a/projectionobserver.h b/projectionobserver.h index badca4d..db68c73 100644 --- a/projectionobserver.h +++ b/projectionobserver.h @@ -19,12 +19,16 @@ signals: void valuesChanged(const arma::vec &values) const; void cpValuesChanged(const arma::vec &values) const; void rpValuesChanged(const arma::vec &values) const; + void valuesRewound(const arma::vec &values) const; + void cpValuesRewound(const arma::vec &values) const; + void rpValuesRewound(const arma::vec &values) const; public slots: void setMap(const arma::mat &Y); bool setType(int type); void setCPSelection(const std::vector &cpSelection); void setRPSelection(const std::vector &rpSelection); + void setRewind(double t); private: bool emitValuesChanged() const; @@ -37,7 +41,7 @@ private: bool m_cpSelectionEmpty, m_rpSelectionEmpty; std::vector m_cpSelection, m_rpSelection; - // alpha(i, j): the influence CP j has on RP i + // alpha(i, j): the influence CP j has on RP i void computeAlphas(); arma::mat m_alphas, m_influences; -- cgit v1.2.3