Merge lp:~inkscape.dev/inkscape/improvements_lpe_widget_redraw into lp:~inkscape.dev/inkscape/trunk

[Jabiertxof]

Fix redraw of LPE widgets on each LPEitem update. -to not redraw always-

[lp:~inkscape.dev/inkscape/improvements_lpe_widget_redraw]

15022. By Jabiertxof on 2016-07-24

update to trunk

15023. By Jabiertxof on 2016-07-24

Improvements and add toogle biton to play update

15024. By Jabiertxof on 2016-07-29

Fixes to autoredraw point and scalar on changes whitout redrawing all widgets

[Martin Owens (doctormo)]

This looks good.

review: Approve

=== modified file 'src/knotholder.cpp'
--- src/knotholder.cpp	2016-07-28 11:26:17 +0000
+++ src/knotholder.cpp	2016-07-29 10:29:18 +0000
@@ -17,6 +17,7 @@
 
 #include "document.h"
 #include "document-undo.h"
+#include "selection.h"
 #include "sp-shape.h"
 #include "knot.h"
 #include "knotholder.h"
@@ -202,7 +203,7 @@
 }
 
 void
-KnotHolder::knot_ungrabbed_handler(SPKnot */*knot*/, guint)
+KnotHolder::knot_ungrabbed_handler(SPKnot */*knot*/, guint /*state*/)
 {
 	this->dragging = false;
 

=== modified file 'src/knotholder.h'
--- src/knotholder.h	2014-10-08 02:22:03 +0000
+++ src/knotholder.h	2016-07-29 10:29:18 +0000
@@ -51,7 +51,7 @@
 
     void knot_moved_handler(SPKnot *knot, Geom::Point const &p, unsigned int state);
     void knot_clicked_handler(SPKnot *knot, unsigned int state);
-    void knot_ungrabbed_handler(SPKnot *knot, unsigned int);
+    void knot_ungrabbed_handler(SPKnot *knot, unsigned int state);
 
     void add(KnotHolderEntity *e);
 

=== modified file 'src/live_effects/effect.cpp'
--- src/live_effects/effect.cpp	2016-07-28 11:26:17 +0000
+++ src/live_effects/effect.cpp	2016-07-29 10:29:18 +0000
@@ -364,6 +364,7 @@
       concatenate_before_pwd2(false),
       sp_lpe_item(NULL),
       current_zoom(1),
+      upd_params(true),
       sp_curve(NULL),
       provides_own_flash_paths(true), // is automatically set to false if providesOwnFlashPaths() is not overridden
       is_ready(false) // is automatically set to false if providesOwnFlashPaths() is not overridden
@@ -691,7 +692,7 @@
 
         ++it;
     }
-
+    upd_params = false;
     return dynamic_cast<Gtk::Widget *>(vbox);
 }
 

=== modified file 'src/live_effects/effect.h'
--- src/live_effects/effect.h	2016-03-14 16:47:47 +0000
+++ src/live_effects/effect.h	2016-07-29 10:29:18 +0000
@@ -122,6 +122,7 @@
 
     void editNextParamOncanvas(SPItem * item, SPDesktop * desktop);
     bool apply_to_clippath_and_mask;
+    bool upd_params;
 
 protected:
     Effect(LivePathEffectObject *lpeobject);

=== modified file 'src/live_effects/lpe-ellipse_5pts.cpp'
--- src/live_effects/lpe-ellipse_5pts.cpp	2016-07-28 11:26:17 +0000
+++ src/live_effects/lpe-ellipse_5pts.cpp	2016-07-29 10:29:18 +0000
@@ -171,7 +171,7 @@
 
     // figure out if we have a slice, guarding against rounding errors
 
