From 806890f384b382a02675cadc33c15fdbcec7d432 Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Tue, 14 Sep 2010 17:53:36 +0000 Subject: [PATCH] Phase 3 of polyline functionality added: Create polyline somewhat working... --- src/actions/actiondrawpolyline.cpp | 19 +++++++++++++++++++ src/actions/actiondrawpolyline.h | 3 +++ src/forms/polylineoptions.cpp | 2 +- src/forms/polylineoptions.h | 2 +- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/actions/actiondrawpolyline.cpp b/src/actions/actiondrawpolyline.cpp index f4f81a4..03925ab 100644 --- a/src/actions/actiondrawpolyline.cpp +++ b/src/actions/actiondrawpolyline.cpp @@ -33,6 +33,11 @@ ActionDrawPolyline::~ActionDrawPolyline() delete polyline; } +/*virtual*/ RS2::ActionType ActionDrawPolyline::rtti() +{ + return RS2::ActionDrawPolyline; +} + void ActionDrawPolyline::trigger() { if (polyline) @@ -129,6 +134,20 @@ void ActionDrawPolyline::updateToolBar() DIALOGFACTORY->requestToolBar(RS2::ToolBarPolylines); } +void ActionDrawPolyline::showOptions() +{ + DEBUG->print("ActionDrawPolyline::showOptions"); + ActionInterface::showOptions(); + DIALOGFACTORY->requestOptions(this, true); + DEBUG->print("ActionDrawPolyline::showOptions: OK"); +} + +void ActionDrawPolyline::hideOptions() +{ + ActionInterface::hideOptions(); + DIALOGFACTORY->requestOptions(this, false); +} + void ActionDrawPolyline::close() { #if 0 diff --git a/src/actions/actiondrawpolyline.h b/src/actions/actiondrawpolyline.h index 6902f40..171e5ea 100644 --- a/src/actions/actiondrawpolyline.h +++ b/src/actions/actiondrawpolyline.h @@ -25,6 +25,7 @@ class ActionDrawPolyline: public ActionInterface ActionDrawPolyline(EntityContainer & container, GraphicView & graphicView); ~ActionDrawPolyline(); + virtual RS2::ActionType rtti(); virtual void trigger(); virtual void mouseMoveEvent(QMouseEvent * e); virtual void mousePressEvent(QMouseEvent * e); @@ -32,6 +33,8 @@ class ActionDrawPolyline: public ActionInterface virtual void updateMouseButtonHints(); virtual void updateMouseCursor(); virtual void updateToolBar(); + virtual void showOptions(); + virtual void hideOptions(); void close(); void undo(); diff --git a/src/forms/polylineoptions.cpp b/src/forms/polylineoptions.cpp index 5c185ae..bdc194e 100644 --- a/src/forms/polylineoptions.cpp +++ b/src/forms/polylineoptions.cpp @@ -49,7 +49,7 @@ PolylineOptions::~PolylineOptions() { } -void PolylineOptions::setAction(ActionInterface * a, bool & /*unknown*/) +void PolylineOptions::setAction(ActionInterface * a, bool /*update*/) { if (a && a->rtti() == RS2::ActionDrawPolyline) { diff --git a/src/forms/polylineoptions.h b/src/forms/polylineoptions.h index ba224cf..fa4ecfd 100644 --- a/src/forms/polylineoptions.h +++ b/src/forms/polylineoptions.h @@ -15,7 +15,7 @@ class PolylineOptions: public QWidget ~PolylineOptions(); public slots: - void setAction(ActionInterface * a, bool &); + void setAction(ActionInterface * a, bool); void close(); void undo(); -- 2.37.2