From eea796f53f5d9dc1444a620713b3326f04b73339 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Mon, 9 Oct 2017 22:17:10 -0300 Subject: Divider control element implemented Abstract class math operations implemented Divider need to be redesigned Expor/import divider functions implemented but supressed --- Project/Multiplier.h | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'Project/Multiplier.h') diff --git a/Project/Multiplier.h b/Project/Multiplier.h index f675b34..2bc0be9 100644 --- a/Project/Multiplier.h +++ b/Project/Multiplier.h @@ -18,7 +18,7 @@ #ifndef MULTIPLIER_H #define MULTIPLIER_H -#include "ControlElement.h" +#include "MathOperation.h" class ConnectionLine; @@ -29,22 +29,14 @@ class ConnectionLine; * @brief Multiplies two inputs. * @file Multiplier.h */ -class Multiplier : public ControlElement +class Multiplier : public MathOperation { public: Multiplier(int id); ~Multiplier(); - virtual void Draw(wxPoint2DDouble translation, double scale) const; - virtual bool Contains(wxPoint2DDouble position) const { return m_rect.Contains(position); } - virtual bool Intersects(wxRect2DDouble rect) const { return m_rect.Intersects(rect); } - virtual bool ShowForm(wxWindow* parent, Element* element) { return false; } - virtual void Rotate(bool clockwise = true); - - virtual void UpdatePoints(); - + virtual void DrawSymbol() const; virtual bool Solve(double input, double timeStep); - virtual Element* GetCopy(); }; -- cgit