remove many unnecessary to_2geom and from_2geom calls

[inkscape.git] / src / live_effects / parameter / point.cpp

diff --git a/src/live_effects/parameter/point.cpp b/src/live_effects/parameter/point.cpp
index 84de8db0561d72d65fc2e3a0224bdc0edb30d16f..107f5b24947e1c83df7cb0c23c321a10b68a5058 100644 (file)
--- a/src/live_effects/parameter/point.cpp
+++ b/src/live_effects/parameter/point.cpp
@@ -35,11 +35,9 @@ PointParam::PointParam( const Glib::ustring& label, const Glib::ustring& tip,
                         Effect* effect, const gchar *htip, Geom::Point default_value)
     : Geom::Point(default_value), Parameter(label, tip, key, wr, effect), defvalue(default_value)
 {
-    oncanvas_editable = true;
-
-    knot_shape = SP_KNOT_SHAPE_SQUARE;
+    knot_shape = SP_KNOT_SHAPE_DIAMOND;
     knot_mode  = SP_KNOT_MODE_XOR;
-    knot_color = 0x00ff0000;
+    knot_color = 0xffffff00;
     handle_tip = g_strdup(htip);
 }
 
@@ -80,7 +78,7 @@ PointParam::param_getSVGValue() const
 }
 
 Gtk::Widget *
-PointParam::param_newWidget(Gtk::Tooltips * tooltips)
+PointParam::param_newWidget(Gtk::Tooltips * /*tooltips*/)
 {
     Inkscape::UI::Widget::RegisteredTransformedPoint * pointwdg = Gtk::manage(
         new Inkscape::UI::Widget::RegisteredTransformedPoint( param_label,
@@ -91,26 +89,16 @@ PointParam::param_newWidget(Gtk::Tooltips * tooltips)
                                                               param_effect->getSPDoc() ) );
     // TODO: fix to get correct desktop (don't use SP_ACTIVE_DESKTOP)
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    Geom::Matrix transf = to_2geom(desktop->doc2dt());
+    Geom::Matrix transf = desktop->doc2dt();
     pointwdg->setTransform(transf);
     pointwdg->setValue( *this );
     pointwdg->clearProgrammatically();
     pointwdg->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change point parameter"));
 
-    Gtk::Widget*  pIcon = Gtk::manage( sp_icon_get_icon( "draw_node", Inkscape::ICON_SIZE_BUTTON) );
-    Gtk::Button * pButton = Gtk::manage(new Gtk::Button());
-    pButton->set_relief(Gtk::RELIEF_NONE);
-    pIcon->show();
-    pButton->add(*pIcon);
-    pButton->show();
-
     Gtk::HBox * hbox = Gtk::manage( new Gtk::HBox() );
-    static_cast<Gtk::HBox*>(hbox)->pack_start(*pButton, true, true);
     static_cast<Gtk::HBox*>(hbox)->pack_start(*pointwdg, true, true);
     static_cast<Gtk::HBox*>(hbox)->show_all_children();
 
-    tooltips->set_tip(*pButton, _("Edit on-canvas"));
-
     return dynamic_cast<Gtk::Widget *> (hbox);
 }
 
@@ -130,25 +118,6 @@ PointParam::param_set_and_write_new_value (Geom::Point newpoint)
     g_free(str);
 }
 
-void
-PointParam::param_editOncanvas(SPItem * item, SPDesktop * dt)
-{
-    // If not already in nodecontext, goto it!
-    if (!tools_isactive(dt, TOOLS_NODES)) {
-        tools_switch_current(TOOLS_NODES);
-    }
-
-    PointParamKnotHolder * kh =  new PointParamKnotHolder(dt, SP_OBJECT(param_effect->getLPEObj()), param_key.c_str(), item);
-    if (kh) {
-        kh->add_knot(* dynamic_cast<Geom::Point *>( this ), NULL, knot_shape, knot_mode, knot_color, param_getTooltip()->c_str() );
-
-        ShapeEditor * shape_editor = SP_NODE_CONTEXT( dt->event_context )->shape_editor;
-        shape_editor->set_knotholder(kh);
-    }
-}
-
-
-
 void
 PointParam::param_transform_multiply(Geom::Matrix const& postmul, bool /*set*/)
 {
@@ -164,23 +133,47 @@ PointParam::set_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode, guint
     knot_color = color;
 }
 
+class PointParamKnotHolderEntity : public LPEKnotHolderEntity {
+public:
+    PointParamKnotHolderEntity(PointParam *p) { this->pparam = p; }
+    virtual ~PointParamKnotHolderEntity() {}
+
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
+    virtual Geom::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(Geom::Point const &p, Geom::Point const &/*origin*/, guint /*state*/)
 {
-    param_setValue(p.to_2geom());
+    Geom::Point const s = snap_knot_position(p);
+    pparam->param_setValue(s);
     sp_lpe_item_update_patheffect(SP_LPE_ITEM(item), false, false);
 }
 
-NR::Point
-PointParam::knot_get()
+Geom::Point
+PointParamKnotHolderEntity::knot_get()
 {
-    return *this;
+    return *pparam;
 }
 
 void
-PointParam::knot_click(guint state)
+PointParamKnotHolderEntity::knot_click(guint /*state*/)
 {
-    g_print ("This is the handle associated to the parameter '%s'\n", param_key.c_str());
+    g_print ("This is the handle associated to parameter '%s'\n", pparam->param_key.c_str());
+}
+
+void
+PointParam::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item)
+{
+    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(), knot_shape, knot_mode, knot_color);
+    knotholder->add(e);
+
 }
 
 } /* namespace LivePathEffect */