diff options
author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-10-09 22:17:10 -0300 |
---|---|---|
committer | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-10-09 22:17:10 -0300 |
commit | eea796f53f5d9dc1444a620713b3326f04b73339 (patch) | |
tree | 2cc6cd35c3dfa718c26b7f5de9dcee913fb93028 /Project/Multiplier.h | |
parent | aa2378020ee0bbfd041681cfdbe62a8d028687f3 (diff) | |
download | PSP.git-eea796f53f5d9dc1444a620713b3326f04b73339.tar.gz PSP.git-eea796f53f5d9dc1444a620713b3326f04b73339.tar.xz PSP.git-eea796f53f5d9dc1444a620713b3326f04b73339.zip |
Divider control element implemented
Abstract class math operations implemented
Divider need to be redesigned
Expor/import divider functions implemented but supressed
Diffstat (limited to 'Project/Multiplier.h')
-rw-r--r-- | Project/Multiplier.h | 14 |
1 files changed, 3 insertions, 11 deletions
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(); }; |