-    Path p(Geom::Point(cos(0), sin(0)));
+    Geom::Path p(Geom::Point(cos(0), sin(0)));
 
     double end = 2 * M_PI;
     for (s = 0; s < end; s += M_PI_2) {

=== modified file 'src/live_effects/lpe-extrude.cpp'
--- src/live_effects/lpe-extrude.cpp	2016-07-28 11:26:17 +0000
+++ src/live_effects/lpe-extrude.cpp	2016-07-29 10:29:18 +0000
@@ -66,7 +66,7 @@
     using namespace Geom;
 
     // generate connecting lines (the 'sides' of the extrusion)
-    Path path(Point(0.,0.));
+    Geom::Path path(Point(0.,0.));
     path.appendNew<Geom::LineSegment>( extrude_vector.getVector() );
     Piecewise<D2<SBasis> > connector = path.toPwSb();
 

=== modified file 'src/live_effects/lpe-knot.cpp'
--- src/live_effects/lpe-knot.cpp	2016-07-28 11:26:17 +0000
+++ src/live_effects/lpe-knot.cpp	2016-07-29 10:29:18 +0000
@@ -101,7 +101,7 @@
 
     Affine mat = from_basis( T, N, pt_and_dir[0] );
     mat = mat.inverse();
-    Path p = patha * mat;
+    Geom::Path p = patha * mat;
     
     std::vector<double> times;
     
@@ -484,7 +484,7 @@
 //                std::cout<<"fusing first and last component\n";
                 ++beg_comp;
                 --end_comp;
-                Path first = gpaths[i0].portion(dom.back());
+                Geom::Path first = gpaths[i0].portion(dom.back());
                 //FIXME: stitching should not be necessary (?!?)
                 first.setStitching(true);
                 first.append(gpaths[i0].portion(dom.front()));

=== modified file 'src/live_effects/lpe-transform_2pts.cpp'
--- src/live_effects/lpe-transform_2pts.cpp	2016-07-28 11:26:17 +0000
+++ src/live_effects/lpe-transform_2pts.cpp	2016-07-29 10:29:18 +0000
@@ -90,7 +90,6 @@
 {
     using namespace Geom;
     original_bbox(lpeitem);
-
     point_a = Point(boundingbox_X.min(), boundingbox_Y.middle());
     point_b = Point(boundingbox_X.max(), boundingbox_Y.middle());
     SPLPEItem * splpeitem = const_cast<SPLPEItem *>(lpeitem);

=== modified file 'src/live_effects/parameter/parameter.cpp'
--- src/live_effects/parameter/parameter.cpp	2015-10-18 19:13:13 +0000
+++ src/live_effects/parameter/parameter.cpp	2016-07-29 10:29:18 +0000
@@ -4,8 +4,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "ui/widget/registered-widget.h"
-#include <glibmm/i18n.h>
 
 #include "live_effects/parameter/parameter.h"
 #include "live_effects/effect.h"
@@ -16,6 +14,8 @@
 
 #include "verbs.h"
 
+#include <glibmm/i18n.h>
+
 #define noLPEREALPARAM_DEBUG
 
 namespace Inkscape {
@@ -66,7 +66,8 @@
       inc_page(1),
       add_slider(false),
       overwrite_widget(false),
-      hide_widget(no_widget)
+      hide_widget(no_widget),
+      _rsu(NULL)
 {
 }
 
@@ -101,6 +102,12 @@
     param_set_value(defvalue);
 }
 
+void 
+ScalarParam::param_update_default(gdouble default_value)
+{
+    defvalue = default_value;
+}
+
 void
 ScalarParam::param_set_value(gdouble val)
 {
@@ -111,6 +118,9 @@
         value = max;
     if (value < min)
         value = min;
+    if (_rsu) {
+        _rsu->setValue(val);
+    }
 }
 
 void
@@ -132,7 +142,9 @@
     } else {
 	this->max = SCALARPARAM_G_MAXDOUBLE;
     }
-
+    if (_rsu) {
+        _rsu->setRange(this->min, this->max);
+    }
     param_set_value(value); // reset value to see whether it is in ranges
 }
 
