Merge pull request #40 from Thales1330/wip-mimo-control-system

Wip mimo control system

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();
 };