LPE knotholder refactoring: PointParams are not knotholder entities any more; instead...

diff --git a/src/knot-holder-entity.h b/src/knot-holder-entity.h
index a29b71f4d8a722a0a73c06593627f21e24690aa6..9cdc908de15f1623b9531b5bb11a2cd436a59ebb 100644 (file)
--- a/src/knot-holder-entity.h
+++ b/src/knot-holder-entity.h
@@ -43,6 +43,7 @@ public:
 
     /* derived classes like PointParam for LPEs use this, e.g., to indicate that we must not call
        delete on their pointer when a knotholder is destroyed */
+    // TODO: purge this now that PointParams are not KnotHolderEntities any more!
     virtual bool isLPEParam() { return false; }
 
     /* the get/set/click handlers are virtual functions; each handler class for a knot

diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 289d22172b22544c180cd0390e99da1d585c539f..c4bbc31e10d57198c30bfed72b856171908a3257 100644 (file)
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -422,6 +422,9 @@ Effect::registerKnotHolderHandle(KnotHolderEntity* entity, const char* descr)
  */
 void
 Effect::addHandles(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) {
+    using namespace Inkscape::LivePathEffect;
+
+    // add handles provided by the effect itself
     std::vector<std::pair<KnotHolderEntity*, const char*> >::iterator i;
     for (i = kh_entity_vector.begin(); i != kh_entity_vector.end(); ++i) {
         KnotHolderEntity *entity = i->first;
@@ -430,18 +433,10 @@ Effect::addHandles(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) {
         entity->create(desktop, item, knotholder, descr);
         knotholder->add(entity);
     }
-}
 
-void
-Effect::addPointParamHandles(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) {
-    using namespace Inkscape::LivePathEffect;
+    // add handles provided by the effect's parameters (if any)
     for (std::vector<Parameter *>::iterator p = param_vector.begin(); p != param_vector.end(); ++p) {
-        if ( Inkscape::LivePathEffect::PointParam *pparam = dynamic_cast<Inkscape::LivePathEffect::PointParam*>(*p) ) {
-            KnotHolderEntity *e = dynamic_cast<KnotHolderEntity *>(*p);
-            e->create(desktop, item, knotholder, pparam->handleTip(),
-                      pparam->knotShape(), pparam->knotMode(), pparam->knotColor());
-            knotholder->add(e);
-        }
+        (*p)->addKnotHolderEntities(knotholder, desktop, item);
     }
 }
 
@@ -612,6 +607,7 @@ Effect::transform_multiply(Geom::Matrix const& postmul, bool set)
     }
 }
 
+// TODO: take _all_ parameters into account, not only PointParams
 bool
 Effect::providesKnotholder()
 {

diff --git a/src/live_effects/parameter/parameter.h b/src/live_effects/parameter/parameter.h
index 3b3b1467395429eecc851ca4fd874d1942953e98..02d520fe4c9d0c968ee1fc40b720cc1500986145 100644 (file)
--- a/src/live_effects/parameter/parameter.h
+++ b/src/live_effects/parameter/parameter.h
@@ -12,6 +12,7 @@
 #include <glibmm/ustring.h>
 #include <2geom/forward.h>
 
+class KnotHolder;
 struct SPDesktop;
 struct SPItem;
 
@@ -56,6 +57,8 @@ public:
 
     virtual Glib::ustring * param_getTooltip() { return &param_tooltip; };
 
+    virtual void addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) {}
+
     virtual void param_editOncanvas(SPItem * /*item*/, SPDesktop * /*dt*/) {};
     virtual void param_setup_nodepath(Inkscape::NodePath::Path */*np*/) {};
 

diff --git a/src/live_effects/parameter/point.cpp b/src/live_effects/parameter/point.cpp
index 69e2520c2a5f1e21625ffcaaddfc82551d375052..7889bf1642e60ac3b7f7b5ed6644e14a786094db 100644 (file)
--- a/src/live_effects/parameter/point.cpp
+++ b/src/live_effects/parameter/point.cpp
@@ -152,23 +152,46 @@ PointParam::set_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode, guint
     knot_color = color;
 }
 