@@ -155,21 +167,22 @@
 ScalarParam::param_newWidget()
 {
     if(!hide_widget){
-        Inkscape::UI::Widget::RegisteredScalar *rsu = Gtk::manage( new Inkscape::UI::Widget::RegisteredScalar(
+        _rsu = Gtk::manage( new Inkscape::UI::Widget::RegisteredScalar(
             param_label, param_tooltip, param_key, *param_wr, param_effect->getRepr(), param_effect->getSPDoc() ) );
 
-        rsu->setValue(value);
-        rsu->setDigits(digits);
-        rsu->setIncrements(inc_step, inc_page);
-        rsu->setRange(min, max);
-        rsu->setProgrammatically = false;
+        _rsu->setValue(value);
+        _rsu->setDigits(digits);
+        _rsu->setIncrements(inc_step, inc_page);
+        _rsu->setRange(min, max);
+        _rsu->setProgrammatically = false;
         if (add_slider) {
-            rsu->addSlider();
+            _rsu->addSlider();
         }
         if(!overwrite_widget){
-            rsu->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change scalar parameter"));
+            _rsu->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change scalar parameter"));
         }
-        return dynamic_cast<Gtk::Widget *> (rsu);
+        param_effect->upd_params = false;
+        return dynamic_cast<Gtk::Widget *> (_rsu);
     } else {
         return NULL;
     }
@@ -179,6 +192,9 @@
 ScalarParam::param_set_digits(unsigned digits)
 {
     this->digits = digits;
+    if (_rsu) {
+        _rsu->setDigits(this->digits);
+    }
 }
 
 void
@@ -186,6 +202,9 @@
 {
     inc_step = step;
     inc_page = page;
+    if (_rsu) {
+       _rsu->setIncrements(inc_step, inc_page);
+    }
 }
 
 

=== modified file 'src/live_effects/parameter/parameter.h'
--- src/live_effects/parameter/parameter.h	2015-10-18 19:13:13 +0000
+++ src/live_effects/parameter/parameter.h	2016-07-29 10:29:18 +0000
@@ -12,6 +12,7 @@
 #include <glibmm/ustring.h>
 #include <2geom/forward.h>
 #include <2geom/pathvector.h>
+#include "ui/widget/registered-widget.h"
 
 // In gtk2, this wasn't an issue; we could toss around
 // G_MAXDOUBLE and not worry about size allocations. But
@@ -110,6 +111,7 @@
     virtual gchar * param_getSVGValue() const;
 
     virtual void param_set_default();
+    void param_update_default(gdouble default_value);
     void param_set_value(gdouble val);
     void param_make_integer(bool yes = true);
     void param_set_range(gdouble min, gdouble max);
@@ -139,6 +141,7 @@
 private:
     ScalarParam(const ScalarParam&);
     ScalarParam& operator=(const ScalarParam&);
+    Inkscape::UI::Widget::RegisteredScalar *_rsu;
 };
 
 } //namespace LivePathEffect

=== modified file 'src/live_effects/parameter/point.cpp'
--- src/live_effects/parameter/point.cpp	2016-01-17 19:18:53 +0000
+++ src/live_effects/parameter/point.cpp	2016-07-29 10:29:18 +0000
@@ -4,7 +4,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "ui/widget/registered-widget.h"
 #include "live_effects/parameter/point.h"
 #include "live_effects/effect.h"
 #include "svg/svg.h"
@@ -30,7 +29,8 @@
     :   Parameter(label, tip, key, wr, effect), 
         defvalue(default_value),
         liveupdate(live_update),
-        knoth(NULL)
+        knoth(NULL),
+        _pointwdg(NULL)
 {
     knot_shape = SP_KNOT_SHAPE_DIAMOND;
     knot_mode  = SP_KNOT_MODE_XOR;
@@ -62,9 +62,9 @@
 }
 
 void
-PointParam::param_update_default(Geom::Point newpoint)
+PointParam::param_update_default(const Geom::Point default_point)
 {
-    defvalue = newpoint;
+    defvalue = default_point;
 }
 
 void
@@ -81,6 +81,9 @@
     if(knoth && liveupdate){
         knoth->update_knots();
     }
+    if (_pointwdg) {
+        _pointwdg->setValue( newpoint );
+    }
 }
 
 bool
