diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-01-05 19:37:42 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-05 19:37:42 -0200 |
| commit | 9df133274802731220546d1f9383c213193c8413 (patch) | |
| tree | 9c6e2fa2a45d6c6c4c14d8711b2b89066bfb37d7 /Project/Line.h | |
| parent | c5343c718cf80620c2fc7452a4315f7ddb9e5826 (diff) | |
| parent | b6f96ca48bc156898df79deba63d270b393fb150 (diff) | |
| download | PSP.git-9df133274802731220546d1f9383c213193c8413.tar.gz PSP.git-9df133274802731220546d1f9383c213193c8413.tar.xz PSP.git-9df133274802731220546d1f9383c213193c8413.zip | |
Merge pull request #5 from Thales1330/opt/element-parent-search
Opt element parent search
Diffstat (limited to 'Project/Line.h')
| -rw-r--r-- | Project/Line.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Project/Line.h b/Project/Line.h index 7000701..1ff1102 100644 --- a/Project/Line.h +++ b/Project/Line.h @@ -21,8 +21,8 @@ struct LineElectricalData { bool useLinePower = false; // Power flow (p.u.) - std::complex<double> current[2] = {std::complex<double>(0.0, 0.0), std::complex<double>(0.0, 0.0)}; - std::complex<double> powerFlow[2] = {std::complex<double>(0.0, 0.0), std::complex<double>(0.0, 0.0)}; + std::complex<double> current[2] = { std::complex<double>(0.0, 0.0), std::complex<double>(0.0, 0.0) }; + std::complex<double> powerFlow[2] = { std::complex<double>(0.0, 0.0), std::complex<double>(0.0, 0.0) }; // Fault double zeroResistance = 0.0; @@ -34,7 +34,7 @@ struct LineElectricalData { class Line : public Branch { - public: +public: Line(); Line(wxString name); ~Line(); @@ -45,13 +45,14 @@ class Line : public Branch virtual void MoveNode(Element* parent, wxPoint2DDouble position); virtual bool SetNodeParent(Element* parent); virtual wxCursor GetBestPickboxCursor() const { return wxCURSOR_SIZING; } - virtual Element* GetCopy(); + virtual Element* GetCopy(); 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 AddPoint(wxPoint2DDouble point); virtual bool GetContextMenu(wxMenu& menu); + virtual wxString GetTipText() const; virtual void RemoveNode(wxPoint2DDouble point); virtual void AddNode(wxPoint2DDouble point); virtual void RotateNode(Element* parent, bool clockwise = true); @@ -63,10 +64,10 @@ class Line : public Branch virtual void SetNominalVoltage(std::vector<double> nominalVoltage, std::vector<ElectricalUnit> nominalVoltageUnit); virtual void SetPointList(std::vector<wxPoint2DDouble> pointList); - protected: +protected: double PointToLineDistance(wxPoint2DDouble point, int* segmentNumber = NULL) const; void UpdatePowerFlowArrowsPosition(); LineElectricalData m_electricaData; }; -#endif // LINE_H +#endif // LINE_H |