+class PointParamKnotHolderEntity : public KnotHolderEntity {
+public:
+    PointParamKnotHolderEntity(PointParam *p) { this->pparam = p; }
+    virtual ~PointParamKnotHolderEntity() {}
+
+    virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state);
+    virtual NR::Point knot_get();
+    virtual void knot_click(guint state);
+
+private:
+    PointParam *pparam;
+};
+
 void
-PointParam::knot_set(NR::Point const &p, NR::Point const &/*origin*/, guint /*state*/)
+PointParamKnotHolderEntity::knot_set(NR::Point const &p, NR::Point const &/*origin*/, guint /*state*/)
 {
-    param_setValue(p.to_2geom());
+    pparam->param_setValue(p.to_2geom());
     sp_lpe_item_update_patheffect(SP_LPE_ITEM(item), false, false);
 }
 
 NR::Point
-PointParam::knot_get()
+PointParamKnotHolderEntity::knot_get()
+{
+    return *pparam;
+}
+
+void
+PointParamKnotHolderEntity::knot_click(guint /*state*/)
 {
-    return *this;
+    g_print ("This is the handle associated to parameter '%s'\n", pparam->param_key.c_str());
 }
 
 void
-PointParam::knot_click(guint /*state*/)
+PointParam::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item)
 {
-    g_print ("This is the handle associated to the parameter '%s'\n", param_key.c_str());
+    PointParamKnotHolderEntity *e = new PointParamKnotHolderEntity(this);
+    // TODO: can we ditch handleTip() etc. because we have access to handle_tip etc. itself???
+    e->create(desktop, item, knotholder, handleTip(), knotShape(), knotMode(), knotColor());
+    knotholder->add(e);
+
 }
 
 } /* namespace LivePathEffect */

diff --git a/src/live_effects/parameter/point.h b/src/live_effects/parameter/point.h
index 90c318b5ee19919938e09e680912fe9cb93b28c6..0334db7e0f3baac5b25f1838e36a4c2403278872 100644 (file)
--- a/src/live_effects/parameter/point.h
+++ b/src/live_effects/parameter/point.h
@@ -23,7 +23,7 @@ namespace Inkscape {
 namespace LivePathEffect {
 
 
-class PointParam : public Geom::Point, public Parameter, public KnotHolderEntity {
+class PointParam : public Geom::Point, public Parameter {
 public:
     PointParam( const Glib::ustring& label,
                 const Glib::ustring& tip,
@@ -45,6 +45,7 @@ public:
 
     void param_set_and_write_new_value(Geom::Point newpoint);
 
+    // TODO: ditch this
     virtual void param_editOncanvas(SPItem * item, SPDesktop * dt);
 
     virtual void param_transform_multiply(Geom::Matrix const& /*postmul*/, bool /*set*/);
@@ -54,11 +55,9 @@ public:
     SPKnotModeType knotMode() { return knot_mode; }
     guint32 knotColor() { return knot_color; }
 
-    /* these are overloaded from KnotHolderEntity */
-    virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state);
-    virtual NR::Point knot_get();
-    virtual void knot_click(guint state);
+    virtual void addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item);
 
+    // TODO: ditch this!
     virtual bool isLPEParam() { return true; }
 
 private:

diff --git a/src/object-edit.cpp b/src/object-edit.cpp
index 9245166ca79de6116c044ef44fd2ac7cb6afd8c7..52c5d42cce1961cbe0e9eb1897d5a4e344751f07 100644 (file)
--- a/src/object-edit.cpp
+++ b/src/object-edit.cpp
@@ -56,7 +56,6 @@ static KnotHolder *sp_lpe_knot_holder(SPItem *item, SPDesktop *desktop)
     KnotHolder *knot_holder = new KnotHolder(desktop, item, NULL);
 
     Inkscape::LivePathEffect::Effect *effect = sp_lpe_item_get_current_lpe(SP_LPE_ITEM(item));
-    effect->addPointParamHandles(knot_holder, desktop, item);
     effect->addHandles(knot_holder, desktop, item);
 
     return knot_holder;