@@ -116,7 +119,7 @@
 Gtk::Widget *
 PointParam::param_newWidget()
 {
-    Inkscape::UI::Widget::RegisteredTransformedPoint * pointwdg = Gtk::manage(
+    _pointwdg = Gtk::manage(
         new Inkscape::UI::Widget::RegisteredTransformedPoint( param_label,
                                                               param_tooltip,
                                                               param_key,
@@ -126,15 +129,15 @@
     // TODO: fix to get correct desktop (don't use SP_ACTIVE_DESKTOP)
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     Geom::Affine transf = desktop->doc2dt();
-    pointwdg->setTransform(transf);
-    pointwdg->setValue( *this );
-    pointwdg->clearProgrammatically();
-    pointwdg->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change point parameter"));
+    _pointwdg->setTransform(transf);
+    _pointwdg->setValue( *this );
+    _pointwdg->clearProgrammatically();
+    _pointwdg->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change point parameter"));
 
     Gtk::HBox * hbox = Gtk::manage( new Gtk::HBox() );
-    static_cast<Gtk::HBox*>(hbox)->pack_start(*pointwdg, true, true);
+    static_cast<Gtk::HBox*>(hbox)->pack_start(*_pointwdg, true, true);
     static_cast<Gtk::HBox*>(hbox)->show_all_children();
-
+    param_effect->upd_params = false;
     return dynamic_cast<Gtk::Widget *> (hbox);
 }
 
@@ -191,13 +194,13 @@
 PointParamKnotHolderEntity::knot_click(guint state)
 {
     if (state & GDK_CONTROL_MASK) {
-            if (state & GDK_MOD1_MASK) {
-                this->pparam->param_set_default();
-                SPLPEItem * splpeitem = dynamic_cast<SPLPEItem *>(item);
-                if(splpeitem){
-                    sp_lpe_item_update_patheffect(splpeitem, false, false);
-                }
+        if (state & GDK_MOD1_MASK) {
+            this->pparam->param_set_default();
+            SPLPEItem * splpeitem = dynamic_cast<SPLPEItem *>(item);
+            if(splpeitem){
+                sp_lpe_item_update_patheffect(splpeitem, false, false);
             }
+        }
     }
 }
 

=== modified file 'src/live_effects/parameter/point.h'
--- src/live_effects/parameter/point.h	2016-01-17 19:18:53 +0000
+++ src/live_effects/parameter/point.h	2016-07-29 10:29:18 +0000
@@ -11,7 +11,7 @@
 
 #include <glib.h>
 #include <2geom/point.h>
-
+#include "ui/widget/registered-widget.h"
 #include "live_effects/parameter/parameter.h"
 
 #include "knot-holder-entity.h"
@@ -43,7 +43,7 @@
     void param_set_default();
     Geom::Point param_get_default() const;
     void param_set_liveupdate(bool live_update);
-    void param_update_default(Geom::Point newpoint);
+    void param_update_default(const Geom::Point default_point);
     virtual void param_transform_multiply(Geom::Affine const& /*postmul*/, bool /*set*/);
 
     void set_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode, guint32 color);
@@ -62,6 +62,7 @@
     SPKnotModeType knot_mode;
     guint32 knot_color;
     gchar *handle_tip;
+    Inkscape::UI::Widget::RegisteredTransformedPoint * _pointwdg;
 };
 
 

=== modified file 'src/live_effects/parameter/togglebutton.cpp'
--- src/live_effects/parameter/togglebutton.cpp	2016-07-24 15:05:29 +0000
+++ src/live_effects/parameter/togglebutton.cpp	2016-07-29 10:29:18 +0000
@@ -12,6 +12,7 @@
 #include "live_effects/effect.h"
 #include "svg/svg.h"
 #include "svg/stringstream.h"
+#include "selection.h"
 #include "widgets/icon.h"
 #include "inkscape.h"
 #include "verbs.h"
@@ -114,7 +115,7 @@
     checkwdg->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change togglebutton parameter"));
 
     _toggled_connection = checkwdg->signal_toggled().connect(sigc::mem_fun(*this, &ToggleButtonParam::toggled));
-
+    param_effect->upd_params = false;
     return checkwdg;
 }
 
@@ -161,6 +162,12 @@
 
 void
 ToggleButtonParam::toggled() {
+    //Force redraw for update widgets
+    param_effect->upd_params = true;
+    if (SP_ACTIVE_DESKTOP) {
+        Inkscape::Selection *selection = SP_ACTIVE_DESKTOP->getSelection();
+        selection ->emitModified();
+    }
     _signal_toggled.emit();
 }
 

=== modified file 'src/selection.cpp'
--- src/selection.cpp	2016-07-28 11:26:17 +0000
+++ src/selection.cpp	2016-07-29 10:29:18 +0000
@@ -282,6 +282,11 @@
     _emitChanged();
 }
 
