X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flive_effects%2Fparameter%2Fpath.h;h=d72b4b7fea30321bc4f6b3db05a2c4a8a838a3ff;hb=d43709890eb582d2be4fb89d5735665e6b917fcd;hp=f02974bc7b9793de318ec7c910cef4e8a12ad4c1;hpb=539b02bd98b6985f91ccbf7041f88fdf93061531;p=inkscape.git

diff --git a/src/live_effects/parameter/path.h b/src/live_effects/parameter/path.h
index f02974bc7..d72b4b7fe 100644
--- a/src/live_effects/parameter/path.h
+++ b/src/live_effects/parameter/path.h
@@ -12,18 +12,17 @@
 #include <glib/gtypes.h>
 #include <2geom/path.h>
 
-#include "ui/widget/registry.h"
 #include <gtkmm/tooltips.h>
 
 #include "live_effects/parameter/parameter.h"
-
+#include "live_effects/parameter/path-reference.h"
 #include <sigc++/sigc++.h>
 
 namespace Inkscape {
 
 namespace LivePathEffect {
 
-class PathParam : public Geom::Piecewise<Geom::D2<Geom::SBasis> >, public Parameter {
+class PathParam : public Parameter {
 public:
     PathParam ( const Glib::ustring& label,
                 const Glib::ustring& tip,
@@ -33,32 +32,56 @@ public:
                 const gchar * default_value = "M0,0 L1,1");
     virtual ~PathParam();
 
+    std::vector<Geom::Path> const & get_pathvector();
+    Geom::Piecewise<Geom::D2<Geom::SBasis> > const & get_pwd2();
+
     virtual Gtk::Widget * param_newWidget(Gtk::Tooltips * tooltips);
 
     bool param_readSVGValue(const gchar * strvalue);
     gchar * param_writeSVGValue() const;
 
     void param_set_default();
+    void param_set_and_write_default();
+    void param_set_and_write_new_value (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & newpath);
+    void param_set_and_write_new_value (std::vector<Geom::Path> const & newpath);
 
-    void param_set_and_write_new_value (Geom::Piecewise<Geom::D2<Geom::SBasis> > newpath);
-
-    void param_editOncanvas(SPItem * item, SPDesktop * dt);
-    void param_setup_nodepath(Inkscape::NodePath::Path *np);
+    virtual void param_editOncanvas(SPItem * item, SPDesktop * dt);
+    virtual void param_setup_nodepath(Inkscape::NodePath::Path *np);
 
     virtual void param_transform_multiply(Geom::Matrix const& /*postmul*/, bool /*set*/);
 
     sigc::signal <void> signal_path_pasted;
     sigc::signal <void> signal_path_changed;
 
-private:
-    PathParam(const PathParam&);
-    PathParam& operator=(const PathParam&);
+protected:
+    std::vector<Geom::Path> _pathvector;   // this is primary data storage, since it is closest to SVG.
+
+    Geom::Piecewise<Geom::D2<Geom::SBasis> > _pwd2; // secondary, hence the bool must_recalculate_pwd2
+    bool must_recalculate_pwd2; // set when _pathvector was updated, but _pwd2 not
+    void ensure_pwd2();  // ensures _pwd2 is up to date
+
+    gchar * href;     // contains link to other object, e.g. "#path2428", NULL if PathParam contains pathdata itself
+    PathReference ref;
+    sigc::connection ref_changed_connection;
+    sigc::connection linked_delete_connection;
+    sigc::connection linked_modified_connection;
+    void ref_changed(SPObject *old_ref, SPObject *new_ref);
+    void remove_link();
+    void start_listening(SPObject * to);
+    void quit_listening(void);
+    void linked_delete(SPObject *deleted);
+    void linked_modified(SPObject *linked_obj, guint flags);
 
     void on_edit_button_click();
     void on_paste_button_click();
     void on_copy_button_click();
+    void on_link_button_click();
 
     gchar * defvalue;
+
+private:
+    PathParam(const PathParam&);
+    PathParam& operator=(const PathParam&);
 };