Motor implementation done, elements classes reorganized

1 files changed, 2 insertions, 12 deletions

diff --git a/Project/Line.h b/Project/Line.h
index 32ebdf8..d2b3547 100644
--- a/Project/Line.h
+++ b/Project/Line.h
@@ -1,9 +1,9 @@
 #ifndef LINE_H
 #define LINE_H
 
-#include "Element.h"
+#include "Branch.h"
 
-class Line : public Element
+class Line : public Branch
 {
    public:
     Line();
@@ -13,28 +13,18 @@ class Line : public Element
     virtual void Move(wxPoint2DDouble position);
     virtual void StartMove(wxPoint2DDouble position);
     virtual void MoveNode(Element* parent, wxPoint2DDouble position);
-    virtual bool NodeContains(wxPoint2DDouble position);
-    virtual bool SetNodeParent(Element* parent);
-	virtual void RemoveParent(Element* parent);
-    virtual void UpdateNodes();
     virtual wxCursor GetBestPickboxCursor() const { return wxCURSOR_SIZING; }
     virtual bool AddParent(Element* parent, wxPoint2DDouble position);
     virtual bool Intersects(wxRect2DDouble rect) const;
     virtual void MovePickbox(wxPoint2DDouble position);
     virtual bool PickboxContains(wxPoint2DDouble position);
-    virtual void Rotate() {}
-    virtual void RotateNode(Element* parent);
     virtual void AddPoint(wxPoint2DDouble point);
     virtual bool GetContextMenu(wxMenu& menu);
     virtual void RemoveNode(wxPoint2DDouble point);
     virtual void AddNode(wxPoint2DDouble point);
 
    protected:
-    void UpdateSwitchesPosition();
     double PointToLineDistance(wxPoint2DDouble point, int* segmentNumber = NULL) const;
-    std::vector<wxPoint2DDouble> m_pointList;
-    bool m_inserted = false;
-    std::vector<wxPoint2DDouble> m_movePts;
 };
 
 #endif  // LINE_H