+void Selection::emitModified()
+{
+    _emitChanged();
+}
+
 std::vector<SPObject*> const &Selection::list() {
     if(!_objs_vector.empty())
     return _objs_vector;

=== modified file 'src/selection.h'
--- src/selection.h	2016-07-28 11:26:17 +0000
+++ src/selection.h	2016-07-29 10:29:18 +0000
@@ -192,6 +192,11 @@
     void clear();
 
     /**
+     * Emmit modified signal
+     */
+    void emitModified();
+
+    /**
      * Returns true if no items are selected.
      */
     bool isEmpty() const { return _objs.empty(); }

=== modified file 'src/ui/dialog/livepatheffect-editor.cpp'
--- src/ui/dialog/livepatheffect-editor.cpp	2016-07-28 11:26:17 +0000
+++ src/ui/dialog/livepatheffect-editor.cpp	2016-07-29 10:29:18 +0000
@@ -61,7 +61,7 @@
 {
     LivePathEffectEditor *lpeeditor = static_cast<LivePathEffectEditor *>(data);
     lpeeditor->lpe_list_locked = false;
-    lpeeditor->onSelectionChanged(selection);
+    lpeeditor->onSelectionChanged(selection, true);
 }
 
 static void lpeeditor_selection_modified (Inkscape::Selection * selection, guint /*flags*/, gpointer data)
@@ -98,7 +98,8 @@
       button_up(),
       button_down(),
       current_desktop(NULL),
-      current_lpeitem(NULL)
+      current_lpeitem(NULL),
+      current_lperef(NULL)
 {
     Gtk::Box *contents = _getContents();
     contents->set_spacing(4);
@@ -206,6 +207,10 @@
 void
 LivePathEffectEditor::showParams(LivePathEffect::Effect& effect)
 {
+    if ( ! effect.upd_params ) {
+        return;
+    }
+
     if (effectwidget) {
         effectcontrol_vbox.remove(*effectwidget);
         delete effectwidget;
@@ -265,9 +270,8 @@
     button_down.set_sensitive(sensitive);
 }
 
-
 void
-LivePathEffectEditor::onSelectionChanged(Inkscape::Selection *sel)
+LivePathEffectEditor::onSelectionChanged(Inkscape::Selection *sel, bool upd_params)
 {
     if (lpe_list_locked) {
         // this was triggered by selecting a row in the list, so skip reloading
@@ -291,6 +295,9 @@
                 if ( lpeitem->hasPathEffect() ) {
                     Inkscape::LivePathEffect::Effect *lpe = lpeitem->getCurrentLPE();
                     if (lpe) {
+                        if (upd_params) {
+                            lpe->upd_params = true;
+                        }
                         showParams(*lpe);
                         lpe_list_locked = true;
                         selectInList(lpe);
@@ -494,6 +501,12 @@
         SPItem *item = sel->singleItem();
         SPLPEItem *lpeitem  = dynamic_cast<SPLPEItem *>(item);
         if ( lpeitem ) {
+            if (current_lperef && current_lperef->lpeobject) {
+                LivePathEffect::Effect * effect = current_lperef->lpeobject->get_lpe();
+                if (effect) {
+                    effect->upd_params = true;
+                }
+            }
             lpeitem->removeCurrentPathEffect(false);
 
             DocumentUndo::done( current_desktop->getDocument(), SP_VERB_DIALOG_LIVE_PATH_EFFECT,
@@ -548,11 +561,17 @@
     Gtk::TreeModel::iterator it = sel->get_selected();
     LivePathEffect::LPEObjectReference * lperef = (*it)[columns.lperef];
 
-    if (lperef && current_lpeitem) {
+    if (lperef && current_lpeitem && current_lperef != lperef) {
+    //The last condition ignore Gtk::TreeModel may occasionally be changed emitted when nothing has happened
         if (lperef->lpeobject->get_lpe()) {
             lpe_list_locked = true; // prevent reload of the list which would lose selection
             current_lpeitem->setCurrentPathEffect(lperef);
-            showParams(*lperef->lpeobject->get_lpe());
+            current_lperef = lperef;
+            LivePathEffect::Effect * effect = lperef->lpeobject->get_lpe();
+            if (effect) {
+                effect->upd_params = true;
+                showParams(*effect);
+            }
         }
     }
 }

=== modified file 'src/ui/dialog/livepatheffect-editor.h'
--- src/ui/dialog/livepatheffect-editor.h	2014-03-27 01:33:44 +0000
+++ src/ui/dialog/livepatheffect-editor.h	2016-07-29 10:29:18 +0000
@@ -45,7 +45,8 @@
 
     static LivePathEffectEditor &getInstance() { return *new LivePathEffectEditor(); }
 
-    void onSelectionChanged(Inkscape::Selection *sel);
+    void onSelectionChanged(Inkscape::Selection *sel, bool upd_params = false);
+    void onSelectionModified(Inkscape::Selection *sel);
     virtual void on_effect_selection_changed();
     void setDesktop(SPDesktop *desktop);
 
@@ -126,6 +127,8 @@
     
     SPLPEItem * current_lpeitem;
 
+    LivePathEffect::LPEObjectReference * current_lperef;
+
     friend void lpeeditor_selection_changed (Inkscape::Selection * selection, gpointer data);
 
     LivePathEffectEditor(LivePathEffectEditor const &d);