From ea061109b19616f4bef39cbe77c4f16c7a28208d Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 8 Aug 2015 22:19:02 +0200
Subject: minor coding style changes

(bzr r14284)
---
 src/ui/tool/multi-path-manipulator.cpp |  9 +++---
 src/ui/tool/node.cpp                   | 52 +++++++++++++++++-----------------
 2 files changed, 31 insertions(+), 30 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp
index 46c6246a1..9ec6f733f 100644
--- a/src/ui/tool/multi-path-manipulator.cpp
+++ b/src/ui/tool/multi-path-manipulator.cpp
@@ -683,13 +683,14 @@ bool MultiPathManipulator::event(Inkscape::UI::Tools::ToolBase *event_context, G
                 //if the trace is bspline ( mode 2)
                 if(mode==2){
                     //  is this correct ?
-                    if(del_preserves_shape ^ held_control(event->key))
+                    if(del_preserves_shape ^ held_control(event->key)){
                         deleteNodes(false);
-                    else
+                    } else {
                         deleteNodes(true);
-                }
-                else
+                    }
+                } else {
                     deleteNodes(del_preserves_shape ^ held_control(event->key));
+                }
 
                 // Delete any selected gradient nodes as well
                 event_context->deleteSelectedDrag(held_control(event->key));
diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index ca6f5abb1..eaec4477a 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -176,8 +176,8 @@ void Handle::move(Geom::Point const &new_pos)
 
         //move the handler and its oposite the same proportion
         if(_pm()._isBSpline()){
-            setPosition(_pm()._bsplineHandleReposition(this,this));
-            this->other()->setPosition(_pm()._bsplineHandleReposition(this->other(),this));
+            setPosition(_pm()._bsplineHandleReposition(this, this));
+            this->other()->setPosition(_pm()._bsplineHandleReposition(this->other(), this));
         }
         return;
     }
@@ -193,8 +193,8 @@ void Handle::move(Geom::Point const &new_pos)
 
         //move the handler and its oposite the same proportion
         if(_pm()._isBSpline()){ 
-            setPosition(_pm()._bsplineHandleReposition(this,this));
-            this->other()->setPosition(_pm()._bsplineHandleReposition(this->other(),this));
+            setPosition(_pm()._bsplineHandleReposition(this, this));
+            this->other()->setPosition(_pm()._bsplineHandleReposition(this->other(), this));
         }
         
         return;
@@ -219,8 +219,8 @@ void Handle::move(Geom::Point const &new_pos)
 
     // moves the handler and its oposite the same proportion
     if(_pm()._isBSpline()){
-        setPosition(_pm()._bsplineHandleReposition(this,this));
-        this->other()->setPosition(_pm()._bsplineHandleReposition(this->other(),this));
+        setPosition(_pm()._bsplineHandleReposition(this, this));
+        this->other()->setPosition(_pm()._bsplineHandleReposition(this->other(), this));
     }
 }
 
@@ -313,8 +313,8 @@ bool Handle::_eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEven
 //this function moves the handler and its oposite to the default proportion of defaultStartPower
 void Handle::handle_2button_press(){
     if(_pm()._isBSpline()){
-        setPosition(_pm()._bsplineHandleReposition(this,defaultStartPower));
-        this->other()->setPosition(_pm()._bsplineHandleReposition(this->other(),defaultStartPower));
+        setPosition(_pm()._bsplineHandleReposition(this, defaultStartPower));
+        this->other()->setPosition(_pm()._bsplineHandleReposition(this->other(), defaultStartPower));
         _pm().update();
     }
 }
@@ -375,7 +375,7 @@ void Handle::dragged(Geom::Point &new_pos, GdkEventMotion *event)
         if(_pm()._isBSpline()){
             setPosition(new_pos);
             int steps = _pm()._bsplineGetSteps();
-            new_pos=_pm()._bsplineHandleReposition(this,ceilf(_pm()._bsplineHandlePosition(this,this)*steps)/steps);
+            new_pos=_pm()._bsplineHandleReposition(this,ceilf(_pm()._bsplineHandlePosition(this, this)*steps)/steps);
         }
     }
 
@@ -549,7 +549,7 @@ Glib::ustring Handle::_getTip(unsigned state) const
                 "<b>Auto node handle</b>: drag to convert to smooth node (%s)"), more);
         }else{
             return format_tip(C_("Path handle tip",
-                "<b>BSpline node handle</b>: Shift to drag, double click to reset (%s). %g power"),more,_pm()._bsplineHandlePosition(h,NULL));
+                "<b>BSpline node handle</b>: Shift to drag, double click to reset (%s). %g power"),more,_pm()._bsplineHandlePosition(h, NULL));
         }
     }
 }
@@ -636,12 +636,12 @@ void Node::move(Geom::Point const &new_pos)
     nodeWeight = fmax(_pm()._bsplineHandlePosition(n->front()),_pm()._bsplineHandlePosition(n->back()));
     if(prevNode){
         if(prevNode->isEndNode()){
-            prevNodeWeight = _pm()._bsplineHandlePosition(prevNode->front(),prevNode->front());
+            prevNodeWeight = _pm()._bsplineHandlePosition(prevNode->front(), prevNode->front());
         }
     }
     if(nextNode){
         if(nextNode->isEndNode()){
-            nextNodeWeight = _pm()._bsplineHandlePosition(nextNode->back(),nextNode->back());
+            nextNodeWeight = _pm()._bsplineHandlePosition(nextNode->back(), nextNode->back());
         }
     }
 
@@ -660,16 +660,16 @@ void Node::move(Geom::Point const &new_pos)
         _back.setPosition(_pm()._bsplineHandleReposition(this->back(),nodeWeight));
         if(prevNode){
             if(prevNode->isEndNode()){
-                prevNode->front()->setPosition(_pm()._bsplineHandleReposition(prevNode->front(),prevNodeWeight));
+                prevNode->front()->setPosition(_pm()._bsplineHandleReposition(prevNode->front(), prevNodeWeight));
             }else{
-                prevNode->front()->setPosition(_pm()._bsplineHandleReposition(prevNode->front(),prevNode->back()));
+                prevNode->front()->setPosition(_pm()._bsplineHandleReposition(prevNode->front(), prevNode->back()));
             }
         }
         if(nextNode){
             if(nextNode->isEndNode()){
-                nextNode->back()->setPosition(_pm()._bsplineHandleReposition(nextNode->back(),nextNodeWeight));
+                nextNode->back()->setPosition(_pm()._bsplineHandleReposition(nextNode->back(), nextNodeWeight));
             }else{
-                nextNode->back()->setPosition(_pm()._bsplineHandleReposition(nextNode->back(),nextNode->front()));
+                nextNode->back()->setPosition(_pm()._bsplineHandleReposition(nextNode->back(), nextNode->front()));
             }
         }
     }
@@ -690,12 +690,12 @@ void Node::transform(Geom::Affine const &m)
     nodeWeight = _pm()._bsplineHandlePosition(n->front());
     if(prevNode){
         if(prevNode->isEndNode()){
-            prevNodeWeight = _pm()._bsplineHandlePosition(prevNode->front(),prevNode->front());
+            prevNodeWeight = _pm()._bsplineHandlePosition(prevNode->front(), prevNode->front());
         }
     }
     if(nextNode){
         if(nextNode->isEndNode()){
-            nextNodeWeight = _pm()._bsplineHandlePosition(nextNode->back(),nextNode->back());
+            nextNodeWeight = _pm()._bsplineHandlePosition(nextNode->back(), nextNode->back());
         }
     }
 
@@ -709,20 +709,20 @@ void Node::transform(Geom::Affine const &m)
 
     // move the involved handlers, first the node ones, later the adjoining ones 
     if(_pm()._isBSpline()){
-        _front.setPosition(_pm()._bsplineHandleReposition(this->front(),nodeWeight));
-        _back.setPosition(_pm()._bsplineHandleReposition(this->back(),nodeWeight));
+        _front.setPosition(_pm()._bsplineHandleReposition(this->front(), nodeWeight));
+        _back.setPosition(_pm()._bsplineHandleReposition(this->back(), nodeWeight));
         if(prevNode){
             if(prevNode->isEndNode()){
-                prevNode->front()->setPosition(_pm()._bsplineHandleReposition(prevNode->front(),prevNodeWeight));
+                prevNode->front()->setPosition(_pm()._bsplineHandleReposition(prevNode->front(), prevNodeWeight));
             }else{
-                prevNode->front()->setPosition(_pm()._bsplineHandleReposition(prevNode->front(),prevNode->back()));
+                prevNode->front()->setPosition(_pm()._bsplineHandleReposition(prevNode->front(), prevNode->back()));
             }
         }
         if(nextNode){
             if(nextNode->isEndNode()){
-                nextNode->back()->setPosition(_pm()._bsplineHandleReposition(nextNode->back(),nextNodeWeight));
+                nextNode->back()->setPosition(_pm()._bsplineHandleReposition(nextNode->back(), nextNodeWeight));
             }else{
-                nextNode->back()->setPosition(_pm()._bsplineHandleReposition(nextNode->back(),nextNode->front()));
+                nextNode->back()->setPosition(_pm()._bsplineHandleReposition(nextNode->back(), nextNode->front()));
             }
         }
     }
@@ -920,8 +920,8 @@ void Node::setType(NodeType type, bool update_handles)
             if(_pm()._bsplineHandlePosition(this->front()) != noPower ){
                 weight = defaultStartPower;
             }
-            _front.setPosition(_pm()._bsplineHandleReposition(this->front(),weight));
-            _back.setPosition(_pm()._bsplineHandleReposition(this->back(),weight));
+            _front.setPosition(_pm()._bsplineHandleReposition(this->front(), weight));
+            _back.setPosition(_pm()._bsplineHandleReposition(this->back(), weight));
         }
     }
     _type = type;
-- 
cgit v1.2.3


From ecf586f701c881523a035178baa6322564f80c0c Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Tue, 11 Aug 2015 16:28:35 +0200
Subject: Translations. Second set of new Indian languages translations (Bodo,
 Malayalam, Marathi, Urdu, Sindhi [PA and Devanagari], and Sanskrit).

Fixed bugs:
  - https://launchpad.net/bugs/1316442
  - https://launchpad.net/bugs/1316564
  - https://launchpad.net/bugs/1316427
  - https://launchpad.net/bugs/1316572
  - https://launchpad.net/bugs/1316570
  - https://launchpad.net/bugs/1316566

(bzr r14288)
---
 src/ui/dialog/inkscape-preferences.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 2bfec2ad7..84eb8435b 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -523,21 +523,21 @@ void InkscapePreferences::initPageUI()
     _path_ui = _page_list.get_model()->get_path(iter_ui);
 
     Glib::ustring languages[] = {_("System default"), _("Albanian (sq)"), _("Amharic (am)"), _("Arabic (ar)"), _("Armenian (hy)"), _("Assamese (as)"), _("Azerbaijani (az)"), _("Basque (eu)"), _("Belarusian (be)"),
-        _("Bulgarian (bg)"), _("Bengali (bn)"), _("Bengali/Bangladesh (bn_BD)"), _("Breton (br)"), _("Catalan (ca)"), _("Valencian Catalan (ca@valencia)"), _("Chinese/China (zh_CN)"),
+        _("Bulgarian (bg)"), _("Bengali (bn)"), _("Bengali/Bangladesh (bn_BD)"), _("Bodo (brx)"), _("Breton (br)"), _("Catalan (ca)"), _("Valencian Catalan (ca@valencia)"), _("Chinese/China (zh_CN)"),
         _("Chinese/Taiwan (zh_TW)"), _("Croatian (hr)"), _("Czech (cs)"),
         _("Danish (da)"), _("Dogri (doi)"), _("Dutch (nl)"), _("Dzongkha (dz)"), _("German (de)"), _("Greek (el)"), _("English (en)"), _("English/Australia (en_AU)"),
         _("English/Canada (en_CA)"), _("English/Great Britain (en_GB)"), _("Pig Latin (en_US@piglatin)"),
         _("Esperanto (eo)"), _("Estonian (et)"), _("Farsi (fa)"), _("Finnish (fi)"),
         _("French (fr)"), _("Irish (ga)"), _("Galician (gl)"), _("Gujarati (gu)"), _("Hebrew (he)"), _("Hindi (hi)"), _("Hungarian (hu)"),
-        _("Indonesian (id)"), _("Icelandic (is)"), _("Italian (it)"), _("Japanese (ja)"), _("Khmer (km)"), _("Kinyarwanda (rw)"), _("Korean (ko)"), _("Lithuanian (lt)"), _("Latvian (lv)"), _("Macedonian (mk)"),
+        _("Indonesian (id)"), _("Icelandic (is)"), _("Italian (it)"), _("Japanese (ja)"), _("Khmer (km)"), _("Kinyarwanda (rw)"), _("Korean (ko)"), _("Lithuanian (lt)"), _("Latvian (lv)"), _("Macedonian (mk)"), _("Malayalam (ml)"), _("Marathi (mr)"),
         _("Mongolian (mn)"), _("Nepali (ne)"), _("Norwegian Bokmål (nb)"), _("Norwegian Nynorsk (nn)"), _("Odia (or)"), _("Panjabi (pa)"),
-        _("Polish (pl)"), _("Portuguese (pt)"), _("Portuguese/Brazil (pt_BR)"), _("Romanian (ro)"), _("Russian (ru)"), _("Santali in Devnagari script (sat@deva)"), _("Santali in Ol-Chiki script (sat@olck)"),
-        _("Serbian (sr)"), _("Serbian in Latin script (sr@latin)"), _("Slovak (sk)"), _("Slovenian (sl)"),  _("Spanish (es)"), _("Spanish/Mexico (es_MX)"),
-        _("Swedish (sv)"), _("Tamil (ta)"), _("Telugu (te)"), _("Thai (th)"), _("Turkish (tr)"), _("Ukrainian (uk)"), _("Vietnamese (vi)")};
-    Glib::ustring langValues[] = {"", "sq", "am", "ar", "hy", "as", "az", "eu", "be", "bg", "bn", "bn_BD", "br", "ca", "ca@valencia", "zh_CN", "zh_TW", "hr", "cs", "da", "doi", "nl",
+        _("Polish (pl)"), _("Portuguese (pt)"), _("Portuguese/Brazil (pt_BR)"), _("Romanian (ro)"), _("Russian (ru)"), _("Sanskrit (sa)"), _("Santali (sat)"), _("Santali in Devanagari script (sat@deva)"),
+        _("Serbian (sr)"), _("Serbian in Latin script (sr@latin)"), _("Sindhi (sd)"), _("Sindhi in Devanagari script (sd@deva)"), _("Slovak (sk)"), _("Slovenian (sl)"),  _("Spanish (es)"), _("Spanish/Mexico (es_MX)"),
+        _("Swedish (sv)"), _("Tamil (ta)"), _("Telugu (te)"), _("Thai (th)"), _("Turkish (tr)"), _("Ukrainian (uk)"), _("Urdu (ur)"), _("Vietnamese (vi)")};
+    Glib::ustring langValues[] = {"", "sq", "am", "ar", "hy", "as", "az", "eu", "be", "bg", "bn", "bn_BD", "brx", "br", "ca", "ca@valencia", "zh_CN", "zh_TW", "hr", "cs", "da", "doi", "nl",
         "dz", "de", "el", "en", "en_AU", "en_CA", "en_GB", "en_US@piglatin", "eo", "et", "fa", "fi", "fr", "ga",
-        "gl", "gu", "he", "hi", "hu", "id", "is", "it", "ja", "km", "rw", "ko", "lt", "lv", "mk", "mn", "ne", "nb", "nn", "or", "pa",
-        "pl", "pt", "pt_BR", "ro", "ru", "sat@deva", "sat@olck", "sr", "sr@latin", "sk", "sl", "es", "es_MX", "sv", "ta", "te", "th", "tr", "uk", "vi" };
+        "gl", "gu", "he", "hi", "hu", "id", "is", "it", "ja", "km", "rw", "ko", "lt", "lv", "mk", "ml", "mr", "mn", "ne", "nb", "nn", "or", "pa",
+        "pl", "pt", "pt_BR", "ro", "ru", "sa", "sat", "sat@deva", "sr", "sr@latin", "sd", "sd@deva", "sk", "sl", "es", "es_MX", "sv", "ta", "te", "th", "tr", "uk", "ur", "vi" };
 
     {
         // sorting languages according to translated name
-- 
cgit v1.2.3


From 86c3fa9255f57488f2fe2dc9beeccb0ecb636ecf Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Wed, 12 Aug 2015 11:12:17 +0200
Subject: Translations. Last set of new Indian languages translations (Kannada,
 Kashmiri [Perso-Arabic and Devanagari scripts], Kokani [Roman and Devanagari
 scripts], Maithili, and Manipuri [Meetei Mayek  and Bengali scripts]).

Fixed bugs:
  - https://launchpad.net/bugs/1316550
  - https://launchpad.net/bugs/1316555
  - https://launchpad.net/bugs/1316559
  - https://launchpad.net/bugs/1316560
  - https://launchpad.net/bugs/1316561

(bzr r14291)
---
 src/ui/dialog/inkscape-preferences.cpp | 64 +++++++++++++++++++++++++---------
 1 file changed, 48 insertions(+), 16 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 84eb8435b..49864ccbb 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -522,22 +522,54 @@ void InkscapePreferences::initPageUI()
     Gtk::TreeModel::iterator iter_ui = this->AddPage(_page_ui, _("Interface"), PREFS_PAGE_UI);
     _path_ui = _page_list.get_model()->get_path(iter_ui);
 
-    Glib::ustring languages[] = {_("System default"), _("Albanian (sq)"), _("Amharic (am)"), _("Arabic (ar)"), _("Armenian (hy)"), _("Assamese (as)"), _("Azerbaijani (az)"), _("Basque (eu)"), _("Belarusian (be)"),
-        _("Bulgarian (bg)"), _("Bengali (bn)"), _("Bengali/Bangladesh (bn_BD)"), _("Bodo (brx)"), _("Breton (br)"), _("Catalan (ca)"), _("Valencian Catalan (ca@valencia)"), _("Chinese/China (zh_CN)"),
-        _("Chinese/Taiwan (zh_TW)"), _("Croatian (hr)"), _("Czech (cs)"),
-        _("Danish (da)"), _("Dogri (doi)"), _("Dutch (nl)"), _("Dzongkha (dz)"), _("German (de)"), _("Greek (el)"), _("English (en)"), _("English/Australia (en_AU)"),
-        _("English/Canada (en_CA)"), _("English/Great Britain (en_GB)"), _("Pig Latin (en_US@piglatin)"),
-        _("Esperanto (eo)"), _("Estonian (et)"), _("Farsi (fa)"), _("Finnish (fi)"),
-        _("French (fr)"), _("Irish (ga)"), _("Galician (gl)"), _("Gujarati (gu)"), _("Hebrew (he)"), _("Hindi (hi)"), _("Hungarian (hu)"),
-        _("Indonesian (id)"), _("Icelandic (is)"), _("Italian (it)"), _("Japanese (ja)"), _("Khmer (km)"), _("Kinyarwanda (rw)"), _("Korean (ko)"), _("Lithuanian (lt)"), _("Latvian (lv)"), _("Macedonian (mk)"), _("Malayalam (ml)"), _("Marathi (mr)"),
-        _("Mongolian (mn)"), _("Nepali (ne)"), _("Norwegian Bokmål (nb)"), _("Norwegian Nynorsk (nn)"), _("Odia (or)"), _("Panjabi (pa)"),
-        _("Polish (pl)"), _("Portuguese (pt)"), _("Portuguese/Brazil (pt_BR)"), _("Romanian (ro)"), _("Russian (ru)"), _("Sanskrit (sa)"), _("Santali (sat)"), _("Santali in Devanagari script (sat@deva)"),
-        _("Serbian (sr)"), _("Serbian in Latin script (sr@latin)"), _("Sindhi (sd)"), _("Sindhi in Devanagari script (sd@deva)"), _("Slovak (sk)"), _("Slovenian (sl)"),  _("Spanish (es)"), _("Spanish/Mexico (es_MX)"),
-        _("Swedish (sv)"), _("Tamil (ta)"), _("Telugu (te)"), _("Thai (th)"), _("Turkish (tr)"), _("Ukrainian (uk)"), _("Urdu (ur)"), _("Vietnamese (vi)")};
-    Glib::ustring langValues[] = {"", "sq", "am", "ar", "hy", "as", "az", "eu", "be", "bg", "bn", "bn_BD", "brx", "br", "ca", "ca@valencia", "zh_CN", "zh_TW", "hr", "cs", "da", "doi", "nl",
-        "dz", "de", "el", "en", "en_AU", "en_CA", "en_GB", "en_US@piglatin", "eo", "et", "fa", "fi", "fr", "ga",
-        "gl", "gu", "he", "hi", "hu", "id", "is", "it", "ja", "km", "rw", "ko", "lt", "lv", "mk", "ml", "mr", "mn", "ne", "nb", "nn", "or", "pa",
-        "pl", "pt", "pt_BR", "ro", "ru", "sa", "sat", "sat@deva", "sr", "sr@latin", "sd", "sd@deva", "sk", "sl", "es", "es_MX", "sv", "ta", "te", "th", "tr", "uk", "ur", "vi" };
+    Glib::ustring languages[] = {_("System default"),
+        _("Albanian (sq)"), _("Amharic (am)"), _("Arabic (ar)"), _("Armenian (hy)"), _("Assamese (as)"), _("Azerbaijani (az)"),
+        _("Basque (eu)"), _("Belarusian (be)"), _("Bulgarian (bg)"), _("Bengali (bn)"), _("Bengali/Bangladesh (bn_BD)"), _("Bodo (brx)"), _("Breton (br)"),
+        _("Catalan (ca)"), _("Valencian Catalan (ca@valencia)"), _("Chinese/China (zh_CN)"),  _("Chinese/Taiwan (zh_TW)"), _("Croatian (hr)"), _("Czech (cs)"),
+        _("Danish (da)"), _("Dogri (doi)"), _("Dutch (nl)"), _("Dzongkha (dz)"),
+        _("German (de)"), _("Greek (el)"),
+        _("English (en)"), _("English/Australia (en_AU)"), _("English/Canada (en_CA)"), _("English/Great Britain (en_GB)"), _("Pig Latin (en_US@piglatin)"), _("Esperanto (eo)"), _("Estonian (et)"),
+        _("Farsi (fa)"), _("Finnish (fi)"), _("French (fr)"),
+        _("Galician (gl)"), _("Gujarati (gu)"),
+        _("Hebrew (he)"), _("Hindi (hi)"), _("Hungarian (hu)"),
+        _("Icelandic (is)"), _("Indonesian (id)"), _("Irish (ga)"), _("Italian (it)"),
+        _("Japanese (ja)"),
+        _("Kannada (kn)"), _("Kashmiri in Peso-Arabic script (ks@aran)"), _("Kashmiri in Devanagari script (ks@deva)"), _("Khmer (km)"), _("Kinyarwanda (rw)"), _("Konkani (kok)"), _("Konkani in Latin script (kok@latin)"), _("Korean (ko)"),
+        _("Latvian (lv)"), _("Lithuanian (lt)"),
+        _("Macedonian (mk)"), _("Maithili (mai)"), _("Malayalam (ml)"), _("Manipuri (mni)"), _("Manipuri in Bengali script (mni@beng)"), _("Marathi (mr)"), _("Mongolian (mn)"),
+        _("Nepali (ne)"), _("Norwegian Bokmål (nb)"), _("Norwegian Nynorsk (nn)"),
+        _("Odia (or)"),
+        _("Panjabi (pa)"), _("Polish (pl)"), _("Portuguese (pt)"), _("Portuguese/Brazil (pt_BR)"),
+        _("Romanian (ro)"), _("Russian (ru)"),
+        _("Sanskrit (sa)"), _("Santali (sat)"), _("Santali in Devanagari script (sat@deva)"), _("Serbian (sr)"), _("Serbian in Latin script (sr@latin)"),
+        _("Sindhi (sd)"), _("Sindhi in Devanagari script (sd@deva)"), _("Slovak (sk)"), _("Slovenian (sl)"),  _("Spanish (es)"), _("Spanish/Mexico (es_MX)"), _("Swedish (sv)"),
+        _("Tamil (ta)"), _("Telugu (te)"), _("Thai (th)"), _("Turkish (tr)"),
+        _("Ukrainian (uk)"), _("Urdu (ur)"),
+        _("Vietnamese (vi)")};
+    Glib::ustring langValues[] = {"",
+        "sq", "am", "ar", "hy", "as", "az",
+        "eu", "be", "bg", "bn", "bn_BD", "brx", "br",
+        "ca", "ca@valencia", "zh_CN", "zh_TW", "hr", "cs",
+        "da", "doi", "nl", "dz",
+        "de", "el",
+        "en", "en_AU", "en_CA", "en_GB", "en_US@piglatin", "eo", "et",
+        "fa", "fi", "fr",
+        "gl", "gu",
+        "he", "hi", "hu",
+        "is", "id", "ga", "it",
+        "ja",
+        "kn", "ks@aran", "ks@deva", "km", "rw", "kok", "kok@latin", "ko",
+        "lv", "lt",
+        "mk", "mai", "ml", "mni", "mni@beng", "mr", "mn",
+        "ne", "nb", "nn",
+        "or",
+        "pa", "pl", "pt", "pt_BR",
+        "ro", "ru",
+        "sa", "sat", "sat@deva", "sr", "sr@latin",
+        "sd", "sd@deva", "sk", "sl", "es", "es_MX", "sv",
+        "ta", "te", "th", "tr",
+        "uk", "ur",
+        "vi" };
 
     {
         // sorting languages according to translated name
-- 
cgit v1.2.3


From 0932ef5feb3707d94b527890bab29ed67d20b384 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Fri, 14 Aug 2015 01:23:05 +0200
Subject: Refactor of BSPline code attemping to fix the duplicate end node bug,
 not sure if fixed jet

(bzr r14300)
---
 src/ui/tool/node.cpp             | 97 ++++++++++++++++------------------------
 src/ui/tool/path-manipulator.cpp | 19 ++++----
 src/ui/tool/path-manipulator.h   |  4 +-
 src/ui/tools/pen-tool.cpp        |  5 ++-
 4 files changed, 51 insertions(+), 74 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index eaec4477a..08ca13038 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -61,8 +61,8 @@ namespace Inkscape {
 namespace UI {
 
 /*const double handleCubicGap = 0.01;*/
-const double noPower = 0.0;
-const double defaultStartPower = 0.3334;
+const double NO_POWER = 0.0;
+const double DEFAULT_START_POWER = 0.3334;
 /*const double defaultEndPower = 0.6667;*/
 
 ControlPoint::ColorSet Node::node_colors = {
@@ -142,6 +142,7 @@ void Handle::move(Geom::Point const &new_pos)
     Node *node_away = _parent->nodeAwayFrom(this); // node in the opposite direction
     Handle *towards = node_towards ? node_towards->handleAwayFrom(_parent) : NULL;
     Handle *towards_second = node_towards ? node_towards->handleToward(_parent) : NULL;
+    double bspline_weight = 0.0;
 
     if (Geom::are_near(new_pos, _parent->position())) {
         // The handle becomes degenerate.
@@ -176,8 +177,9 @@ void Handle::move(Geom::Point const &new_pos)
 
         //move the handler and its oposite the same proportion
         if(_pm()._isBSpline()){
-            setPosition(_pm()._bsplineHandleReposition(this, this));
-            this->other()->setPosition(_pm()._bsplineHandleReposition(this->other(), this));
+            setPosition(_pm()._bsplineHandleReposition(this, false));
+            bspline_weight = _pm()._bsplineHandlePosition(this, false);
+            this->other()->setPosition(_pm()._bsplineHandleReposition(this->other(), bspline_weight));
         }
         return;
     }
@@ -193,8 +195,9 @@ void Handle::move(Geom::Point const &new_pos)
 
         //move the handler and its oposite the same proportion
         if(_pm()._isBSpline()){ 
-            setPosition(_pm()._bsplineHandleReposition(this, this));
-            this->other()->setPosition(_pm()._bsplineHandleReposition(this->other(), this));
+            setPosition(_pm()._bsplineHandleReposition(this, false));
+            bspline_weight = _pm()._bsplineHandlePosition(this, false);
+            this->other()->setPosition(_pm()._bsplineHandleReposition(this->other(), bspline_weight));
         }
         
         return;
@@ -219,8 +222,9 @@ void Handle::move(Geom::Point const &new_pos)
 
     // moves the handler and its oposite the same proportion
     if(_pm()._isBSpline()){
-        setPosition(_pm()._bsplineHandleReposition(this, this));
-        this->other()->setPosition(_pm()._bsplineHandleReposition(this->other(), this));
+        setPosition(_pm()._bsplineHandleReposition(this, false));
+        bspline_weight = _pm()._bsplineHandlePosition(this, false);
+        this->other()->setPosition(_pm()._bsplineHandleReposition(this->other(), bspline_weight));
     }
 }
 
@@ -299,7 +303,7 @@ bool Handle::_eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEven
         default: break;
         }
         break;
-    // new double click event to set the handlers of a node to the default proportion, defaultStartPower% 
+    // new double click event to set the handlers of a node to the default proportion, DEFAULT_START_POWER% 
     case GDK_2BUTTON_PRESS:
         handle_2button_press();
         break;
@@ -310,11 +314,11 @@ bool Handle::_eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEven
     return ControlPoint::_eventHandler(event_context, event);
 }
 
-//this function moves the handler and its oposite to the default proportion of defaultStartPower
+//this function moves the handler and its oposite to the default proportion of DEFAULT_START_POWER
 void Handle::handle_2button_press(){
     if(_pm()._isBSpline()){
-        setPosition(_pm()._bsplineHandleReposition(this, defaultStartPower));
-        this->other()->setPosition(_pm()._bsplineHandleReposition(this->other(), defaultStartPower));
+        setPosition(_pm()._bsplineHandleReposition(this, DEFAULT_START_POWER));
+        this->other()->setPosition(_pm()._bsplineHandleReposition(this->other(), DEFAULT_START_POWER));
         _pm().update();
     }
 }
@@ -375,7 +379,7 @@ void Handle::dragged(Geom::Point &new_pos, GdkEventMotion *event)
         if(_pm()._isBSpline()){
             setPosition(new_pos);
             int steps = _pm()._bsplineGetSteps();
-            new_pos=_pm()._bsplineHandleReposition(this,ceilf(_pm()._bsplineHandlePosition(this, this)*steps)/steps);
+            new_pos=_pm()._bsplineHandleReposition(this,ceilf(_pm()._bsplineHandlePosition(this, false)*steps)/steps);
         }
     }
 
@@ -549,7 +553,7 @@ Glib::ustring Handle::_getTip(unsigned state) const
                 "<b>Auto node handle</b>: drag to convert to smooth node (%s)"), more);
         }else{
             return format_tip(C_("Path handle tip",
-                "<b>BSpline node handle</b>: Shift to drag, double click to reset (%s). %g power"),more,_pm()._bsplineHandlePosition(h, NULL));
+                "<b>BSpline node handle</b>: Shift to drag, double click to reset (%s). %g power"),more,_pm()._bsplineHandlePosition(h));
         }
     }
 }
@@ -627,22 +631,18 @@ void Node::move(Geom::Point const &new_pos)
     Geom::Point delta = new_pos - position();
 
     // save the previous nodes strength to apply it again once the node is moved 
-    double nodeWeight = noPower;
-    double nextNodeWeight = noPower;
-    double prevNodeWeight = noPower;
+    double nodeWeight = NO_POWER;
+    double nextNodeWeight = NO_POWER;
+    double prevNodeWeight = NO_POWER;
     Node *n = this;
     Node * nextNode = n->nodeToward(n->front());
     Node * prevNode = n->nodeToward(n->back());
-    nodeWeight = fmax(_pm()._bsplineHandlePosition(n->front()),_pm()._bsplineHandlePosition(n->back()));
+    nodeWeight = fmax(_pm()._bsplineHandlePosition(n->front(), false),_pm()._bsplineHandlePosition(n->back(), false));
     if(prevNode){
-        if(prevNode->isEndNode()){
-            prevNodeWeight = _pm()._bsplineHandlePosition(prevNode->front(), prevNode->front());
-        }
+        prevNodeWeight = _pm()._bsplineHandlePosition(prevNode->front());
     }
     if(nextNode){
-        if(nextNode->isEndNode()){
-            nextNodeWeight = _pm()._bsplineHandlePosition(nextNode->back(), nextNode->back());
-        }
+        nextNodeWeight = _pm()._bsplineHandlePosition(nextNode->back());
     }
 
     setPosition(new_pos);
@@ -659,18 +659,10 @@ void Node::move(Geom::Point const &new_pos)
         _front.setPosition(_pm()._bsplineHandleReposition(this->front(),nodeWeight));
         _back.setPosition(_pm()._bsplineHandleReposition(this->back(),nodeWeight));
         if(prevNode){
-            if(prevNode->isEndNode()){
-                prevNode->front()->setPosition(_pm()._bsplineHandleReposition(prevNode->front(), prevNodeWeight));
-            }else{
-                prevNode->front()->setPosition(_pm()._bsplineHandleReposition(prevNode->front(), prevNode->back()));
-            }
+            prevNode->front()->setPosition(_pm()._bsplineHandleReposition(prevNode->front(), prevNodeWeight));
         }
         if(nextNode){
-            if(nextNode->isEndNode()){
-                nextNode->back()->setPosition(_pm()._bsplineHandleReposition(nextNode->back(), nextNodeWeight));
-            }else{
-                nextNode->back()->setPosition(_pm()._bsplineHandleReposition(nextNode->back(), nextNode->front()));
-            }
+            nextNode->back()->setPosition(_pm()._bsplineHandleReposition(nextNode->back(), nextNodeWeight));
         }
     }
 }
@@ -681,22 +673,18 @@ void Node::transform(Geom::Affine const &m)
     Geom::Point old_pos = position();
 
     // save the previous nodes strength to apply it again once the node is moved 
-    double nodeWeight = noPower;
-    double nextNodeWeight = noPower;
-    double prevNodeWeight = noPower;
+    double nodeWeight = NO_POWER;
+    double nextNodeWeight = NO_POWER;
+    double prevNodeWeight = NO_POWER;
     Node *n = this;
     Node * nextNode = n->nodeToward(n->front());
     Node * prevNode = n->nodeToward(n->back());
     nodeWeight = _pm()._bsplineHandlePosition(n->front());
     if(prevNode){
-        if(prevNode->isEndNode()){
-            prevNodeWeight = _pm()._bsplineHandlePosition(prevNode->front(), prevNode->front());
-        }
+        prevNodeWeight = _pm()._bsplineHandlePosition(prevNode->front());
     }
     if(nextNode){
-        if(nextNode->isEndNode()){
-            nextNodeWeight = _pm()._bsplineHandlePosition(nextNode->back(), nextNode->back());
-        }
+        nextNodeWeight = _pm()._bsplineHandlePosition(nextNode->back());
     }
 
     setPosition(position() * m);
@@ -712,18 +700,10 @@ void Node::transform(Geom::Affine const &m)
         _front.setPosition(_pm()._bsplineHandleReposition(this->front(), nodeWeight));
         _back.setPosition(_pm()._bsplineHandleReposition(this->back(), nodeWeight));
         if(prevNode){
-            if(prevNode->isEndNode()){
-                prevNode->front()->setPosition(_pm()._bsplineHandleReposition(prevNode->front(), prevNodeWeight));
-            }else{
-                prevNode->front()->setPosition(_pm()._bsplineHandleReposition(prevNode->front(), prevNode->back()));
-            }
+            prevNode->front()->setPosition(_pm()._bsplineHandleReposition(prevNode->front(), prevNodeWeight));
         }
         if(nextNode){
-            if(nextNode->isEndNode()){
-                nextNode->back()->setPosition(_pm()._bsplineHandleReposition(nextNode->back(), nextNodeWeight));
-            }else{
-                nextNode->back()->setPosition(_pm()._bsplineHandleReposition(nextNode->back(), nextNode->front()));
-            }
+            nextNode->back()->setPosition(_pm()._bsplineHandleReposition(nextNode->back(), nextNodeWeight));
         }
     }
 }
@@ -913,12 +893,12 @@ void Node::setType(NodeType type, bool update_handles)
             break;
         default: break;
         }
-        /* in node type changes, about bspline traces, we can mantain them with noPower power in border mode,
+        /* in node type changes, about bspline traces, we can mantain them with NO_POWER power in border mode,
            or we give them the default power in curve mode */
         if(_pm()._isBSpline()){
-            double weight = noPower;
-            if(_pm()._bsplineHandlePosition(this->front()) != noPower ){
-                weight = defaultStartPower;
+            double weight = NO_POWER;
+            if(_pm()._bsplineHandlePosition(this->front()) != NO_POWER ){
+                weight = DEFAULT_START_POWER;
             }
             _front.setPosition(_pm()._bsplineHandleReposition(this->front(), weight));
             _back.setPosition(_pm()._bsplineHandleReposition(this->back(), weight));
@@ -1435,7 +1415,6 @@ Glib::ustring Node::_getTip(unsigned state) const
 {
     bool isBSpline = _pm()._isBSpline();
     Handle *h = const_cast<Handle *>(&_front);
-    Handle *h2 = const_cast<Handle *>(&_back);
     if (state_held_shift(state)) {
         bool can_drag_out = (_next() && _front.isDegenerate()) || (_prev() && _back.isDegenerate());
         if (can_drag_out) {
@@ -1464,7 +1443,7 @@ Glib::ustring Node::_getTip(unsigned state) const
 
     // No modifiers: assemble tip from node type
     char const *nodetype = node_type_to_localized_string(_type);
-    double power = _pm()._bsplineHandlePosition(h,h2);
+    double power = _pm()._bsplineHandlePosition(h);
     if (_selection.transformHandlesEnabled() && selected()) {
         if (_selection.size() == 1 && !isBSpline) {
             return format_tip(C_("Path node tip",
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index 848b10373..7c9fb5841 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -58,7 +58,7 @@ enum PathChange {
 } // anonymous namespace
 const double HANDLE_CUBIC_GAP = 0.01;
 const double NO_POWER = 0.0;
-const double defaultStartPower = 0.3334;
+const double DEFAULT_START_POWER = 0.3334;
 
 
 /**
@@ -1033,7 +1033,7 @@ NodeList::iterator PathManipulator::subdivideSegment(NodeList::iterator first, d
                 line_inside_nodes->moveto(n->position());
                 line_inside_nodes->lineto(second->position());
                 sbasis_inside_nodes = line_inside_nodes->first_segment()->toSBasis();
-                Geom::Point next = sbasis_inside_nodes.valueAt(defaultStartPower);
+                Geom::Point next = sbasis_inside_nodes.valueAt(DEFAULT_START_POWER);
                 next = Geom::Point(next[Geom::X] + HANDLE_CUBIC_GAP,next[Geom::Y] + HANDLE_CUBIC_GAP);
                 line_inside_nodes->reset();
                 n->front()->setPosition(next);
@@ -1044,7 +1044,7 @@ NodeList::iterator PathManipulator::subdivideSegment(NodeList::iterator first, d
                 line_inside_nodes->moveto(n->position());
                 line_inside_nodes->lineto(first->position());
                 sbasis_inside_nodes = line_inside_nodes->first_segment()->toSBasis();
-                Geom::Point previous = sbasis_inside_nodes.valueAt(defaultStartPower);
+                Geom::Point previous = sbasis_inside_nodes.valueAt(DEFAULT_START_POWER);
                 previous = Geom::Point(previous[Geom::X] + HANDLE_CUBIC_GAP,previous[Geom::Y] + HANDLE_CUBIC_GAP);
                 n->back()->setPosition(previous);
             }else{
@@ -1277,13 +1277,10 @@ bool PathManipulator::_isBSpline() const {
 }
 
 // returns the corresponding strength to the position of the handlers
-double PathManipulator::_bsplineHandlePosition(Handle *h, Handle *h2)
+double PathManipulator::_bsplineHandlePosition(Handle *h, bool check_other)
 {
     using Geom::X;
     using Geom::Y;
-    if(h2){
-        h = h2;
-    }
     double pos = NO_POWER;
     Node *n = h->parent();
     Node * next_node = NULL;
@@ -1296,16 +1293,16 @@ double PathManipulator::_bsplineHandlePosition(Handle *h, Handle *h2)
             pos = Geom::nearest_time(Geom::Point(h->position()[X] - HANDLE_CUBIC_GAP, h->position()[Y] - HANDLE_CUBIC_GAP), *line_inside_nodes->first_segment());
         }
     }
-    if (pos == NO_POWER && !h2){
-        return _bsplineHandlePosition(h, h->other());
+    if (pos == NO_POWER && check_other){
+        return _bsplineHandlePosition(h->other(), false);
     }
     return pos;
 }
 
 // give the location for the handler in the corresponding position
-Geom::Point PathManipulator::_bsplineHandleReposition(Handle *h, Handle *h2)
+Geom::Point PathManipulator::_bsplineHandleReposition(Handle *h, bool check_other)
 {
-    double pos = this->_bsplineHandlePosition(h, h2);
+    double pos = this->_bsplineHandlePosition(h, check_other);
     return _bsplineHandleReposition(h,pos);
 }
 
diff --git a/src/ui/tool/path-manipulator.h b/src/ui/tool/path-manipulator.h
index 4c6f74ba4..283cb610a 100644
--- a/src/ui/tool/path-manipulator.h
+++ b/src/ui/tool/path-manipulator.h
@@ -111,8 +111,8 @@ private:
 
     void _recalculateIsBSpline();
     bool _isBSpline() const;
-    double _bsplineHandlePosition(Handle *h, Handle *h2 = NULL);
-    Geom::Point _bsplineHandleReposition(Handle *h, Handle *h2 = NULL);
+    double _bsplineHandlePosition(Handle *h, bool check_other = true);
+    Geom::Point _bsplineHandleReposition(Handle *h, bool check_other = true);
     Geom::Point _bsplineHandleReposition(Handle *h, double pos);
     void _createGeometryFromControlPoints(bool alert_LPE = false);
     unsigned _deleteStretch(NodeList::iterator first, NodeList::iterator last, bool keep_shape);
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 6a3928f27..69068f2a7 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -382,11 +382,12 @@ bool PenTool::_handleButtonPress(GdkEventButton const &bevent) {
         if( anchor && anchor == this->sa && this->green_curve->is_empty()){
             //remove the following line to avoid having one node on top of another
             _finishSegment(event_dt, bevent.state);
-            _finish( false);
+            _finish(true);
             return true;
         }
         return false;
     } 
+    
     bool ret = false;
     if (bevent.button == 1 && !this->space_panning
         // make sure this is not the last click for a waiting LPE (otherwise we want to finish the path)
@@ -860,7 +861,7 @@ bool PenTool::_handleButtonRelease(GdkEventButton const &revent) {
 bool PenTool::_handle2ButtonPress(GdkEventButton const &bevent) {
     bool ret = false;
     // only end on LMB double click. Otherwise horizontal scrolling causes ending of the path
-    if (this->npoints != 0 && bevent.button == 1) {
+    if (this->npoints != 0 && bevent.button == 1 && this->state != PenTool::CLOSE) {
         this->_finish(false);
         ret = true;
     }
-- 
cgit v1.2.3


From 439df6b61c37528b2ca6210f77a4bb50aa692906 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Fri, 14 Aug 2015 10:20:45 +0200
Subject: A bit more refactor of BSPline tool. Still the bug duplicating end
 node :(

(bzr r14301)
---
 src/ui/tool/node.cpp             | 2 --
 src/ui/tool/path-manipulator.cpp | 8 +++++---
 src/ui/tools/pen-tool.cpp        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index 08ca13038..55d801c46 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -60,10 +60,8 @@ Inkscape::ControlType nodeTypeToCtrlType(Inkscape::UI::NodeType type)
 namespace Inkscape {
 namespace UI {
 
-/*const double handleCubicGap = 0.01;*/
 const double NO_POWER = 0.0;
 const double DEFAULT_START_POWER = 0.3334;
-/*const double defaultEndPower = 0.6667;*/
 
 ControlPoint::ColorSet Node::node_colors = {
     {0xbfbfbf00, 0x000000ff}, // normal fill, stroke
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index 7c9fb5841..7b7bc98ee 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -56,7 +56,7 @@ enum PathChange {
 };
 
 } // anonymous namespace
-const double HANDLE_CUBIC_GAP = 0.01;
+const double HANDLE_CUBIC_GAP = 0.001;
 const double NO_POWER = 0.0;
 const double DEFAULT_START_POWER = 0.3334;
 
@@ -695,10 +695,12 @@ unsigned PathManipulator::_deleteStretch(NodeList::iterator start, NodeList::ite
     // if we are removing, we readjust the handlers
     if(_isBSpline()){
         if(start.prev()){
-            start.prev()->front()->setPosition(_bsplineHandleReposition(start.prev()->front(),start.prev()->back()));
+            double bspline_weight = _bsplineHandlePosition(start.prev()->back(), false);
+            start.prev()->front()->setPosition(_bsplineHandleReposition(start.prev()->front(), bspline_weight));
         }
         if(end){
-            end->back()->setPosition(_bsplineHandleReposition(end->back(),end->front()));
+            double bspline_weight = _bsplineHandlePosition(end->front(), false);
+            end->back()->setPosition(_bsplineHandleReposition(end->back(),bspline_weight));
         }
     }
 
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 69068f2a7..2ed366a7d 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -84,7 +84,7 @@ namespace Tools {
 static Geom::Point pen_drag_origin_w(0, 0);
 static bool pen_within_tolerance = false;
 static int pen_last_paraxial_dir = 0; // last used direction in horizontal/vertical mode; 0 = horizontal, 1 = vertical
-const double HANDLE_CUBIC_GAP = 0.01;
+const double HANDLE_CUBIC_GAP = 0.001;
 
 const std::string& PenTool::getPrefsPath() {
     return PenTool::prefsPath;
-- 
cgit v1.2.3


From 209b7267fe77a04874519b6ac247651102fa1b47 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Wed, 19 Aug 2015 00:56:36 +0200
Subject: Allows for copying clones between inkscape instances. This patch puts
 the original of clones as children of _clipnode (<inkscape:clipboard>). Then,
 on paste, it checks for the presence of an element with the right id (so that
 it does not breaks copypaste clones in the same doc), then pastes all, and
 deletes the original if needed (which automagically unlinks the clone if
 needed). [an alternate solution is to put the original in the defs (which
 might cause edition problems) and not unlink. Depending on whether people
 would be more interested in this behavior there could be a preference item to
 choose]

Fixed bugs:
  - https://launchpad.net/bugs/167907

(bzr r14309)
---
 src/ui/clipboard.cpp | 43 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 8 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index d6cf1f980..816daf2e5 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -154,6 +154,7 @@ private:
     Inkscape::XML::Node *_root; ///< Reference to the clipboard's root node
     Inkscape::XML::Node *_clipnode; ///< The node that holds extra information
     Inkscape::XML::Document *_doc; ///< Reference to the clipboard's Inkscape::XML::Document
+    std::set<SPItem*> cloned_elements;
 
     // we need a way to copy plain text AND remember its style;
     // the standard _clipnode is only available in an SVG tree, hence this special storage
@@ -239,7 +240,7 @@ void ClipboardManagerImpl::copy(SPDesktop *desktop)
     // Special case for when the color picker ("dropper") is active - copies color under cursor
     if (tools_isactive(desktop, TOOLS_DROPPER)) {
         //_setClipboardColor(sp_dropper_context_get_color(desktop->event_context));
-    	_setClipboardColor(SP_DROPPER_CONTEXT(desktop->event_context)->get_color());
+        _setClipboardColor(SP_DROPPER_CONTEXT(desktop->event_context)->get_color());
         _discardInternalClipboard();
         return;
     }
@@ -523,7 +524,7 @@ bool ClipboardManagerImpl::pasteSize(SPDesktop *desktop, bool separately, bool a
 
         // resize each object in the selection
         if (separately) {
-        	std::vector<SPItem*> itemlist=selection->itemList();
+            std::vector<SPItem*> itemlist=selection->itemList();
             for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++){
                 SPItem *item = *i;
                 if (item) {
@@ -630,7 +631,7 @@ Glib::ustring ClipboardManagerImpl::getShapeOrTextObjectId(SPDesktop *desktop)
     // at the first object to be <svg:path> or <svg:text>.
     // but that could then return the id of the object's 
     // clip path or mask, not the original path!
-	
+    
     SPDocument *tempdoc = _retrieveClipboard(); // any target will do here
     if ( tempdoc == NULL ) {
         _userWarn(desktop, _("Nothing on the clipboard."));
@@ -662,7 +663,8 @@ Glib::ustring ClipboardManagerImpl::getShapeOrTextObjectId(SPDesktop *desktop)
 void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection)
 {
     // copy the defs used by all items
-	std::vector<SPItem*> itemlist=selection->itemList();
+    std::vector<SPItem*> itemlist=selection->itemList();
+    cloned_elements.clear();
     for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++){
         SPItem *item = *i;
         if (item) {
@@ -673,14 +675,33 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection)
     }
 
     // copy the representation of the items
-    std::vector<SPItem*> sorted_items(itemlist);
+    std::vector<SPObject*> sorted_items;
+    for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++)
+        sorted_items.push_back(*i);
     sort(sorted_items.begin(),sorted_items.end(),sp_object_compare_position_bool);
 
-    for(std::vector<SPItem*>::const_iterator i=sorted_items.begin();i!=sorted_items.end();i++){
-        SPItem *item = *i;
+    //remove already copied elements from cloned_elements
+    std::vector<SPItem*>tr;
+    for(std::set<SPItem*>::iterator it = cloned_elements.begin();it!=cloned_elements.end();it++){
+        if(std::find(sorted_items.begin(),sorted_items.end(),*it)!=sorted_items.end())
+            tr.push_back(*it);
+    }
+    for(std::vector<SPItem*>::iterator it = tr.begin();it!=tr.end();it++){
+        cloned_elements.erase(*it);
+    }
+
+    sorted_items.insert(sorted_items.end(),cloned_elements.begin(),cloned_elements.end());
+
+    for(std::vector<SPObject*>::const_iterator i=sorted_items.begin();i!=sorted_items.end();i++){
+        SPItem *item = dynamic_cast<SPItem*>(*i);
         if (item) {
             Inkscape::XML::Node *obj = item->getRepr();
-            Inkscape::XML::Node *obj_copy = _copyNode(obj, _doc, _root);
+            Inkscape::XML::Node *obj_copy;
+            if(cloned_elements.find(item)==cloned_elements.end())
+                obj_copy = _copyNode(obj, _doc, _root);
+            else
+                obj_copy = _copyNode(obj, _doc, _clipnode);
+
 
             // copy complete inherited style
             SPCSSAttr *css = sp_repr_css_attr_inherited(obj, "style");
@@ -737,6 +758,12 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection)
  */
 void ClipboardManagerImpl::_copyUsedDefs(SPItem *item)
 {
+    SPUse *use=dynamic_cast<SPUse *>(item);
+    if(use){
+        if(cloned_elements.insert(use->get_original()).second)
+            _copyUsedDefs(use->get_original());
+    }
+
     // copy fill and stroke styles (patterns and gradients)
     SPStyle *style = item->style;
 
-- 
cgit v1.2.3


From e988d0857f6313c196437d8ed60c01d38217738a Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Thu, 20 Aug 2015 10:10:44 +0200
Subject: UI. Fix for Bug #1485831 (Preview of bitmap image in file chooser no
 longer displays its dimensions).

Fixed bugs:
  - https://launchpad.net/bugs/1485831

(bzr r14310)
---
 src/ui/dialog/filedialogimpl-gtkmm.cpp | 68 ++++++++++++++++++++--------------
 1 file changed, 40 insertions(+), 28 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp
index 17cf835cd..042637d22 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.cpp
+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp
@@ -199,37 +199,9 @@ void SVGPreview::showImage(Glib::ustring &theFileName)
     // files so we assume they are well formed.
 
     // std::cout << "SVGPreview::showImage: " << theFileName << std::endl;
-    std::ifstream input(theFileName.c_str());
-
     std::string width;
     std::string height;
 
-    if( !input ) {
-        std::cerr << "SVGPreview::showImage: Failed to open file: " << theFileName << std::endl;
-    } else {
-
-        std::string token;
-
-        Glib::MatchInfo match_info;
-        Glib::RefPtr<Glib::Regex> regex1 = Glib::Regex::create("width=\"(.*)\"");
-        Glib::RefPtr<Glib::Regex> regex2 = Glib::Regex::create("height=\"(.*)\"");
- 
-        while( !input.eof() && (height.empty() || width.empty()) ) {
-
-            input >> token;
-            // std::cout << "|" << token << "|" << std::endl;
-
-            if (regex1->match(token, match_info)) {
-                width = match_info.fetch(1).raw();
-            }
-
-            if (regex2->match(token, match_info)) {
-                height = match_info.fetch(1).raw();
-            }
-
-        }
-    }
-
     /*#####################################
     # LET'S HAVE SOME FUN WITH SVG!
     # Instead of just loading an image, why
@@ -265,6 +237,46 @@ void SVGPreview::showImage(Glib::ustring &theFileName)
 
     gint imgWidth = img->get_width();
     gint imgHeight = img->get_height();
+    
+    Glib::ustring svg = ".svg";
+    if (hasSuffix(fileName, svg)) {
+        std::ifstream input(theFileName.c_str());
+        if( !input ) {
+            std::cerr << "SVGPreview::showImage: Failed to open file: " << theFileName << std::endl;
+        } else {
+
+            std::string token;
+
+            Glib::MatchInfo match_info;
+            Glib::RefPtr<Glib::Regex> regex1 = Glib::Regex::create("width=\"(.*)\"");
+            Glib::RefPtr<Glib::Regex> regex2 = Glib::Regex::create("height=\"(.*)\"");
+     
+            while( !input.eof() && (height.empty() || width.empty()) ) {
+
+                input >> token;
+                // std::cout << "|" << token << "|" << std::endl;
+
+                if (regex1->match(token, match_info)) {
+                    width = match_info.fetch(1).raw();
+                }
+
+                if (regex2->match(token, match_info)) {
+                    height = match_info.fetch(1).raw();
+                }
+
+            }
+        }
+    }
+    
+    // TODO: replace int to string conversion with std::to_string when fully C++11 compliant
+    if (height.empty() || width.empty()) {
+        std::ostringstream s_width;
+        std::ostringstream s_height;
+        s_width << imgWidth;
+        s_height << imgHeight;
+        width = s_width.str();
+        height = s_height.str();
+    }
 
     // Find the minimum scale to fit the image inside the preview area
     double scaleFactorX = (0.9 * (double)previewWidth) / ((double)imgWidth);
-- 
cgit v1.2.3


From 24cdeecb6af278d2bb321dad6561a2dbe55e3960 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Fri, 28 Aug 2015 15:14:36 +0200
Subject: typo ?

(bzr r14330)
---
 src/ui/widget/color-entry.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui')

diff --git a/src/ui/widget/color-entry.h b/src/ui/widget/color-entry.h
index edabe1980..08537f26d 100644
--- a/src/ui/widget/color-entry.h
+++ b/src/ui/widget/color-entry.h
@@ -9,7 +9,7 @@
  */
 
 #ifndef SEEN_COLOR_ENTRY_H
-#define SEEN_COLOR_ENTRY_H_
+#define SEEN_COLOR_ENTRY_H
 
 #include <gtkmm/entry.h>
 #include "ui/selected-color.h"
-- 
cgit v1.2.3


From b72f37fbc96879418572c01b682d0403c3e36b18 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Sun, 30 Aug 2015 19:55:25 +0200
Subject: Why would anyone make a sorting function that is not antisymmetric ?
 That makes std::sort crash, and makes me sad.

Fixed bugs:
  - https://launchpad.net/bugs/1490196

(bzr r14334)
---
 src/ui/dialog/grid-arrange-tab.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/grid-arrange-tab.cpp b/src/ui/dialog/grid-arrange-tab.cpp
index ccd23a572..086cbe45f 100644
--- a/src/ui/dialog/grid-arrange-tab.cpp
+++ b/src/ui/dialog/grid-arrange-tab.cpp
@@ -75,16 +75,10 @@ static bool sp_compare_x_position(SPItem *first, SPItem *second)
         a_in_b_vert = false;
     }
 
-    if (!a_in_b_vert) {
-        return true;
-    }
-    if (a_in_b_vert && a->min()[X] > b->min()[X]) {
-        return false;
+    if (!a_in_b_vert) { // a and b are not in the same row
+        return (a->min()[Y] < b->min()[Y]);
     }
-    if (a_in_b_vert && a->min()[X] < b->min()[X]) {
-        return true;
-    }
-    return false;
+    return (a->min()[X] < b->min()[X]);
 }
 
 /*
-- 
cgit v1.2.3


From 6dd9965594784716e56646d385b9a81063290353 Mon Sep 17 00:00:00 2001
From: jtx <javier.arraiza@marker.es>
Date: Tue, 1 Sep 2015 12:45:09 +0200
Subject: Improvements to BSPline widgets: Now the "Change Weight" is % based
 insteas 0-1 interval Removed "Ignore cusp nodes" and substituted by: "Apply
 on cusp nodes" and "Apply on non cusp nodes"

(bzr r14337)
---
 src/ui/tool/node.cpp             | 2 +-
 src/ui/tool/path-manipulator.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index 55d801c46..06e49dc7f 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -61,7 +61,7 @@ namespace Inkscape {
 namespace UI {
 
 const double NO_POWER = 0.0;
-const double DEFAULT_START_POWER = 0.3334;
+const double DEFAULT_START_POWER = 0.333334;
 
 ControlPoint::ColorSet Node::node_colors = {
     {0xbfbfbf00, 0x000000ff}, // normal fill, stroke
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index 7b7bc98ee..fb9e2c070 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -58,7 +58,7 @@ enum PathChange {
 } // anonymous namespace
 const double HANDLE_CUBIC_GAP = 0.001;
 const double NO_POWER = 0.0;
-const double DEFAULT_START_POWER = 0.3334;
+const double DEFAULT_START_POWER = 0.333334;
 
 
 /**
-- 
cgit v1.2.3


From 8bd8486dc468d6c41b84013c60d9592146851ff8 Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Sat, 12 Sep 2015 08:40:47 +0200
Subject: Export. Fix for bug #170295 (default export image name for not-saved
 drawings).

Fixed bugs:
  - https://launchpad.net/bugs/170295

(bzr r14357)
---
 src/ui/dialog/export.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/ui')

diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 1edfdfe80..59fab7771 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -474,7 +474,14 @@ void Export::set_default_filename () {
 
         doc_export_name = filename_entry.get_text();
     }
+    else if ( SP_ACTIVE_DOCUMENT )
+    {
+        Glib::ustring filename = create_filepath_from_id (_("bitmap"), filename_entry.get_text());
+        filename_entry.set_text(filename);
+        filename_entry.set_position(filename.length());
 
+        doc_export_name = filename_entry.get_text();
+    }
 }
 
 #if WITH_GTKMM_3_0
-- 
cgit v1.2.3


From da33293ac34f6e05d62b1ea3d3e0e78887e7cfd1 Mon Sep 17 00:00:00 2001
From: Alvin Penner <penner@vaxxine.com>
Date: Sat, 12 Sep 2015 15:05:21 -0400
Subject: set node tool rubberband shadow. (Bug 1494445)

Fixed bugs:
  - https://launchpad.net/bugs/1494445

(bzr r14358)
---
 src/ui/tool/selector.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/ui')

diff --git a/src/ui/tool/selector.cpp b/src/ui/tool/selector.cpp
index 051cb41ae..9acf7de88 100644
--- a/src/ui/tool/selector.cpp
+++ b/src/ui/tool/selector.cpp
@@ -39,6 +39,7 @@ public:
         setVisible(false);
         _rubber = static_cast<CtrlRect*>(sp_canvas_item_new(_desktop->getControls(),
         SP_TYPE_CTRLRECT, NULL));
+        _rubber->setShadow(1, 0xffffffff);
         sp_canvas_item_hide(_rubber);
     }
 
-- 
cgit v1.2.3


From 25900540fbb26b44933ce1ead2240893769cd60f Mon Sep 17 00:00:00 2001
From: Diederik van Lierop <mail@diedenrezi.nl>
Date: Sun, 13 Sep 2015 19:50:28 +0200
Subject: Refactoring of the code that handles transformations and snapping in
 the selector tool and the node tool. Splitting large chunks of code into some
 small classes, and eliminating some wrapper methods which were all just too
 similar

(bzr r14363)
---
 src/ui/tool/transform-handle-set.cpp | 48 ++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 19 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tool/transform-handle-set.cpp b/src/ui/tool/transform-handle-set.cpp
index da2a54989..748b9d4cc 100644
--- a/src/ui/tool/transform-handle-set.cpp
+++ b/src/ui/tool/transform-handle-set.cpp
@@ -15,9 +15,11 @@
 #include <glib/gi18n.h>
 #include <2geom/transforms.h>
 #include "desktop.h"
+#include "sp-namedview.h"
 
 #include "display/sodipodi-ctrlrect.h"
 #include "preferences.h"
+#include "pure-transform.h"
 #include "snap.h"
 #include "snap-candidate.h"
 #include "sp-namedview.h"
@@ -93,6 +95,7 @@ TransformHandle::TransformHandle(TransformHandleSet &th, SPAnchorType anchor, Gl
     setVisible(false);
 }
 
+// TODO: This code is duplicated in seltrans.cpp; fix this!
 void TransformHandle::getNextClosestPoint(bool reverse)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -113,6 +116,11 @@ void TransformHandle::getNextClosestPoint(bool reverse)
             _snap_points.clear();
             _snap_points.push_back(*_all_snap_sources_iter);
 
+            // Show the updated snap source now; otherwise it won't be shown until the selection is being moved again
+            SnapManager &m = _desktop->namedview->snap_manager;
+            m.setup(_desktop);
+            m.displaySnapsource(*_all_snap_sources_iter);
+            m.unSetup();
         }
     }
 }
@@ -247,7 +255,7 @@ protected:
         if (Geom::are_near(vold[Geom::X], 0) || Geom::are_near(vold[Geom::Y], 0))
             return Geom::identity();
 
-        double scale[2] = { vnew[Geom::X] / vold[Geom::X], vnew[Geom::Y] / vold[Geom::Y] };
+        Geom::Scale scale = Geom::Scale(vnew[Geom::X] / vold[Geom::X], vnew[Geom::Y] / vold[Geom::Y]);
 
         if (held_alt(*event)) {
             for (unsigned i = 0; i < 2; ++i) {
@@ -261,20 +269,21 @@ protected:
             SnapManager &m = _th._desktop->namedview->snap_manager;
             m.setupIgnoreSelection(_th._desktop, true, &_unselected_points);
 
-            Inkscape::SnappedPoint sp;
+            Inkscape::PureScale *ptr;
             if (held_control(*event)) {
                 scale[0] = scale[1] = std::min(scale[0], scale[1]);
-                sp = m.constrainedSnapScale(_snap_points, _origin, Geom::Scale(scale[0], scale[1]), scc);
+                ptr = new Inkscape::PureScaleConstrained(Geom::Scale(scale[0], scale[1]), scc);
             } else {
-                sp = m.freeSnapScale(_snap_points, _origin, Geom::Scale(scale[0], scale[1]), scc);
+                ptr = new Inkscape::PureScale(Geom::Scale(scale[0], scale[1]), scc, false);
             }
+            m.snapTransformed(_snap_points, _origin, (*ptr));
             m.unSetup();
 
-            if (sp.getSnapped()) {
-                Geom::Point result = sp.getTransformation();
-                scale[0] = result[0];
-                scale[1] = result[1];
+            if (ptr->best_snapped_point.getSnapped()) {
+                scale = ptr->getScaleSnapped();
             }
+
+            delete ptr;
         }
 
         _last_scale_x = scale[0];
@@ -349,11 +358,12 @@ protected:
             m.setupIgnoreSelection(_th._desktop, true, &_unselected_points);
 
             bool uniform = held_control(*event);
-            Inkscape::SnappedPoint sp = m.constrainedSnapStretch(_snap_points, _origin, vs[d1], scc, d1, uniform);
+            Inkscape::PureStretchConstrained psc = Inkscape::PureStretchConstrained(vs[d1], scc, d1, uniform);
+            m.snapTransformed(_snap_points, _origin, psc);
             m.unSetup();
 
-            if (sp.getSnapped()) {
-                Geom::Point result = sp.getTransformation();
+            if (psc.best_snapped_point.getSnapped()) {
+                Geom::Point result = psc.getStretchSnapped().vector(); //best_snapped_point.getTransformation();
                 vs[d1] = result[d1];
                 vs[d2] = result[d2];
             } else {
@@ -414,11 +424,12 @@ protected:
         } else {
             SnapManager &m = _th._desktop->namedview->snap_manager;
             m.setupIgnoreSelection(_th._desktop, true, &_unselected_points);
-            Inkscape::SnappedPoint sp = m.constrainedSnapRotate(_snap_points, _origin, angle, rotc);
+            Inkscape::PureRotateConstrained prc = Inkscape::PureRotateConstrained(angle, rotc);
+            m.snapTransformed(_snap_points, _origin, prc);
             m.unSetup();
 
-            if (sp.getSnapped()) {
-                angle = sp.getTransformation()[0];
+            if (prc.best_snapped_point.getSnapped()) {
+                angle = prc.getAngleSnapped(); //best_snapped_point.getTransformation()[0];
             }
         }
 
@@ -528,13 +539,12 @@ protected:
             SnapManager &m = _th._desktop->namedview->snap_manager;
             m.setupIgnoreSelection(_th._desktop, true, &_unselected_points);
 
-            Geom::Point cvec; cvec[d2] = 1.0;
-            Inkscape::Snapper::SnapConstraint const constraint(cvec);
-            Inkscape::SnappedPoint sp = m.constrainedSnapSkew(_snap_points, _origin, constraint, Geom::Point(skew[d1], scale[d1]), scc, d2);
+            Inkscape::PureSkewConstrained psc = Inkscape::PureSkewConstrained(skew[d1], scale[d1], scc, d2);
+            m.snapTransformed(_snap_points, _origin, psc);
             m.unSetup();
 
-            if (sp.getSnapped()) {
-                skew[d1] =  sp.getTransformation()[0];
+            if (psc.best_snapped_point.getSnapped()) {
+                skew[d1] = psc.getSkewSnapped(); //best_snapped_point.getTransformation()[0];
             }
         }
 
-- 
cgit v1.2.3


From 82ca9953c316a91967aae392583310a4f6dec45d Mon Sep 17 00:00:00 2001
From: Mattia Rizzolo <mattia@mapreri.org>
Date: Mon, 14 Sep 2015 17:08:31 +0000
Subject: Fix typo s/seperator/separator/

(bzr r14364.1.1)
---
 src/ui/interface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui')

diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index a129d4b92..d8dbd9452 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -872,7 +872,7 @@ static void sp_ui_build_dyn_menus(Inkscape::XML::Node *menus, GtkWidget *menu, I
                 // This was spelt wrong in the original version
                 // and so this is for backward compatibility.  It can
                 // probably be dropped after the 0.44 release.
-             || !strcmp(menu_pntr->name(), "seperator")) {
+             || !strcmp(menu_pntr->name(), "separator")) {
             GtkWidget *item = gtk_separator_menu_item_new();
             gtk_widget_show(item);
             gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-- 
cgit v1.2.3


From cde4201fc0a5eed704bf7374300132e5ab9a0476 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Wed, 16 Sep 2015 20:22:07 +0200
Subject: fix for recent merge of ~mapreri/inkscape/typo (cf discussion at
 https://code.launchpad.net/~mapreri/inkscape/typo/+merge/270993 )

(bzr r14370)
---
 src/ui/interface.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index d8dbd9452..9a4e1d773 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -868,11 +868,7 @@ static void sp_ui_build_dyn_menus(Inkscape::XML::Node *menus, GtkWidget *menu, I
             }
             continue;
         }
-        if (!strcmp(menu_pntr->name(), "separator")
-                // This was spelt wrong in the original version
-                // and so this is for backward compatibility.  It can
-                // probably be dropped after the 0.44 release.
-             || !strcmp(menu_pntr->name(), "separator")) {
+        if (!strcmp(menu_pntr->name(), "separator")) {
             GtkWidget *item = gtk_separator_menu_item_new();
             gtk_widget_show(item);
             gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-- 
cgit v1.2.3


From ab9ef493fa3a752c5e16da7f3e187b4c00031442 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Thu, 17 Sep 2015 02:24:19 +0200
Subject: Added a pref option to disable "spacebar panning". (default:enabled)

Fixed bugs:
  - https://launchpad.net/bugs/1401593

(bzr r14372)
---
 src/ui/dialog/inkscape-preferences.cpp | 8 +++-----
 src/ui/tools/tool-base.cpp             | 9 ++++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 49864ccbb..14eaa65aa 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -1250,11 +1250,9 @@ void InkscapePreferences::initPageBehavior()
     _scroll_auto_thres.init ( "/options/autoscrolldistance/value", -600.0, 600.0, 1.0, 1.0, -10.0, true, false);
     _page_scrolling.add_line( true, _("_Threshold:"), _scroll_auto_thres, _("pixels"),
                            _("How far (in screen pixels) you need to be from the canvas edge to trigger autoscroll; positive is outside the canvas, negative is within the canvas"), false);
-/*
-    _scroll_space.init ( _("Left mouse button pans when Space is pressed"), "/options/spacepans/value", false);
-    _page_scrolling.add_line( false, "", _scroll_space, "",
-                            _("When on, pressing and holding Space and dragging with left mouse button pans canvas (as in Adobe Illustrator); when off, Space temporarily switches to Selector tool (default)"));
-*/
+    _scroll_space.init ( _("Mouse move pans when Space is pressed"), "/options/spacebarpans/value", true);
+    _page_scrolling.add_line( true, "", _scroll_space, "",
+                            _("When on, pressing and holding Space and dragging pans canvas"));
     _wheel_zoom.init ( _("Mouse wheel zooms by default"), "/options/wheelzooms/value", false);
     _page_scrolling.add_line( false, "", _wheel_zoom, "",
                             _("When on, mouse wheel zooms without Ctrl and scrolls canvas with Ctrl; when off, it zooms with Ctrl and scrolls without Ctrl"));
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 0f9b3ee7a..b5ffb9e7a 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -358,7 +358,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
 
     /// @todo REmove redundant /value in preference keys
     tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
-
+    bool allow_panning = prefs->getBool("/options/spacebarpans/value");
     gint ret = FALSE;
 
     switch (event->type) {
@@ -582,7 +582,6 @@ bool ToolBase::root_handler(GdkEvent* event) {
     case GDK_KEY_PRESS: {
         double const acceleration = prefs->getDoubleLimited(
                 "/options/scrollingacceleration/value", 0, 0, 6);
-
         int const key_scroll = prefs->getIntLimited("/options/keyscroll/value",
                 10, 0, 1000);
 
@@ -692,10 +691,10 @@ bool ToolBase::root_handler(GdkEvent* event) {
             break;
 
         case GDK_KEY_space:
-            xp = yp = 0;
             within_tolerance = true;
+            xp = yp = 0;
+            if (!allow_panning) break;
             panning = 4;
-
             this->space_panning = true;
             this->message_context->set(Inkscape::INFORMATION_MESSAGE,
                     _("<b>Space+mouse move</b> to pan canvas"));
@@ -742,7 +741,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
 
         switch (get_group0_keyval(&event->key)) {
         case GDK_KEY_space:
-            if (within_tolerance == true) {
+            if (within_tolerance || !allow_panning) {
                 // Space was pressed, but not panned
                 sp_toggle_selector(desktop);
 
-- 
cgit v1.2.3


From 6acb877a000ae9feaa38316bd6f69730cef3822d Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Sun, 20 Sep 2015 15:57:16 +0200
Subject: Enable "Tile" filter primitive in Filters dialog.

(bzr r14378)
---
 src/ui/dialog/filter-effects-dialog.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 1ff9e4a1b..22c8c76f2 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -2756,8 +2756,6 @@ FilterEffectsDialog::FilterEffectsDialog()
     _sizegroup = Gtk::SizeGroup::create(Gtk::SIZE_GROUP_HORIZONTAL);
     _sizegroup->set_ignore_hidden();
 
-    _add_primitive_type.remove_row(NR_FILTER_TILE);
-
     // Initialize widget hierarchy
 #if WITH_GTKMM_3_0
     Gtk::Paned* hpaned = Gtk::manage(new Gtk::Paned);
@@ -2925,7 +2923,7 @@ void FilterEffectsDialog::init_settings_widgets()
     _settings->add_lightsource();
 
     _settings->type(NR_FILTER_TILE);
-    _settings->add_notimplemented();
+    _settings->add_no_params();
 
     _settings->type(NR_FILTER_TURBULENCE);
 //    _settings->add_checkbutton(false, SP_ATTR_STITCHTILES, _("Stitch Tiles"), "stitch", "noStitch");
@@ -3017,7 +3015,7 @@ void FilterEffectsDialog::update_primitive_infobox()
             break;
         case(NR_FILTER_TILE):
             _infobox_icon.set_from_icon_name("feTile-icon", Gtk::ICON_SIZE_DIALOG);
-            _infobox_desc.set_markup(_("The <b>feTile</b> filter primitive tiles a region with its input graphic"));
+            _infobox_desc.set_markup(_("The <b>feTile</b> filter primitive tiles a region with an input graphic. The source tile is defined by the filter primitive subregion of the input."));
             break;
         case(NR_FILTER_TURBULENCE):
             _infobox_icon.set_from_icon_name("feTurbulence-icon", Gtk::ICON_SIZE_DIALOG);
-- 
cgit v1.2.3


From a1a178ce0e1550a8dc92585b90f0f93dd498833e Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Fri, 25 Sep 2015 18:11:37 +0200
Subject: UI. Fix for bug #1365405 (Scaling-Tool edit field for height not
 acting proportional).

Fixed bugs:
  - https://launchpad.net/bugs/1365405

(bzr r14386)
---
 src/ui/dialog/transformation.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/ui')

diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index 498ad7822..6049368f5 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -1170,6 +1170,9 @@ void Transformation::onReplaceMatrixToggled()
 void Transformation::onScaleProportionalToggled()
 {
     onScaleXValueChanged();
+    if (_scalar_scale_vertical.setProgrammatically) {
+        _scalar_scale_vertical.setProgrammatically = false;
+    }
 }
 
 
-- 
cgit v1.2.3


From 7acea8118f730927d041f26aae4e98f964fdda4f Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Sat, 3 Oct 2015 00:16:13 +0200
Subject: Fixes some non-antisymmetrical sort function

Fixed bugs:
  - https://launchpad.net/bugs/1502267

(bzr r14392)
---
 src/ui/dialog/align-and-distribute.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 882427912..6a9c3db6b 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -535,7 +535,7 @@ private :
             if (length_a != length_b) return (length_a > length_b);
         }
         // Last criteria: Sort according to the z-coordinate
-        return (a->isSiblingOf(b));
+        return sp_item_repr_compare_position(a,b)<0;
     }
 
     virtual void on_button_click()
-- 
cgit v1.2.3


From 8a5fcb84747766ff098bbc21080a24a74bce2973 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Sat, 3 Oct 2015 16:09:07 +0200
Subject: Fix for r14372 bug

Fixed bugs:
  - https://launchpad.net/bugs/1401593

(bzr r14394)
---
 src/ui/tools/tool-base.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index b5ffb9e7a..bf7b61b61 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -741,7 +741,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
 
         switch (get_group0_keyval(&event->key)) {
         case GDK_KEY_space:
-            if (within_tolerance || !allow_panning) {
+            if (within_tolerance) {
                 // Space was pressed, but not panned
                 sp_toggle_selector(desktop);
 
-- 
cgit v1.2.3


From 6b61296109001d15cd1e2a43c38385b5fdba81c7 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 4 Oct 2015 03:31:27 +0200
Subject: Add improvements to measure tool: more responsive add option to
 handle only active layer or all add a option to hide/show first and last
 segment add a option to compute only one global sice

(bzr r14393.1.1)
---
 src/ui/tools/measure-tool.cpp | 731 +++++++++++++++++++++---------------------
 src/ui/tools/measure-tool.h   |   4 +-
 2 files changed, 369 insertions(+), 366 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 570f3e796..aadc8790a 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -15,6 +15,7 @@
 #include <boost/none_t.hpp>
 #include "util/units.h"
 #include "macros.h"
+#include "rubberband.h"
 #include "display/curve.h"
 #include "sp-shape.h"
 #include "sp-text.h"
@@ -296,22 +297,18 @@ static void calculate_intersections(SPDesktop * /*desktop*/, SPItem* item, Geom:
 }
 
 bool MeasureTool::root_handler(GdkEvent* event) {
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
-
     gint ret = FALSE;
 
     switch (event->type) {
         case GDK_BUTTON_PRESS: {
             Geom::Point const button_w(event->button.x, event->button.y);
             explicitBase = boost::none;
-            lastEnd = boost::none;
+            last_end = boost::none;
             start_point = desktop->w2d(button_w);
 
             if (event->button.button == 1 && !this->space_panning) {
                 // save drag origin
-                xp = static_cast<gint>(event->button.x);
-                yp = static_cast<gint>(event->button.y);
+                start_point = desktop->w2d(Geom::Point(event->button.x, event->button.y));
                 within_tolerance = true;
 
                 ret = TRUE;
@@ -330,417 +327,423 @@ bool MeasureTool::root_handler(GdkEvent* event) {
         }
         case GDK_KEY_PRESS: {
             if ((event->key.keyval == GDK_KEY_Shift_L) || (event->key.keyval == GDK_KEY_Shift_R)) {
-                if (lastEnd) {
-                    explicitBase = lastEnd;
+                if (last_end) {
+                    explicitBase = last_end;
                 }
             }
             break;
         }
         case GDK_MOTION_NOTIFY: {
-            if (!((event->motion.state & GDK_BUTTON1_MASK) && !this->space_panning)) {
-                if (!(event->motion.state & GDK_SHIFT_MASK)) {
-                    Geom::Point const motion_w(event->motion.x, event->motion.y);
-                    Geom::Point const motion_dt(desktop->w2d(motion_w));
+            if (!(event->motion.state & GDK_BUTTON1_MASK) && !(event->motion.state & GDK_SHIFT_MASK)) {
+                Geom::Point const motion_w(event->motion.x, event->motion.y);
+                Geom::Point const motion_dt(desktop->w2d(motion_w));
 
-                    SnapManager &m = desktop->namedview->snap_manager;
-                    m.setup(desktop);
+                SnapManager &m = desktop->namedview->snap_manager;
+                m.setup(desktop);
 
-                    Inkscape::SnapCandidatePoint scp(motion_dt, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-                    scp.addOrigin(start_point);
+                Inkscape::SnapCandidatePoint scp(motion_dt, Inkscape::SNAPSOURCE_OTHER_HANDLE);
+                scp.addOrigin(start_point);
 
-                    m.preSnap(scp);
-                    m.unSetup();
-                }
+                m.preSnap(scp);
+                m.unSetup();
             } else {
                 ret = TRUE;
-
-                if ( within_tolerance
-                     && ( abs( static_cast<gint>(event->motion.x) - xp ) < tolerance )
-                     && ( abs( static_cast<gint>(event->motion.y) - yp ) < tolerance ) ) {
-                    break; // do not drag if we're within tolerance from origin
+                Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+                tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
+                Geom::Point const motion_w(event->motion.x, event->motion.y);
+                if ( within_tolerance){
+                    if ( Geom::LInfty( motion_w - start_point ) < tolerance) {
+                        return false;   // Do not drag if we're within tolerance from origin.
+                    }
                 }
                 // Once the user has moved farther than tolerance from the original location
                 // (indicating they intend to move the object, not click), then always process the
                 // motion notify coordinates as given (no snapping back to origin)
                 within_tolerance = false;
-
-                //clear previous temporary canvas items, we'll draw new ones
-                for (size_t idx = 0; idx < measure_tmp_items.size(); ++idx) {
-                    desktop->remove_temporary_canvasitem(measure_tmp_items[idx]);
-                }
-
-                measure_tmp_items.clear();
-
-                Geom::Point const motion_w(event->motion.x, event->motion.y);
-                Geom::Point const motion_dt(desktop->w2d(motion_w));
-                Geom::Point end_point = motion_dt;
-
-                if (event->motion.state & GDK_CONTROL_MASK) {
-                    spdc_endpoint_snap_rotation(this, end_point, start_point, event->motion.state);
-                } else {
-                    if (!(event->motion.state & GDK_SHIFT_MASK)) {
-                        SnapManager &m = desktop->namedview->snap_manager;
-                        m.setup(desktop);
-                        Inkscape::SnapCandidatePoint scp(end_point, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-                        scp.addOrigin(start_point);
-                        Inkscape::SnappedPoint sp = m.freeSnap(scp);
-                        end_point = sp.getPoint();
-                        m.unSetup();
-                    }
+                if(event->motion.time == 0 || !last_end  || Geom::LInfty( motion_w - *last_end ) > (tolerance/2)){
+                    showCanvasItems(event->motion);
+                    last_end = motion_w ;
                 }
+                gobble_motion_events(GDK_BUTTON1_MASK);
+            }
+            break;
+        }
+        case GDK_BUTTON_RELEASE: {
+            sp_event_context_discard_delayed_snap_event(this);
+            explicitBase = boost::none;
+            last_end = boost::none;
 
-                Geom::PathVector lineseg;
-                Geom::Path p;
-                p.start(desktop->dt2doc(start_point));
-                p.appendNew<Geom::LineSegment>(desktop->dt2doc(end_point));
-                lineseg.push_back(p);
-
-                double deltax = end_point[Geom::X] - start_point[Geom::X];
-                double deltay = end_point[Geom::Y] - start_point[Geom::Y];
-                double angle = atan2(deltay, deltax);
-                double baseAngle = 0;
+            //clear all temporary canvas items related to the measurement tool.
+            for (size_t idx = 0; idx < measure_tmp_items.size(); ++idx) {
+                desktop->remove_temporary_canvasitem(measure_tmp_items[idx]);
+            }
 
-                if (explicitBase) {
-                    double deltax2 = explicitBase.get()[Geom::X] - start_point[Geom::X];
-                    double deltay2 = explicitBase.get()[Geom::Y] - start_point[Geom::Y];
+            measure_tmp_items.clear();
 
-                    baseAngle = atan2(deltay2, deltax2);
-                    angle -= baseAngle;
+            if (this->grabbed) {
+                sp_canvas_item_ungrab(this->grabbed, event->button.time);
+                this->grabbed = NULL;
+            }
 
-                    if (angle < -M_PI) {
-                        angle += 2 * M_PI;
-                    } else if (angle > M_PI) {
-                        angle -= 2 * M_PI;
-                    }
-                }
+            start_point = Geom::Point();
+            break;
+        }
+        default:
+            break;
+    }
+    if (!ret) {
+    	ret = ToolBase::root_handler(event);
+    }
+    
+    return ret;
+}
 
-//TODO: calculate NPOINTS
-//800 seems to be a good value for 800x600 resolution
-#define NPOINTS 800
+void MeasureTool::showCanvasItems(GdkEventMotion const &mevent){
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    Geom::Point const motion_w(mevent.x, mevent.y);
+    bool show_in_between = prefs->getBool("/tools/measure/show_in_between");
+    bool all_layers = prefs->getBool("/tools/measure/all_layers");
+    //clear previous temporary canvas items, we'll draw new ones
+    for (size_t idx = 0; idx < measure_tmp_items.size(); ++idx) {
+        desktop->remove_temporary_canvasitem(measure_tmp_items[idx]);
+    }
 
-                std::vector<Geom::Point> points;
+    measure_tmp_items.clear();
+    Geom::Point const motion_dt(desktop->w2d(motion_w));
+    Geom::Point end_point = motion_dt;
 
-                for (double i = 0; i < NPOINTS; i++) {
-                    points.push_back(desktop->d2w(start_point + (i / NPOINTS) * (end_point - start_point)));
-                }
+    if (mevent.state & GDK_CONTROL_MASK) {
+        spdc_endpoint_snap_rotation(this, end_point, start_point, mevent.state);
+    } else {
+        if (!(mevent.state & GDK_SHIFT_MASK)) {
+            SnapManager &m = desktop->namedview->snap_manager;
+            m.setup(desktop);
+            Inkscape::SnapCandidatePoint scp(end_point, Inkscape::SNAPSOURCE_OTHER_HANDLE);
+            scp.addOrigin(start_point);
+            Inkscape::SnappedPoint sp = m.freeSnap(scp);
+            end_point = sp.getPoint();
+            m.unSetup();
+        }
+    }
 
-                // TODO: Felipe, why don't you simply iterate over all items, and test whether their bounding boxes intersect
-                // with the measurement line, instead of interpolating over 800 points? E.g. bbox_of_measurement_line.intersects(*bbox_of_item).
-                // That's also how the object-snapper works, see _findCandidates() in object-snapper.cpp.
-
-                // TODO switch to a different variable name. The single letter 'l' is easy to misread.
-
-                //select elements crossed by line segment:
-                std::vector<SPItem*> items = desktop->getDocument()->getItemsAtPoints(desktop->dkey, points);
-                std::vector<double> intersection_times;
-                for (std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++) {
-                    SPItem *item = *i;
-
-                    if (SP_IS_SHAPE(item)) {
-                       calculate_intersections(desktop, item, lineseg, SP_SHAPE(item)->getCurve(), intersection_times);
-                    } else {
-                        if (SP_IS_TEXT(item) || SP_IS_FLOWTEXT(item)) {
-                            Inkscape::Text::Layout::iterator iter = te_get_layout(item)->begin();
-                            do {
-                                Inkscape::Text::Layout::iterator iter_next = iter;
-                                iter_next.nextGlyph(); // iter_next is one glyph ahead from iter
-                                if (iter == iter_next) {
-                                    break;
-                                }
-
-                                // get path from iter to iter_next:
-                                SPCurve *curve = te_get_layout(item)->convertToCurves(iter, iter_next);
-                                iter = iter_next; // shift to next glyph
-                                if (!curve) {
-                                    continue; // error converting this glyph
-                                }
-                                if (curve->is_empty()) { // whitespace glyph?
-                                    curve->unref();
-                                    continue;
-                                }
-
-                                curve->transform(item->i2doc_affine());
-
-                                calculate_intersections(desktop, item, lineseg, curve, intersection_times);
-
-                                if (iter == te_get_layout(item)->end()) {
-                                    break;
-                                }
-                            } while (true);
-                        }
-                    }
-                }
+    Geom::PathVector lineseg;
+    Geom::Path p;
+    p.start(desktop->dt2doc(start_point));
+    p.appendNew<Geom::LineSegment>(desktop->dt2doc(end_point));
+    lineseg.push_back(p);
 
-                Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-                if (!prefs->getBool("/tools/measure/ignore_1st_and_last", true)) {
-                    intersection_times.push_back(0);
-                    intersection_times.push_back(1);
-                }
+    double deltax = end_point[Geom::X] - start_point[Geom::X];
+    double deltay = end_point[Geom::Y] - start_point[Geom::Y];
+    double angle = atan2(deltay, deltax);
+    double baseAngle = 0;
 
-                Glib::ustring unit_name = prefs->getString("/tools/measure/unit");
-                if (!unit_name.compare("")) {
-                    unit_name = "px";
-                }
+    if (explicitBase) {
+        double deltax2 = explicitBase.get()[Geom::X] - start_point[Geom::X];
+        double deltay2 = explicitBase.get()[Geom::Y] - start_point[Geom::Y];
 
-                double fontsize = prefs->getInt("/tools/measure/fontsize");
+        baseAngle = atan2(deltay2, deltax2);
+        angle -= baseAngle;
 
-                // Normal will be used for lines and text
-                Geom::Point windowNormal = Geom::unit_vector(Geom::rot90(desktop->d2w(end_point - start_point)));
-                Geom::Point normal = desktop->w2d(windowNormal);
+        if (angle < -M_PI) {
+            angle += 2 * M_PI;
+        } else if (angle > M_PI) {
+            angle -= 2 * M_PI;
+        }
+    }
+    std::vector<SPItem*> items;
+    Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
+    r->setMode(RUBBERBAND_MODE_TOUCHPATH);
+    if(!show_in_between){
+        r->start(desktop,start_point);
+        r->move(end_point);
+        items = desktop->getDocument()->getItemsAtPoints(desktop->dkey, r->getPoints(), all_layers, 2);
+        r->stop();
+        r->setMode(RUBBERBAND_MODE_TOUCHPATH);
+        r->start(desktop,end_point);
+        r->move(start_point);
+        std::vector<SPItem*> items_reverse = desktop->getDocument()->getItemsAtPoints(desktop->dkey, r->getPoints(), all_layers, 2);
+        r->stop();
+        if(items_reverse.size() == 2){
+            items.push_back(items_reverse[1]);
+        }
+        if(items_reverse.size() >= 1){
+            items.push_back(items_reverse[0]);
+        }
+    } else {
+        r->start(desktop,start_point);
+        r->move(end_point);
+        items = desktop->getDocument()->getItemsAtPoints(desktop->dkey, r->getPoints(), all_layers);
+        r->stop();
+    }
+    std::vector<double> intersection_times;
+    for (std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++) {
+        SPItem *item = *i;
+        if (SP_IS_SHAPE(item)) {
+           calculate_intersections(desktop, item, lineseg, SP_SHAPE(item)->getCurve(), intersection_times);
+        } else {
+            if (SP_IS_TEXT(item) || SP_IS_FLOWTEXT(item)) {
+                Inkscape::Text::Layout::iterator iter = te_get_layout(item)->begin();
+                do {
+                    Inkscape::Text::Layout::iterator iter_next = iter;
+                    iter_next.nextGlyph(); // iter_next is one glyph ahead from iter
+                    if (iter == iter_next) {
+                        break;
+                    }
 
-                std::vector<Geom::Point> intersections;
-                std::sort(intersection_times.begin(), intersection_times.end());
-                for (std::vector<double>::iterator iter_t = intersection_times.begin(); iter_t != intersection_times.end(); iter_t++) {
-                    intersections.push_back(lineseg[0].pointAt(*iter_t));
-                }
+                    // get path from iter to iter_next:
+                    SPCurve *curve = te_get_layout(item)->convertToCurves(iter, iter_next);
+                    iter = iter_next; // shift to next glyph
+                    if (!curve) {
+                        continue; // error converting this glyph
+                    }
+                    if (curve->is_empty()) { // whitespace glyph?
+                        curve->unref();
+                        continue;
+                    }
 
-                std::vector<LabelPlacement> placements;
-                for (size_t idx = 1; idx < intersections.size(); ++idx) {
-                    LabelPlacement placement;
-                    placement.lengthVal = (intersections[idx] - intersections[idx - 1]).length();
-                    placement.lengthVal = Inkscape::Util::Quantity::convert(placement.lengthVal, "px", unit_name);
-                    placement.offset = DIMENSION_OFFSET;
-                    placement.start = desktop->doc2dt( (intersections[idx - 1] + intersections[idx]) / 2 );
-                    placement.end = placement.start - (normal * placement.offset);
+                    curve->transform(item->i2doc_affine());
 
-                    placements.push_back(placement);
-                }
+                    calculate_intersections(desktop, item, lineseg, curve, intersection_times);
+                    if (iter == te_get_layout(item)->end()) {
+                        break;
+                    }
+                } while (true);
+            }
+        }
+    }
+    Glib::ustring unit_name = prefs->getString("/tools/measure/unit");
+    if (!unit_name.compare("")) {
+        unit_name = "px";
+    }
 
-                // Adjust positions
-                repositionOverlappingLabels(placements, desktop, windowNormal, fontsize);
-
-                for (std::vector<LabelPlacement>::iterator it = placements.begin(); it != placements.end(); ++it)
-                {
-                    LabelPlacement &place = *it;
-
-                    // TODO cleanup memory, Glib::ustring, etc.:
-                    gchar *measure_str = g_strdup_printf("%.2f %s", place.lengthVal, unit_name.c_str());
-                    SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
-                                                                     desktop,
-                                                                     place.end,
-                                                                     measure_str);
-                    sp_canvastext_set_fontsize(canvas_tooltip, fontsize);
-                    canvas_tooltip->rgba = 0xffffffff;
-                    canvas_tooltip->rgba_background = 0x0000007f;
-                    canvas_tooltip->outline = false;
-                    canvas_tooltip->background = true;
-                    canvas_tooltip->anchor_position = TEXT_ANCHOR_CENTER;
-
-                    measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvas_tooltip, 0));
-                    g_free(measure_str);
-                }
+    double fontsize = prefs->getInt("/tools/measure/fontsize");
 
-                Geom::Point angleDisplayPt = calcAngleDisplayAnchor(desktop, angle, baseAngle,
-                                                                    start_point, end_point,
-                                                                    fontsize);
-
-                {
-                    // TODO cleanup memory, Glib::ustring, etc.:
-                    gchar *angle_str = g_strdup_printf("%.2f °", angle * 180/M_PI);
-
-                    SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
-                                                                     desktop,
-                                                                     angleDisplayPt,
-                                                                     angle_str);
-                    sp_canvastext_set_fontsize(canvas_tooltip, fontsize);
-                    canvas_tooltip->rgba = 0xffffffff;
-                    canvas_tooltip->rgba_background = 0x337f337f;
-                    canvas_tooltip->outline = false;
-                    canvas_tooltip->background = true;
-                    canvas_tooltip->anchor_position = TEXT_ANCHOR_CENTER;
-
-                    measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvas_tooltip, 0));
-                    g_free(angle_str);
-                }
+    // Normal will be used for lines and text
+    Geom::Point windowNormal = Geom::unit_vector(Geom::rot90(desktop->d2w(end_point - start_point)));
+    Geom::Point normal = desktop->w2d(windowNormal);
 
-                {
-                    double totallengthval = (end_point - start_point).length();
-                    totallengthval = Inkscape::Util::Quantity::convert(totallengthval, "px", unit_name);
-
-                    // TODO cleanup memory, Glib::ustring, etc.:
-                    gchar *totallength_str = g_strdup_printf("%.2f %s", totallengthval, unit_name.c_str());
-                    SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
-                                                                     desktop,
-                                                                     end_point + desktop->w2d(Geom::Point(3*fontsize, -fontsize)),
-                                                                     totallength_str);
-                    sp_canvastext_set_fontsize(canvas_tooltip, fontsize);
-                    canvas_tooltip->rgba = 0xffffffff;
-                    canvas_tooltip->rgba_background = 0x3333337f;
-                    canvas_tooltip->outline = false;
-                    canvas_tooltip->background = true;
-                    canvas_tooltip->anchor_position = TEXT_ANCHOR_LEFT;
-
-                    measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvas_tooltip, 0));
-                    g_free(totallength_str);
-                }
+    std::vector<Geom::Point> intersections;
+    std::sort(intersection_times.begin(), intersection_times.end());
+    for (std::vector<double>::iterator iter_t = intersection_times.begin(); iter_t != intersection_times.end(); iter_t++) {
+        if(show_in_between){
+            intersections.push_back(lineseg[0].pointAt(*iter_t));
+        }
+    }
+    if(!show_in_between && intersection_times.size() > 1){
+        intersections.push_back(lineseg[0].pointAt(intersection_times[0]));
+        intersections.push_back(lineseg[0].pointAt(intersection_times[intersection_times.size()-1]));
+    }
+    if (!prefs->getBool("/tools/measure/ignore_1st_and_last", true)) {
+        intersections.insert(intersections.begin(),lineseg[0].pointAt(0));
+        intersections.push_back(lineseg[0].pointAt(1));
+    }
+    std::vector<LabelPlacement> placements;
+    for (size_t idx = 1; idx < intersections.size(); ++idx) {
+        LabelPlacement placement;
+        placement.lengthVal = (intersections[idx] - intersections[idx - 1]).length();
+        placement.lengthVal = Inkscape::Util::Quantity::convert(placement.lengthVal, "px", unit_name);
+        placement.offset = DIMENSION_OFFSET;
+        placement.start = desktop->doc2dt( (intersections[idx - 1] + intersections[idx]) / 2 );
+        placement.end = placement.start - (normal * placement.offset);
+
+        placements.push_back(placement);
+    }
 
-                if (intersections.size() > 2) {
-                    double totallengthval = (intersections[intersections.size()-1] - intersections[0]).length();
-                    totallengthval = Inkscape::Util::Quantity::convert(totallengthval, "px", unit_name);
-
-                    // TODO cleanup memory, Glib::ustring, etc.:
-                    gchar *total_str = g_strdup_printf("%.2f %s", totallengthval, unit_name.c_str());
-                    SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
-                                                                     desktop,
-                                                                     desktop->doc2dt((intersections[0] + intersections[intersections.size()-1])/2) + normal * 60,
-                                                                     total_str);
-                    sp_canvastext_set_fontsize(canvas_tooltip, fontsize);
-                    canvas_tooltip->rgba = 0xffffffff;
-                    canvas_tooltip->rgba_background = 0x33337f7f;
-                    canvas_tooltip->outline = false;
-                    canvas_tooltip->background = true;
-                    canvas_tooltip->anchor_position = TEXT_ANCHOR_CENTER;
-
-                    measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvas_tooltip, 0));
-                    g_free(total_str);
-                }
+    // Adjust positions
+    repositionOverlappingLabels(placements, desktop, windowNormal, fontsize);
+    for (std::vector<LabelPlacement>::iterator it = placements.begin(); it != placements.end(); ++it)
+    {
+        LabelPlacement &place = *it;
+
+        // TODO cleanup memory, Glib::ustring, etc.:
+        gchar *measure_str = g_strdup_printf("%.2f %s", place.lengthVal, unit_name.c_str());
+        SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
+                                                         desktop,
+                                                         place.end,
+                                                         measure_str);
+        sp_canvastext_set_fontsize(canvas_tooltip, fontsize);
+        canvas_tooltip->rgba = 0xffffffff;
+        canvas_tooltip->rgba_background = 0x0000007f;
+        canvas_tooltip->outline = false;
+        canvas_tooltip->background = true;
+        canvas_tooltip->anchor_position = TEXT_ANCHOR_CENTER;
+
+        measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvas_tooltip, 0));
+        g_free(measure_str);
+    }
 
-                // Now that text has been added, we can add lines and controls so that they go underneath
-
-                for (size_t idx = 0; idx < intersections.size(); ++idx) {
-                    // Display the intersection indicator (i.e. the cross)
-                    SPCanvasItem * canvasitem = sp_canvas_item_new(desktop->getTempGroup(),
-                                                                   SP_TYPE_CTRL,
-                                                                   "anchor", SP_ANCHOR_CENTER,
-                                                                   "size", 8.0,
-                                                                   "stroked", TRUE,
-                                                                   "stroke_color", 0xff0000ff,
-                                                                   "mode", SP_KNOT_MODE_XOR,
-                                                                   "shape", SP_KNOT_SHAPE_CROSS,
-                                                                   NULL );
-
-                    SP_CTRL(canvasitem)->moveto(desktop->doc2dt(intersections[idx]));
-                    measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvasitem, 0));
-                }
+    Geom::Point angleDisplayPt = calcAngleDisplayAnchor(desktop, angle, baseAngle,
+                                                        start_point, end_point,
+                                                        fontsize);
 
-                // Since adding goes to the bottom, do all lines last.
-
-                // draw main control line
-                {
-                    SPCtrlLine *control_line = ControlManager::getManager().createControlLine(desktop->getTempGroup(),
-                                                                                              start_point,
-                                                                                              end_point);
-                    measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
-
-                    if ((end_point[Geom::X] != start_point[Geom::X]) && (end_point[Geom::Y] != start_point[Geom::Y])) {
-                        double length = std::abs((end_point - start_point).length());
-                        Geom::Point anchorEnd = start_point;
-                        anchorEnd[Geom::X] += length;
-                        if (explicitBase) {
-                            anchorEnd *= (Geom::Affine(Geom::Translate(-start_point))
-                                          * Geom::Affine(Geom::Rotate(baseAngle))
-                                          * Geom::Affine(Geom::Translate(start_point)));
-                        }
-
-                        SPCtrlLine *control_line = ControlManager::getManager().createControlLine(desktop->getTempGroup(),
-                                                                                                  start_point,
-                                                                                                  anchorEnd,
-                                                                                                  CTLINE_SECONDARY);
-                        measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
-
-                        createAngleDisplayCurve(desktop, start_point, end_point, angleDisplayPt, angle);
-                    }
-                }
+    {
+        // TODO cleanup memory, Glib::ustring, etc.:
+        gchar *angle_str = g_strdup_printf("%.2f °", angle * 180/M_PI);
+
+        SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
+                                                         desktop,
+                                                         angleDisplayPt,
+                                                         angle_str);
+        sp_canvastext_set_fontsize(canvas_tooltip, fontsize);
+        canvas_tooltip->rgba = 0xffffffff;
+        canvas_tooltip->rgba_background = 0x337f337f;
+        canvas_tooltip->outline = false;
+        canvas_tooltip->background = true;
+        canvas_tooltip->anchor_position = TEXT_ANCHOR_CENTER;
+
+        measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvas_tooltip, 0));
+        g_free(angle_str);
+    }
 
-                if (intersections.size() > 2) {
-                    ControlManager &mgr = ControlManager::getManager();
-                    SPCtrlLine *control_line = 0;
-                    control_line = mgr.createControlLine(desktop->getTempGroup(),
-                                                         desktop->doc2dt(intersections[0]) + normal * 60,
-                                                         desktop->doc2dt(intersections[intersections.size() - 1]) + normal * 60);
-                    measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
-
-                    control_line = mgr.createControlLine(desktop->getTempGroup(),
-                                                         desktop->doc2dt(intersections[0]),
-                                                         desktop->doc2dt(intersections[0]) + normal * 65);
-                    measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
-
-                    control_line = mgr.createControlLine(desktop->getTempGroup(),
-                                                         desktop->doc2dt(intersections[intersections.size() - 1]),
-                                                         desktop->doc2dt(intersections[intersections.size() - 1]) + normal * 65);
-                    measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
-                }
+    {
+        double totallengthval = (end_point - start_point).length();
+        totallengthval = Inkscape::Util::Quantity::convert(totallengthval, "px", unit_name);
+
+        // TODO cleanup memory, Glib::ustring, etc.:
+        gchar *totallength_str = g_strdup_printf("%.2f %s", totallengthval, unit_name.c_str());
+        SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
+                                                         desktop,
+                                                         end_point + desktop->w2d(Geom::Point(3*fontsize, -fontsize)),
+                                                         totallength_str);
+        sp_canvastext_set_fontsize(canvas_tooltip, fontsize);
+        canvas_tooltip->rgba = 0xffffffff;
+        canvas_tooltip->rgba_background = 0x3333337f;
+        canvas_tooltip->outline = false;
+        canvas_tooltip->background = true;
+        canvas_tooltip->anchor_position = TEXT_ANCHOR_LEFT;
+
+        measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvas_tooltip, 0));
+        g_free(totallength_str);
+    }
 
-                // call-out lines
-                for (std::vector<LabelPlacement>::iterator it = placements.begin(); it != placements.end(); ++it)
-                {
-                    LabelPlacement &place = *it;
-
-                    ControlManager &mgr = ControlManager::getManager();
-                    SPCtrlLine *control_line = mgr.createControlLine(desktop->getTempGroup(),
-                                                                     place.start,
-                                                                     place.end,
-                                                                     CTLINE_SECONDARY);
-                    measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
-                }
+    if (intersections.size() > 2) {
+        double totallengthval = (intersections[intersections.size()-1] - intersections[0]).length();
+        totallengthval = Inkscape::Util::Quantity::convert(totallengthval, "px", unit_name);
+
+        // TODO cleanup memory, Glib::ustring, etc.:
+        gchar *total_str = g_strdup_printf("%.2f %s", totallengthval, unit_name.c_str());
+        SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
+                                                         desktop,
+                                                         desktop->doc2dt((intersections[0] + intersections[intersections.size()-1])/2) + normal * 60,
+                                                         total_str);
+        sp_canvastext_set_fontsize(canvas_tooltip, fontsize);
+        canvas_tooltip->rgba = 0xffffffff;
+        canvas_tooltip->rgba_background = 0x33337f7f;
+        canvas_tooltip->outline = false;
+        canvas_tooltip->background = true;
+        canvas_tooltip->anchor_position = TEXT_ANCHOR_CENTER;
+
+        measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvas_tooltip, 0));
+        g_free(total_str);
+    }
 
-                {
-                    for (size_t idx = 1; idx < intersections.size(); ++idx) {
-                        Geom::Point measure_text_pos = (intersections[idx - 1] + intersections[idx]) / 2;
+    // Now that text has been added, we can add lines and controls so that they go underneath
+    for (size_t idx = 0; idx < intersections.size(); ++idx) {
+        // Display the intersection indicator (i.e. the cross)
+        SPCanvasItem * canvasitem = sp_canvas_item_new(desktop->getTempGroup(),
+                                                       SP_TYPE_CTRL,
+                                                       "anchor", SP_ANCHOR_CENTER,
+                                                       "size", 8.0,
+                                                       "stroked", TRUE,
+                                                       "stroke_color", 0xff0000ff,
+                                                       "mode", SP_KNOT_MODE_XOR,
+                                                       "shape", SP_KNOT_SHAPE_CROSS,
+                                                       NULL );
+
+        SP_CTRL(canvasitem)->moveto(desktop->doc2dt(intersections[idx]));
+        measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvasitem, 0));
+    }
 
-                        ControlManager &mgr = ControlManager::getManager();
-                        SPCtrlLine *control_line = mgr.createControlLine(desktop->getTempGroup(),
-                                                                         desktop->doc2dt(measure_text_pos),
-                                                                         desktop->doc2dt(measure_text_pos) - (normal * DIMENSION_OFFSET),
-                                                                         CTLINE_SECONDARY);
-                        measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
-                    }
-                }
+    // Since adding goes to the bottom, do all lines last.
 
-                // Initial point
-                {
-                    SPCanvasItem * canvasitem = sp_canvas_item_new(desktop->getTempGroup(),
-                                                                   SP_TYPE_CTRL,
-                                                                   "anchor", SP_ANCHOR_CENTER,
-                                                                   "size", 8.0,
-                                                                   "stroked", TRUE,
-                                                                   "stroke_color", 0xff0000ff,
-                                                                   "mode", SP_KNOT_MODE_XOR,
-                                                                   "shape", SP_KNOT_SHAPE_CROSS,
-                                                                   NULL );
-
-                    SP_CTRL(canvasitem)->moveto(start_point);
-                    measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvasitem, 0));
-                }
+    // draw main control line
+    {
+        SPCtrlLine *control_line = ControlManager::getManager().createControlLine(desktop->getTempGroup(),
+                                                                                  start_point,
+                                                                                  end_point);
+        measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
+
+        if ((end_point[Geom::X] != start_point[Geom::X]) && (end_point[Geom::Y] != start_point[Geom::Y])) {
+            double length = std::abs((end_point - start_point).length());
+            Geom::Point anchorEnd = start_point;
+            anchorEnd[Geom::X] += length;
+            if (explicitBase) {
+                anchorEnd *= (Geom::Affine(Geom::Translate(-start_point))
+                              * Geom::Affine(Geom::Rotate(baseAngle))
+                              * Geom::Affine(Geom::Translate(start_point)));
+            }
 
-                lastEnd = end_point; // track in case we get a anchoring key-press later
+            SPCtrlLine *control_line = ControlManager::getManager().createControlLine(desktop->getTempGroup(),
+                                                                                      start_point,
+                                                                                      anchorEnd,
+                                                                                      CTLINE_SECONDARY);
+            measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
 
-                gobble_motion_events(GDK_BUTTON1_MASK);
-            }
-            break;
+            createAngleDisplayCurve(desktop, start_point, end_point, angleDisplayPt, angle);
         }
-        case GDK_BUTTON_RELEASE: {
-            sp_event_context_discard_delayed_snap_event(this);
-            explicitBase = boost::none;
-            lastEnd = boost::none;
-
-            //clear all temporary canvas items related to the measurement tool.
-            for (size_t idx = 0; idx < measure_tmp_items.size(); ++idx) {
-                desktop->remove_temporary_canvasitem(measure_tmp_items[idx]);
-            }
+    }
 
-            measure_tmp_items.clear();
+    if (intersections.size() > 2) {
+        ControlManager &mgr = ControlManager::getManager();
+        SPCtrlLine *control_line = 0;
+        control_line = mgr.createControlLine(desktop->getTempGroup(),
+                                             desktop->doc2dt(intersections[0]) + normal * 60,
+                                             desktop->doc2dt(intersections[intersections.size() - 1]) + normal * 60);
+        measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
+
+        control_line = mgr.createControlLine(desktop->getTempGroup(),
+                                             desktop->doc2dt(intersections[0]),
+                                             desktop->doc2dt(intersections[0]) + normal * 65);
+        measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
+
+        control_line = mgr.createControlLine(desktop->getTempGroup(),
+                                             desktop->doc2dt(intersections[intersections.size() - 1]),
+                                             desktop->doc2dt(intersections[intersections.size() - 1]) + normal * 65);
+        measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
+    }
 
-            if (this->grabbed) {
-                sp_canvas_item_ungrab(this->grabbed, event->button.time);
-                this->grabbed = NULL;
-            }
+    // call-out lines
+    for (std::vector<LabelPlacement>::iterator it = placements.begin(); it != placements.end(); ++it)
+    {
+        LabelPlacement &place = *it;
+
+        ControlManager &mgr = ControlManager::getManager();
+        SPCtrlLine *control_line = mgr.createControlLine(desktop->getTempGroup(),
+                                                         place.start,
+                                                         place.end,
+                                                         CTLINE_SECONDARY);
+        measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
+    }
 
-            xp = 0;
-            yp = 0;
-            break;
+    {
+        for (size_t idx = 1; idx < intersections.size(); ++idx) {
+            Geom::Point measure_text_pos = (intersections[idx - 1] + intersections[idx]) / 2;
+
+            ControlManager &mgr = ControlManager::getManager();
+            SPCtrlLine *control_line = mgr.createControlLine(desktop->getTempGroup(),
+                                                             desktop->doc2dt(measure_text_pos),
+                                                             desktop->doc2dt(measure_text_pos) - (normal * DIMENSION_OFFSET),
+                                                             CTLINE_SECONDARY);
+            measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
         }
-        default:
-            break;
     }
 
-    if (!ret) {
-    	ret = ToolBase::root_handler(event);
+    // Initial point
+    {
+        SPCanvasItem * canvasitem = sp_canvas_item_new(desktop->getTempGroup(),
+                                                       SP_TYPE_CTRL,
+                                                       "anchor", SP_ANCHOR_CENTER,
+                                                       "size", 8.0,
+                                                       "stroked", TRUE,
+                                                       "stroke_color", 0xff0000ff,
+                                                       "mode", SP_KNOT_MODE_XOR,
+                                                       "shape", SP_KNOT_SHAPE_CROSS,
+                                                       NULL );
+
+        SP_CTRL(canvasitem)->moveto(start_point);
+        measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvasitem, 0));
     }
-
-    return ret;
 }
-
 }
 }
 }
diff --git a/src/ui/tools/measure-tool.h b/src/ui/tools/measure-tool.h
index 9701ba6ea..4673e0f0a 100644
--- a/src/ui/tools/measure-tool.h
+++ b/src/ui/tools/measure-tool.h
@@ -32,15 +32,15 @@ public:
 
 	virtual void finish();
 	virtual bool root_handler(GdkEvent* event);
+	virtual void showCanvasItems(GdkEventMotion const &event);
 
 	virtual const std::string& getPrefsPath();
 
 private:
 	SPCanvasItem* grabbed;
-
     Geom::Point start_point;
     boost::optional<Geom::Point> explicitBase;
-    boost::optional<Geom::Point> lastEnd;
+    boost::optional<Geom::Point> last_end;
 };
 
 }
-- 
cgit v1.2.3


From 4ebb09cb87a2f082f505e774f33c1f6d24fdf26d Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Sun, 4 Oct 2015 17:42:12 +0200
Subject: Fixes clonetiler trace mode on non-px documents

Fixed bugs:
  - https://launchpad.net/bugs/1502521

(bzr r14396)
---
 src/ui/dialog/clonetiler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index f84a2ffd6..da1c6d9fb 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -2479,7 +2479,7 @@ void CloneTiler::clonetiler_apply(GtkWidget */*widget*/, GtkWidget *dlg)
 
             // Trace tab
             if (dotrace) {
-                Geom::Rect bbox_t = transform_rect (bbox_original, t);
+                Geom::Rect bbox_t = transform_rect (bbox_original, t*Geom::Scale(1.0/scale_units));
 
                 guint32 rgba = clonetiler_trace_pick (bbox_t);
                 float r = SP_RGBA32_R_F(rgba);
-- 
cgit v1.2.3


From bd4a5a52a3aae4a9c871a9ea766ab490a5e25d84 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 4 Oct 2015 20:15:20 +0200
Subject: Added knots to post editing the measure and make it persistant
 throught tools

(bzr r14393.1.3)
---
 src/ui/tools/measure-tool.cpp | 139 ++++++++++++++++++++++++++++--------------
 src/ui/tools/measure-tool.h   |  30 ++++++---
 2 files changed, 114 insertions(+), 55 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index aadc8790a..142c04fc3 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -30,7 +30,7 @@
 #include "pixmaps/cursor-measure.xpm"
 #include "preferences.h"
 #include "inkscape.h"
-
+#include "knot.h"
 #include "ui/tools/measure-tool.h"
 #include "ui/tools/freehand-base.h"
 #include "display/canvas-text.h"
@@ -45,11 +45,15 @@
 #include "enums.h"
 #include "ui/control-manager.h"
 #include "knot-enums.h"
+#include <glibmm/i18n.h>
 
 using Inkscape::ControlManager;
 using Inkscape::CTLINE_SECONDARY;
 using Inkscape::Util::unit_table;
 
+#define MT_KNOT_COLOR_NORMAL 0xffffff00
+#define MT_KNOT_COLOR_MOUSEOVER 0xff000000
+
 namespace Inkscape {
 namespace UI {
 namespace Tools {
@@ -57,7 +61,7 @@ namespace Tools {
 std::vector<Inkscape::Display::TemporaryItem*> measure_tmp_items;
 
 const std::string& MeasureTool::getPrefsPath() {
-	return MeasureTool::prefsPath;
+    return MeasureTool::prefsPath;
 }
 
 const std::string MeasureTool::prefsPath = "/tools/measure";
@@ -227,14 +231,61 @@ void createAngleDisplayCurve(SPDesktop *desktop, Geom::Point const &center, Geom
 
 } // namespace
 
-
+static Geom::Point start_p = Geom::Point();
+static Geom::Point end_p = Geom::Point();
 MeasureTool::MeasureTool()
     : ToolBase(cursor_measure_xpm, 4, 4)
     , grabbed(NULL)
 {
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    // create the knot
+    this->knot_start = new SPKnot(desktop, N_("Measure start"));
+    this->knot_start->setMode(SP_KNOT_MODE_XOR);
+    this->knot_start->setFill(MT_KNOT_COLOR_NORMAL, MT_KNOT_COLOR_MOUSEOVER, MT_KNOT_COLOR_MOUSEOVER);
+    this->knot_start->setStroke(0x0000007f, 0x0000007f, 0x0000007f);
+    this->knot_start->setShape(SP_KNOT_SHAPE_CIRCLE);
+    this->knot_start->updateCtrl();
+    this->knot_end = new SPKnot(desktop, N_("Measure end"));
+    this->knot_end->setMode(SP_KNOT_MODE_XOR);
+    this->knot_end->setFill(MT_KNOT_COLOR_NORMAL, MT_KNOT_COLOR_MOUSEOVER, MT_KNOT_COLOR_MOUSEOVER);
+    this->knot_end->setStroke(0x0000007f, 0x0000007f, 0x0000007f);
+    this->knot_end->setShape(SP_KNOT_SHAPE_CIRCLE);
+    this->knot_end->updateCtrl();
+    if(end_p != Geom::Point()){
+        this->knot_start->setPosition(start_p, SP_KNOT_STATE_NORMAL);
+        this->knot_start->show();
+        this->knot_end->setPosition(end_p, SP_KNOT_STATE_NORMAL);
+        this->knot_end->show();
+        this->showCanvasItems(this->knot_start->position(), this->knot_end->position());
+    }
+    this->_knot_start_moved_connection = this->knot_start->moved_signal.connect(sigc::mem_fun(*this, &MeasureTool::knotMovedHandler));
+    this->_knot_start_ungrabbed_connection = this->knot_start->ungrabbed_signal.connect(sigc::mem_fun(*this, &MeasureTool::knotUngrabbedHandler));
+    this->_knot_end_moved_connection = this->knot_end->moved_signal.connect(sigc::mem_fun(*this, &MeasureTool::knotMovedHandler));
+    this->_knot_end_ungrabbed_connection = this->knot_end->ungrabbed_signal.connect(sigc::mem_fun(*this, &MeasureTool::knotUngrabbedHandler));
+
 }
 
 MeasureTool::~MeasureTool() {
+    this->_knot_start_moved_connection.disconnect();
+    this->_knot_start_ungrabbed_connection.disconnect();
+    this->_knot_end_moved_connection.disconnect();
+    this->_knot_end_ungrabbed_connection.disconnect();
+
+    /* unref should call destroy */
+    knot_unref(this->knot_start);
+    knot_unref(this->knot_end);
+    for (size_t idx = 0; idx < measure_tmp_items.size(); ++idx) {
+        desktop->remove_temporary_canvasitem(measure_tmp_items[idx]);
+    }
+    measure_tmp_items.clear();
+}
+
+void MeasureTool::knotMovedHandler(SPKnot */*knot*/, Geom::Point const /*&ppointer*/, guint /*state*/){
+    showCanvasItems(this->knot_start->position(), this->knot_end->position());
+}
+
+void MeasureTool::knotUngrabbedHandler(SPKnot */*knot*/,  unsigned int /*state*/){
+    showCanvasItems(this->knot_start->position(), this->knot_end->position());
 }
 
 void MeasureTool::finish() {
@@ -249,12 +300,12 @@ void MeasureTool::finish() {
 }
 
 //void MeasureTool::setup() {
-//	ToolBase* ec = this;
+//    ToolBase* ec = this;
 //
 ////    if (SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->setup) {
 ////        SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->setup(ec);
 ////    }
-//	ToolBase::setup();
+//    ToolBase::setup();
 //}
 
 //gint MeasureTool::item_handler(SPItem* item, GdkEvent* event) {
@@ -301,6 +352,8 @@ bool MeasureTool::root_handler(GdkEvent* event) {
 
     switch (event->type) {
         case GDK_BUTTON_PRESS: {
+            this->knot_start->hide();
+            this->knot_end->hide();
             Geom::Point const button_w(event->button.x, event->button.y);
             explicitBase = boost::none;
             last_end = boost::none;
@@ -353,7 +406,7 @@ bool MeasureTool::root_handler(GdkEvent* event) {
                 Geom::Point const motion_w(event->motion.x, event->motion.y);
                 if ( within_tolerance){
                     if ( Geom::LInfty( motion_w - start_point ) < tolerance) {
-                        return false;   // Do not drag if we're within tolerance from origin.
+                        return FALSE;   // Do not drag if we're within tolerance from origin.
                     }
                 }
                 // Once the user has moved farther than tolerance from the original location
@@ -361,7 +414,24 @@ bool MeasureTool::root_handler(GdkEvent* event) {
                 // motion notify coordinates as given (no snapping back to origin)
                 within_tolerance = false;
                 if(event->motion.time == 0 || !last_end  || Geom::LInfty( motion_w - *last_end ) > (tolerance/2)){
-                    showCanvasItems(event->motion);
+                    Geom::Point const motion_w(event->motion.x, event->motion.y);
+                    Geom::Point const motion_dt(desktop->w2d(motion_w));
+                    Geom::Point end_point = motion_dt;
+
+                    if (event->motion.state & GDK_CONTROL_MASK) {
+                        spdc_endpoint_snap_rotation(this, end_point, start_point, event->motion.state);
+                    } else {
+                        if (!(event->motion.state & GDK_SHIFT_MASK)) {
+                            SnapManager &m = desktop->namedview->snap_manager;
+                            m.setup(desktop);
+                            Inkscape::SnapCandidatePoint scp(end_point, Inkscape::SNAPSOURCE_OTHER_HANDLE);
+                            scp.addOrigin(start_point);
+                            Inkscape::SnappedPoint sp = m.freeSnap(scp);
+                            end_point = sp.getPoint();
+                            m.unSetup();
+                        }
+                    }
+                    showCanvasItems(start_point, end_point);
                     last_end = motion_w ;
                 }
                 gobble_motion_events(GDK_BUTTON1_MASK);
@@ -369,63 +439,42 @@ bool MeasureTool::root_handler(GdkEvent* event) {
             break;
         }
         case GDK_BUTTON_RELEASE: {
-            sp_event_context_discard_delayed_snap_event(this);
-            explicitBase = boost::none;
-            last_end = boost::none;
-
-            //clear all temporary canvas items related to the measurement tool.
-            for (size_t idx = 0; idx < measure_tmp_items.size(); ++idx) {
-                desktop->remove_temporary_canvasitem(measure_tmp_items[idx]);
+            this->knot_start->setPosition(start_point, SP_KNOT_STATE_NORMAL);
+            this->knot_start->show();
+            if(last_end){
+                Geom::Point end_point = desktop->w2d(*last_end);
+                this->knot_end->setPosition(end_point, SP_KNOT_STATE_NORMAL);
+                this->knot_end->show();
             }
-
-            measure_tmp_items.clear();
-
             if (this->grabbed) {
                 sp_canvas_item_ungrab(this->grabbed, event->button.time);
                 this->grabbed = NULL;
             }
-
-            start_point = Geom::Point();
+            sp_event_context_discard_delayed_snap_event(this);
             break;
         }
         default:
             break;
     }
     if (!ret) {
-    	ret = ToolBase::root_handler(event);
+        ret = ToolBase::root_handler(event);
     }
     
     return ret;
 }
 
-void MeasureTool::showCanvasItems(GdkEventMotion const &mevent){
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    Geom::Point const motion_w(mevent.x, mevent.y);
-    bool show_in_between = prefs->getBool("/tools/measure/show_in_between");
-    bool all_layers = prefs->getBool("/tools/measure/all_layers");
+void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point){
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    start_p = start_point;
+    end_p = end_point;
     //clear previous temporary canvas items, we'll draw new ones
     for (size_t idx = 0; idx < measure_tmp_items.size(); ++idx) {
         desktop->remove_temporary_canvasitem(measure_tmp_items[idx]);
     }
-
     measure_tmp_items.clear();
-    Geom::Point const motion_dt(desktop->w2d(motion_w));
-    Geom::Point end_point = motion_dt;
-
-    if (mevent.state & GDK_CONTROL_MASK) {
-        spdc_endpoint_snap_rotation(this, end_point, start_point, mevent.state);
-    } else {
-        if (!(mevent.state & GDK_SHIFT_MASK)) {
-            SnapManager &m = desktop->namedview->snap_manager;
-            m.setup(desktop);
-            Inkscape::SnapCandidatePoint scp(end_point, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-            scp.addOrigin(start_point);
-            Inkscape::SnappedPoint sp = m.freeSnap(scp);
-            end_point = sp.getPoint();
-            m.unSetup();
-        }
-    }
-
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    bool show_in_between = prefs->getBool("/tools/measure/show_in_between");
+    bool all_layers = prefs->getBool("/tools/measure/all_layers");
     Geom::PathVector lineseg;
     Geom::Path p;
     p.start(desktop->dt2doc(start_point));
@@ -463,10 +512,10 @@ void MeasureTool::showCanvasItems(GdkEventMotion const &mevent){
         r->move(start_point);
         std::vector<SPItem*> items_reverse = desktop->getDocument()->getItemsAtPoints(desktop->dkey, r->getPoints(), all_layers, 2);
         r->stop();
-        if(items_reverse.size() == 2){
+        if(items_reverse.size() == 2 && items_reverse[1] != items[0] && items_reverse[1] != items[1]){
             items.push_back(items_reverse[1]);
         }
-        if(items_reverse.size() >= 1){
+        if(items_reverse.size() >= 1 && items_reverse[0] != items[1]){
             items.push_back(items_reverse[0]);
         }
     } else {
diff --git a/src/ui/tools/measure-tool.h b/src/ui/tools/measure-tool.h
index 4673e0f0a..8a1eb2203 100644
--- a/src/ui/tools/measure-tool.h
+++ b/src/ui/tools/measure-tool.h
@@ -11,7 +11,8 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
-
+#include <stddef.h>
+#include <sigc++/sigc++.h>
 #include "ui/tools/tool-base.h"
 #include <2geom/point.h>
 #include <boost/optional.hpp>
@@ -19,28 +20,37 @@
 #define SP_MEASURE_CONTEXT(obj) (dynamic_cast<Inkscape::UI::Tools::MeasureTool*>((Inkscape::UI::Tools::ToolBase*)obj))
 #define SP_IS_MEASURE_CONTEXT(obj) (dynamic_cast<const Inkscape::UI::Tools::MeasureTool*>((const Inkscape::UI::Tools::ToolBase*)obj) != NULL)
 
+class SPKnot;
+
 namespace Inkscape {
 namespace UI {
 namespace Tools {
 
 class MeasureTool : public ToolBase {
 public:
-	MeasureTool();
-	virtual ~MeasureTool();
-
-	static const std::string prefsPath;
+    MeasureTool();
+    virtual ~MeasureTool();
 
-	virtual void finish();
-	virtual bool root_handler(GdkEvent* event);
-	virtual void showCanvasItems(GdkEventMotion const &event);
+    static const std::string prefsPath;
 
-	virtual const std::string& getPrefsPath();
+    virtual void finish();
+    virtual bool root_handler(GdkEvent* event);
+    virtual void showCanvasItems(Geom::Point start_point, Geom::Point end_point);
+    virtual const std::string& getPrefsPath();
+    void knotMovedHandler(SPKnot */*knot*/, Geom::Point const /*&ppointer*/, guint /*state*/);
+    void knotUngrabbedHandler(SPKnot */*knot*/,  unsigned int /*state*/);
 
 private:
-	SPCanvasItem* grabbed;
+    SPCanvasItem* grabbed;
     Geom::Point start_point;
     boost::optional<Geom::Point> explicitBase;
     boost::optional<Geom::Point> last_end;
+    SPKnot *knot_start;
+    SPKnot *knot_end;
+    sigc::connection _knot_start_moved_connection;
+    sigc::connection _knot_start_ungrabbed_connection;
+    sigc::connection _knot_end_moved_connection;
+    sigc::connection _knot_end_ungrabbed_connection;
 };
 
 }
-- 
cgit v1.2.3


From ef0299883a7bc9402c96856eeebba118ef7f49c8 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 4 Oct 2015 20:33:00 +0200
Subject: Add snap and CTRL constrain

(bzr r14393.1.5)
---
 src/ui/tools/measure-tool.cpp | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 142c04fc3..5521dd6e8 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -420,16 +420,14 @@ bool MeasureTool::root_handler(GdkEvent* event) {
 
                     if (event->motion.state & GDK_CONTROL_MASK) {
                         spdc_endpoint_snap_rotation(this, end_point, start_point, event->motion.state);
-                    } else {
-                        if (!(event->motion.state & GDK_SHIFT_MASK)) {
-                            SnapManager &m = desktop->namedview->snap_manager;
-                            m.setup(desktop);
-                            Inkscape::SnapCandidatePoint scp(end_point, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-                            scp.addOrigin(start_point);
-                            Inkscape::SnappedPoint sp = m.freeSnap(scp);
-                            end_point = sp.getPoint();
-                            m.unSetup();
-                        }
+                    } else if (!(event->motion.state & GDK_SHIFT_MASK)) {
+                        SnapManager &m = desktop->namedview->snap_manager;
+                        m.setup(desktop);
+                        Inkscape::SnapCandidatePoint scp(end_point, Inkscape::SNAPSOURCE_OTHER_HANDLE);
+                        scp.addOrigin(start_point);
+                        Inkscape::SnappedPoint sp = m.freeSnap(scp);
+                        end_point = sp.getPoint();
+                        m.unSetup();
                     }
                     showCanvasItems(start_point, end_point);
                     last_end = motion_w ;
@@ -443,6 +441,17 @@ bool MeasureTool::root_handler(GdkEvent* event) {
             this->knot_start->show();
             if(last_end){
                 Geom::Point end_point = desktop->w2d(*last_end);
+                if (event->button.state & GDK_CONTROL_MASK) {
+                        spdc_endpoint_snap_rotation(this, end_point, start_point, event->motion.state);
+                } else if (!(event->button.state & GDK_SHIFT_MASK)) {
+                    SnapManager &m = desktop->namedview->snap_manager;
+                    m.setup(desktop);
+                    Inkscape::SnapCandidatePoint scp(end_point, Inkscape::SNAPSOURCE_OTHER_HANDLE);
+                    scp.addOrigin(start_point);
+                    Inkscape::SnappedPoint sp = m.freeSnap(scp);
+                    end_point = sp.getPoint();
+                    m.unSetup();
+                }
                 this->knot_end->setPosition(end_point, SP_KNOT_STATE_NORMAL);
                 this->knot_end->show();
             }
-- 
cgit v1.2.3


From 88f15a973fc593be36a423864526c7e064bf3dd3 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 5 Oct 2015 19:30:47 +0200
Subject: Add redraw to meassure when use toolbar

(bzr r14393.1.6)
---
 src/ui/tools/measure-tool.cpp | 6 +++++-
 src/ui/tools/measure-tool.h   | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 5521dd6e8..c275a6d79 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -256,7 +256,7 @@ MeasureTool::MeasureTool()
         this->knot_start->show();
         this->knot_end->setPosition(end_p, SP_KNOT_STATE_NORMAL);
         this->knot_end->show();
-        this->showCanvasItems(this->knot_start->position(), this->knot_end->position());
+        this->showCanvasItems();
     }
     this->_knot_start_moved_connection = this->knot_start->moved_signal.connect(sigc::mem_fun(*this, &MeasureTool::knotMovedHandler));
     this->_knot_start_ungrabbed_connection = this->knot_start->ungrabbed_signal.connect(sigc::mem_fun(*this, &MeasureTool::knotUngrabbedHandler));
@@ -472,6 +472,10 @@ bool MeasureTool::root_handler(GdkEvent* event) {
     return ret;
 }
 
+void MeasureTool::showCanvasItems(){
+    showCanvasItems(start_p, end_p);
+}
+
 void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point){
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     start_p = start_point;
diff --git a/src/ui/tools/measure-tool.h b/src/ui/tools/measure-tool.h
index 8a1eb2203..412de8b72 100644
--- a/src/ui/tools/measure-tool.h
+++ b/src/ui/tools/measure-tool.h
@@ -35,6 +35,7 @@ public:
 
     virtual void finish();
     virtual bool root_handler(GdkEvent* event);
+    virtual void showCanvasItems();
     virtual void showCanvasItems(Geom::Point start_point, Geom::Point end_point);
     virtual const std::string& getPrefsPath();
     void knotMovedHandler(SPKnot */*knot*/, Geom::Point const /*&ppointer*/, guint /*state*/);
-- 
cgit v1.2.3


From ae0a08f8986529a81c7bd239c7cde548c8bdacc3 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 5 Oct 2015 20:13:58 +0200
Subject: add reverse to meassure output

(bzr r14393.1.8)
---
 src/ui/tools/measure-tool.cpp | 10 ++++++++++
 src/ui/tools/measure-tool.h   |  1 +
 2 files changed, 11 insertions(+)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index c275a6d79..8d838fc06 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -280,6 +280,16 @@ MeasureTool::~MeasureTool() {
     measure_tmp_items.clear();
 }
 
+void MeasureTool::reverseKnots(){
+    Geom::Point start = start_p;
+    Geom::Point end = end_p;
+    this->knot_start->setPosition(end, SP_KNOT_STATE_NORMAL);
+    this->knot_start->show();
+    this->knot_end->setPosition(start, SP_KNOT_STATE_NORMAL);
+    this->knot_end->show();
+    this->showCanvasItems(end, start);
+}
+
 void MeasureTool::knotMovedHandler(SPKnot */*knot*/, Geom::Point const /*&ppointer*/, guint /*state*/){
     showCanvasItems(this->knot_start->position(), this->knot_end->position());
 }
diff --git a/src/ui/tools/measure-tool.h b/src/ui/tools/measure-tool.h
index 412de8b72..944b14ed8 100644
--- a/src/ui/tools/measure-tool.h
+++ b/src/ui/tools/measure-tool.h
@@ -37,6 +37,7 @@ public:
     virtual bool root_handler(GdkEvent* event);
     virtual void showCanvasItems();
     virtual void showCanvasItems(Geom::Point start_point, Geom::Point end_point);
+    virtual void reverseKnots();
     virtual const std::string& getPrefsPath();
     void knotMovedHandler(SPKnot */*knot*/, Geom::Point const /*&ppointer*/, guint /*state*/);
     void knotUngrabbedHandler(SPKnot */*knot*/,  unsigned int /*state*/);
-- 
cgit v1.2.3


From 8db12376ba038c323068c14955fac45f00fcb0e6 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 6 Oct 2015 18:34:19 +0200
Subject: add snaping to knots and stating convert measure to items

(bzr r14393.1.9)
---
 src/ui/tools/measure-tool.cpp | 148 ++++++++++++++++++++++++++++++++++++++----
 src/ui/tools/measure-tool.h   |   7 +-
 2 files changed, 143 insertions(+), 12 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 8d838fc06..2a89189dd 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -17,15 +17,13 @@
 #include "macros.h"
 #include "rubberband.h"
 #include "display/curve.h"
-#include "sp-shape.h"
-#include "sp-text.h"
-#include "sp-flowtext.h"
 #include "text-editing.h"
 #include "display/sp-ctrlline.h"
 #include "display/sodipodi-ctrl.h"
 #include "display/sp-canvas-item.h"
 #include "display/sp-canvas-util.h"
 #include "desktop.h"
+#include "svg/svg.h"
 #include "document.h"
 #include "pixmaps/cursor-measure.xpm"
 #include "preferences.h"
@@ -42,6 +40,10 @@
 #include <2geom/angle.h>
 #include "snap.h"
 #include "sp-namedview.h"
+#include "sp-shape.h"
+#include "sp-text.h"
+#include "sp-flowtext.h"
+#include "sp-defs.h"
 #include "enums.h"
 #include "ui/control-manager.h"
 #include "knot-enums.h"
@@ -258,9 +260,9 @@ MeasureTool::MeasureTool()
         this->knot_end->show();
         this->showCanvasItems();
     }
-    this->_knot_start_moved_connection = this->knot_start->moved_signal.connect(sigc::mem_fun(*this, &MeasureTool::knotMovedHandler));
+    this->_knot_start_moved_connection = this->knot_start->moved_signal.connect(sigc::mem_fun(*this, &MeasureTool::knotStartMovedHandler));
     this->_knot_start_ungrabbed_connection = this->knot_start->ungrabbed_signal.connect(sigc::mem_fun(*this, &MeasureTool::knotUngrabbedHandler));
-    this->_knot_end_moved_connection = this->knot_end->moved_signal.connect(sigc::mem_fun(*this, &MeasureTool::knotMovedHandler));
+    this->_knot_end_moved_connection = this->knot_end->moved_signal.connect(sigc::mem_fun(*this, &MeasureTool::knotEndMovedHandler));
     this->_knot_end_ungrabbed_connection = this->knot_end->ungrabbed_signal.connect(sigc::mem_fun(*this, &MeasureTool::knotUngrabbedHandler));
 
 }
@@ -290,14 +292,44 @@ void MeasureTool::reverseKnots(){
     this->showCanvasItems(end, start);
 }
 
-void MeasureTool::knotMovedHandler(SPKnot */*knot*/, Geom::Point const /*&ppointer*/, guint /*state*/){
-    showCanvasItems(this->knot_start->position(), this->knot_end->position());
+void MeasureTool::knotStartMovedHandler(SPKnot */*knot*/, Geom::Point const &ppointer, guint state){
+    if (!(state & GDK_SHIFT_MASK)) {
+        SnapManager &m = desktop->namedview->snap_manager;
+        m.setup(desktop);
+        Inkscape::SnapCandidatePoint scp(ppointer, Inkscape::SNAPSOURCE_OTHER_HANDLE);
+        scp.addOrigin(end_p);
+        Inkscape::SnappedPoint sp = m.freeSnap(scp);
+        if(start_p != sp.getPoint()){
+            start_p = sp.getPoint();
+            this->knot_end->setPosition(start_p, SP_KNOT_STATE_MOUSEOVER);
+        }
+        m.unSetup();
+    }
+    showCanvasItems(start_point, this->knot_end->position());
+}
+
+void MeasureTool::knotEndMovedHandler(SPKnot */*knot*/, Geom::Point const &ppointer, guint state){
+    if (!(state & GDK_SHIFT_MASK)) {
+        SnapManager &m = desktop->namedview->snap_manager;
+        m.setup(desktop);
+        Inkscape::SnapCandidatePoint scp(ppointer, Inkscape::SNAPSOURCE_OTHER_HANDLE);
+        scp.addOrigin(start_p);
+        Inkscape::SnappedPoint sp = m.freeSnap(scp);
+        if(end_p != sp.getPoint()){
+            end_p = sp.getPoint();
+            this->knot_end->setPosition(end_p, SP_KNOT_STATE_MOUSEOVER);
+        }
+        m.unSetup();
+    }
+    showCanvasItems(this->knot_start->position(), end_p);
 }
 
-void MeasureTool::knotUngrabbedHandler(SPKnot */*knot*/,  unsigned int /*state*/){
-    showCanvasItems(this->knot_start->position(), this->knot_end->position());
+void MeasureTool::knotUngrabbedHandler(SPKnot */*knot*/,  unsigned int state){
+    showCanvasItems(this->knot_start->position(), end_p);
 }
 
+
+
 void MeasureTool::finish() {
     this->enableGrDrag(false);
 
@@ -482,6 +514,100 @@ bool MeasureTool::root_handler(GdkEvent* event) {
     return ret;
 }
 
+void MeasureTool::setMarkers(){
+    SPDesktop *desktop = this->desktop;
+    SPDocument *doc = desktop->getDocument();
+    SPObject *arrowStart = doc->getObjectById("Arrow2Sstart");
+    SPObject *arrowEnd = doc->getObjectById("Arrow2Send");
+    if (!arrowStart) {
+        setMarker(true);
+    }
+    if(!arrowEnd){
+        setMarker(false);
+    }
+}
+void MeasureTool::setMarker(bool isStart){
+    SPDesktop *desktop = this->desktop;
+    SPDocument *doc = desktop->getDocument();
+    SPDefs *defs = doc->getDefs();
+    Inkscape::XML::Node *repr;
+    Inkscape::XML::Document *xml_doc = doc->getReprDoc();
+    repr = xml_doc->createElement("svg:marker");
+    if(isStart){
+        repr->setAttribute("id", "Arrow2Sstart");
+    } else {
+        repr->setAttribute("id", "Arrow2Send");
+    }
+    repr->setAttribute("inkscape:isstock", "true");
+    if(isStart){
+        repr->setAttribute("inkscape:stockid", "Arrow2Sstart");
+    } else {
+        repr->setAttribute("inkscape:stockid", "Arrow2Send");
+    }
+    repr->setAttribute("orient", "auto");
+    repr->setAttribute("refX", "0.0");
+    repr->setAttribute("refY", "0.0");
+    repr->setAttribute("style", "overflow:visible;");
+    SPItem *item = SP_ITEM(defs->appendChildRepr(repr));
+    Inkscape::GC::release(repr);
+    item->updateRepr();
+    Inkscape::XML::Node *repr2;
+    repr2 = xml_doc->createElement("svg:path");
+    repr2->setAttribute("d", "M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z");
+    if(isStart){
+        repr2->setAttribute("id", "Arrow2SstartPath");
+    } else {
+        repr2->setAttribute("id", "Arrow2SendPath");
+    }
+    repr2->setAttribute("style", "fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1");
+    if(isStart){
+        repr2->setAttribute("transform", "scale(0.3) translate(-2.3,0)");
+    } else {
+        repr2->setAttribute("transform", "scale(0.3) rotate(180) translate(-2.3,0)");
+    }
+    SPItem *item2 = SP_ITEM(item->appendChildRepr(repr2));
+    Inkscape::GC::release(repr2);
+    item2->updateRepr();
+}
+
+void MeasureTool::toMarkDimension(){
+    setMarkers();
+    Geom::PathVector c;
+    Geom::Path p;
+    p.start(start_p);
+    p.appendNew<Geom::LineSegment>(end_p);
+    c.push_back(p);
+    SPDesktop *desktop = this->desktop;
+    SPDocument *doc = desktop->getDocument();
+    Inkscape::XML::Document *xml_doc = doc->getReprDoc();
+    if (c.size() == 1) {
+        Inkscape::XML::Node *repr;
+        repr = xml_doc->createElement("svg:path");
+        gchar const *str = sp_svg_write_path(c);
+        gchar const *style_str = "fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Sstart);marker-end:url(#Arrow2Send)";
+        g_assert( str != NULL );
+        repr->setAttribute("d", str);
+        repr->setAttribute("style", style_str);
+        // Attach repr
+        SPItem *item = SP_ITEM(desktop->currentLayer()->appendChildRepr(repr));
+        Inkscape::GC::release(repr);
+        item->updateRepr();
+    }
+
+    // Flush pending updates
+    doc->ensureUpToDate();
+    reset();
+}
+
+void MeasureTool::reset(){
+    this->knot_start->hide();
+    this->knot_end->hide();
+    for (size_t idx = 0; idx < measure_tmp_items.size(); ++idx) {
+        desktop->remove_temporary_canvasitem(measure_tmp_items[idx]);
+    }
+    measure_tmp_items.clear();
+}
+
 void MeasureTool::showCanvasItems(){
     showCanvasItems(start_p, end_p);
 }
@@ -765,12 +891,12 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
 
         control_line = mgr.createControlLine(desktop->getTempGroup(),
                                              desktop->doc2dt(intersections[0]),
-                                             desktop->doc2dt(intersections[0]) + normal * 65);
+                                             desktop->doc2dt(intersections[0]) + normal * 60);
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
 
         control_line = mgr.createControlLine(desktop->getTempGroup(),
                                              desktop->doc2dt(intersections[intersections.size() - 1]),
-                                             desktop->doc2dt(intersections[intersections.size() - 1]) + normal * 65);
+                                             desktop->doc2dt(intersections[intersections.size() - 1]) + normal * 60);
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
     }
 
diff --git a/src/ui/tools/measure-tool.h b/src/ui/tools/measure-tool.h
index 944b14ed8..44153a144 100644
--- a/src/ui/tools/measure-tool.h
+++ b/src/ui/tools/measure-tool.h
@@ -38,8 +38,13 @@ public:
     virtual void showCanvasItems();
     virtual void showCanvasItems(Geom::Point start_point, Geom::Point end_point);
     virtual void reverseKnots();
+    virtual void toMarkDimension();
+    virtual void reset();
+    virtual void setMarkers();
+    virtual void setMarker(bool isStart);
     virtual const std::string& getPrefsPath();
-    void knotMovedHandler(SPKnot */*knot*/, Geom::Point const /*&ppointer*/, guint /*state*/);
+    void knotStartMovedHandler(SPKnot */*knot*/, Geom::Point const &ppointer, guint state);
+    void knotEndMovedHandler(SPKnot */*knot*/, Geom::Point const &ppointer, guint state);
     void knotUngrabbedHandler(SPKnot */*knot*/,  unsigned int /*state*/);
 
 private:
-- 
cgit v1.2.3


From bfe639d1e476a1144cecae26d5959569aae79dcd Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 6 Oct 2015 18:57:43 +0200
Subject: fix a bug on snapping with start knot

(bzr r14393.1.10)
---
 src/ui/tools/measure-tool.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 2a89189dd..894687919 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -296,24 +296,24 @@ void MeasureTool::knotStartMovedHandler(SPKnot */*knot*/, Geom::Point const &ppo
     if (!(state & GDK_SHIFT_MASK)) {
         SnapManager &m = desktop->namedview->snap_manager;
         m.setup(desktop);
-        Inkscape::SnapCandidatePoint scp(ppointer, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-        scp.addOrigin(end_p);
+        Inkscape::SnapCandidatePoint scp(this->knot_start->position(), Inkscape::SNAPSOURCE_OTHER_HANDLE);
+        scp.addOrigin(this->knot_end->position());
         Inkscape::SnappedPoint sp = m.freeSnap(scp);
         if(start_p != sp.getPoint()){
             start_p = sp.getPoint();
-            this->knot_end->setPosition(start_p, SP_KNOT_STATE_MOUSEOVER);
+            this->knot_start->setPosition(start_p, SP_KNOT_STATE_MOUSEOVER);
         }
         m.unSetup();
     }
-    showCanvasItems(start_point, this->knot_end->position());
+    showCanvasItems(start_p, this->knot_end->position());
 }
 
 void MeasureTool::knotEndMovedHandler(SPKnot */*knot*/, Geom::Point const &ppointer, guint state){
     if (!(state & GDK_SHIFT_MASK)) {
         SnapManager &m = desktop->namedview->snap_manager;
         m.setup(desktop);
-        Inkscape::SnapCandidatePoint scp(ppointer, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-        scp.addOrigin(start_p);
+        Inkscape::SnapCandidatePoint scp(this->knot_end->position(), Inkscape::SNAPSOURCE_OTHER_HANDLE);
+        scp.addOrigin(this->knot_start->position());
         Inkscape::SnappedPoint sp = m.freeSnap(scp);
         if(end_p != sp.getPoint()){
             end_p = sp.getPoint();
-- 
cgit v1.2.3


From 98b86a476c3b26d341a4c175d90bc5611b0899cf Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 6 Oct 2015 19:14:44 +0200
Subject: fix a bug rendering the angle line in diferent units than pixels

(bzr r14393.1.11)
---
 src/ui/tools/measure-tool.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 894687919..8a9340b07 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -190,12 +190,14 @@ Geom::Point calcAngleDisplayAnchor(SPDesktop *desktop, double angle, double base
  * @param anchor the anchor point for displaying the text label.
  * @param angle the angle of the arc segment to draw.
  */
-void createAngleDisplayCurve(SPDesktop *desktop, Geom::Point const &center, Geom::Point const &end, Geom::Point const &anchor, double angle)
+void createAngleDisplayCurve(SPDesktop *desktop, Geom::Point const &center, Geom::Point const &end, Geom::Point const &anchor, double angle, Glib::ustring unit_name)
 {
     // Given that we have a point on the arc's edge and the angle of the arc, we need to get the two endpoints.
 
     double textLen = std::abs((anchor - center).length());
+    textLen = Inkscape::Util::Quantity::convert(textLen, "px", unit_name);
     double sideLen = std::abs((end - center).length());
+    sideLen = Inkscape::Util::Quantity::convert(sideLen, "px", unit_name);
     if (sideLen > 0.0) {
         double factor = std::min(1.0, textLen / sideLen);
     
@@ -877,7 +879,7 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
                                                                                       CTLINE_SECONDARY);
             measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
 
-            createAngleDisplayCurve(desktop, start_point, end_point, angleDisplayPt, angle);
+            createAngleDisplayCurve(desktop, start_point, end_point, angleDisplayPt, angle, unit_name);
         }
     }
 
-- 
cgit v1.2.3


From 8ffe79882b3a4e746088d75b76b51251c87aa4a9 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 6 Oct 2015 19:33:01 +0200
Subject: Remove wrong code for angle helper path

(bzr r14393.1.12)
---
 src/ui/tools/measure-tool.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 8a9340b07..894687919 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -190,14 +190,12 @@ Geom::Point calcAngleDisplayAnchor(SPDesktop *desktop, double angle, double base
  * @param anchor the anchor point for displaying the text label.
  * @param angle the angle of the arc segment to draw.
  */
-void createAngleDisplayCurve(SPDesktop *desktop, Geom::Point const &center, Geom::Point const &end, Geom::Point const &anchor, double angle, Glib::ustring unit_name)
+void createAngleDisplayCurve(SPDesktop *desktop, Geom::Point const &center, Geom::Point const &end, Geom::Point const &anchor, double angle)
 {
     // Given that we have a point on the arc's edge and the angle of the arc, we need to get the two endpoints.
 
     double textLen = std::abs((anchor - center).length());
-    textLen = Inkscape::Util::Quantity::convert(textLen, "px", unit_name);
     double sideLen = std::abs((end - center).length());
-    sideLen = Inkscape::Util::Quantity::convert(sideLen, "px", unit_name);
     if (sideLen > 0.0) {
         double factor = std::min(1.0, textLen / sideLen);
     
@@ -879,7 +877,7 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
                                                                                       CTLINE_SECONDARY);
             measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
 
-            createAngleDisplayCurve(desktop, start_point, end_point, angleDisplayPt, angle, unit_name);
+            createAngleDisplayCurve(desktop, start_point, end_point, angleDisplayPt, angle);
         }
     }
 
-- 
cgit v1.2.3


From 4f5e6cf51b5fdd584d57fa225d3cdba407f01561 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 7 Oct 2015 18:13:48 +0200
Subject: working in dimension to item

(bzr r14393.1.13)
---
 src/ui/tools/measure-tool.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 894687919..32f164a96 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -25,6 +25,7 @@
 #include "desktop.h"
 #include "svg/svg.h"
 #include "document.h"
+#include <viewbox.h>
 #include "pixmaps/cursor-measure.xpm"
 #include "preferences.h"
 #include "inkscape.h"
@@ -38,12 +39,14 @@
 #include <2geom/pathvector.h>
 #include <2geom/crossing.h>
 #include <2geom/angle.h>
+#include <2geom/transforms.h>
 #include "snap.h"
 #include "sp-namedview.h"
 #include "sp-shape.h"
 #include "sp-text.h"
 #include "sp-flowtext.h"
 #include "sp-defs.h"
+#include "sp-item.h"
 #include "enums.h"
 #include "ui/control-manager.h"
 #include "knot-enums.h"
@@ -571,12 +574,17 @@ void MeasureTool::setMarker(bool isStart){
 }
 
 void MeasureTool::toMarkDimension(){
+    Geom::Point windowNormal = Geom::unit_vector(Geom::rot90(desktop->d2w(end_p - start_p)));
+    Geom::Point normal = desktop->w2d(windowNormal);
     setMarkers();
     Geom::PathVector c;
     Geom::Path p;
-    p.start(start_p);
-    p.appendNew<Geom::LineSegment>(end_p);
+    p.start(desktop->doc2dt(start_p) + normal * 60);
+    p.appendNew<Geom::LineSegment>(desktop->doc2dt(end_p) + normal * 60);
     c.push_back(p);
+    c *= desktop->doc2dt();
+    c *= SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
+    c *= Geom::Scale(95.0);
     SPDesktop *desktop = this->desktop;
     SPDocument *doc = desktop->getDocument();
     Inkscape::XML::Document *xml_doc = doc->getReprDoc();
@@ -596,7 +604,7 @@ void MeasureTool::toMarkDimension(){
 
     // Flush pending updates
     doc->ensureUpToDate();
-    reset();
+    //reset();
 }
 
 void MeasureTool::reset(){
-- 
cgit v1.2.3


From 92d48dff17928ec1f964e5671383a9ebb32f3a6b Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Thu, 8 Oct 2015 12:25:06 +0200
Subject: Add buttons for some side/corner mesh opeartions.

(bzr r14402)
---
 src/ui/tools/mesh-tool.cpp | 2 +-
 src/ui/tools/mesh-tool.h   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp
index 813d6ae5b..303757493 100644
--- a/src/ui/tools/mesh-tool.cpp
+++ b/src/ui/tools/mesh-tool.cpp
@@ -316,7 +316,7 @@ static void sp_mesh_context_split_near_point(MeshTool *rc, SPItem *item,  Geom::
 /**
 Wrapper for various mesh operations that require a list of selected corner nodes.
  */
-static void
+void
 sp_mesh_context_corner_operation (MeshTool *rc, MeshCornerOperation operation )
 {
 
diff --git a/src/ui/tools/mesh-tool.h b/src/ui/tools/mesh-tool.h
index d952c9010..91b35b3af 100644
--- a/src/ui/tools/mesh-tool.h
+++ b/src/ui/tools/mesh-tool.h
@@ -20,6 +20,7 @@
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 #include "ui/tools/tool-base.h"
+#include "sp-mesh-array.h"
 
 #define SP_MESH_CONTEXT(obj) (dynamic_cast<Inkscape::UI::Tools::MeshTool*>((Inkscape::UI::Tools::ToolBase*)obj))
 #define SP_IS_MESH_CONTEXT(obj) (dynamic_cast<const Inkscape::UI::Tools::MeshTool*>((const Inkscape::UI::Tools::ToolBase*)obj) != NULL)
@@ -57,6 +58,7 @@ private:
 
 void sp_mesh_context_select_next(ToolBase *event_context);
 void sp_mesh_context_select_prev(ToolBase *event_context);
+void sp_mesh_context_corner_operation(MeshTool *event_context, MeshCornerOperation operation );
 
 }
 }
-- 
cgit v1.2.3


From 17f2a27dfcfbf68d218193a830faa9580ce8a363 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 10 Oct 2015 21:17:34 +0200
Subject: Added new button to get global measure as a dimension

(bzr r14393.1.15)
---
 src/ui/tools/measure-tool.cpp | 169 ++++++++++++++++++++++++++++++------------
 src/ui/tools/measure-tool.h   |   1 +
 2 files changed, 121 insertions(+), 49 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 32f164a96..585128135 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -25,6 +25,7 @@
 #include "desktop.h"
 #include "svg/svg.h"
 #include "document.h"
+#include "document-undo.h"
 #include <viewbox.h>
 #include "pixmaps/cursor-measure.xpm"
 #include "preferences.h"
@@ -50,11 +51,14 @@
 #include "enums.h"
 #include "ui/control-manager.h"
 #include "knot-enums.h"
+#include "desktop-style.h"
+#include "verbs.h"
 #include <glibmm/i18n.h>
 
 using Inkscape::ControlManager;
 using Inkscape::CTLINE_SECONDARY;
 using Inkscape::Util::unit_table;
+using Inkscape::DocumentUndo;
 
 #define MT_KNOT_COLOR_NORMAL 0xffffff00
 #define MT_KNOT_COLOR_MOUSEOVER 0xff000000
@@ -74,7 +78,7 @@ const std::string MeasureTool::prefsPath = "/tools/measure";
 namespace
 {
 
-gint const DIMENSION_OFFSET = 35;
+gint dimension_offset = 35;
 
 /**
  * Simple class to use for removing label overlap.
@@ -236,8 +240,10 @@ void createAngleDisplayCurve(SPDesktop *desktop, Geom::Point const &center, Geom
 
 } // namespace
 
-static Geom::Point start_p = Geom::Point();
-static Geom::Point end_p = Geom::Point();
+Geom::Point const MAGIC_POINT = Geom::Point(-0.0003432532004303,-0.006745034004304);
+static Geom::Point start_p = MAGIC_POINT;
+static Geom::Point end_p = MAGIC_POINT;
+
 MeasureTool::MeasureTool()
     : ToolBase(cursor_measure_xpm, 4, 4)
     , grabbed(NULL)
@@ -256,10 +262,10 @@ MeasureTool::MeasureTool()
     this->knot_end->setStroke(0x0000007f, 0x0000007f, 0x0000007f);
     this->knot_end->setShape(SP_KNOT_SHAPE_CIRCLE);
     this->knot_end->updateCtrl();
-    if(end_p != Geom::Point()){
-        this->knot_start->setPosition(start_p, SP_KNOT_STATE_NORMAL);
+    if(end_p != MAGIC_POINT){
+        this->knot_start->moveto(start_p);
         this->knot_start->show();
-        this->knot_end->setPosition(end_p, SP_KNOT_STATE_NORMAL);
+        this->knot_end->moveto(end_p);
         this->knot_end->show();
         this->showCanvasItems();
     }
@@ -288,9 +294,9 @@ MeasureTool::~MeasureTool() {
 void MeasureTool::reverseKnots(){
     Geom::Point start = start_p;
     Geom::Point end = end_p;
-    this->knot_start->setPosition(end, SP_KNOT_STATE_NORMAL);
+    this->knot_start->moveto(end);
     this->knot_start->show();
-    this->knot_end->setPosition(start, SP_KNOT_STATE_NORMAL);
+    this->knot_end->moveto(start);
     this->knot_end->show();
     this->showCanvasItems(end, start);
 }
@@ -304,7 +310,7 @@ void MeasureTool::knotStartMovedHandler(SPKnot */*knot*/, Geom::Point const &ppo
         Inkscape::SnappedPoint sp = m.freeSnap(scp);
         if(start_p != sp.getPoint()){
             start_p = sp.getPoint();
-            this->knot_start->setPosition(start_p, SP_KNOT_STATE_MOUSEOVER);
+            this->knot_start->moveto(start_p);
         }
         m.unSetup();
     }
@@ -320,7 +326,7 @@ void MeasureTool::knotEndMovedHandler(SPKnot */*knot*/, Geom::Point const &ppoin
         Inkscape::SnappedPoint sp = m.freeSnap(scp);
         if(end_p != sp.getPoint()){
             end_p = sp.getPoint();
-            this->knot_end->setPosition(end_p, SP_KNOT_STATE_MOUSEOVER);
+            this->knot_end->moveto(end_p);
         }
         m.unSetup();
     }
@@ -328,7 +334,7 @@ void MeasureTool::knotEndMovedHandler(SPKnot */*knot*/, Geom::Point const &ppoin
 }
 
 void MeasureTool::knotUngrabbedHandler(SPKnot */*knot*/,  unsigned int state){
-    showCanvasItems(this->knot_start->position(), end_p);
+    showCanvasItems(this->knot_start->position(), this->knot_end->position());
 }
 
 
@@ -432,18 +438,20 @@ bool MeasureTool::root_handler(GdkEvent* event) {
             break;
         }
         case GDK_MOTION_NOTIFY: {
-            if (!(event->motion.state & GDK_BUTTON1_MASK) && !(event->motion.state & GDK_SHIFT_MASK)) {
-                Geom::Point const motion_w(event->motion.x, event->motion.y);
-                Geom::Point const motion_dt(desktop->w2d(motion_w));
+            if (!(event->motion.state & GDK_BUTTON1_MASK)){
+                if(!(event->motion.state & GDK_SHIFT_MASK)) {
+                    Geom::Point const motion_w(event->motion.x, event->motion.y);
+                    Geom::Point const motion_dt(desktop->w2d(motion_w));
 
-                SnapManager &m = desktop->namedview->snap_manager;
-                m.setup(desktop);
+                    SnapManager &m = desktop->namedview->snap_manager;
+                    m.setup(desktop);
 
-                Inkscape::SnapCandidatePoint scp(motion_dt, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-                scp.addOrigin(start_point);
+                    Inkscape::SnapCandidatePoint scp(motion_dt, Inkscape::SNAPSOURCE_OTHER_HANDLE);
+                    scp.addOrigin(start_point);
 
-                m.preSnap(scp);
-                m.unSetup();
+                    m.preSnap(scp);
+                    m.unSetup();
+                }
             } else {
                 ret = TRUE;
                 Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -482,12 +490,13 @@ bool MeasureTool::root_handler(GdkEvent* event) {
             break;
         }
         case GDK_BUTTON_RELEASE: {
-            this->knot_start->setPosition(start_point, SP_KNOT_STATE_NORMAL);
+            this->knot_start->moveto(start_point);
             this->knot_start->show();
+            Geom::Point end_point = end_p;
             if(last_end){
-                Geom::Point end_point = desktop->w2d(*last_end);
+                end_point = desktop->w2d(*last_end);
                 if (event->button.state & GDK_CONTROL_MASK) {
-                        spdc_endpoint_snap_rotation(this, end_point, start_point, event->motion.state);
+                    spdc_endpoint_snap_rotation(this, end_point, start_point, event->motion.state);
                 } else if (!(event->button.state & GDK_SHIFT_MASK)) {
                     SnapManager &m = desktop->namedview->snap_manager;
                     m.setup(desktop);
@@ -497,14 +506,14 @@ bool MeasureTool::root_handler(GdkEvent* event) {
                     end_point = sp.getPoint();
                     m.unSetup();
                 }
-                this->knot_end->setPosition(end_point, SP_KNOT_STATE_NORMAL);
-                this->knot_end->show();
             }
+            this->knot_end->moveto(end_point);
+            this->knot_end->show();
+            showCanvasItems(start_point, end_point);
             if (this->grabbed) {
                 sp_canvas_item_ungrab(this->grabbed, event->button.time);
                 this->grabbed = NULL;
             }
-            sp_event_context_discard_delayed_snap_event(this);
             break;
         }
         default:
@@ -562,7 +571,7 @@ void MeasureTool::setMarker(bool isStart){
     } else {
         repr2->setAttribute("id", "Arrow2SendPath");
     }
-    repr2->setAttribute("style", "fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1");
+    repr2->setAttribute("style", "stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1");
     if(isStart){
         repr2->setAttribute("transform", "scale(0.3) translate(-2.3,0)");
     } else {
@@ -574,17 +583,18 @@ void MeasureTool::setMarker(bool isStart){
 }
 
 void MeasureTool::toMarkDimension(){
-    Geom::Point windowNormal = Geom::unit_vector(Geom::rot90(desktop->d2w(end_p - start_p)));
-    Geom::Point normal = desktop->w2d(windowNormal);
     setMarkers();
     Geom::PathVector c;
     Geom::Path p;
-    p.start(desktop->doc2dt(start_p) + normal * 60);
-    p.appendNew<Geom::LineSegment>(desktop->doc2dt(end_p) + normal * 60);
+    Geom::Ray ray(start_p,end_p);
+    Geom::Point start = start_p + Geom::Point::polar(ray.angle(), 5);
+    start = desktop->doc2dt(start + Geom::Point::polar(ray.angle() + Geom::deg_to_rad(90), -(dimension_offset / 4.0)));
+    Geom::Point end = end_p + Geom::Point::polar(ray.angle(), -5);
+    end = desktop->doc2dt(end+ Geom::Point::polar(ray.angle() + Geom::deg_to_rad(90), -(dimension_offset / 4.0)));
+    p.start(start);
+    p.appendNew<Geom::LineSegment>(end);
     c.push_back(p);
-    c *= desktop->doc2dt();
     c *= SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
-    c *= Geom::Scale(95.0);
     SPDesktop *desktop = this->desktop;
     SPDocument *doc = desktop->getDocument();
     Inkscape::XML::Document *xml_doc = doc->getReprDoc();
@@ -592,21 +602,79 @@ void MeasureTool::toMarkDimension(){
         Inkscape::XML::Node *repr;
         repr = xml_doc->createElement("svg:path");
         gchar const *str = sp_svg_write_path(c);
-        gchar const *style_str = "fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Sstart);marker-end:url(#Arrow2Send)";
+        Geom::Point stroke_width = Geom::Point(1,1) * SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
+        std::stringstream style_str;
+        style_str.imbue(std::locale::classic());
+        style_str << "fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:" << stroke_width[Geom::X] << ";stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Sstart);marker-end:url(#Arrow2Send)";
         g_assert( str != NULL );
         repr->setAttribute("d", str);
-        repr->setAttribute("style", style_str);
-        // Attach repr
+        repr->setAttribute("style", style_str.str().c_str());
         SPItem *item = SP_ITEM(desktop->currentLayer()->appendChildRepr(repr));
         Inkscape::GC::release(repr);
         item->updateRepr();
     }
 
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    Glib::ustring unit_name = prefs->getString("/tools/measure/unit");
+    if (!unit_name.compare("")) {
+        unit_name = "px";
+    }
+    double fontsize = prefs->getInt("/tools/measure/fontsize")  * (96/72);
+    Geom::Point middle = Geom::middle_point(start, end);
+    double totallengthval = (end_p - start_p).length();
+    totallengthval = Inkscape::Util::Quantity::convert(totallengthval, "px", unit_name);
+    gchar *totallength_str = g_strdup_printf("%.2f %s", totallengthval, unit_name.c_str());
+    setLabelText(totallength_str, middle, fontsize, Geom::deg_to_rad(180) - ray.angle());
     // Flush pending updates
     doc->ensureUpToDate();
+    DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MEASURE,
+                           _("Add global meassure line"));
     //reset();
 }
 
+void MeasureTool::setLabelText(const char *value, Geom::Point pos, double fontsize, Geom::Coord angle)
+{
+    /* Create <text> */
+    Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
+    Inkscape::XML::Node *rtext = xml_doc->createElement("svg:text");
+    rtext->setAttribute("xml:space", "preserve");
+
+
+    /* Set style */
+    sp_desktop_apply_style_tool(desktop, rtext, "/tools/text", true);
+
+    sp_repr_set_svg_double(rtext, "x", 0);
+    sp_repr_set_svg_double(rtext, "y", 0);
+
+    /* Create <tspan> */
+    Inkscape::XML::Node *rtspan = xml_doc->createElement("svg:tspan");
+    rtspan->setAttribute("sodipodi:role", "line"); // otherwise, why bother creating the tspan?
+    std::stringstream text_style;
+    text_style.imbue(std::locale::classic());
+    text_style << "font-style:normal;font-weight:normal;font-size:" << fontsize << "px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1";
+    rtspan->setAttribute("style", text_style.str().c_str());
+    rtext->addChild(rtspan, NULL);
+    Inkscape::GC::release(rtspan);
+    /* Create TEXT */
+    Inkscape::XML::Node *rstring = xml_doc->createTextNode(value);
+    rtspan->addChild(rstring, NULL);
+    Inkscape::GC::release(rstring);
+    SPItem *text_item = SP_ITEM(desktop->currentLayer()->appendChildRepr(rtext));
+    Inkscape::GC::release(rtext);
+    text_item->updateRepr();
+    Geom::OptRect bbox = text_item->geometricBounds();
+    if (bbox) {
+        Geom::Coord posX = Geom::middle_point(Geom::Point(bbox->left(), bbox->top()), Geom::Point(bbox->right(), bbox->top()))[Geom::X];
+        Geom::Coord posY = Geom::middle_point(Geom::Point(bbox->left(), bbox->top()), Geom::Point(bbox->left(), bbox->bottom()))[Geom::Y];
+        text_item->transform *= Geom::Translate(Geom::Point(posX, posY)).inverse();
+        pos = pos + Geom::Point::polar(angle                                                                                                                                                                                                                                                                                                                                        + Geom::deg_to_rad(90), -Geom::distance(Geom::Point(bbox->left(), bbox->top()), Geom::Point(bbox->left(), bbox->bottom())));
+    }
+    text_item->transform *= Geom::Rotate(angle);
+    text_item->transform *= Geom::Translate(pos);
+    text_item->transform *= SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
+    text_item->doWriteTransform(text_item->getRepr(), text_item->transform, NULL, true);
+}
+
 void MeasureTool::reset(){
     this->knot_start->hide();
     this->knot_end->hide();
@@ -622,6 +690,9 @@ void MeasureTool::showCanvasItems(){
 
 void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point){
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    if(!desktop || !start_point.isFinite() || !end_point.isFinite() || end_point == MAGIC_POINT){
+        return;
+    }
     start_p = start_point;
     end_p = end_point;
     //clear previous temporary canvas items, we'll draw new ones
@@ -632,6 +703,7 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     bool show_in_between = prefs->getBool("/tools/measure/show_in_between");
     bool all_layers = prefs->getBool("/tools/measure/all_layers");
+    dimension_offset = prefs->getDouble("/tools/measure/offset");
     Geom::PathVector lineseg;
     Geom::Path p;
     p.start(desktop->dt2doc(start_point));
@@ -660,13 +732,13 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
     Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
     r->setMode(RUBBERBAND_MODE_TOUCHPATH);
     if(!show_in_between){
-        r->start(desktop,start_point);
-        r->move(end_point);
+        r->start(desktop,start_p);
+        r->move(end_p);
         items = desktop->getDocument()->getItemsAtPoints(desktop->dkey, r->getPoints(), all_layers, 2);
         r->stop();
         r->setMode(RUBBERBAND_MODE_TOUCHPATH);
-        r->start(desktop,end_point);
-        r->move(start_point);
+        r->start(desktop,end_p);
+        r->move(start_p);
         std::vector<SPItem*> items_reverse = desktop->getDocument()->getItemsAtPoints(desktop->dkey, r->getPoints(), all_layers, 2);
         r->stop();
         if(items_reverse.size() == 2 && items_reverse[1] != items[0] && items_reverse[1] != items[1]){
@@ -722,8 +794,7 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
         unit_name = "px";
     }
 
-    double fontsize = prefs->getInt("/tools/measure/fontsize");
-
+    double fontsize = prefs->getInt("/tools/measure/fontsize") * (96/72);
     // Normal will be used for lines and text
     Geom::Point windowNormal = Geom::unit_vector(Geom::rot90(desktop->d2w(end_point - start_point)));
     Geom::Point normal = desktop->w2d(windowNormal);
@@ -748,7 +819,7 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
         LabelPlacement placement;
         placement.lengthVal = (intersections[idx] - intersections[idx - 1]).length();
         placement.lengthVal = Inkscape::Util::Quantity::convert(placement.lengthVal, "px", unit_name);
-        placement.offset = DIMENSION_OFFSET;
+        placement.offset = dimension_offset;
         placement.start = desktop->doc2dt( (intersections[idx - 1] + intersections[idx]) / 2 );
         placement.end = placement.start - (normal * placement.offset);
 
@@ -830,7 +901,7 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
         gchar *total_str = g_strdup_printf("%.2f %s", totallengthval, unit_name.c_str());
         SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
                                                          desktop,
-                                                         desktop->doc2dt((intersections[0] + intersections[intersections.size()-1])/2) + normal * 60,
+                                                         desktop->doc2dt((intersections[0] + intersections[intersections.size()-1])/2) + normal * (dimension_offset * 2),
                                                          total_str);
         sp_canvastext_set_fontsize(canvas_tooltip, fontsize);
         canvas_tooltip->rgba = 0xffffffff;
@@ -893,18 +964,18 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
         ControlManager &mgr = ControlManager::getManager();
         SPCtrlLine *control_line = 0;
         control_line = mgr.createControlLine(desktop->getTempGroup(),
-                                             desktop->doc2dt(intersections[0]) + normal * 60,
-                                             desktop->doc2dt(intersections[intersections.size() - 1]) + normal * 60);
+                                             desktop->doc2dt(intersections[0]) + normal * (dimension_offset * 2),
+                                             desktop->doc2dt(intersections[intersections.size() - 1]) + normal * (dimension_offset * 2));
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
 
         control_line = mgr.createControlLine(desktop->getTempGroup(),
                                              desktop->doc2dt(intersections[0]),
-                                             desktop->doc2dt(intersections[0]) + normal * 60);
+                                             desktop->doc2dt(intersections[0]) + normal * (dimension_offset * 2));
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
 
         control_line = mgr.createControlLine(desktop->getTempGroup(),
                                              desktop->doc2dt(intersections[intersections.size() - 1]),
-                                             desktop->doc2dt(intersections[intersections.size() - 1]) + normal * 60);
+                                             desktop->doc2dt(intersections[intersections.size() - 1]) + normal * (dimension_offset * 2));
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
     }
 
@@ -928,7 +999,7 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
             ControlManager &mgr = ControlManager::getManager();
             SPCtrlLine *control_line = mgr.createControlLine(desktop->getTempGroup(),
                                                              desktop->doc2dt(measure_text_pos),
-                                                             desktop->doc2dt(measure_text_pos) - (normal * DIMENSION_OFFSET),
+                                                             desktop->doc2dt(measure_text_pos) - (normal * dimension_offset),
                                                              CTLINE_SECONDARY);
             measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
         }
diff --git a/src/ui/tools/measure-tool.h b/src/ui/tools/measure-tool.h
index 44153a144..0670fb9f7 100644
--- a/src/ui/tools/measure-tool.h
+++ b/src/ui/tools/measure-tool.h
@@ -43,6 +43,7 @@ public:
     virtual void setMarkers();
     virtual void setMarker(bool isStart);
     virtual const std::string& getPrefsPath();
+    void setLabelText(const char *value, Geom::Point pos, double fontsize, Geom::Coord angle);
     void knotStartMovedHandler(SPKnot */*knot*/, Geom::Point const &ppointer, guint state);
     void knotEndMovedHandler(SPKnot */*knot*/, Geom::Point const &ppointer, guint state);
     void knotUngrabbedHandler(SPKnot */*knot*/,  unsigned int /*state*/);
-- 
cgit v1.2.3


From b76d7592902d9e27cb442e203ebffed4a915b8e6 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Mon, 12 Oct 2015 12:05:07 +0200
Subject: Fix from Johan to prevent referencing null C++ pointer. Found via
 Clang scan build.

(bzr r14404)
---
 src/ui/clipboard.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui')

diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 816daf2e5..0792fb9c5 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -565,7 +565,7 @@ bool ClipboardManagerImpl::pastePathEffect(SPDesktop *desktop)
     }
 
     Inkscape::Selection *selection = desktop->getSelection();
-    if (selection && selection->isEmpty()) {
+    if (!selection || selection->isEmpty()) {
         _userWarn(desktop, _("Select <b>object(s)</b> to paste live path effect to."));
         return false;
     }
-- 
cgit v1.2.3


From 2653fd7c3a138f91181f7bb64e1fd342c943ee7b Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 12 Oct 2015 12:37:15 +0200
Subject: Convert Measure to Item done

(bzr r14393.1.17)
---
 src/ui/tools/measure-tool.cpp | 905 ++++++++++++++++++++++++++++--------------
 src/ui/tools/measure-tool.h   |  21 +-
 2 files changed, 620 insertions(+), 306 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 585128135..76b8e931e 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -4,6 +4,7 @@
  * Authors:
  *   Felipe Correa da Silva Sanches <juca@members.fsf.org>
  *   Jon A. Cruz <jon@joncruz.org>
+ *   Jabiertxo Arraiza <jabier.arraiza@marker.es>
  *
  * Copyright (C) 2011 Authors
  *
@@ -14,42 +15,44 @@
 #include <gdk/gdkkeysyms.h>
 #include <boost/none_t.hpp>
 #include "util/units.h"
-#include "macros.h"
-#include "rubberband.h"
+#include "display/canvas-text.h"
 #include "display/curve.h"
-#include "text-editing.h"
-#include "display/sp-ctrlline.h"
 #include "display/sodipodi-ctrl.h"
+#include "display/sp-ctrlline.h"
+#include "display/sp-canvas.h"
 #include "display/sp-canvas-item.h"
 #include "display/sp-canvas-util.h"
-#include "desktop.h"
 #include "svg/svg.h"
-#include "document.h"
-#include "document-undo.h"
-#include <viewbox.h>
-#include "pixmaps/cursor-measure.xpm"
-#include "preferences.h"
-#include "inkscape.h"
-#include "knot.h"
+#include "svg/svg-color.h"
 #include "ui/tools/measure-tool.h"
 #include "ui/tools/freehand-base.h"
-#include "display/canvas-text.h"
-#include "path-chemistry.h"
-#include "2geom/line.h"
+#include "ui/control-manager.h"
+#include <2geom/line.h>
 #include <2geom/path-intersection.h>
 #include <2geom/pathvector.h>
 #include <2geom/crossing.h>
 #include <2geom/angle.h>
 #include <2geom/transforms.h>
-#include "snap.h"
 #include "sp-namedview.h"
 #include "sp-shape.h"
 #include "sp-text.h"
 #include "sp-flowtext.h"
 #include "sp-defs.h"
 #include "sp-item.h"
+#include "macros.h"
+#include "rubberband.h"
+#include "path-chemistry.h"
+#include "desktop.h"
+#include "document.h"
+#include "document-undo.h"
+#include "viewbox.h"
+#include "snap.h"
+#include "text-editing.h"
+#include "pixmaps/cursor-measure.xpm"
+#include "preferences.h"
+#include "inkscape.h"
+#include "knot.h"
 #include "enums.h"
-#include "ui/control-manager.h"
 #include "knot-enums.h"
 #include "desktop-style.h"
 #include "verbs.h"
@@ -63,20 +66,21 @@ using Inkscape::DocumentUndo;
 #define MT_KNOT_COLOR_NORMAL 0xffffff00
 #define MT_KNOT_COLOR_MOUSEOVER 0xff000000
 
+
 namespace Inkscape {
 namespace UI {
 namespace Tools {
 
 std::vector<Inkscape::Display::TemporaryItem*> measure_tmp_items;
 
-const std::string& MeasureTool::getPrefsPath() {
+const std::string& MeasureTool::getPrefsPath()
+{
     return MeasureTool::prefsPath;
 }
 
 const std::string MeasureTool::prefsPath = "/tools/measure";
 
-namespace
-{
+namespace {
 
 gint dimension_offset = 35;
 
@@ -196,8 +200,9 @@ Geom::Point calcAngleDisplayAnchor(SPDesktop *desktop, double angle, double base
  * @param end the point that ends at the edge of the arc segment.
  * @param anchor the anchor point for displaying the text label.
  * @param angle the angle of the arc segment to draw.
+ * @param measure_rpr the container of the curve if converted to items.
  */
-void createAngleDisplayCurve(SPDesktop *desktop, Geom::Point const &center, Geom::Point const &end, Geom::Point const &anchor, double angle)
+void createAngleDisplayCurve(SPDesktop *desktop, Geom::Point const &center, Geom::Point const &end, Geom::Point const &anchor, double angle, Inkscape::XML::Node *measure_repr = NULL)
 {
     // Given that we have a point on the arc's edge and the angle of the arc, we need to get the two endpoints.
 
@@ -205,7 +210,7 @@ void createAngleDisplayCurve(SPDesktop *desktop, Geom::Point const &center, Geom
     double sideLen = std::abs((end - center).length());
     if (sideLen > 0.0) {
         double factor = std::min(1.0, textLen / sideLen);
-    
+
         // arc start
         Geom::Point p1 = end * (Geom::Affine(Geom::Translate(-center))
                                 * Geom::Affine(Geom::Scale(factor))
@@ -235,9 +240,47 @@ void createAngleDisplayCurve(SPDesktop *desktop, Geom::Point const &center, Geom
         SPCtrlCurve *curve = ControlManager::getManager().createControlCurve(desktop->getTempGroup(), p1, p2, p3, p4, CTLINE_SECONDARY);
 
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(SP_CANVAS_ITEM(curve), 0, true));
+        if(measure_repr) {
+            Geom::PathVector c;
+            Geom::Path p;
+            p.start(desktop->doc2dt(p1));
+            p.appendNew<Geom::CubicBezier>(desktop->doc2dt(p2),desktop->doc2dt(p3),desktop->doc2dt(p4));
+            c.push_back(p);
+            c *= SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
+            SPDocument *doc = desktop->getDocument();
+            Inkscape::XML::Document *xml_doc = doc->getReprDoc();
+            if (c.size() == 1) {
+                Inkscape::XML::Node *repr;
+                repr = xml_doc->createElement("svg:path");
+                gchar const *str = sp_svg_write_path(c);
+                Geom::Point strokewidth = Geom::Point(1,1) * SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
+                SPCSSAttr *css = sp_repr_css_attr_new();
+                std::stringstream stroke_width;
+                stroke_width.imbue(std::locale::classic());
+                stroke_width <<  strokewidth[Geom::X] / desktop->current_zoom();
+                sp_repr_css_set_property (css, "stroke-width", stroke_width.str().c_str());
+                sp_repr_css_set_property (css, "fill", "none");
+                guint32 line_color_secondary = 0xff00007f;
+                gchar c[64];
+                sp_svg_write_color (c, sizeof(c), line_color_secondary);
+                sp_repr_css_set_property (css, "stroke", c);
+                sp_repr_css_set_property (css, "stroke-linecap", "butt");
+                sp_repr_css_set_property (css, "stroke-linejoin", "miter");
+                sp_repr_css_set_property (css, "stroke-miterlimit", "4");
+                sp_repr_css_set_property (css, "stroke-dasharray", "none");
+                sp_repr_css_set_property (css, "stroke-opacity", "0.5");
+                Glib::ustring css_str;
+                sp_repr_css_write_string(css,css_str);
+                repr->setAttribute("style", css_str.c_str());
+                sp_repr_css_attr_unref (css);
+                g_assert( str != NULL );
+                repr->setAttribute("d", str);
+                measure_repr->addChild(repr, NULL);
+                Inkscape::GC::release(repr);
+            }
+        }
     }
 }
-
 } // namespace
 
 Geom::Point const MAGIC_POINT = Geom::Point(-0.0003432532004303,-0.006745034004304);
@@ -249,7 +292,7 @@ MeasureTool::MeasureTool()
     , grabbed(NULL)
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    // create the knot
+    // create the knots
     this->knot_start = new SPKnot(desktop, N_("Measure start"));
     this->knot_start->setMode(SP_KNOT_MODE_XOR);
     this->knot_start->setFill(MT_KNOT_COLOR_NORMAL, MT_KNOT_COLOR_MOUSEOVER, MT_KNOT_COLOR_MOUSEOVER);
@@ -262,12 +305,13 @@ MeasureTool::MeasureTool()
     this->knot_end->setStroke(0x0000007f, 0x0000007f, 0x0000007f);
     this->knot_end->setShape(SP_KNOT_SHAPE_CIRCLE);
     this->knot_end->updateCtrl();
-    if(end_p != MAGIC_POINT){
+    Geom::Rect display_area = desktop->get_display_area () ;
+    if(display_area.interiorContains(start_p) && display_area.interiorContains(end_p) && end_p != MAGIC_POINT) {
         this->knot_start->moveto(start_p);
         this->knot_start->show();
         this->knot_end->moveto(end_p);
         this->knot_end->show();
-        this->showCanvasItems();
+        showCanvasItems();
     }
     this->_knot_start_moved_connection = this->knot_start->moved_signal.connect(sigc::mem_fun(*this, &MeasureTool::knotStartMovedHandler));
     this->_knot_start_ungrabbed_connection = this->knot_start->ungrabbed_signal.connect(sigc::mem_fun(*this, &MeasureTool::knotUngrabbedHandler));
@@ -276,7 +320,8 @@ MeasureTool::MeasureTool()
 
 }
 
-MeasureTool::~MeasureTool() {
+MeasureTool::~MeasureTool()
+{
     this->_knot_start_moved_connection.disconnect();
     this->_knot_start_ungrabbed_connection.disconnect();
     this->_knot_end_moved_connection.disconnect();
@@ -291,7 +336,8 @@ MeasureTool::~MeasureTool() {
     measure_tmp_items.clear();
 }
 
-void MeasureTool::reverseKnots(){
+void MeasureTool::reverseKnots()
+{
     Geom::Point start = start_p;
     Geom::Point end = end_p;
     this->knot_start->moveto(end);
@@ -301,45 +347,59 @@ void MeasureTool::reverseKnots(){
     this->showCanvasItems(end, start);
 }
 
-void MeasureTool::knotStartMovedHandler(SPKnot */*knot*/, Geom::Point const &ppointer, guint state){
-    if (!(state & GDK_SHIFT_MASK)) {
+void MeasureTool::knotStartMovedHandler(SPKnot */*knot*/, Geom::Point const &ppointer, guint state)
+{
+    Geom::Point point = this->knot_start->position();
+    if (state & GDK_CONTROL_MASK) {
+        spdc_endpoint_snap_rotation(this, point, end_p, state);
+    } else if (!(state & GDK_SHIFT_MASK)) {
         SnapManager &m = desktop->namedview->snap_manager;
         m.setup(desktop);
-        Inkscape::SnapCandidatePoint scp(this->knot_start->position(), Inkscape::SNAPSOURCE_OTHER_HANDLE);
+        Inkscape::SnapCandidatePoint scp(point, Inkscape::SNAPSOURCE_OTHER_HANDLE);
         scp.addOrigin(this->knot_end->position());
         Inkscape::SnappedPoint sp = m.freeSnap(scp);
-        if(start_p != sp.getPoint()){
-            start_p = sp.getPoint();
-            this->knot_start->moveto(start_p);
-        }
+        point = sp.getPoint();
         m.unSetup();
     }
-    showCanvasItems(start_p, this->knot_end->position());
+    if(start_p != point) {
+        start_p = point;
+        this->knot_start->moveto(start_p);
+    }
+    showCanvasItems(start_p, end_p);
 }
 
-void MeasureTool::knotEndMovedHandler(SPKnot */*knot*/, Geom::Point const &ppointer, guint state){
-    if (!(state & GDK_SHIFT_MASK)) {
+void MeasureTool::knotEndMovedHandler(SPKnot */*knot*/, Geom::Point const &ppointer, guint state)
+{
+    Geom::Point point = this->knot_end->position();
+    if (state & GDK_CONTROL_MASK) {
+        spdc_endpoint_snap_rotation(this, point, start_p, state);
+    } else if (!(state & GDK_SHIFT_MASK)) {
         SnapManager &m = desktop->namedview->snap_manager;
         m.setup(desktop);
-        Inkscape::SnapCandidatePoint scp(this->knot_end->position(), Inkscape::SNAPSOURCE_OTHER_HANDLE);
+        Inkscape::SnapCandidatePoint scp(point, Inkscape::SNAPSOURCE_OTHER_HANDLE);
         scp.addOrigin(this->knot_start->position());
         Inkscape::SnappedPoint sp = m.freeSnap(scp);
-        if(end_p != sp.getPoint()){
-            end_p = sp.getPoint();
-            this->knot_end->moveto(end_p);
-        }
+        point = sp.getPoint();
         m.unSetup();
     }
-    showCanvasItems(this->knot_start->position(), end_p);
+    if(end_p != point) {
+        end_p = point;
+        this->knot_end->moveto(end_p);
+    }
+    showCanvasItems(start_p, end_p);
 }
 
-void MeasureTool::knotUngrabbedHandler(SPKnot */*knot*/,  unsigned int state){
-    showCanvasItems(this->knot_start->position(), this->knot_end->position());
+void MeasureTool::knotUngrabbedHandler(SPKnot */*knot*/,  unsigned int state)
+{
+    this->knot_start->moveto(start_p);
+    this->knot_end->moveto(end_p);
+    showCanvasItems(start_p, end_p);
 }
 
 
 
-void MeasureTool::finish() {
+void MeasureTool::finish()
+{
     this->enableGrDrag(false);
 
     if (this->grabbed) {
@@ -386,9 +446,9 @@ static void calculate_intersections(SPDesktop * /*desktop*/, SPItem* item, Geom:
         double eps = 0.0001;
         SPDocument* doc = desktop->getDocument();
         if (((*m).ta > eps &&
-             item == doc->getItemAtPoint(desktop->dkey, lineseg[0].pointAt((*m).ta - eps), false, NULL)) ||
-            ((*m).ta + eps < 1 &&
-             item == doc->getItemAtPoint(desktop->dkey, lineseg[0].pointAt((*m).ta + eps), false, NULL)) ) {
+                item == doc->getItemAtPoint(desktop->dkey, lineseg[0].pointAt((*m).ta - eps), false, NULL)) ||
+                ((*m).ta + eps < 1 &&
+                 item == doc->getItemAtPoint(desktop->dkey, lineseg[0].pointAt((*m).ta + eps), false, NULL)) ) {
             intersections.push_back((*m).ta);
         }
 #else
@@ -398,106 +458,83 @@ static void calculate_intersections(SPDesktop * /*desktop*/, SPItem* item, Geom:
     }
 }
 
-bool MeasureTool::root_handler(GdkEvent* event) {
+bool MeasureTool::root_handler(GdkEvent* event)
+{
     gint ret = FALSE;
 
     switch (event->type) {
-        case GDK_BUTTON_PRESS: {
-            this->knot_start->hide();
-            this->knot_end->hide();
-            Geom::Point const button_w(event->button.x, event->button.y);
-            explicitBase = boost::none;
-            last_end = boost::none;
-            start_point = desktop->w2d(button_w);
-
-            if (event->button.button == 1 && !this->space_panning) {
-                // save drag origin
-                start_point = desktop->w2d(Geom::Point(event->button.x, event->button.y));
-                within_tolerance = true;
-
-                ret = TRUE;
-            }
+    case GDK_BUTTON_PRESS: {
+        this->knot_start->hide();
+        this->knot_end->hide();
+        Geom::Point const button_w(event->button.x, event->button.y);
+        explicitBase = boost::none;
+        last_end = boost::none;
+        start_point = desktop->w2d(button_w);
+
+        if (event->button.button == 1 && !this->space_panning) {
+            // save drag origin
+            start_point = desktop->w2d(Geom::Point(event->button.x, event->button.y));
+            within_tolerance = true;
+
+            ret = TRUE;
+        }
 
-            SnapManager &m = desktop->namedview->snap_manager;
-            m.setup(desktop);
-            m.freeSnapReturnByRef(start_point, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-            m.unSetup();
+        SnapManager &m = desktop->namedview->snap_manager;
+        m.setup(desktop);
+        m.freeSnapReturnByRef(start_point, Inkscape::SNAPSOURCE_OTHER_HANDLE);
+        m.unSetup();
 
-            sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
-                                GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK,
-                                NULL, event->button.time);
-            this->grabbed = SP_CANVAS_ITEM(desktop->acetate);
-            break;
-        }
-        case GDK_KEY_PRESS: {
-            if ((event->key.keyval == GDK_KEY_Shift_L) || (event->key.keyval == GDK_KEY_Shift_R)) {
-                if (last_end) {
-                    explicitBase = last_end;
-                }
+        sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
+                            GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK,
+                            NULL, event->button.time);
+        this->grabbed = SP_CANVAS_ITEM(desktop->acetate);
+        break;
+    }
+    case GDK_KEY_PRESS: {
+        if ((event->key.keyval == GDK_KEY_Shift_L) || (event->key.keyval == GDK_KEY_Shift_R)) {
+            if (last_end) {
+                explicitBase = last_end;
             }
-            break;
         }
-        case GDK_MOTION_NOTIFY: {
-            if (!(event->motion.state & GDK_BUTTON1_MASK)){
-                if(!(event->motion.state & GDK_SHIFT_MASK)) {
-                    Geom::Point const motion_w(event->motion.x, event->motion.y);
-                    Geom::Point const motion_dt(desktop->w2d(motion_w));
+        break;
+    }
+    case GDK_MOTION_NOTIFY: {
+        if (!(event->motion.state & GDK_BUTTON1_MASK)) {
+            if(!(event->motion.state & GDK_SHIFT_MASK)) {
+                Geom::Point const motion_w(event->motion.x, event->motion.y);
+                Geom::Point const motion_dt(desktop->w2d(motion_w));
 
-                    SnapManager &m = desktop->namedview->snap_manager;
-                    m.setup(desktop);
+                SnapManager &m = desktop->namedview->snap_manager;
+                m.setup(desktop);
 
-                    Inkscape::SnapCandidatePoint scp(motion_dt, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-                    scp.addOrigin(start_point);
+                Inkscape::SnapCandidatePoint scp(motion_dt, Inkscape::SNAPSOURCE_OTHER_HANDLE);
+                scp.addOrigin(start_point);
 
-                    m.preSnap(scp);
-                    m.unSetup();
-                }
-            } else {
-                ret = TRUE;
-                Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-                tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
-                Geom::Point const motion_w(event->motion.x, event->motion.y);
-                if ( within_tolerance){
-                    if ( Geom::LInfty( motion_w - start_point ) < tolerance) {
-                        return FALSE;   // Do not drag if we're within tolerance from origin.
-                    }
-                }
-                // Once the user has moved farther than tolerance from the original location
-                // (indicating they intend to move the object, not click), then always process the
-                // motion notify coordinates as given (no snapping back to origin)
-                within_tolerance = false;
-                if(event->motion.time == 0 || !last_end  || Geom::LInfty( motion_w - *last_end ) > (tolerance/2)){
-                    Geom::Point const motion_w(event->motion.x, event->motion.y);
-                    Geom::Point const motion_dt(desktop->w2d(motion_w));
-                    Geom::Point end_point = motion_dt;
-
-                    if (event->motion.state & GDK_CONTROL_MASK) {
-                        spdc_endpoint_snap_rotation(this, end_point, start_point, event->motion.state);
-                    } else if (!(event->motion.state & GDK_SHIFT_MASK)) {
-                        SnapManager &m = desktop->namedview->snap_manager;
-                        m.setup(desktop);
-                        Inkscape::SnapCandidatePoint scp(end_point, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-                        scp.addOrigin(start_point);
-                        Inkscape::SnappedPoint sp = m.freeSnap(scp);
-                        end_point = sp.getPoint();
-                        m.unSetup();
-                    }
-                    showCanvasItems(start_point, end_point);
-                    last_end = motion_w ;
+                m.preSnap(scp);
+                m.unSetup();
+            }
+        } else {
+            ret = TRUE;
+            Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+            tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
+            Geom::Point const motion_w(event->motion.x, event->motion.y);
+            if ( within_tolerance) {
+                if ( Geom::LInfty( motion_w - start_point ) < tolerance) {
+                    return FALSE;   // Do not drag if we're within tolerance from origin.
                 }
-                gobble_motion_events(GDK_BUTTON1_MASK);
             }
-            break;
-        }
-        case GDK_BUTTON_RELEASE: {
-            this->knot_start->moveto(start_point);
-            this->knot_start->show();
-            Geom::Point end_point = end_p;
-            if(last_end){
-                end_point = desktop->w2d(*last_end);
-                if (event->button.state & GDK_CONTROL_MASK) {
+            // Once the user has moved farther than tolerance from the original location
+            // (indicating they intend to move the object, not click), then always process the
+            // motion notify coordinates as given (no snapping back to origin)
+            within_tolerance = false;
+            if(event->motion.time == 0 || !last_end  || Geom::LInfty( motion_w - *last_end ) > (tolerance/4.0)) {
+                Geom::Point const motion_w(event->motion.x, event->motion.y);
+                Geom::Point const motion_dt(desktop->w2d(motion_w));
+                Geom::Point end_point = motion_dt;
+
+                if (event->motion.state & GDK_CONTROL_MASK) {
                     spdc_endpoint_snap_rotation(this, end_point, start_point, event->motion.state);
-                } else if (!(event->button.state & GDK_SHIFT_MASK)) {
+                } else if (!(event->motion.state & GDK_SHIFT_MASK)) {
                     SnapManager &m = desktop->namedview->snap_manager;
                     m.setup(desktop);
                     Inkscape::SnapCandidatePoint scp(end_point, Inkscape::SNAPSOURCE_OTHER_HANDLE);
@@ -506,153 +543,317 @@ bool MeasureTool::root_handler(GdkEvent* event) {
                     end_point = sp.getPoint();
                     m.unSetup();
                 }
+                showCanvasItems(start_point, end_point);
+                last_end = motion_w ;
             }
-            this->knot_end->moveto(end_point);
-            this->knot_end->show();
-            showCanvasItems(start_point, end_point);
-            if (this->grabbed) {
-                sp_canvas_item_ungrab(this->grabbed, event->button.time);
-                this->grabbed = NULL;
+            gobble_motion_events(GDK_BUTTON1_MASK);
+        }
+        break;
+    }
+    case GDK_BUTTON_RELEASE: {
+        this->knot_start->moveto(start_point);
+        this->knot_start->show();
+        Geom::Point end_point = end_p;
+        if(last_end) {
+            end_point = desktop->w2d(*last_end);
+            if (event->button.state & GDK_CONTROL_MASK) {
+                spdc_endpoint_snap_rotation(this, end_point, start_point, event->motion.state);
+            } else if (!(event->button.state & GDK_SHIFT_MASK)) {
+                SnapManager &m = desktop->namedview->snap_manager;
+                m.setup(desktop);
+                Inkscape::SnapCandidatePoint scp(end_point, Inkscape::SNAPSOURCE_OTHER_HANDLE);
+                scp.addOrigin(start_point);
+                Inkscape::SnappedPoint sp = m.freeSnap(scp);
+                end_point = sp.getPoint();
+                m.unSetup();
             }
-            break;
         }
-        default:
-            break;
+        this->knot_end->moveto(end_point);
+        this->knot_end->show();
+        showCanvasItems(start_point, end_point);
+        if (this->grabbed) {
+            sp_canvas_item_ungrab(this->grabbed, event->button.time);
+            this->grabbed = NULL;
+        }
+        break;
+    }
+    default:
+        break;
     }
     if (!ret) {
         ret = ToolBase::root_handler(event);
     }
-    
+
     return ret;
 }
 
-void MeasureTool::setMarkers(){
-    SPDesktop *desktop = this->desktop;
+void MeasureTool::setMarkers()
+{
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     SPDocument *doc = desktop->getDocument();
     SPObject *arrowStart = doc->getObjectById("Arrow2Sstart");
     SPObject *arrowEnd = doc->getObjectById("Arrow2Send");
     if (!arrowStart) {
         setMarker(true);
     }
-    if(!arrowEnd){
+    if(!arrowEnd) {
         setMarker(false);
     }
 }
-void MeasureTool::setMarker(bool isStart){
-    SPDesktop *desktop = this->desktop;
+void MeasureTool::setMarker(bool isStart)
+{
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     SPDocument *doc = desktop->getDocument();
     SPDefs *defs = doc->getDefs();
-    Inkscape::XML::Node *repr;
+    Inkscape::XML::Node *rmarker;
     Inkscape::XML::Document *xml_doc = doc->getReprDoc();
-    repr = xml_doc->createElement("svg:marker");
-    if(isStart){
-        repr->setAttribute("id", "Arrow2Sstart");
+    rmarker = xml_doc->createElement("svg:marker");
+    if(isStart) {
+        rmarker->setAttribute("id", "Arrow2Sstart");
     } else {
-        repr->setAttribute("id", "Arrow2Send");
+        rmarker->setAttribute("id", "Arrow2Send");
     }
-    repr->setAttribute("inkscape:isstock", "true");
-    if(isStart){
-        repr->setAttribute("inkscape:stockid", "Arrow2Sstart");
+    rmarker->setAttribute("inkscape:isstock", "true");
+    if(isStart) {
+        rmarker->setAttribute("inkscape:stockid", "Arrow2Sstart");
     } else {
-        repr->setAttribute("inkscape:stockid", "Arrow2Send");
+        rmarker->setAttribute("inkscape:stockid", "Arrow2Send");
     }
-    repr->setAttribute("orient", "auto");
-    repr->setAttribute("refX", "0.0");
-    repr->setAttribute("refY", "0.0");
-    repr->setAttribute("style", "overflow:visible;");
-    SPItem *item = SP_ITEM(defs->appendChildRepr(repr));
-    Inkscape::GC::release(repr);
-    item->updateRepr();
-    Inkscape::XML::Node *repr2;
-    repr2 = xml_doc->createElement("svg:path");
-    repr2->setAttribute("d", "M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z");
-    if(isStart){
-        repr2->setAttribute("id", "Arrow2SstartPath");
+    rmarker->setAttribute("orient", "auto");
+    rmarker->setAttribute("refX", "0.0");
+    rmarker->setAttribute("refY", "0.0");
+    rmarker->setAttribute("style", "overflow:visible;");
+    SPItem *marker = SP_ITEM(defs->appendChildRepr(rmarker));
+    Inkscape::GC::release(rmarker);
+    marker->updateRepr();
+    Inkscape::XML::Node *rpath;
+    rpath = xml_doc->createElement("svg:path");
+    rpath->setAttribute("d", "M 8.72,4.03 L -2.21,0.02 L 8.72,-4.00 C 6.97,-1.63 6.98,1.62 8.72,4.03 z");
+    if(isStart) {
+        rpath->setAttribute("id", "Arrow2SstartPath");
     } else {
-        repr2->setAttribute("id", "Arrow2SendPath");
+        rpath->setAttribute("id", "Arrow2SendPath");
     }
-    repr2->setAttribute("style", "stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1");
-    if(isStart){
-        repr2->setAttribute("transform", "scale(0.3) translate(-2.3,0)");
+    SPCSSAttr *css = sp_repr_css_attr_new();
+    sp_repr_css_set_property (css, "stroke", "none");
+    sp_repr_css_set_property (css, "fill", "#000000");
+    sp_repr_css_set_property (css, "fill-opacity", "1");
+    Glib::ustring css_str;
+    sp_repr_css_write_string(css,css_str);
+    rpath->setAttribute("style", css_str.c_str());
+    sp_repr_css_attr_unref (css);
+    if(isStart) {
+        rpath->setAttribute("transform", "scale(0.3) translate(-2.3,0)");
     } else {
-        repr2->setAttribute("transform", "scale(0.3) rotate(180) translate(-2.3,0)");
+        rpath->setAttribute("transform", "scale(0.3) rotate(180) translate(-2.3,0)");
     }
-    SPItem *item2 = SP_ITEM(item->appendChildRepr(repr2));
-    Inkscape::GC::release(repr2);
-    item2->updateRepr();
+    SPItem *path = SP_ITEM(marker->appendChildRepr(rpath));
+    Inkscape::GC::release(rpath);
+    path->updateRepr();
+}
+
+void MeasureTool::toItem()
+{
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    SPDocument *doc = desktop->getDocument();
+    Geom::Ray ray(start_p,end_p);
+    guint32 line_color_primary = 0x0000ff7f;
+    Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
+    Inkscape::XML::Node *rgroup = xml_doc->createElement("svg:g");
+    showCanvasItems(start_p, end_p, true, rgroup);
+    setLine(start_p,end_p, false, &line_color_primary, rgroup);
+    SPItem *measure_item = SP_ITEM(desktop->currentLayer()->appendChildRepr(rgroup));
+    Inkscape::GC::release(rgroup);
+    measure_item->updateRepr();
+    doc->ensureUpToDate();
+    DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MEASURE,_("Convert measure to items"));
+    reset();
 }
 
-void MeasureTool::toMarkDimension(){
+void MeasureTool::toMarkDimension()
+{
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    SPDocument *doc = desktop->getDocument();
     setMarkers();
-    Geom::PathVector c;
-    Geom::Path p;
     Geom::Ray ray(start_p,end_p);
     Geom::Point start = start_p + Geom::Point::polar(ray.angle(), 5);
-    start = desktop->doc2dt(start + Geom::Point::polar(ray.angle() + Geom::deg_to_rad(90), -(dimension_offset / 4.0)));
+    start = start + Geom::Point::polar(ray.angle() + Geom::deg_to_rad(90), -(dimension_offset / 4.0));
     Geom::Point end = end_p + Geom::Point::polar(ray.angle(), -5);
-    end = desktop->doc2dt(end+ Geom::Point::polar(ray.angle() + Geom::deg_to_rad(90), -(dimension_offset / 4.0)));
-    p.start(start);
-    p.appendNew<Geom::LineSegment>(end);
+    end = end+ Geom::Point::polar(ray.angle() + Geom::deg_to_rad(90), -(dimension_offset / 4.0));
+    guint32 color = 0x000000ff;
+    setLine(start, end, true, &color);
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    Glib::ustring unit_name = prefs->getString("/tools/measure/unit");
+    if (!unit_name.compare("")) {
+        unit_name = "px";
+    }
+    double fontsize = prefs->getInt("/tools/measure/fontsize")  * (96/72);
+    Geom::Point middle = Geom::middle_point(start, end);
+    double totallengthval = (end_p - start_p).length();
+    totallengthval = Inkscape::Util::Quantity::convert(totallengthval, "px", unit_name);
+    gchar *totallength_str = g_strdup_printf("%.2f %s", totallengthval, unit_name.c_str());
+    setLabelText(totallength_str, middle, fontsize, Geom::deg_to_rad(180) - ray.angle());
+    doc->ensureUpToDate();
+    DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MEASURE,_("Add global meassure line"));
+}
+
+void MeasureTool::setLine(Geom::Point start_point,Geom::Point end_point, bool markers, guint32 *color, Inkscape::XML::Node *measure_repr)
+{
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    if(!desktop || !start_point.isFinite() || !end_point.isFinite()) {
+        return;
+    }
+    Geom::PathVector c;
+    Geom::Path p;
+    p.start(desktop->doc2dt(start_point));
+    p.appendNew<Geom::LineSegment>(desktop->doc2dt(end_point));
     c.push_back(p);
     c *= SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
-    SPDesktop *desktop = this->desktop;
     SPDocument *doc = desktop->getDocument();
     Inkscape::XML::Document *xml_doc = doc->getReprDoc();
     if (c.size() == 1) {
         Inkscape::XML::Node *repr;
         repr = xml_doc->createElement("svg:path");
         gchar const *str = sp_svg_write_path(c);
-        Geom::Point stroke_width = Geom::Point(1,1) * SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
-        std::stringstream style_str;
-        style_str.imbue(std::locale::classic());
-        style_str << "fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:" << stroke_width[Geom::X] << ";stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Sstart);marker-end:url(#Arrow2Send)";
+        Geom::Point strokewidth = Geom::Point(1,1) * SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
+        SPCSSAttr *css = sp_repr_css_attr_new();
+        std::stringstream stroke_width;
+        stroke_width.imbue(std::locale::classic());
+        if(measure_repr) {
+            stroke_width <<  strokewidth[Geom::X] / desktop->current_zoom();
+        } else {
+            stroke_width <<  strokewidth[Geom::X];
+        }
+        sp_repr_css_set_property (css, "stroke-width", stroke_width.str().c_str());
+        sp_repr_css_set_property (css, "fill", "none");
+        if(color) {
+            gchar c[64];
+            sp_svg_write_color (c, sizeof(c), *color);
+            sp_repr_css_set_property (css, "stroke", c);
+        } else {
+            sp_repr_css_set_property (css, "stroke", "#000000");
+        }
+        sp_repr_css_set_property (css, "stroke-linecap", "butt");
+        sp_repr_css_set_property (css, "stroke-linejoin", "miter");
+        sp_repr_css_set_property (css, "stroke-miterlimit", "4");
+        sp_repr_css_set_property (css, "stroke-dasharray", "none");
+        if(measure_repr) {
+            sp_repr_css_set_property (css, "stroke-opacity", "0.5");
+        } else {
+            sp_repr_css_set_property (css, "stroke-opacity", "1");
+        }
+        if(markers) {
+            sp_repr_css_set_property (css, "marker-start", "url(#Arrow2Sstart)");
+            sp_repr_css_set_property (css, "marker-end", "url(#Arrow2Send)");
+        }
+        Glib::ustring css_str;
+        sp_repr_css_write_string(css,css_str);
+        repr->setAttribute("style", css_str.c_str());
+        sp_repr_css_attr_unref (css);
         g_assert( str != NULL );
         repr->setAttribute("d", str);
-        repr->setAttribute("style", style_str.str().c_str());
-        SPItem *item = SP_ITEM(desktop->currentLayer()->appendChildRepr(repr));
-        Inkscape::GC::release(repr);
-        item->updateRepr();
+        if(measure_repr) {
+            measure_repr->addChild(repr, NULL);
+            Inkscape::GC::release(repr);
+        } else {
+            SPItem *item = SP_ITEM(desktop->currentLayer()->appendChildRepr(repr));
+            Inkscape::GC::release(repr);
+            item->updateRepr();
+        }
     }
+}
 
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    Glib::ustring unit_name = prefs->getString("/tools/measure/unit");
-    if (!unit_name.compare("")) {
-        unit_name = "px";
+void MeasureTool::setPoint(Geom::Point origin, Inkscape::XML::Node *measure_repr)
+{
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    if(!desktop || !origin.isFinite()) {
+        return;
+    }
+    char const * svgd;
+    svgd = "m -3.55,-3.55 7.11,7.11 m 0,-7.11 -7.11,7.11";
+    Geom::PathVector c = sp_svg_read_pathv(svgd);
+    Geom::Scale scale = Geom::Scale(desktop->current_zoom()).inverse();
+    c *= scale;
+    Geom::Point strokewidth = (Geom::Point(1,1) * SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse())/ desktop->current_zoom();
+    c *= Geom::Translate(Geom::Point(strokewidth/2.0) - (scale.vector() * 0.5));
+    c *= Geom::Translate(desktop->doc2dt(origin));
+    c *= SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
+    SPDocument *doc = desktop->getDocument();
+    Inkscape::XML::Document *xml_doc = doc->getReprDoc();
+    if (c.size() == 2) {
+        Inkscape::XML::Node *repr;
+        repr = xml_doc->createElement("svg:path");
+        gchar const *str = sp_svg_write_path(c);
+        SPCSSAttr *css = sp_repr_css_attr_new();
+        std::stringstream stroke_width;
+        stroke_width.imbue(std::locale::classic());
+        stroke_width <<  strokewidth[Geom::X];
+        sp_repr_css_set_property (css, "stroke-width", stroke_width.str().c_str());
+        sp_repr_css_set_property (css, "fill", "none");
+        guint32 line_color_secondary = 0xff0000ff;
+        gchar c[64];
+        sp_svg_write_color (c, sizeof(c), line_color_secondary);
+        sp_repr_css_set_property (css, "stroke", c);
+        sp_repr_css_set_property (css, "stroke-linecap", "butt");
+        sp_repr_css_set_property (css, "stroke-linejoin", "miter");
+        sp_repr_css_set_property (css, "stroke-miterlimit", "4");
+        sp_repr_css_set_property (css, "stroke-dasharray", "none");
+        sp_repr_css_set_property (css, "stroke-opacity", "0.5");
+        Glib::ustring css_str;
+        sp_repr_css_write_string(css,css_str);
+        repr->setAttribute("style", css_str.c_str());
+        sp_repr_css_attr_unref (css);
+        g_assert( str != NULL );
+        repr->setAttribute("d", str);
+        measure_repr->addChild(repr, NULL);
+        Inkscape::GC::release(repr);
     }
-    double fontsize = prefs->getInt("/tools/measure/fontsize")  * (96/72);
-    Geom::Point middle = Geom::middle_point(start, end);
-    double totallengthval = (end_p - start_p).length();
-    totallengthval = Inkscape::Util::Quantity::convert(totallengthval, "px", unit_name);
-    gchar *totallength_str = g_strdup_printf("%.2f %s", totallengthval, unit_name.c_str());
-    setLabelText(totallength_str, middle, fontsize, Geom::deg_to_rad(180) - ray.angle());
-    // Flush pending updates
-    doc->ensureUpToDate();
-    DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MEASURE,
-                           _("Add global meassure line"));
-    //reset();
 }
 
-void MeasureTool::setLabelText(const char *value, Geom::Point pos, double fontsize, Geom::Coord angle)
+void MeasureTool::setLabelText(const char *value, Geom::Point pos, double fontsize, Geom::Coord angle, guint32 *background, Inkscape::XML::Node *measure_repr, CanvasTextAnchorPositionEnum text_anchor)
 {
-    /* Create <text> */
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
+    /* Create <text> */
+    pos = desktop->doc2dt(pos);
     Inkscape::XML::Node *rtext = xml_doc->createElement("svg:text");
     rtext->setAttribute("xml:space", "preserve");
 
 
     /* Set style */
     sp_desktop_apply_style_tool(desktop, rtext, "/tools/text", true);
-
-    sp_repr_set_svg_double(rtext, "x", 0);
-    sp_repr_set_svg_double(rtext, "y", 0);
+    if(measure_repr) {
+        sp_repr_set_svg_double(rtext, "x", 2);
+        sp_repr_set_svg_double(rtext, "y", 2);
+    } else {
+        sp_repr_set_svg_double(rtext, "x", 0);
+        sp_repr_set_svg_double(rtext, "y", 0);
+    }
 
     /* Create <tspan> */
     Inkscape::XML::Node *rtspan = xml_doc->createElement("svg:tspan");
     rtspan->setAttribute("sodipodi:role", "line"); // otherwise, why bother creating the tspan?
-    std::stringstream text_style;
-    text_style.imbue(std::locale::classic());
-    text_style << "font-style:normal;font-weight:normal;font-size:" << fontsize << "px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1";
-    rtspan->setAttribute("style", text_style.str().c_str());
+    SPCSSAttr *css = sp_repr_css_attr_new();
+    std::stringstream font_size;
+    font_size.imbue(std::locale::classic());
+    font_size <<  fontsize ;
+    sp_repr_css_set_property (css, "font-size", font_size.str().c_str());
+    sp_repr_css_set_property (css, "font-style", "normal");
+    sp_repr_css_set_property (css, "font-weight", "normal");
+    sp_repr_css_set_property (css, "line-height", "125%");
+    sp_repr_css_set_property (css, "letter-spacing", "0px");
+    sp_repr_css_set_property (css, "word-spacing", "0px");
+    if(measure_repr) {
+        sp_repr_css_set_property (css, "fill", "#FFFFFF");
+    } else {
+        sp_repr_css_set_property (css, "fill", "#000000");
+    }
+    sp_repr_css_set_property (css, "fill-opacity", "1");
+    sp_repr_css_set_property (css, "stroke", "none");
+    Glib::ustring css_str;
+    sp_repr_css_write_string(css,css_str);
+    rtspan->setAttribute("style", css_str.c_str());
+    sp_repr_css_attr_unref (css);
     rtext->addChild(rtspan, NULL);
     Inkscape::GC::release(rtspan);
     /* Create TEXT */
@@ -663,19 +864,63 @@ void MeasureTool::setLabelText(const char *value, Geom::Point pos, double fontsi
     Inkscape::GC::release(rtext);
     text_item->updateRepr();
     Geom::OptRect bbox = text_item->geometricBounds();
-    if (bbox) {
-        Geom::Coord posX = Geom::middle_point(Geom::Point(bbox->left(), bbox->top()), Geom::Point(bbox->right(), bbox->top()))[Geom::X];
-        Geom::Coord posY = Geom::middle_point(Geom::Point(bbox->left(), bbox->top()), Geom::Point(bbox->left(), bbox->bottom()))[Geom::Y];
-        text_item->transform *= Geom::Translate(Geom::Point(posX, posY)).inverse();
-        pos = pos + Geom::Point::polar(angle                                                                                                                                                                                                                                                                                                                                        + Geom::deg_to_rad(90), -Geom::distance(Geom::Point(bbox->left(), bbox->top()), Geom::Point(bbox->left(), bbox->bottom())));
+    if (!measure_repr && bbox) {
+        Geom::Point center = bbox->midpoint();
+        text_item->transform *= Geom::Translate(center).inverse();
+        pos = pos + Geom::Point::polar(angle+ Geom::deg_to_rad(90), -bbox->height());
+    }
+    if(measure_repr) {
+        /* Create <group> */
+        Inkscape::XML::Node *rgroup = xml_doc->createElement("svg:g");
+        /* Create <rect> */
+        Inkscape::XML::Node *rrect = xml_doc->createElement("svg:rect");
+        SPCSSAttr *css = sp_repr_css_attr_new ();
+        gchar c[64];
+        sp_svg_write_color (c, sizeof(c), *background);
+        sp_repr_css_set_property (css, "fill", c);
+        sp_repr_css_set_property (css, "fill-opacity", "0.5");
+        sp_repr_css_set_property (css, "stroke-width", "0");
+        Glib::ustring css_str;
+        sp_repr_css_write_string(css,css_str);
+        rrect->setAttribute("style", css_str.c_str());
+        sp_repr_css_attr_unref (css);
+        sp_repr_set_svg_double(rgroup, "x", 0);
+        sp_repr_set_svg_double(rgroup, "y", 0);
+        sp_repr_set_svg_double(rrect, "x", 0);
+        sp_repr_set_svg_double(rrect, "y", -bbox->height());
+        sp_repr_set_svg_double(rrect, "width", (bbox->width()) + 6);
+        sp_repr_set_svg_double(rrect, "height", (bbox->height()) + 6);
+        Inkscape::XML::Node *rtextitem = text_item->getRepr();
+        text_item->deleteObject();
+        rgroup->addChild(rtextitem, NULL);
+        Inkscape::GC::release(rtextitem);
+        rgroup->addChild(rrect, NULL);
+        Inkscape::GC::release(rrect);
+        SPItem *text_item_box = SP_ITEM(desktop->currentLayer()->appendChildRepr(rgroup));
+        Geom::Scale scale = Geom::Scale(desktop->current_zoom()).inverse();
+        if(bbox && text_anchor == TEXT_ANCHOR_CENTER) {
+            text_item_box->transform *= Geom::Translate(bbox->midpoint() - Geom::Point(1.0,1.0)).inverse();
+        }
+        text_item_box->transform *= scale;
+        text_item_box->transform *= Geom::Translate(Geom::Point() - (scale.vector() * 0.5));
+        text_item_box->transform *= Geom::Translate(pos);
+        text_item_box->transform *= SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
+        text_item_box->updateRepr();
+        text_item_box->doWriteTransform(text_item_box->getRepr(), text_item_box->transform, NULL, true);
+        Inkscape::XML::Node *rlabel = text_item_box->getRepr();
+        text_item_box->deleteObject();
+        measure_repr->addChild(rlabel, NULL);
+        Inkscape::GC::release(rlabel);
+    } else {
+        text_item->transform *= Geom::Rotate(angle);
+        text_item->transform *= Geom::Translate(pos);
+        text_item->transform *= SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
+        text_item->doWriteTransform(text_item->getRepr(), text_item->transform, NULL, true);
     }
-    text_item->transform *= Geom::Rotate(angle);
-    text_item->transform *= Geom::Translate(pos);
-    text_item->transform *= SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
-    text_item->doWriteTransform(text_item->getRepr(), text_item->transform, NULL, true);
 }
 
-void MeasureTool::reset(){
+void MeasureTool::reset()
+{
     this->knot_start->hide();
     this->knot_end->hide();
     for (size_t idx = 0; idx < measure_tmp_items.size(); ++idx) {
@@ -684,15 +929,19 @@ void MeasureTool::reset(){
     measure_tmp_items.clear();
 }
 
-void MeasureTool::showCanvasItems(){
+void MeasureTool::showCanvasItems()
+{
     showCanvasItems(start_p, end_p);
 }
 
-void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point){
+void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point, bool to_item, Inkscape::XML::Node *measure_repr)
+{
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    if(!desktop || !start_point.isFinite() || !end_point.isFinite() || end_point == MAGIC_POINT){
+    if(!desktop || !start_point.isFinite() || !end_point.isFinite() || end_point == MAGIC_POINT) {
         return;
     }
+    guint32 line_color_primary = 0x0000ff7f;
+    guint32 line_color_secondary = 0xff00007f;
     start_p = start_point;
     end_p = end_point;
     //clear previous temporary canvas items, we'll draw new ones
@@ -731,7 +980,7 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
     std::vector<SPItem*> items;
     Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
     r->setMode(RUBBERBAND_MODE_TOUCHPATH);
-    if(!show_in_between){
+    if(!show_in_between) {
         r->start(desktop,start_p);
         r->move(end_p);
         items = desktop->getDocument()->getItemsAtPoints(desktop->dkey, r->getPoints(), all_layers, 2);
@@ -741,10 +990,10 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
         r->move(start_p);
         std::vector<SPItem*> items_reverse = desktop->getDocument()->getItemsAtPoints(desktop->dkey, r->getPoints(), all_layers, 2);
         r->stop();
-        if(items_reverse.size() == 2 && items_reverse[1] != items[0] && items_reverse[1] != items[1]){
+        if(items_reverse.size() == 2 && items_reverse[1] != items[0] && items_reverse[1] != items[1]) {
             items.push_back(items_reverse[1]);
         }
-        if(items_reverse.size() >= 1 && items_reverse[0] != items[1]){
+        if(items_reverse.size() >= 1 && items_reverse[0] != items[1]) {
             items.push_back(items_reverse[0]);
         }
     } else {
@@ -754,10 +1003,10 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
         r->stop();
     }
     std::vector<double> intersection_times;
-    for (std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++) {
+    for (std::vector<SPItem*>::const_iterator i=items.begin(); i!=items.end(); i++) {
         SPItem *item = *i;
         if (SP_IS_SHAPE(item)) {
-           calculate_intersections(desktop, item, lineseg, SP_SHAPE(item)->getCurve(), intersection_times);
+            calculate_intersections(desktop, item, lineseg, SP_SHAPE(item)->getCurve(), intersection_times);
         } else {
             if (SP_IS_TEXT(item) || SP_IS_FLOWTEXT(item)) {
                 Inkscape::Text::Layout::iterator iter = te_get_layout(item)->begin();
@@ -802,11 +1051,11 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
     std::vector<Geom::Point> intersections;
     std::sort(intersection_times.begin(), intersection_times.end());
     for (std::vector<double>::iterator iter_t = intersection_times.begin(); iter_t != intersection_times.end(); iter_t++) {
-        if(show_in_between){
+        if(show_in_between) {
             intersections.push_back(lineseg[0].pointAt(*iter_t));
         }
     }
-    if(!show_in_between && intersection_times.size() > 1){
+    if(!show_in_between && intersection_times.size() > 1) {
         intersections.push_back(lineseg[0].pointAt(intersection_times[0]));
         intersections.push_back(lineseg[0].pointAt(intersection_times[intersection_times.size()-1]));
     }
@@ -828,47 +1077,52 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
 
     // Adjust positions
     repositionOverlappingLabels(placements, desktop, windowNormal, fontsize);
-    for (std::vector<LabelPlacement>::iterator it = placements.begin(); it != placements.end(); ++it)
-    {
+    for (std::vector<LabelPlacement>::iterator it = placements.begin(); it != placements.end(); ++it) {
         LabelPlacement &place = *it;
 
         // TODO cleanup memory, Glib::ustring, etc.:
         gchar *measure_str = g_strdup_printf("%.2f %s", place.lengthVal, unit_name.c_str());
         SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
-                                                         desktop,
-                                                         place.end,
-                                                         measure_str);
+                                       desktop,
+                                       place.end,
+                                       measure_str);
         sp_canvastext_set_fontsize(canvas_tooltip, fontsize);
         canvas_tooltip->rgba = 0xffffffff;
         canvas_tooltip->rgba_background = 0x0000007f;
         canvas_tooltip->outline = false;
         canvas_tooltip->background = true;
         canvas_tooltip->anchor_position = TEXT_ANCHOR_CENTER;
-
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvas_tooltip, 0));
+        if(to_item) {
+            guint32 background = canvas_tooltip->rgba_background;
+            setLabelText(measure_str, place.end, fontsize, 0, &background, measure_repr);
+        }
         g_free(measure_str);
     }
 
     Geom::Point angleDisplayPt = calcAngleDisplayAnchor(desktop, angle, baseAngle,
-                                                        start_point, end_point,
-                                                        fontsize);
+                                 start_point, end_point,
+                                 fontsize);
 
     {
         // TODO cleanup memory, Glib::ustring, etc.:
         gchar *angle_str = g_strdup_printf("%.2f °", angle * 180/M_PI);
 
         SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
-                                                         desktop,
-                                                         angleDisplayPt,
-                                                         angle_str);
+                                       desktop,
+                                       angleDisplayPt,
+                                       angle_str);
         sp_canvastext_set_fontsize(canvas_tooltip, fontsize);
         canvas_tooltip->rgba = 0xffffffff;
         canvas_tooltip->rgba_background = 0x337f337f;
         canvas_tooltip->outline = false;
         canvas_tooltip->background = true;
         canvas_tooltip->anchor_position = TEXT_ANCHOR_CENTER;
-
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvas_tooltip, 0));
+        if(to_item) {
+            guint32 background = canvas_tooltip->rgba_background;
+            setLabelText(angle_str, angleDisplayPt, fontsize, 0, &background, measure_repr);
+        }
         g_free(angle_str);
     }
 
@@ -879,17 +1133,20 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
         // TODO cleanup memory, Glib::ustring, etc.:
         gchar *totallength_str = g_strdup_printf("%.2f %s", totallengthval, unit_name.c_str());
         SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
-                                                         desktop,
-                                                         end_point + desktop->w2d(Geom::Point(3*fontsize, -fontsize)),
-                                                         totallength_str);
+                                       desktop,
+                                       end_point + desktop->w2d(Geom::Point(3*fontsize, -fontsize)),
+                                       totallength_str);
         sp_canvastext_set_fontsize(canvas_tooltip, fontsize);
         canvas_tooltip->rgba = 0xffffffff;
         canvas_tooltip->rgba_background = 0x3333337f;
         canvas_tooltip->outline = false;
         canvas_tooltip->background = true;
         canvas_tooltip->anchor_position = TEXT_ANCHOR_LEFT;
-
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvas_tooltip, 0));
+        if(to_item) {
+            guint32 background = canvas_tooltip->rgba_background;
+            setLabelText(totallength_str, end_point + desktop->w2d(Geom::Point(3*fontsize, -fontsize)), fontsize, 0, &background, measure_repr, TEXT_ANCHOR_LEFT);
+        }
         g_free(totallength_str);
     }
 
@@ -900,44 +1157,68 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
         // TODO cleanup memory, Glib::ustring, etc.:
         gchar *total_str = g_strdup_printf("%.2f %s", totallengthval, unit_name.c_str());
         SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
-                                                         desktop,
-                                                         desktop->doc2dt((intersections[0] + intersections[intersections.size()-1])/2) + normal * (dimension_offset * 2),
-                                                         total_str);
+                                       desktop,
+                                       desktop->doc2dt((intersections[0] + intersections[intersections.size()-1])/2) + normal * (dimension_offset * 2),
+                                       total_str);
         sp_canvastext_set_fontsize(canvas_tooltip, fontsize);
         canvas_tooltip->rgba = 0xffffffff;
         canvas_tooltip->rgba_background = 0x33337f7f;
         canvas_tooltip->outline = false;
         canvas_tooltip->background = true;
         canvas_tooltip->anchor_position = TEXT_ANCHOR_CENTER;
-
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvas_tooltip, 0));
+        if(to_item) {
+            guint32 background = canvas_tooltip->rgba_background;
+            setLabelText(total_str, desktop->doc2dt((intersections[0] + intersections[intersections.size()-1])/2) + normal * (dimension_offset * 2), fontsize, 0, &background, measure_repr);
+        }
         g_free(total_str);
     }
 
+    // Initial point
+    {
+        SPCanvasItem * canvasitem = sp_canvas_item_new(desktop->getTempGroup(),
+                                    SP_TYPE_CTRL,
+                                    "anchor", SP_ANCHOR_CENTER,
+                                    "size", 8.0,
+                                    "stroked", TRUE,
+                                    "stroke_color", 0xff0000ff,
+                                    "mode", SP_KNOT_MODE_XOR,
+                                    "shape", SP_KNOT_SHAPE_CROSS,
+                                    NULL );
+
+        SP_CTRL(canvasitem)->moveto(start_point);
+        measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvasitem, 0));
+        if(to_item) {
+            setPoint(start_point, measure_repr);
+        }
+    }
+
     // Now that text has been added, we can add lines and controls so that they go underneath
     for (size_t idx = 0; idx < intersections.size(); ++idx) {
         // Display the intersection indicator (i.e. the cross)
         SPCanvasItem * canvasitem = sp_canvas_item_new(desktop->getTempGroup(),
-                                                       SP_TYPE_CTRL,
-                                                       "anchor", SP_ANCHOR_CENTER,
-                                                       "size", 8.0,
-                                                       "stroked", TRUE,
-                                                       "stroke_color", 0xff0000ff,
-                                                       "mode", SP_KNOT_MODE_XOR,
-                                                       "shape", SP_KNOT_SHAPE_CROSS,
-                                                       NULL );
+                                    SP_TYPE_CTRL,
+                                    "anchor", SP_ANCHOR_CENTER,
+                                    "size", 8.0,
+                                    "stroked", TRUE,
+                                    "stroke_color", 0xff0000ff,
+                                    "mode", SP_KNOT_MODE_XOR,
+                                    "shape", SP_KNOT_SHAPE_CROSS,
+                                    NULL );
 
         SP_CTRL(canvasitem)->moveto(desktop->doc2dt(intersections[idx]));
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvasitem, 0));
+        if(to_item) {
+            setPoint(desktop->doc2dt(intersections[idx]), measure_repr);
+        }
     }
-
     // Since adding goes to the bottom, do all lines last.
 
     // draw main control line
     {
         SPCtrlLine *control_line = ControlManager::getManager().createControlLine(desktop->getTempGroup(),
-                                                                                  start_point,
-                                                                                  end_point);
+                                   start_point,
+                                   end_point);
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
 
         if ((end_point[Geom::X] != start_point[Geom::X]) && (end_point[Geom::Y] != start_point[Geom::Y])) {
@@ -951,12 +1232,18 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
             }
 
             SPCtrlLine *control_line = ControlManager::getManager().createControlLine(desktop->getTempGroup(),
-                                                                                      start_point,
-                                                                                      anchorEnd,
-                                                                                      CTLINE_SECONDARY);
+                                       start_point,
+                                       anchorEnd,
+                                       CTLINE_SECONDARY);
             measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
-
-            createAngleDisplayCurve(desktop, start_point, end_point, angleDisplayPt, angle);
+            if(to_item) {
+                setLine(start_point,
+                        anchorEnd,
+                        false,
+                        &line_color_secondary,
+                        measure_repr);
+            }
+            createAngleDisplayCurve(desktop, start_point, end_point, angleDisplayPt, angle, measure_repr);
         }
     }
 
@@ -967,29 +1254,50 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
                                              desktop->doc2dt(intersections[0]) + normal * (dimension_offset * 2),
                                              desktop->doc2dt(intersections[intersections.size() - 1]) + normal * (dimension_offset * 2));
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
-
+        if(to_item) {
+            setLine(desktop->doc2dt(intersections[0]) + normal * (dimension_offset * 2),
+                    desktop->doc2dt(intersections[intersections.size() - 1]) + normal * (dimension_offset * 2),
+                    false,
+                    &line_color_primary,
+                    measure_repr);
+        }
         control_line = mgr.createControlLine(desktop->getTempGroup(),
                                              desktop->doc2dt(intersections[0]),
                                              desktop->doc2dt(intersections[0]) + normal * (dimension_offset * 2));
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
-
+        if(to_item) {
+            setLine(desktop->doc2dt(intersections[0]),
+                    desktop->doc2dt(intersections[0]) + normal * (dimension_offset * 2),
+                    false,
+                    &line_color_primary,
+                    measure_repr);
+        }
         control_line = mgr.createControlLine(desktop->getTempGroup(),
                                              desktop->doc2dt(intersections[intersections.size() - 1]),
                                              desktop->doc2dt(intersections[intersections.size() - 1]) + normal * (dimension_offset * 2));
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
+        if(to_item) {
+            setLine(desktop->doc2dt(intersections[intersections.size() - 1]),
+                    desktop->doc2dt(intersections[intersections.size() - 1]) + normal * (dimension_offset * 2),
+                    false,
+                    &line_color_primary,
+                    measure_repr);
+        }
     }
 
     // call-out lines
-    for (std::vector<LabelPlacement>::iterator it = placements.begin(); it != placements.end(); ++it)
-    {
+    for (std::vector<LabelPlacement>::iterator it = placements.begin(); it != placements.end(); ++it) {
         LabelPlacement &place = *it;
 
         ControlManager &mgr = ControlManager::getManager();
         SPCtrlLine *control_line = mgr.createControlLine(desktop->getTempGroup(),
-                                                         place.start,
-                                                         place.end,
-                                                         CTLINE_SECONDARY);
+                                   place.start,
+                                   place.end,
+                                   CTLINE_SECONDARY);
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
+        if(to_item) {
+            setLine(place.start,place.end, false, &line_color_secondary, measure_repr);
+        }
     }
 
     {
@@ -998,28 +1306,19 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
 
             ControlManager &mgr = ControlManager::getManager();
             SPCtrlLine *control_line = mgr.createControlLine(desktop->getTempGroup(),
-                                                             desktop->doc2dt(measure_text_pos),
-                                                             desktop->doc2dt(measure_text_pos) - (normal * dimension_offset),
-                                                             CTLINE_SECONDARY);
+                                       desktop->doc2dt(measure_text_pos),
+                                       desktop->doc2dt(measure_text_pos) - (normal * dimension_offset),
+                                       CTLINE_SECONDARY);
             measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
+            if(to_item) {
+                setLine(desktop->doc2dt(measure_text_pos),
+                        desktop->doc2dt(measure_text_pos) - (normal * dimension_offset),
+                        false,
+                        &line_color_secondary,
+                        measure_repr);
+            }
         }
     }
-
-    // Initial point
-    {
-        SPCanvasItem * canvasitem = sp_canvas_item_new(desktop->getTempGroup(),
-                                                       SP_TYPE_CTRL,
-                                                       "anchor", SP_ANCHOR_CENTER,
-                                                       "size", 8.0,
-                                                       "stroked", TRUE,
-                                                       "stroke_color", 0xff0000ff,
-                                                       "mode", SP_KNOT_MODE_XOR,
-                                                       "shape", SP_KNOT_SHAPE_CROSS,
-                                                       NULL );
-
-        SP_CTRL(canvasitem)->moveto(start_point);
-        measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvasitem, 0));
-    }
 }
 }
 }
diff --git a/src/ui/tools/measure-tool.h b/src/ui/tools/measure-tool.h
index 0670fb9f7..ee45c18e5 100644
--- a/src/ui/tools/measure-tool.h
+++ b/src/ui/tools/measure-tool.h
@@ -6,7 +6,7 @@
  *
  * Authors:
  *   Felipe Correa da Silva Sanches <juca@members.fsf.org>
- *
+ *   Jabiertxo Arraiza <jabier.arraiza@marker.es>
  * Copyright (C) 2011 Authors
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
@@ -15,6 +15,7 @@
 #include <sigc++/sigc++.h>
 #include "ui/tools/tool-base.h"
 #include <2geom/point.h>
+#include "display/canvas-text.h"
 #include <boost/optional.hpp>
 
 #define SP_MEASURE_CONTEXT(obj) (dynamic_cast<Inkscape::UI::Tools::MeasureTool*>((Inkscape::UI::Tools::ToolBase*)obj))
@@ -36,14 +37,17 @@ public:
     virtual void finish();
     virtual bool root_handler(GdkEvent* event);
     virtual void showCanvasItems();
-    virtual void showCanvasItems(Geom::Point start_point, Geom::Point end_point);
+    virtual void showCanvasItems(Geom::Point start_point, Geom::Point end_point, bool to_item = false, Inkscape::XML::Node *measure_repr = NULL);
     virtual void reverseKnots();
     virtual void toMarkDimension();
+    virtual void toItem();
     virtual void reset();
     virtual void setMarkers();
     virtual void setMarker(bool isStart);
     virtual const std::string& getPrefsPath();
-    void setLabelText(const char *value, Geom::Point pos, double fontsize, Geom::Coord angle);
+    void setPoint(Geom::Point origin, Inkscape::XML::Node *measure_repr);
+    void setLine(Geom::Point start_point,Geom::Point end_point, bool markers = false, guint32 *color = NULL, Inkscape::XML::Node *measure_repr = NULL);
+    void setLabelText(const char *value, Geom::Point pos, double fontsize, Geom::Coord angle, guint32 *background = NULL, Inkscape::XML::Node *measure_repr = NULL, CanvasTextAnchorPositionEnum text_anchor = TEXT_ANCHOR_CENTER );
     void knotStartMovedHandler(SPKnot */*knot*/, Geom::Point const &ppointer, guint state);
     void knotEndMovedHandler(SPKnot */*knot*/, Geom::Point const &ppointer, guint state);
     void knotUngrabbedHandler(SPKnot */*knot*/,  unsigned int /*state*/);
@@ -66,3 +70,14 @@ private:
 }
 
 #endif // SEEN_SP_MEASURING_CONTEXT_H
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
-- 
cgit v1.2.3


From 328132ad756f7b094341c52175d184449155fe0f Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 12 Oct 2015 18:08:22 +0200
Subject: Fix positions of genetated intersection items

(bzr r14393.1.19)
---
 src/ui/tools/measure-tool.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 76b8e931e..00d66b4c9 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -733,7 +733,7 @@ void MeasureTool::setLine(Geom::Point start_point,Geom::Point end_point, bool ma
         } else {
             sp_repr_css_set_property (css, "stroke", "#000000");
         }
-        sp_repr_css_set_property (css, "stroke-linecap", "butt");
+        sp_repr_css_set_property (css, "stroke-linecap", "square");
         sp_repr_css_set_property (css, "stroke-linejoin", "miter");
         sp_repr_css_set_property (css, "stroke-miterlimit", "4");
         sp_repr_css_set_property (css, "stroke-dasharray", "none");
@@ -770,12 +770,12 @@ void MeasureTool::setPoint(Geom::Point origin, Inkscape::XML::Node *measure_repr
         return;
     }
     char const * svgd;
-    svgd = "m -3.55,-3.55 7.11,7.11 m 0,-7.11 -7.11,7.11";
+    svgd = "m 0.707,0.707 6.586,6.586 m 0,-6.586 -6.586,6.586";
     Geom::PathVector c = sp_svg_read_pathv(svgd);
     Geom::Scale scale = Geom::Scale(desktop->current_zoom()).inverse();
+    c *= Geom::Translate(Geom::Point(-3.5,-3.5));
     c *= scale;
-    Geom::Point strokewidth = (Geom::Point(1,1) * SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse())/ desktop->current_zoom();
-    c *= Geom::Translate(Geom::Point(strokewidth/2.0) - (scale.vector() * 0.5));
+    c *= Geom::Translate(Geom::Point() - (scale.vector() * 0.5));
     c *= Geom::Translate(desktop->doc2dt(origin));
     c *= SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
     SPDocument *doc = desktop->getDocument();
@@ -785,6 +785,7 @@ void MeasureTool::setPoint(Geom::Point origin, Inkscape::XML::Node *measure_repr
         repr = xml_doc->createElement("svg:path");
         gchar const *str = sp_svg_write_path(c);
         SPCSSAttr *css = sp_repr_css_attr_new();
+        Geom::Point strokewidth = (Geom::Point(1,1) * SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse())/ desktop->current_zoom();
         std::stringstream stroke_width;
         stroke_width.imbue(std::locale::classic());
         stroke_width <<  strokewidth[Geom::X];
@@ -794,7 +795,7 @@ void MeasureTool::setPoint(Geom::Point origin, Inkscape::XML::Node *measure_repr
         gchar c[64];
         sp_svg_write_color (c, sizeof(c), line_color_secondary);
         sp_repr_css_set_property (css, "stroke", c);
-        sp_repr_css_set_property (css, "stroke-linecap", "butt");
+        sp_repr_css_set_property (css, "stroke-linecap", "square");
         sp_repr_css_set_property (css, "stroke-linejoin", "miter");
         sp_repr_css_set_property (css, "stroke-miterlimit", "4");
         sp_repr_css_set_property (css, "stroke-dasharray", "none");
-- 
cgit v1.2.3


From c5b64a5ba1975d10f5e4a9ba41c41ad03a6321ee Mon Sep 17 00:00:00 2001
From: Diederik van Lierop <mail@diedenrezi.nl>
Date: Thu, 15 Oct 2015 21:06:11 +0200
Subject: Make the handle of a dynamic offset snappable

Fixed bugs:
  - https://launchpad.net/bugs/1174858

(bzr r14419)
---
 src/ui/object-edit.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/object-edit.cpp b/src/ui/object-edit.cpp
index 0a6c792dc..459acf002 100644
--- a/src/ui/object-edit.cpp
+++ b/src/ui/object-edit.cpp
@@ -1364,13 +1364,15 @@ public:
 };
 
 void
-OffsetKnotHolderEntity::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, unsigned int /*state*/)
+OffsetKnotHolderEntity::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, unsigned int state)
 {
     SPOffset *offset = dynamic_cast<SPOffset *>(item);
     g_assert(offset != NULL);
 
-    offset->rad = sp_offset_distance_to_original(offset, p);
-    offset->knot = p;
+    Geom::Point const p_snapped = snap_knot_position(p, state);
+
+    offset->rad = sp_offset_distance_to_original(offset, p_snapped);
+    offset->knot = p_snapped;
     offset->knotSet = true;
 
     offset->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
-- 
cgit v1.2.3


From 074d5514042f280f94ea897269a4421ff50d8c30 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Fri, 16 Oct 2015 13:12:59 +0200
Subject: Fixed explicit base with SHIFT to allow calculate angles A bit
 refactor

(bzr r14393.2.2)
---
 src/ui/tools/measure-tool.cpp | 118 ++++++++++++++++++++----------------------
 src/ui/tools/measure-tool.h   |   4 +-
 2 files changed, 56 insertions(+), 66 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 00d66b4c9..110b706fd 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -344,7 +344,7 @@ void MeasureTool::reverseKnots()
     this->knot_start->show();
     this->knot_end->moveto(start);
     this->knot_end->show();
-    this->showCanvasItems(end, start);
+    this->showCanvasItems();
 }
 
 void MeasureTool::knotStartMovedHandler(SPKnot */*knot*/, Geom::Point const &ppointer, guint state)
@@ -365,7 +365,7 @@ void MeasureTool::knotStartMovedHandler(SPKnot */*knot*/, Geom::Point const &ppo
         start_p = point;
         this->knot_start->moveto(start_p);
     }
-    showCanvasItems(start_p, end_p);
+    showCanvasItems();
 }
 
 void MeasureTool::knotEndMovedHandler(SPKnot */*knot*/, Geom::Point const &ppointer, guint state)
@@ -386,14 +386,15 @@ void MeasureTool::knotEndMovedHandler(SPKnot */*knot*/, Geom::Point const &ppoin
         end_p = point;
         this->knot_end->moveto(end_p);
     }
-    showCanvasItems(start_p, end_p);
+    last_end = desktop->d2w(end_p);
+    showCanvasItems();
 }
 
 void MeasureTool::knotUngrabbedHandler(SPKnot */*knot*/,  unsigned int state)
 {
     this->knot_start->moveto(start_p);
     this->knot_end->moveto(end_p);
-    showCanvasItems(start_p, end_p);
+    showCanvasItems();
 }
 
 
@@ -469,11 +470,11 @@ bool MeasureTool::root_handler(GdkEvent* event)
         Geom::Point const button_w(event->button.x, event->button.y);
         explicitBase = boost::none;
         last_end = boost::none;
-        start_point = desktop->w2d(button_w);
+        start_p = desktop->w2d(button_w);
 
         if (event->button.button == 1 && !this->space_panning) {
             // save drag origin
-            start_point = desktop->w2d(Geom::Point(event->button.x, event->button.y));
+            start_p = desktop->w2d(Geom::Point(event->button.x, event->button.y));
             within_tolerance = true;
 
             ret = TRUE;
@@ -481,7 +482,7 @@ bool MeasureTool::root_handler(GdkEvent* event)
 
         SnapManager &m = desktop->namedview->snap_manager;
         m.setup(desktop);
-        m.freeSnapReturnByRef(start_point, Inkscape::SNAPSOURCE_OTHER_HANDLE);
+        m.freeSnapReturnByRef(start_p, Inkscape::SNAPSOURCE_OTHER_HANDLE);
         m.unSetup();
 
         sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
@@ -492,9 +493,7 @@ bool MeasureTool::root_handler(GdkEvent* event)
     }
     case GDK_KEY_PRESS: {
         if ((event->key.keyval == GDK_KEY_Shift_L) || (event->key.keyval == GDK_KEY_Shift_R)) {
-            if (last_end) {
-                explicitBase = last_end;
-            }
+            explicitBase = end_p;
         }
         break;
     }
@@ -508,7 +507,7 @@ bool MeasureTool::root_handler(GdkEvent* event)
                 m.setup(desktop);
 
                 Inkscape::SnapCandidatePoint scp(motion_dt, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-                scp.addOrigin(start_point);
+                scp.addOrigin(start_p);
 
                 m.preSnap(scp);
                 m.unSetup();
@@ -519,7 +518,7 @@ bool MeasureTool::root_handler(GdkEvent* event)
             tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
             Geom::Point const motion_w(event->motion.x, event->motion.y);
             if ( within_tolerance) {
-                if ( Geom::LInfty( motion_w - start_point ) < tolerance) {
+                if ( Geom::LInfty( motion_w - start_p ) < tolerance) {
                     return FALSE;   // Do not drag if we're within tolerance from origin.
                 }
             }
@@ -530,20 +529,20 @@ bool MeasureTool::root_handler(GdkEvent* event)
             if(event->motion.time == 0 || !last_end  || Geom::LInfty( motion_w - *last_end ) > (tolerance/4.0)) {
                 Geom::Point const motion_w(event->motion.x, event->motion.y);
                 Geom::Point const motion_dt(desktop->w2d(motion_w));
-                Geom::Point end_point = motion_dt;
+                end_p = motion_dt;
 
                 if (event->motion.state & GDK_CONTROL_MASK) {
-                    spdc_endpoint_snap_rotation(this, end_point, start_point, event->motion.state);
+                    spdc_endpoint_snap_rotation(this, end_p, start_p, event->motion.state);
                 } else if (!(event->motion.state & GDK_SHIFT_MASK)) {
                     SnapManager &m = desktop->namedview->snap_manager;
                     m.setup(desktop);
-                    Inkscape::SnapCandidatePoint scp(end_point, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-                    scp.addOrigin(start_point);
+                    Inkscape::SnapCandidatePoint scp(end_p, Inkscape::SNAPSOURCE_OTHER_HANDLE);
+                    scp.addOrigin(start_p);
                     Inkscape::SnappedPoint sp = m.freeSnap(scp);
-                    end_point = sp.getPoint();
+                    end_p = sp.getPoint();
                     m.unSetup();
                 }
-                showCanvasItems(start_point, end_point);
+                showCanvasItems();
                 last_end = motion_w ;
             }
             gobble_motion_events(GDK_BUTTON1_MASK);
@@ -551,26 +550,26 @@ bool MeasureTool::root_handler(GdkEvent* event)
         break;
     }
     case GDK_BUTTON_RELEASE: {
-        this->knot_start->moveto(start_point);
+        this->knot_start->moveto(start_p);
         this->knot_start->show();
-        Geom::Point end_point = end_p;
+        end_p = end_p;
         if(last_end) {
-            end_point = desktop->w2d(*last_end);
+            end_p = desktop->w2d(*last_end);
             if (event->button.state & GDK_CONTROL_MASK) {
-                spdc_endpoint_snap_rotation(this, end_point, start_point, event->motion.state);
+                spdc_endpoint_snap_rotation(this, end_p, start_p, event->motion.state);
             } else if (!(event->button.state & GDK_SHIFT_MASK)) {
                 SnapManager &m = desktop->namedview->snap_manager;
                 m.setup(desktop);
-                Inkscape::SnapCandidatePoint scp(end_point, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-                scp.addOrigin(start_point);
+                Inkscape::SnapCandidatePoint scp(end_p, Inkscape::SNAPSOURCE_OTHER_HANDLE);
+                scp.addOrigin(start_p);
                 Inkscape::SnappedPoint sp = m.freeSnap(scp);
-                end_point = sp.getPoint();
+                end_p = sp.getPoint();
                 m.unSetup();
             }
         }
-        this->knot_end->moveto(end_point);
+        this->knot_end->moveto(end_p);
         this->knot_end->show();
-        showCanvasItems(start_point, end_point);
+        showCanvasItems();
         if (this->grabbed) {
             sp_canvas_item_ungrab(this->grabbed, event->button.time);
             this->grabbed = NULL;
@@ -660,7 +659,7 @@ void MeasureTool::toItem()
     guint32 line_color_primary = 0x0000ff7f;
     Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
     Inkscape::XML::Node *rgroup = xml_doc->createElement("svg:g");
-    showCanvasItems(start_p, end_p, true, rgroup);
+    showCanvasItems(true, rgroup);
     setLine(start_p,end_p, false, &line_color_primary, rgroup);
     SPItem *measure_item = SP_ITEM(desktop->currentLayer()->appendChildRepr(rgroup));
     Inkscape::GC::release(rgroup);
@@ -700,7 +699,7 @@ void MeasureTool::toMarkDimension()
 void MeasureTool::setLine(Geom::Point start_point,Geom::Point end_point, bool markers, guint32 *color, Inkscape::XML::Node *measure_repr)
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    if(!desktop || !start_point.isFinite() || !end_point.isFinite()) {
+    if(!desktop || !start_p.isFinite() || !end_p.isFinite()) {
         return;
     }
     Geom::PathVector c;
@@ -930,21 +929,14 @@ void MeasureTool::reset()
     measure_tmp_items.clear();
 }
 
-void MeasureTool::showCanvasItems()
-{
-    showCanvasItems(start_p, end_p);
-}
-
-void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point, bool to_item, Inkscape::XML::Node *measure_repr)
+void MeasureTool::showCanvasItems(bool to_item, Inkscape::XML::Node *measure_repr)
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    if(!desktop || !start_point.isFinite() || !end_point.isFinite() || end_point == MAGIC_POINT) {
+    if(!desktop || !start_p.isFinite() || !end_p.isFinite() || end_p == MAGIC_POINT) {
         return;
     }
     guint32 line_color_primary = 0x0000ff7f;
     guint32 line_color_secondary = 0xff00007f;
-    start_p = start_point;
-    end_p = end_point;
     //clear previous temporary canvas items, we'll draw new ones
     for (size_t idx = 0; idx < measure_tmp_items.size(); ++idx) {
         desktop->remove_temporary_canvasitem(measure_tmp_items[idx]);
@@ -956,18 +948,18 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
     dimension_offset = prefs->getDouble("/tools/measure/offset");
     Geom::PathVector lineseg;
     Geom::Path p;
-    p.start(desktop->dt2doc(start_point));
-    p.appendNew<Geom::LineSegment>(desktop->dt2doc(end_point));
+    p.start(desktop->dt2doc(start_p));
+    p.appendNew<Geom::LineSegment>(desktop->dt2doc(end_p));
     lineseg.push_back(p);
 
-    double deltax = end_point[Geom::X] - start_point[Geom::X];
-    double deltay = end_point[Geom::Y] - start_point[Geom::Y];
+    double deltax = end_p[Geom::X] - start_p[Geom::X];
+    double deltay = end_p[Geom::Y] - start_p[Geom::Y];
     double angle = atan2(deltay, deltax);
     double baseAngle = 0;
 
     if (explicitBase) {
-        double deltax2 = explicitBase.get()[Geom::X] - start_point[Geom::X];
-        double deltay2 = explicitBase.get()[Geom::Y] - start_point[Geom::Y];
+        double deltax2 = explicitBase.get()[Geom::X] - start_p[Geom::X];
+        double deltay2 = explicitBase.get()[Geom::Y] - start_p[Geom::Y];
 
         baseAngle = atan2(deltay2, deltax2);
         angle -= baseAngle;
@@ -998,8 +990,8 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
             items.push_back(items_reverse[0]);
         }
     } else {
-        r->start(desktop,start_point);
-        r->move(end_point);
+        r->start(desktop,start_p);
+        r->move(end_p);
         items = desktop->getDocument()->getItemsAtPoints(desktop->dkey, r->getPoints(), all_layers);
         r->stop();
     }
@@ -1046,7 +1038,7 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
 
     double fontsize = prefs->getInt("/tools/measure/fontsize") * (96/72);
     // Normal will be used for lines and text
-    Geom::Point windowNormal = Geom::unit_vector(Geom::rot90(desktop->d2w(end_point - start_point)));
+    Geom::Point windowNormal = Geom::unit_vector(Geom::rot90(desktop->d2w(end_p - start_p)));
     Geom::Point normal = desktop->w2d(windowNormal);
 
     std::vector<Geom::Point> intersections;
@@ -1102,7 +1094,7 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
     }
 
     Geom::Point angleDisplayPt = calcAngleDisplayAnchor(desktop, angle, baseAngle,
-                                 start_point, end_point,
+                                 start_p, end_p,
                                  fontsize);
 
     {
@@ -1128,14 +1120,14 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
     }
 
     {
-        double totallengthval = (end_point - start_point).length();
+        double totallengthval = (end_p - start_p).length();
         totallengthval = Inkscape::Util::Quantity::convert(totallengthval, "px", unit_name);
 
         // TODO cleanup memory, Glib::ustring, etc.:
         gchar *totallength_str = g_strdup_printf("%.2f %s", totallengthval, unit_name.c_str());
         SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
                                        desktop,
-                                       end_point + desktop->w2d(Geom::Point(3*fontsize, -fontsize)),
+                                       end_p + desktop->w2d(Geom::Point(3*fontsize, -fontsize)),
                                        totallength_str);
         sp_canvastext_set_fontsize(canvas_tooltip, fontsize);
         canvas_tooltip->rgba = 0xffffffff;
@@ -1146,7 +1138,7 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvas_tooltip, 0));
         if(to_item) {
             guint32 background = canvas_tooltip->rgba_background;
-            setLabelText(totallength_str, end_point + desktop->w2d(Geom::Point(3*fontsize, -fontsize)), fontsize, 0, &background, measure_repr, TEXT_ANCHOR_LEFT);
+            setLabelText(totallength_str, end_p + desktop->w2d(Geom::Point(3*fontsize, -fontsize)), fontsize, 0, &background, measure_repr, TEXT_ANCHOR_LEFT);
         }
         g_free(totallength_str);
     }
@@ -1187,10 +1179,10 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
                                     "shape", SP_KNOT_SHAPE_CROSS,
                                     NULL );
 
-        SP_CTRL(canvasitem)->moveto(start_point);
+        SP_CTRL(canvasitem)->moveto(start_p);
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvasitem, 0));
         if(to_item) {
-            setPoint(start_point, measure_repr);
+            setPoint(start_p, measure_repr);
         }
     }
 
@@ -1218,33 +1210,33 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
     // draw main control line
     {
         SPCtrlLine *control_line = ControlManager::getManager().createControlLine(desktop->getTempGroup(),
-                                   start_point,
-                                   end_point);
+                                   start_p,
+                                   end_p);
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
 
-        if ((end_point[Geom::X] != start_point[Geom::X]) && (end_point[Geom::Y] != start_point[Geom::Y])) {
-            double length = std::abs((end_point - start_point).length());
-            Geom::Point anchorEnd = start_point;
+        if ((end_p[Geom::X] != start_p[Geom::X]) && (end_p[Geom::Y] != start_p[Geom::Y])) {
+            double length = std::abs((end_p - start_p).length());
+            Geom::Point anchorEnd = start_p;
             anchorEnd[Geom::X] += length;
             if (explicitBase) {
-                anchorEnd *= (Geom::Affine(Geom::Translate(-start_point))
+                anchorEnd *= (Geom::Affine(Geom::Translate(-start_p))
                               * Geom::Affine(Geom::Rotate(baseAngle))
-                              * Geom::Affine(Geom::Translate(start_point)));
+                              * Geom::Affine(Geom::Translate(start_p)));
             }
 
             SPCtrlLine *control_line = ControlManager::getManager().createControlLine(desktop->getTempGroup(),
-                                       start_point,
+                                       start_p,
                                        anchorEnd,
                                        CTLINE_SECONDARY);
             measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
             if(to_item) {
-                setLine(start_point,
+                setLine(start_p,
                         anchorEnd,
                         false,
                         &line_color_secondary,
                         measure_repr);
             }
-            createAngleDisplayCurve(desktop, start_point, end_point, angleDisplayPt, angle, measure_repr);
+            createAngleDisplayCurve(desktop, start_p, end_p, angleDisplayPt, angle, measure_repr);
         }
     }
 
diff --git a/src/ui/tools/measure-tool.h b/src/ui/tools/measure-tool.h
index ee45c18e5..919152aad 100644
--- a/src/ui/tools/measure-tool.h
+++ b/src/ui/tools/measure-tool.h
@@ -36,8 +36,7 @@ public:
 
     virtual void finish();
     virtual bool root_handler(GdkEvent* event);
-    virtual void showCanvasItems();
-    virtual void showCanvasItems(Geom::Point start_point, Geom::Point end_point, bool to_item = false, Inkscape::XML::Node *measure_repr = NULL);
+    virtual void showCanvasItems(bool to_item = false, Inkscape::XML::Node *measure_repr = NULL);
     virtual void reverseKnots();
     virtual void toMarkDimension();
     virtual void toItem();
@@ -54,7 +53,6 @@ public:
 
 private:
     SPCanvasItem* grabbed;
-    Geom::Point start_point;
     boost::optional<Geom::Point> explicitBase;
     boost::optional<Geom::Point> last_end;
     SPKnot *knot_start;
-- 
cgit v1.2.3


From 7480acb475c646171babc133edcde56356867ede Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Fri, 16 Oct 2015 15:57:52 +0200
Subject: removed unnecesary line

(bzr r14393.2.3)
---
 src/ui/tools/measure-tool.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 110b706fd..7fedf6631 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -386,7 +386,6 @@ void MeasureTool::knotEndMovedHandler(SPKnot */*knot*/, Geom::Point const &ppoin
         end_p = point;
         this->knot_end->moveto(end_p);
     }
-    last_end = desktop->d2w(end_p);
     showCanvasItems();
 }
 
-- 
cgit v1.2.3


From 69aa4c6436321b22525fb11c552ca7d60ac1b096 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Fri, 16 Oct 2015 19:17:47 +0200
Subject: Add convert to guides option

(bzr r14393.2.4)
---
 src/ui/tools/measure-tool.cpp | 91 +++++++++++++++++++++++++++++++++++++++++++
 src/ui/tools/measure-tool.h   |  1 +
 2 files changed, 92 insertions(+)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 7fedf6631..bf82fb745 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -650,6 +650,97 @@ void MeasureTool::setMarker(bool isStart)
     path->updateRepr();
 }
 
+void MeasureTool::toGuides()
+{
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    SPDocument *doc = desktop->getDocument();
+    Inkscape::XML::Document *xml_doc = doc->getReprDoc();
+    Geom::Point start = start_p * SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
+    Geom::Point end = end_p * SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
+    Geom::Ray ray(start,end);
+    SPNamedView *namedview = desktop->namedview;
+    if(!namedview){
+        return;
+    }
+    //meassure angle
+    Inkscape::XML::Node *measure_line;
+    measure_line = xml_doc->createElement("sodipodi:guide");
+    std::stringstream position;
+    position.imbue(std::locale::classic());
+    position <<  start[Geom::X] << "," << start[Geom::Y];
+    measure_line->setAttribute("position", position.str().c_str() );
+    Geom::Point unit_vector = Geom::rot90(start.polar(ray.angle()));
+    std::stringstream angle;
+    angle.imbue(std::locale::classic());
+    angle << unit_vector[Geom::X] << "," << unit_vector[Geom::Y];
+    measure_line->setAttribute("orientation", angle.str().c_str());
+    namedview->appendChild(measure_line);
+    Inkscape::GC::release(measure_line);
+    //base angle
+    if(explicitBase){
+        explicitBase = *explicitBase * SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
+        ray.setPoints(start, *explicitBase);
+        if(ray.angle() != 0){
+            Inkscape::XML::Node *base_line;
+            base_line = xml_doc->createElement("sodipodi:guide");
+            position.str("");
+            position.imbue(std::locale::classic());
+            position <<  start[Geom::X] << "," << start[Geom::Y];
+            base_line->setAttribute("position", position.str().c_str() );
+            Geom::Point unit_vector = Geom::rot90(start.polar(ray.angle()));
+            std::stringstream angle;
+            angle.imbue(std::locale::classic());
+            angle << unit_vector[Geom::X] << "," << unit_vector[Geom::Y];
+            base_line->setAttribute("orientation", angle.str().c_str());
+            namedview->appendChild(base_line);
+            Inkscape::GC::release(base_line);
+        }
+    }
+    //start horizontal
+    Inkscape::XML::Node *start_horizontal;
+    start_horizontal = xml_doc->createElement("sodipodi:guide");
+    position.str("");
+    position.imbue(std::locale::classic());
+    position <<  start[Geom::X] << "," << start[Geom::Y];
+    start_horizontal->setAttribute("position", position.str().c_str() );
+    start_horizontal->setAttribute("orientation", "0,1");
+    namedview->appendChild(start_horizontal);
+    Inkscape::GC::release(start_horizontal);
+    //start vertical
+    Inkscape::XML::Node *start_vertical;
+    start_vertical = xml_doc->createElement("sodipodi:guide");
+    position.str("");
+    position.imbue(std::locale::classic());
+    position <<  start[Geom::X] << "," << start[Geom::Y];
+    start_vertical->setAttribute("position", position.str().c_str() );
+    start_vertical->setAttribute("orientation", "1,0");
+    namedview->appendChild(start_vertical);
+    Inkscape::GC::release(start_vertical);
+    //end horizontal
+    Inkscape::XML::Node *end_horizontal;
+    end_horizontal = xml_doc->createElement("sodipodi:guide");
+    position.str("");
+    position.imbue(std::locale::classic());
+    position <<  end[Geom::X] << "," << end[Geom::Y];
+    end_horizontal->setAttribute("position", position.str().c_str() );
+    end_horizontal->setAttribute("orientation", "0,1");
+    namedview->appendChild(end_horizontal);
+    Inkscape::GC::release(end_horizontal);
+    //start vertical
+    Inkscape::XML::Node *end_vertical;
+    end_vertical = xml_doc->createElement("sodipodi:guide");
+    position.str("");
+    position.imbue(std::locale::classic());
+    position <<  end[Geom::X] << "," << end[Geom::Y];
+    end_vertical->setAttribute("position", position.str().c_str() );
+    end_vertical->setAttribute("orientation", "1,0");
+    namedview->appendChild(end_vertical);
+    Inkscape::GC::release(end_vertical);
+
+    doc->ensureUpToDate();
+    DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MEASURE,_("Add guides from measure tool"));
+}
+
 void MeasureTool::toItem()
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
diff --git a/src/ui/tools/measure-tool.h b/src/ui/tools/measure-tool.h
index 919152aad..b53131ef9 100644
--- a/src/ui/tools/measure-tool.h
+++ b/src/ui/tools/measure-tool.h
@@ -38,6 +38,7 @@ public:
     virtual bool root_handler(GdkEvent* event);
     virtual void showCanvasItems(bool to_item = false, Inkscape::XML::Node *measure_repr = NULL);
     virtual void reverseKnots();
+    virtual void toGuides();
     virtual void toMarkDimension();
     virtual void toItem();
     virtual void reset();
-- 
cgit v1.2.3


From 08729b1dc767a8b3fd3de4ce0098d325f56fae60 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Fri, 16 Oct 2015 20:02:37 +0200
Subject: Fix a regression on mirror measure

(bzr r14393.2.5)
---
 src/ui/tools/measure-tool.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index bf82fb745..1bdccf13b 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -344,6 +344,8 @@ void MeasureTool::reverseKnots()
     this->knot_start->show();
     this->knot_end->moveto(start);
     this->knot_end->show();
+    start_p = end;
+    end_p = start;
     this->showCanvasItems();
 }
 
-- 
cgit v1.2.3


From 3b66eaf39332144a8545a85bbf8516e0e5024dd8 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Fri, 16 Oct 2015 20:44:32 +0200
Subject: fixing guide positions...

(bzr r14393.2.7)
---
 src/ui/tools/measure-tool.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 1bdccf13b..3795a980c 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -657,8 +657,10 @@ void MeasureTool::toGuides()
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     SPDocument *doc = desktop->getDocument();
     Inkscape::XML::Document *xml_doc = doc->getReprDoc();
-    Geom::Point start = start_p * SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
-    Geom::Point end = end_p * SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
+    Geom::Point start = desktop->doc2dt(start_p);
+    Geom::Point end = desktop->doc2dt(end_p);
+    start *= SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
+    end *= SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
     Geom::Ray ray(start,end);
     SPNamedView *namedview = desktop->namedview;
     if(!namedview){
-- 
cgit v1.2.3


From 257bf92c7eada92b55fa9b68a75feedc0e80eefe Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 17 Oct 2015 18:36:14 +0200
Subject: Fixed guides if current layer has any transform Improved guides code
 Change color and label to the result guides

(bzr r14393.1.23)
---
 src/ui/tools/measure-tool.cpp | 129 +++++++++++++++++-------------------------
 src/ui/tools/measure-tool.h   |   3 +-
 2 files changed, 54 insertions(+), 78 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 3795a980c..b26e528c4 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -39,6 +39,7 @@
 #include "sp-flowtext.h"
 #include "sp-defs.h"
 #include "sp-item.h"
+#include "sp-root.h"
 #include "macros.h"
 #include "rubberband.h"
 #include "path-chemistry.h"
@@ -656,91 +657,26 @@ void MeasureTool::toGuides()
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     SPDocument *doc = desktop->getDocument();
-    Inkscape::XML::Document *xml_doc = doc->getReprDoc();
-    Geom::Point start = desktop->doc2dt(start_p);
-    Geom::Point end = desktop->doc2dt(end_p);
-    start *= SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
-    end *= SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
+    Geom::Point start = desktop->doc2dt(start_p) * desktop->doc2dt();
+    Geom::Point end = desktop->doc2dt(end_p) * desktop->doc2dt();
     Geom::Ray ray(start,end);
     SPNamedView *namedview = desktop->namedview;
     if(!namedview){
         return;
     }
-    //meassure angle
-    Inkscape::XML::Node *measure_line;
-    measure_line = xml_doc->createElement("sodipodi:guide");
-    std::stringstream position;
-    position.imbue(std::locale::classic());
-    position <<  start[Geom::X] << "," << start[Geom::Y];
-    measure_line->setAttribute("position", position.str().c_str() );
-    Geom::Point unit_vector = Geom::rot90(start.polar(ray.angle()));
-    std::stringstream angle;
-    angle.imbue(std::locale::classic());
-    angle << unit_vector[Geom::X] << "," << unit_vector[Geom::Y];
-    measure_line->setAttribute("orientation", angle.str().c_str());
-    namedview->appendChild(measure_line);
-    Inkscape::GC::release(measure_line);
-    //base angle
+    setGuide(start,ray.angle(), _("Meassure"));
     if(explicitBase){
         explicitBase = *explicitBase * SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
         ray.setPoints(start, *explicitBase);
         if(ray.angle() != 0){
-            Inkscape::XML::Node *base_line;
-            base_line = xml_doc->createElement("sodipodi:guide");
-            position.str("");
-            position.imbue(std::locale::classic());
-            position <<  start[Geom::X] << "," << start[Geom::Y];
-            base_line->setAttribute("position", position.str().c_str() );
-            Geom::Point unit_vector = Geom::rot90(start.polar(ray.angle()));
-            std::stringstream angle;
-            angle.imbue(std::locale::classic());
-            angle << unit_vector[Geom::X] << "," << unit_vector[Geom::Y];
-            base_line->setAttribute("orientation", angle.str().c_str());
-            namedview->appendChild(base_line);
-            Inkscape::GC::release(base_line);
+            setGuide(start,ray.angle(), _("Base"));
         }
     }
-    //start horizontal
-    Inkscape::XML::Node *start_horizontal;
-    start_horizontal = xml_doc->createElement("sodipodi:guide");
-    position.str("");
-    position.imbue(std::locale::classic());
-    position <<  start[Geom::X] << "," << start[Geom::Y];
-    start_horizontal->setAttribute("position", position.str().c_str() );
-    start_horizontal->setAttribute("orientation", "0,1");
-    namedview->appendChild(start_horizontal);
-    Inkscape::GC::release(start_horizontal);
-    //start vertical
-    Inkscape::XML::Node *start_vertical;
-    start_vertical = xml_doc->createElement("sodipodi:guide");
-    position.str("");
-    position.imbue(std::locale::classic());
-    position <<  start[Geom::X] << "," << start[Geom::Y];
-    start_vertical->setAttribute("position", position.str().c_str() );
-    start_vertical->setAttribute("orientation", "1,0");
-    namedview->appendChild(start_vertical);
-    Inkscape::GC::release(start_vertical);
-    //end horizontal
-    Inkscape::XML::Node *end_horizontal;
-    end_horizontal = xml_doc->createElement("sodipodi:guide");
-    position.str("");
-    position.imbue(std::locale::classic());
-    position <<  end[Geom::X] << "," << end[Geom::Y];
-    end_horizontal->setAttribute("position", position.str().c_str() );
-    end_horizontal->setAttribute("orientation", "0,1");
-    namedview->appendChild(end_horizontal);
-    Inkscape::GC::release(end_horizontal);
-    //start vertical
-    Inkscape::XML::Node *end_vertical;
-    end_vertical = xml_doc->createElement("sodipodi:guide");
-    position.str("");
-    position.imbue(std::locale::classic());
-    position <<  end[Geom::X] << "," << end[Geom::Y];
-    end_vertical->setAttribute("position", position.str().c_str() );
-    end_vertical->setAttribute("orientation", "1,0");
-    namedview->appendChild(end_vertical);
-    Inkscape::GC::release(end_vertical);
-
+    setGuide(start,0,_("Start"));
+    setGuide(start,Geom::deg_to_rad(90),_("Start"));
+    setGuide(end,0,_("End"));
+    setGuide(end,Geom::deg_to_rad(90),_("End"));
+    showCanvasItems(true);
     doc->ensureUpToDate();
     DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MEASURE,_("Add guides from measure tool"));
 }
@@ -753,7 +689,7 @@ void MeasureTool::toItem()
     guint32 line_color_primary = 0x0000ff7f;
     Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
     Inkscape::XML::Node *rgroup = xml_doc->createElement("svg:g");
-    showCanvasItems(true, rgroup);
+    showCanvasItems(false, true,rgroup);
     setLine(start_p,end_p, false, &line_color_primary, rgroup);
     SPItem *measure_item = SP_ITEM(desktop->currentLayer()->appendChildRepr(rgroup));
     Inkscape::GC::release(rgroup);
@@ -790,6 +726,39 @@ void MeasureTool::toMarkDimension()
     DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MEASURE,_("Add global meassure line"));
 }
 
+void MeasureTool::setGuide(Geom::Point origin,double angle, const char *label)
+{
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    SPDocument *doc = desktop->getDocument();
+    Inkscape::XML::Document *xml_doc = doc->getReprDoc();
+    SPRoot const *root = doc->getRoot();
+    Geom::Affine affine(Geom::identity());
+    if(root) {
+        affine *= root->c2p.inverse();
+    }
+    SPNamedView *namedview = desktop->namedview;
+    if(!namedview){
+        return;
+    }
+    origin *= affine; 
+    //meassure angle
+    Inkscape::XML::Node *guide;
+    guide = xml_doc->createElement("sodipodi:guide");
+    std::stringstream position;
+    position.imbue(std::locale::classic());
+    position <<  origin[Geom::X] << "," << origin[Geom::Y];
+    guide->setAttribute("position", position.str().c_str() );
+    guide->setAttribute("inkscape:color", "rgb(167,0,255)");
+    guide->setAttribute("inkscape:label", label);
+    Geom::Point unit_vector = Geom::rot90(origin.polar(angle));
+    std::stringstream angle_str;
+    angle_str.imbue(std::locale::classic());
+    angle_str << unit_vector[Geom::X] << "," << unit_vector[Geom::Y];
+    guide->setAttribute("orientation", angle_str.str().c_str());
+    namedview->appendChild(guide);
+    Inkscape::GC::release(guide);
+}
+
 void MeasureTool::setLine(Geom::Point start_point,Geom::Point end_point, bool markers, guint32 *color, Inkscape::XML::Node *measure_repr)
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
@@ -1023,7 +992,7 @@ void MeasureTool::reset()
     measure_tmp_items.clear();
 }
 
-void MeasureTool::showCanvasItems(bool to_item, Inkscape::XML::Node *measure_repr)
+void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::Node *measure_repr)
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if(!desktop || !start_p.isFinite() || !end_p.isFinite() || end_p == MAGIC_POINT) {
@@ -1193,7 +1162,7 @@ void MeasureTool::showCanvasItems(bool to_item, Inkscape::XML::Node *measure_rep
 
     {
         // TODO cleanup memory, Glib::ustring, etc.:
-        gchar *angle_str = g_strdup_printf("%.2f °", angle * 180/M_PI);
+        gchar *angle_str = g_strdup_printf("%.2f °", Geom::rad_to_deg(angle));
 
         SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
                                        desktop,
@@ -1298,6 +1267,12 @@ void MeasureTool::showCanvasItems(bool to_item, Inkscape::XML::Node *measure_rep
         if(to_item) {
             setPoint(desktop->doc2dt(intersections[idx]), measure_repr);
         }
+        if(to_guides) {
+            std::stringstream cross_number;
+            cross_number.imbue(std::locale::classic());
+            cross_number <<  _("Crossing ") << idx;
+            setGuide(desktop->doc2dt(intersections[idx]), angle + Geom::deg_to_rad(90), cross_number.str().c_str());
+        }
     }
     // Since adding goes to the bottom, do all lines last.
 
diff --git a/src/ui/tools/measure-tool.h b/src/ui/tools/measure-tool.h
index b53131ef9..05c8296c1 100644
--- a/src/ui/tools/measure-tool.h
+++ b/src/ui/tools/measure-tool.h
@@ -36,7 +36,7 @@ public:
 
     virtual void finish();
     virtual bool root_handler(GdkEvent* event);
-    virtual void showCanvasItems(bool to_item = false, Inkscape::XML::Node *measure_repr = NULL);
+    virtual void showCanvasItems(bool to_guides = false, bool to_item = false, Inkscape::XML::Node *measure_repr = NULL);
     virtual void reverseKnots();
     virtual void toGuides();
     virtual void toMarkDimension();
@@ -45,6 +45,7 @@ public:
     virtual void setMarkers();
     virtual void setMarker(bool isStart);
     virtual const std::string& getPrefsPath();
+    void setGuide(Geom::Point origin, double angle, const char *label);
     void setPoint(Geom::Point origin, Inkscape::XML::Node *measure_repr);
     void setLine(Geom::Point start_point,Geom::Point end_point, bool markers = false, guint32 *color = NULL, Inkscape::XML::Node *measure_repr = NULL);
     void setLabelText(const char *value, Geom::Point pos, double fontsize, Geom::Coord angle, guint32 *background = NULL, Inkscape::XML::Node *measure_repr = NULL, CanvasTextAnchorPositionEnum text_anchor = TEXT_ANCHOR_CENTER );
-- 
cgit v1.2.3


From 19a39e655f7abf8fb9844bb4474fdd908a548870 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 17 Oct 2015 18:42:23 +0200
Subject: String fixes

(bzr r14393.1.24)
---
 src/ui/tools/measure-tool.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index b26e528c4..a461a6b3c 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -664,7 +664,7 @@ void MeasureTool::toGuides()
     if(!namedview){
         return;
     }
-    setGuide(start,ray.angle(), _("Meassure"));
+    setGuide(start,ray.angle(), _("Measure"));
     if(explicitBase){
         explicitBase = *explicitBase * SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
         ray.setPoints(start, *explicitBase);
@@ -723,7 +723,7 @@ void MeasureTool::toMarkDimension()
     gchar *totallength_str = g_strdup_printf("%.2f %s", totallengthval, unit_name.c_str());
     setLabelText(totallength_str, middle, fontsize, Geom::deg_to_rad(180) - ray.angle());
     doc->ensureUpToDate();
-    DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MEASURE,_("Add global meassure line"));
+    DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MEASURE,_("Add global measure line"));
 }
 
 void MeasureTool::setGuide(Geom::Point origin,double angle, const char *label)
@@ -741,7 +741,7 @@ void MeasureTool::setGuide(Geom::Point origin,double angle, const char *label)
         return;
     }
     origin *= affine; 
-    //meassure angle
+    //measure angle
     Inkscape::XML::Node *guide;
     guide = xml_doc->createElement("sodipodi:guide");
     std::stringstream position;
-- 
cgit v1.2.3


From c7bf1a0ffbc1e5fc397df2fb8ce7fac90caba9eb Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 17 Oct 2015 18:55:33 +0200
Subject: Fix for numbering crosing labels

(bzr r14393.1.25)
---
 src/ui/tools/measure-tool.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index a461a6b3c..4bb8edcc3 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -672,10 +672,10 @@ void MeasureTool::toGuides()
             setGuide(start,ray.angle(), _("Base"));
         }
     }
-    setGuide(start,0,_("Start"));
+    setGuide(start,0,"");
     setGuide(start,Geom::deg_to_rad(90),_("Start"));
     setGuide(end,0,_("End"));
-    setGuide(end,Geom::deg_to_rad(90),_("End"));
+    setGuide(end,Geom::deg_to_rad(90),"");
     showCanvasItems(true);
     doc->ensureUpToDate();
     DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MEASURE,_("Add guides from measure tool"));
@@ -1270,8 +1270,16 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
         if(to_guides) {
             std::stringstream cross_number;
             cross_number.imbue(std::locale::classic());
-            cross_number <<  _("Crossing ") << idx;
-            setGuide(desktop->doc2dt(intersections[idx]), angle + Geom::deg_to_rad(90), cross_number.str().c_str());
+            if (!prefs->getBool("/tools/measure/ignore_1st_and_last", true)){
+                cross_number <<  _("Crossing ") << idx;
+            } else {
+                cross_number <<  _("Crossing ") << idx + 1;
+            }
+            if (!prefs->getBool("/tools/measure/ignore_1st_and_last", true) && idx == 0) {
+                setGuide(desktop->doc2dt(intersections[idx]), angle + Geom::deg_to_rad(90), "");
+            } else {
+                setGuide(desktop->doc2dt(intersections[idx]), angle + Geom::deg_to_rad(90), cross_number.str().c_str());
+            }
         }
     }
     // Since adding goes to the bottom, do all lines last.
-- 
cgit v1.2.3


From d03a0a3405b10ac4686faac1d4827c01f47114b0 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 17 Oct 2015 19:51:26 +0200
Subject: Add precision to measure. Also change other scalar widgets to a .2
 precision instead 3

(bzr r14393.1.26)
---
 src/ui/tools/measure-tool.cpp | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 4bb8edcc3..57e519a0e 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -716,11 +716,15 @@ void MeasureTool::toMarkDimension()
     if (!unit_name.compare("")) {
         unit_name = "px";
     }
-    double fontsize = prefs->getInt("/tools/measure/fontsize")  * (96/72);
+    double fontsize = prefs->getInt("/tools/measure/fontsize")  * (96.0/72.0);
+    int precision = prefs->getInt("/tools/measure/precision");
+    std::stringstream precision_str;
+    precision_str.imbue(std::locale::classic());
+    precision_str <<  "%." << precision << "f %s";
     Geom::Point middle = Geom::middle_point(start, end);
     double totallengthval = (end_p - start_p).length();
     totallengthval = Inkscape::Util::Quantity::convert(totallengthval, "px", unit_name);
-    gchar *totallength_str = g_strdup_printf("%.2f %s", totallengthval, unit_name.c_str());
+    gchar *totallength_str = g_strdup_printf(precision_str.str().c_str(), totallengthval, unit_name.c_str());
     setLabelText(totallength_str, middle, fontsize, Geom::deg_to_rad(180) - ray.angle());
     doc->ensureUpToDate();
     DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MEASURE,_("Add global measure line"));
@@ -1137,7 +1141,11 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
         LabelPlacement &place = *it;
 
         // TODO cleanup memory, Glib::ustring, etc.:
-        gchar *measure_str = g_strdup_printf("%.2f %s", place.lengthVal, unit_name.c_str());
+        int precision = prefs->getInt("/tools/measure/precision");
+        std::stringstream precision_str;
+        precision_str.imbue(std::locale::classic());
+        precision_str <<  "%." << precision << "f %s";
+        gchar *measure_str = g_strdup_printf(precision_str.str().c_str(), place.lengthVal, unit_name.c_str());
         SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
                                        desktop,
                                        place.end,
@@ -1162,7 +1170,11 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
 
     {
         // TODO cleanup memory, Glib::ustring, etc.:
-        gchar *angle_str = g_strdup_printf("%.2f °", Geom::rad_to_deg(angle));
+        int precision = prefs->getInt("/tools/measure/precision");
+        std::stringstream precision_str;
+        precision_str.imbue(std::locale::classic());
+        precision_str <<  "%." << precision << "f °";
+        gchar *angle_str = g_strdup_printf(precision_str.str().c_str(), Geom::rad_to_deg(angle));
 
         SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
                                        desktop,
@@ -1187,7 +1199,11 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
         totallengthval = Inkscape::Util::Quantity::convert(totallengthval, "px", unit_name);
 
         // TODO cleanup memory, Glib::ustring, etc.:
-        gchar *totallength_str = g_strdup_printf("%.2f %s", totallengthval, unit_name.c_str());
+        int precision = prefs->getInt("/tools/measure/precision");
+        std::stringstream precision_str;
+        precision_str.imbue(std::locale::classic());
+        precision_str <<  "%." << precision << "f %s";
+        gchar *totallength_str = g_strdup_printf(precision_str.str().c_str(), totallengthval, unit_name.c_str());
         SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
                                        desktop,
                                        end_p + desktop->w2d(Geom::Point(3*fontsize, -fontsize)),
@@ -1211,7 +1227,11 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
         totallengthval = Inkscape::Util::Quantity::convert(totallengthval, "px", unit_name);
 
         // TODO cleanup memory, Glib::ustring, etc.:
-        gchar *total_str = g_strdup_printf("%.2f %s", totallengthval, unit_name.c_str());
+        int precision = prefs->getInt("/tools/measure/precision");
+        std::stringstream precision_str;
+        precision_str.imbue(std::locale::classic());
+        precision_str <<  "%." << precision << "f %s";
+        gchar *total_str = g_strdup_printf(precision_str.str().c_str(), totallengthval, unit_name.c_str());
         SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
                                        desktop,
                                        desktop->doc2dt((intersections[0] + intersections[intersections.size()-1])/2) + normal * (dimension_offset * 2),
-- 
cgit v1.2.3


From aed527316ca2cff495c32f57f68e37cd5b346f12 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 18 Oct 2015 13:51:14 +0200
Subject: Added Scale option

(bzr r14393.1.27)
---
 src/ui/tools/measure-tool.cpp | 70 +++++++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 32 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 57e519a0e..e56d0e916 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -106,14 +106,14 @@ bool SortLabelPlacement(LabelPlacement const &first, LabelPlacement const &secon
     }
 }
 
-void repositionOverlappingLabels(std::vector<LabelPlacement> &placements, SPDesktop *desktop, Geom::Point const &normal, double fontsize)
+void repositionOverlappingLabels(std::vector<LabelPlacement> &placements, SPDesktop *desktop, Geom::Point const &normal, double fontsize, int precision)
 {
     std::sort(placements.begin(), placements.end(), SortLabelPlacement);
 
     double border = 3;
     Geom::Rect box;
     {
-        Geom::Point tmp(fontsize * 8 + (border * 2), fontsize + (border * 2));
+        Geom::Point tmp(fontsize * (6 + precision) + (border * 2), fontsize + (border * 2));
         tmp = desktop->w2d(tmp);
         box = Geom::Rect(-tmp[Geom::X] / 2, -tmp[Geom::Y] / 2, tmp[Geom::X] / 2, tmp[Geom::Y] / 2);
     }
@@ -706,12 +706,13 @@ void MeasureTool::toMarkDimension()
     setMarkers();
     Geom::Ray ray(start_p,end_p);
     Geom::Point start = start_p + Geom::Point::polar(ray.angle(), 5);
-    start = start + Geom::Point::polar(ray.angle() + Geom::deg_to_rad(90), -(dimension_offset / 4.0));
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    dimension_offset = prefs->getDouble("/tools/measure/offset");
+    start = start + Geom::Point::polar(ray.angle() + Geom::deg_to_rad(90), -dimension_offset);
     Geom::Point end = end_p + Geom::Point::polar(ray.angle(), -5);
-    end = end+ Geom::Point::polar(ray.angle() + Geom::deg_to_rad(90), -(dimension_offset / 4.0));
+    end = end+ Geom::Point::polar(ray.angle() + Geom::deg_to_rad(90), -dimension_offset);
     guint32 color = 0x000000ff;
     setLine(start, end, true, &color);
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     Glib::ustring unit_name = prefs->getString("/tools/measure/unit");
     if (!unit_name.compare("")) {
         unit_name = "px";
@@ -724,7 +725,8 @@ void MeasureTool::toMarkDimension()
     Geom::Point middle = Geom::middle_point(start, end);
     double totallengthval = (end_p - start_p).length();
     totallengthval = Inkscape::Util::Quantity::convert(totallengthval, "px", unit_name);
-    gchar *totallength_str = g_strdup_printf(precision_str.str().c_str(), totallengthval, unit_name.c_str());
+    double scale = prefs->getDouble("/tools/measure/scale") / 100.0;
+    gchar *totallength_str = g_strdup_printf(precision_str.str().c_str(), totallengthval * scale, unit_name.c_str());
     setLabelText(totallength_str, middle, fontsize, Geom::deg_to_rad(180) - ray.angle());
     doc->ensureUpToDate();
     DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MEASURE,_("Add global measure line"));
@@ -825,6 +827,8 @@ void MeasureTool::setLine(Geom::Point start_point,Geom::Point end_point, bool ma
             SPItem *item = SP_ITEM(desktop->currentLayer()->appendChildRepr(repr));
             Inkscape::GC::release(repr);
             item->updateRepr();
+            desktop->getSelection()->clear();
+            desktop->getSelection()->add(item);
         }
     }
 }
@@ -903,13 +907,15 @@ void MeasureTool::setLabelText(const char *value, Geom::Point pos, double fontsi
     SPCSSAttr *css = sp_repr_css_attr_new();
     std::stringstream font_size;
     font_size.imbue(std::locale::classic());
-    font_size <<  fontsize ;
+    font_size <<  fontsize << "px";
     sp_repr_css_set_property (css, "font-size", font_size.str().c_str());
     sp_repr_css_set_property (css, "font-style", "normal");
     sp_repr_css_set_property (css, "font-weight", "normal");
     sp_repr_css_set_property (css, "line-height", "125%");
     sp_repr_css_set_property (css, "letter-spacing", "0px");
     sp_repr_css_set_property (css, "word-spacing", "0px");
+    sp_repr_css_set_property (css, "text-align", "center");
+    sp_repr_css_set_property (css, "text-anchor", "middle");
     if(measure_repr) {
         sp_repr_css_set_property (css, "fill", "#FFFFFF");
     } else {
@@ -953,10 +959,10 @@ void MeasureTool::setLabelText(const char *value, Geom::Point pos, double fontsi
         sp_repr_css_attr_unref (css);
         sp_repr_set_svg_double(rgroup, "x", 0);
         sp_repr_set_svg_double(rgroup, "y", 0);
-        sp_repr_set_svg_double(rrect, "x", 0);
+        sp_repr_set_svg_double(rrect, "x", -bbox->width()/2.0);
         sp_repr_set_svg_double(rrect, "y", -bbox->height());
-        sp_repr_set_svg_double(rrect, "width", (bbox->width()) + 6);
-        sp_repr_set_svg_double(rrect, "height", (bbox->height()) + 6);
+        sp_repr_set_svg_double(rrect, "width", bbox->width() + 6);
+        sp_repr_set_svg_double(rrect, "height", bbox->height() + 6);
         Inkscape::XML::Node *rtextitem = text_item->getRepr();
         text_item->deleteObject();
         rgroup->addChild(rtextitem, NULL);
@@ -1012,7 +1018,7 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     bool show_in_between = prefs->getBool("/tools/measure/show_in_between");
     bool all_layers = prefs->getBool("/tools/measure/all_layers");
-    dimension_offset = prefs->getDouble("/tools/measure/offset");
+    dimension_offset = 70;
     Geom::PathVector lineseg;
     Geom::Path p;
     p.start(desktop->dt2doc(start_p));
@@ -1102,8 +1108,8 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
     if (!unit_name.compare("")) {
         unit_name = "px";
     }
-
-    double fontsize = prefs->getInt("/tools/measure/fontsize") * (96/72);
+    double scale = prefs->getDouble("/tools/measure/scale") / 100.0;
+    double fontsize = prefs->getDouble("/tools/measure/fontsize") * (96/72);
     // Normal will be used for lines and text
     Geom::Point windowNormal = Geom::unit_vector(Geom::rot90(desktop->d2w(end_p - start_p)));
     Geom::Point normal = desktop->w2d(windowNormal);
@@ -1128,24 +1134,24 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
         LabelPlacement placement;
         placement.lengthVal = (intersections[idx] - intersections[idx - 1]).length();
         placement.lengthVal = Inkscape::Util::Quantity::convert(placement.lengthVal, "px", unit_name);
-        placement.offset = dimension_offset;
+        placement.offset = dimension_offset / 2;
         placement.start = desktop->doc2dt( (intersections[idx - 1] + intersections[idx]) / 2 );
         placement.end = placement.start - (normal * placement.offset);
 
         placements.push_back(placement);
     }
-
+    int precision = prefs->getInt("/tools/measure/precision");
     // Adjust positions
-    repositionOverlappingLabels(placements, desktop, windowNormal, fontsize);
+    repositionOverlappingLabels(placements, desktop, windowNormal, fontsize, precision);
     for (std::vector<LabelPlacement>::iterator it = placements.begin(); it != placements.end(); ++it) {
         LabelPlacement &place = *it;
 
         // TODO cleanup memory, Glib::ustring, etc.:
-        int precision = prefs->getInt("/tools/measure/precision");
+
         std::stringstream precision_str;
         precision_str.imbue(std::locale::classic());
         precision_str <<  "%." << precision << "f %s";
-        gchar *measure_str = g_strdup_printf(precision_str.str().c_str(), place.lengthVal, unit_name.c_str());
+        gchar *measure_str = g_strdup_printf(precision_str.str().c_str(), place.lengthVal * scale, unit_name.c_str());
         SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
                                        desktop,
                                        place.end,
@@ -1203,7 +1209,7 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
         std::stringstream precision_str;
         precision_str.imbue(std::locale::classic());
         precision_str <<  "%." << precision << "f %s";
-        gchar *totallength_str = g_strdup_printf(precision_str.str().c_str(), totallengthval, unit_name.c_str());
+        gchar *totallength_str = g_strdup_printf(precision_str.str().c_str(), totallengthval * scale, unit_name.c_str());
         SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
                                        desktop,
                                        end_p + desktop->w2d(Geom::Point(3*fontsize, -fontsize)),
@@ -1231,10 +1237,10 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
         std::stringstream precision_str;
         precision_str.imbue(std::locale::classic());
         precision_str <<  "%." << precision << "f %s";
-        gchar *total_str = g_strdup_printf(precision_str.str().c_str(), totallengthval, unit_name.c_str());
+        gchar *total_str = g_strdup_printf(precision_str.str().c_str(), totallengthval * scale, unit_name.c_str());
         SPCanvasText *canvas_tooltip = sp_canvastext_new(desktop->getTempGroup(),
                                        desktop,
-                                       desktop->doc2dt((intersections[0] + intersections[intersections.size()-1])/2) + normal * (dimension_offset * 2),
+                                       desktop->doc2dt((intersections[0] + intersections[intersections.size()-1])/2) + normal * dimension_offset,
                                        total_str);
         sp_canvastext_set_fontsize(canvas_tooltip, fontsize);
         canvas_tooltip->rgba = 0xffffffff;
@@ -1245,7 +1251,7 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvas_tooltip, 0));
         if(to_item) {
             guint32 background = canvas_tooltip->rgba_background;
-            setLabelText(total_str, desktop->doc2dt((intersections[0] + intersections[intersections.size()-1])/2) + normal * (dimension_offset * 2), fontsize, 0, &background, measure_repr);
+            setLabelText(total_str, desktop->doc2dt((intersections[0] + intersections[intersections.size()-1])/2) + normal * dimension_offset, fontsize, 0, &background, measure_repr);
         }
         g_free(total_str);
     }
@@ -1341,34 +1347,34 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
         ControlManager &mgr = ControlManager::getManager();
         SPCtrlLine *control_line = 0;
         control_line = mgr.createControlLine(desktop->getTempGroup(),
-                                             desktop->doc2dt(intersections[0]) + normal * (dimension_offset * 2),
-                                             desktop->doc2dt(intersections[intersections.size() - 1]) + normal * (dimension_offset * 2));
+                                             desktop->doc2dt(intersections[0]) + normal * dimension_offset,
+                                             desktop->doc2dt(intersections[intersections.size() - 1]) + normal * dimension_offset);
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
         if(to_item) {
-            setLine(desktop->doc2dt(intersections[0]) + normal * (dimension_offset * 2),
-                    desktop->doc2dt(intersections[intersections.size() - 1]) + normal * (dimension_offset * 2),
+            setLine(desktop->doc2dt(intersections[0]) + normal * dimension_offset,
+                    desktop->doc2dt(intersections[intersections.size() - 1]) + normal * dimension_offset,
                     false,
                     &line_color_primary,
                     measure_repr);
         }
         control_line = mgr.createControlLine(desktop->getTempGroup(),
                                              desktop->doc2dt(intersections[0]),
-                                             desktop->doc2dt(intersections[0]) + normal * (dimension_offset * 2));
+                                             desktop->doc2dt(intersections[0]) + normal * dimension_offset);
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
         if(to_item) {
             setLine(desktop->doc2dt(intersections[0]),
-                    desktop->doc2dt(intersections[0]) + normal * (dimension_offset * 2),
+                    desktop->doc2dt(intersections[0]) + normal * dimension_offset,
                     false,
                     &line_color_primary,
                     measure_repr);
         }
         control_line = mgr.createControlLine(desktop->getTempGroup(),
                                              desktop->doc2dt(intersections[intersections.size() - 1]),
-                                             desktop->doc2dt(intersections[intersections.size() - 1]) + normal * (dimension_offset * 2));
+                                             desktop->doc2dt(intersections[intersections.size() - 1]) + normal * dimension_offset);
         measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
         if(to_item) {
             setLine(desktop->doc2dt(intersections[intersections.size() - 1]),
-                    desktop->doc2dt(intersections[intersections.size() - 1]) + normal * (dimension_offset * 2),
+                    desktop->doc2dt(intersections[intersections.size() - 1]) + normal * dimension_offset,
                     false,
                     &line_color_primary,
                     measure_repr);
@@ -1397,12 +1403,12 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
             ControlManager &mgr = ControlManager::getManager();
             SPCtrlLine *control_line = mgr.createControlLine(desktop->getTempGroup(),
                                        desktop->doc2dt(measure_text_pos),
-                                       desktop->doc2dt(measure_text_pos) - (normal * dimension_offset),
+                                       desktop->doc2dt(measure_text_pos) - (normal * dimension_offset / 2),
                                        CTLINE_SECONDARY);
             measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
             if(to_item) {
                 setLine(desktop->doc2dt(measure_text_pos),
-                        desktop->doc2dt(measure_text_pos) - (normal * dimension_offset),
+                        desktop->doc2dt(measure_text_pos) - (normal * dimension_offset / 2),
                         false,
                         &line_color_secondary,
                         measure_repr);
-- 
cgit v1.2.3


From ccdb4ca4cc4aa57445c770c8410d68f777cf6ba2 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 20 Oct 2015 01:06:16 +0200
Subject: working 2 ways

(bzr r14422.1.2)
---
 src/ui/tools/spray-tool.cpp | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index e2be5ca4b..240d002ae 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -380,6 +380,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Inkscape::XML::Node *old_repr = item->getRepr();
                 Inkscape::XML::Node *parent = old_repr->parent();
                 Inkscape::XML::Node *copy = old_repr->duplicate(xml_doc);
+                copy->setAttribute("inkscape:spray-origin", item->getId());
                 parent->appendChild(copy);
 
                 SPObject *new_obj = doc->getObjectByRepr(copy);
@@ -393,6 +394,46 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 sp_item_move_rel(item_copied, Geom::Translate(move[Geom::X], -move[Geom::Y]));
                 did = true;
+                Geom::OptRect bbox = item_copied->desktopGeometricBounds();
+                std::vector<SPItem*> items = desktop->getDocument()->getItemsInBox(desktop->dkey, *bbox);
+                for (std::vector<SPItem*>::const_iterator i=items.begin(); i!=items.end(); i++) {
+                    SPItem *item_down = *i;
+                    std::cout << item_down->getAttribute("inkscape:spray-origin") << "asdgfasdasas\n";
+                    if(item_down->getAttribute("inkscape:spray-origin") &&( strcmp(item_down->getAttribute("inkscape:spray-origin"),item->getId()) == 0 || strcmp(item_down->getId(),item->getId()) == 0)){
+                        if(!SP_IS_GROUP(item)){
+                            SPShape *down_item_shape = dynamic_cast<SPShape *>(item_down);
+                            if (down_item_shape) {
+                                Geom::PathVector c;
+                                SPPath *down_item_path = dynamic_cast<SPPath *>(down_item_shape);
+                                if (down_item_path) {
+                                    c = down_item_path->get_curve()->get_pathvector();
+                                } else {
+                                    c = down_item_shape->getCurve()->get_pathvector();
+                                }
+                                if (c) {
+                                    SPShape *copied_item_shape = dynamic_cast<SPShape *>(item_copied);
+                                    if (copied_item_shape) {
+                                        Geom::PathVector d;
+                                        SPPath *copied_item_path = dynamic_cast<SPPath *>(copied_item_shape);
+                                        if (copied_item_path) {
+                                            d = copied_item_path->get_curve()->get_pathvector();
+                                        } else {
+                                            d = copied_item_shape->getCurve()->get_pathvector();
+                                        }
+                                        if (d) {
+                                            Geom::CrossingSet cs = Geom::crossings(c,d);
+                                            if(cs[0].size() == 0){
+                                                continue;
+                                            }
+                                        }
+                                }
+                            }
+                        }
+                        item_copied->deleteObject();
+                        std::cout << item_down->getAttribute("inkscape:spray-origin") << "hasssss\n";
+                        did = false;
+                    }
+                }
             }
         }
 #ifdef ENABLE_SPRAY_MODE_SINGLE_PATH
-- 
cgit v1.2.3


From 913cb932fefc97f72cc834beb4129f833ccdd25a Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Thu, 22 Oct 2015 08:25:32 +0200
Subject: improving spray tool

(bzr r14422.2.1)
---
 src/ui/tools/spray-tool.cpp | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 240d002ae..c6448f818 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -57,6 +57,9 @@
 #include "livarot/Shape.h"
 #include <2geom/circle.h>
 #include <2geom/transforms.h>
+#include <2geom/path-intersection.h>
+#include <2geom/pathvector.h>
+#include <2geom/crossing.h>
 #include "preferences.h"
 #include "style.h"
 #include "box3d.h"
@@ -380,7 +383,10 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Inkscape::XML::Node *old_repr = item->getRepr();
                 Inkscape::XML::Node *parent = old_repr->parent();
                 Inkscape::XML::Node *copy = old_repr->duplicate(xml_doc);
-                copy->setAttribute("inkscape:spray-origin", item->getId());
+                std::stringstream original_id;
+                original_id <<  "#" << item->getId();
+                gchar const * spray_origin = original_id.str().c_str());
+                copy->setAttribute("inkscape:spray-origin", spray_origin);
                 parent->appendChild(copy);
 
                 SPObject *new_obj = doc->getObjectByRepr(copy);
@@ -394,44 +400,46 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 sp_item_move_rel(item_copied, Geom::Translate(move[Geom::X], -move[Geom::Y]));
                 did = true;
-                Geom::OptRect bbox = item_copied->desktopGeometricBounds();
+                Geom::OptRect bbox = item_copied->documentVisualBounds();
                 std::vector<SPItem*> items = desktop->getDocument()->getItemsInBox(desktop->dkey, *bbox);
                 for (std::vector<SPItem*>::const_iterator i=items.begin(); i!=items.end(); i++) {
                     SPItem *item_down = *i;
                     std::cout << item_down->getAttribute("inkscape:spray-origin") << "asdgfasdasas\n";
-                    if(item_down->getAttribute("inkscape:spray-origin") &&( strcmp(item_down->getAttribute("inkscape:spray-origin"),item->getId()) == 0 || strcmp(item_down->getId(),item->getId()) == 0)){
+                    if(item_down->getAttribute("inkscape:spray-origin") &&( strcmp(item_down->getAttribute("inkscape:spray-origin"),spray_origin) == 0 || strcmp(item_down->getId(),item->getId()) == 0)){
                         if(!SP_IS_GROUP(item)){
                             SPShape *down_item_shape = dynamic_cast<SPShape *>(item_down);
                             if (down_item_shape) {
-                                Geom::PathVector c;
+                                Geom::PathVector pathv;
                                 SPPath *down_item_path = dynamic_cast<SPPath *>(down_item_shape);
                                 if (down_item_path) {
-                                    c = down_item_path->get_curve()->get_pathvector();
+                                    pathv = down_item_path->get_curve()->get_pathvector();
                                 } else {
-                                    c = down_item_shape->getCurve()->get_pathvector();
+                                    pathv = down_item_shape->getCurve()->get_pathvector();
                                 }
-                                if (c) {
+                                if (!pathv.empty()) {
                                     SPShape *copied_item_shape = dynamic_cast<SPShape *>(item_copied);
                                     if (copied_item_shape) {
-                                        Geom::PathVector d;
+                                        Geom::PathVector pathv_other;
                                         SPPath *copied_item_path = dynamic_cast<SPPath *>(copied_item_shape);
                                         if (copied_item_path) {
-                                            d = copied_item_path->get_curve()->get_pathvector();
+                                            pathv_other = copied_item_path->get_curve()->get_pathvector();
                                         } else {
-                                            d = copied_item_shape->getCurve()->get_pathvector();
+                                            pathv_other = copied_item_shape->getCurve()->get_pathvector();
                                         }
-                                        if (d) {
-                                            Geom::CrossingSet cs = Geom::crossings(c,d);
+                                        if (!pathv_other.empty()) {
+                                            Geom::CrossingSet cs = Geom::crossings(pathv, pathv_other);
                                             if(cs[0].size() == 0){
                                                 continue;
                                             }
                                         }
+                                    }
                                 }
                             }
                         }
                         item_copied->deleteObject();
                         std::cout << item_down->getAttribute("inkscape:spray-origin") << "hasssss\n";
                         did = false;
+                        break;
                     }
                 }
             }
-- 
cgit v1.2.3


From 955f8ffeb6debbbd215314624def36f1fe8276b9 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Fri, 23 Oct 2015 02:22:31 +0200
Subject: Improving spray tool

(bzr r14422.1.5)
---
 src/ui/tools/spray-tool.cpp | 46 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 11 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index ad390ed0d..3085a870b 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -341,6 +341,8 @@ static bool fit_item(SPDesktop *desktop,
                      Geom::Point center,
                      double scale,
                      double scale_variation,
+                     Geom::Point p,
+                     Geom::Point move,
                      size_t limit){
     Geom::OptRect bbox = item_copied->desktopVisualBounds();
     std::vector<SPItem*> items = desktop->getDocument()->getItemsPartiallyInBox(desktop->dkey, *bbox);
@@ -378,16 +380,20 @@ static bool fit_item(SPDesktop *desktop,
 //                    }
 //                }
 //            }
-            if(limit > 10){
+            if(limit > 3){
                 item_copied->deleteObject();
                 return false;
             } else {
                 sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(-scale, -scale));
-                scale = (1.0 - scale_variation / 100.0) + ((1.0 + scale_variation / 100.0)/limit); 
+                sp_item_move_rel(item_copied, Geom::Translate(Geom::Point(-move[Geom::X], move[Geom::Y])));
+                Geom::Path path;
+                path.start(Geom::Point(move[Geom::X],-move[Geom::Y]));
+                path.appendNew<Geom::LineSegment>(p);
+                scale = (1.0 - scale_variation / 100.0) + (scale/(limit+2)); 
                 sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(scale, scale));
-                sp_item_move_rel(item_copied, Geom::Translate(rand() % 20 -10, rand() % 20 -10));
+                sp_item_move_rel(item_copied, Geom::Translate(path.pointAt(1/(limit+2))));
                 limit += 1;
-                return fit_item(desktop, item_copied, item, spray_origin, center, scale, scale_variation, limit);
+                return fit_item(desktop, item_copied, item, spray_origin, center, scale, scale_variation, p, move, limit);
             }
         }
     }
@@ -442,10 +448,13 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Inkscape::XML::Node *old_repr = item->getRepr();
                 Inkscape::XML::Node *parent = old_repr->parent();
                 Inkscape::XML::Node *copy = old_repr->duplicate(xml_doc);
-                std::stringstream original_id;
-                original_id <<  "#" << item->getId();
-                gchar const * spray_origin = original_id.str().c_str();
-                copy->setAttribute("inkscape:spray-origin", spray_origin);
+                gchar const * spray_origin;
+                if(!copy->attribute("inkscape:spray-origin")){
+                    spray_origin = g_strdup_printf("#%s", old_repr->attribute("id"));
+                    copy->setAttribute("inkscape:spray-origin", spray_origin);
+                } else {
+                    spray_origin = copy->attribute("inkscape:spray-origin");
+                }
                 parent->appendChild(copy);
 
                 SPObject *new_obj = doc->getObjectByRepr(copy);
@@ -458,7 +467,8 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 // Move the cursor p
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 sp_item_move_rel(item_copied, Geom::Translate(move[Geom::X], -move[Geom::Y]));
-                did = fit_item(desktop, item_copied, item, spray_origin, center, scale_variation, _scale,  0);
+                Inkscape::GC::release(copy);
+                did = fit_item(desktop, item_copied, item, spray_origin, center, scale_variation, _scale, p , move , 9);
             }
         }
 #ifdef ENABLE_SPRAY_MODE_SINGLE_PATH
@@ -491,6 +501,13 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 if (_fid <= population) { // Rules the population of objects sprayed
                     // Duplicates the parent item
                     Inkscape::XML::Node *copy = old_repr->duplicate(xml_doc);
+                    gchar const * spray_origin;
+                    if(!copy->attribute("inkscape:spray-origin")){
+                        spray_origin = g_strdup_printf("#%s", old_repr->attribute("id"));
+                        copy->setAttribute("inkscape:spray-origin", spray_origin);
+                    } else {
+                        spray_origin = copy->attribute("inkscape:spray-origin");
+                    }
                     parent->appendChild(copy);
                     SPObject *new_obj = doc->getObjectByRepr(copy);
                     item_copied = dynamic_cast<SPItem *>(new_obj);
@@ -513,7 +530,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                     sp_selected_path_union_skip_undo(selection, selection->desktop());
                     selection->add(parent_item);
                     Inkscape::GC::release(copy);
-                    did = true;
+                    did = fit_item(desktop, item_copied, parent_item, spray_origin, center, scale_variation, _scale, p , move , 9);
                 }
             }
         }
@@ -533,6 +550,13 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 // Ad the clone to the list of the parent's children
                 parent->appendChild(clone);
                 // Generates the link between parent and child attributes
+                gchar const * spray_origin;
+                if(!clone->attribute("inkscape:spray-origin")){
+                    spray_origin = g_strdup_printf("#%s", old_repr->attribute("id"));
+                    clone->setAttribute("inkscape:spray-origin", spray_origin);
+                } else {
+                    spray_origin = clone->attribute("inkscape:spray-origin");
+                }
                 gchar *href_str = g_strdup_printf("#%s", old_repr->attribute("id"));
                 clone->setAttribute("xlink:href", href_str, false); 
                 g_free(href_str);
@@ -549,7 +573,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
 
                 Inkscape::GC::release(clone);
 
-                did = true;
+                did = fit_item(desktop, item_copied, item, spray_origin, center, scale_variation, _scale, p , move , 9);
             }
         }
     }
-- 
cgit v1.2.3


From aba9f9838aca1f4d062dd0c0f336587accf74b44 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Fri, 23 Oct 2015 19:47:28 +0200
Subject: Removing some stringsstreams and free gchars

(bzr r14393.3.3)
---
 src/ui/tools/measure-tool.cpp | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 81e1bea7d..87e8d5804 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -210,7 +210,7 @@ void setMeasureItem(Geom::PathVector pathv, bool is_curve, bool markers, guint32
     Inkscape::XML::Document *xml_doc = doc->getReprDoc();
     Inkscape::XML::Node *repr;
     repr = xml_doc->createElement("svg:path");
-    gchar const *str = sp_svg_write_path(pathv);
+    gchar *str = sp_svg_write_path(pathv);
     SPCSSAttr *css = sp_repr_css_attr_new();
     Geom::Coord strokewidth = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse().expansionX();
     std::stringstream stroke_width;
@@ -249,6 +249,7 @@ void setMeasureItem(Geom::PathVector pathv, bool is_curve, bool markers, guint32
     sp_repr_css_attr_unref (css);
     g_assert( str != NULL );
     repr->setAttribute("d", str);
+    g_free(str);
     if(measure_repr) {
         measure_repr->addChild(repr, NULL);
         Inkscape::GC::release(repr);
@@ -408,11 +409,10 @@ void MeasureTool::writeMeasurePoint(Geom::Point point, bool is_start) {
     if(!namedview) {
         return;
     }
-    Inkscape::SVGOStringStream os;
-    os << point;
-    gchar * str = g_strdup(os.str().c_str());
-    char const * measure_point = is_start ? "inkscape:measure-start" : "inkscape:measure-end";
+    gchar *str =  g_strdup_printf("%f,%f", point[Geom::X], point[Geom::Y]);
+    gchar const *measure_point = is_start ? "inkscape:measure-start" : "inkscape:measure-end";
     namedview->setAttribute (measure_point, str);
+    g_free(str);
 }
 
 //This function is used to reverse the Measure, I do it in two steps because when move the knot the 
@@ -759,7 +759,7 @@ void MeasureTool::toMarkDimension()
     if (!unit_name.compare("")) {
         unit_name = "px";
     }
-    double fontsize = prefs->getInt("/tools/measure/fontsize", 10.0);
+    double fontsize = prefs->getDouble("/tools/measure/fontsize", 10.0);
     int precision = prefs->getInt("/tools/measure/precision", 2);
     std::stringstream precision_str;
     precision_str.imbue(std::locale::classic());
@@ -770,6 +770,7 @@ void MeasureTool::toMarkDimension()
     double scale = prefs->getDouble("/tools/measure/scale", 100.0) / 100.0;
     gchar *totallength_str = g_strdup_printf(precision_str.str().c_str(), totallengthval * scale, unit_name.c_str());
     setLabelText(totallength_str, middle, fontsize, Geom::deg_to_rad(180) - ray.angle(), color);
+    g_free(totallength_str);
     doc->ensureUpToDate();
     DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MEASURE,_("Add global measure line"));
 }
@@ -867,7 +868,7 @@ void MeasureTool::setLabelText(const char *value, Geom::Point pos, double fontsi
 
     /* Create <tspan> */
     Inkscape::XML::Node *rtspan = xml_doc->createElement("svg:tspan");
-    rtspan->setAttribute("sodipodi:role", "line"); // otherwise, why bother creating the tspan?
+    rtspan->setAttribute("sodipodi:role", "line");
     SPCSSAttr *css = sp_repr_css_attr_new();
     std::stringstream font_size;
     font_size.imbue(std::locale::classic());
@@ -1199,18 +1200,18 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
     for (size_t idx = 0; idx < intersections.size(); ++idx) {
         setMeasureCanvasItem(desktop->doc2dt(intersections[idx]), to_item, measure_repr);
         if(to_guides) {
-            std::stringstream cross_number;
-            cross_number.imbue(std::locale::classic());
+            gchar *cross_number;
             if (!prefs->getBool("/tools/measure/ignore_1st_and_last", true)) {
-                cross_number <<  _("Crossing ") << idx;
+                cross_number= g_strdup_printf(_("Crossing %d"), idx);
             } else {
-                cross_number <<  _("Crossing ") << idx + 1;
+                cross_number= g_strdup_printf(_("Crossing %d"), idx + 1);
             }
             if (!prefs->getBool("/tools/measure/ignore_1st_and_last", true) && idx == 0) {
                 setGuide(desktop->doc2dt(intersections[idx]), angle + Geom::deg_to_rad(90), "");
             } else {
-                setGuide(desktop->doc2dt(intersections[idx]), angle + Geom::deg_to_rad(90), cross_number.str().c_str());
+                setGuide(desktop->doc2dt(intersections[idx]), angle + Geom::deg_to_rad(90), cross_number);
             }
+            g_free(cross_number);
         }
     }
     // Since adding goes to the bottom, do all lines last.
-- 
cgit v1.2.3


From 51c0ac71d4f52566be5f084274a64eb0a2ee38be Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Fri, 23 Oct 2015 21:25:43 +0200
Subject: Working on spray tool

(bzr r14422.1.6)
---
 src/ui/tools/spray-tool.cpp | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 3085a870b..040678b51 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -339,16 +339,17 @@ static bool fit_item(SPDesktop *desktop,
                      SPItem * item,
                      gchar const * spray_origin,
                      Geom::Point center,
-                     double scale,
+                     double _scale,
                      double scale_variation,
+                     double &scale,
+                     double angle,
                      Geom::Point p,
-                     Geom::Point move,
-                     size_t limit){
+                     Geom::Point move){
     Geom::OptRect bbox = item_copied->desktopVisualBounds();
     std::vector<SPItem*> items = desktop->getDocument()->getItemsPartiallyInBox(desktop->dkey, *bbox);
     for (std::vector<SPItem*>::const_iterator i=items.begin(); i!=items.end(); i++) {
         SPItem *item_down = *i;
-        Geom::OptRect bbox = item_down->desktopVisualBounds();
+        bbox = item_down->desktopVisualBounds();
         if(item_down->getId() == item->getId() || (item_down->getAttribute("inkscape:spray-origin") && item_down != item_copied && strcmp(item_down->getAttribute("inkscape:spray-origin"),spray_origin) == 0)){
 //            if(!SP_IS_GROUP(item) && 1>2){
 //                SPShape *down_item_shape = dynamic_cast<SPShape *>(item_down);
@@ -380,20 +381,26 @@ static bool fit_item(SPDesktop *desktop,
 //                    }
 //                }
 //            }
-            if(limit > 3){
+            sp_item_move_rel(item_copied, Geom::Translate(-move[Geom::X], move[Geom::Y]));
+            sp_spray_rotate_rel(center,desktop,item_copied, Geom::Rotate(angle).inverse());
+            sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(scale,scale).inverse());
+            sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(_scale, _scale).inverse());
+            
+            double min_scale = (1.0 - scale_variation / 100.0);
+            _scale = min_scale + ((_scale - min_scale)/2); 
+            sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(_scale, _scale));
+            sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(scale,scale));
+            sp_spray_rotate_rel(center,desktop,item_copied, Geom::Rotate(angle));
+            sp_item_move_rel(item_copied, Geom::Translate(move[Geom::X], -move[Geom::Y]));
+            bbox = item_copied->desktopVisualBounds();
+            if(bbox->intersects(item_down->desktopVisualBounds())){
+                std::cout << "deleted\n";
                 item_copied->deleteObject();
                 return false;
             } else {
-                sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(-scale, -scale));
-                sp_item_move_rel(item_copied, Geom::Translate(Geom::Point(-move[Geom::X], move[Geom::Y])));
-                Geom::Path path;
-                path.start(Geom::Point(move[Geom::X],-move[Geom::Y]));
-                path.appendNew<Geom::LineSegment>(p);
-                scale = (1.0 - scale_variation / 100.0) + (scale/(limit+2)); 
-                sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(scale, scale));
-                sp_item_move_rel(item_copied, Geom::Translate(path.pointAt(1/(limit+2))));
-                limit += 1;
-                return fit_item(desktop, item_copied, item, spray_origin, center, scale, scale_variation, p, move, limit);
+                std::cout << "applied\n";
+                //if the element fit no other can be down so saefly return
+                return true;
             }
         }
     }
@@ -468,7 +475,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 sp_item_move_rel(item_copied, Geom::Translate(move[Geom::X], -move[Geom::Y]));
                 Inkscape::GC::release(copy);
-                did = fit_item(desktop, item_copied, item, spray_origin, center, scale_variation, _scale, p , move , 9);
+                did = fit_item(desktop, item_copied, item, spray_origin, center, scale_variation, _scale, scale, angle, p , move);
             }
         }
 #ifdef ENABLE_SPRAY_MODE_SINGLE_PATH
@@ -530,7 +537,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                     sp_selected_path_union_skip_undo(selection, selection->desktop());
                     selection->add(parent_item);
                     Inkscape::GC::release(copy);
-                    did = fit_item(desktop, item_copied, parent_item, spray_origin, center, scale_variation, _scale, p , move , 9);
+                    did = fit_item(desktop, item_copied, parent_item, spray_origin, center, scale_variation, _scale, scale, angle, p , move);
                 }
             }
         }
@@ -573,7 +580,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
 
                 Inkscape::GC::release(clone);
 
-                did = fit_item(desktop, item_copied, item, spray_origin, center, scale_variation, _scale, p , move , 9);
+                did = fit_item(desktop, item_copied, item, spray_origin, center, scale_variation, _scale, scale, angle, p , move);
             }
         }
     }
-- 
cgit v1.2.3


From 2bd48486ba7584cc0eb6aa2c034f08b9c589ea5f Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 24 Oct 2015 16:55:14 +0200
Subject: working in a new way

(bzr r14422.1.7)
---
 src/ui/tools/spray-tool.cpp | 162 +++++++++++++++++++++++++++++---------------
 src/ui/tools/spray-tool.h   |   4 +-
 2 files changed, 109 insertions(+), 57 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 040678b51..21fbeccd0 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -154,6 +154,9 @@ SprayTool::SprayTool()
     , is_dilating(false)
     , has_dilated(false)
     , dilate_area(NULL)
+    , overlap(false)
+    , offset(0)
+    , hidding_items()
 {
 }
 
@@ -226,6 +229,8 @@ void SprayTool::setup() {
     sp_event_context_read(this, "standard_deviation");
     sp_event_context_read(this, "usepressure");
     sp_event_context_read(this, "Scale");
+    sp_event_context_read(this, "offset");
+    sp_event_context_read(this, "overlap");
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     if (prefs->getBool("/tools/spray/selcue")) {
@@ -263,6 +268,10 @@ void SprayTool::set(const Inkscape::Preferences::Entry& val) {
         this->tilt = CLAMP(val.getDouble(0.1), 0, 1000.0);
     } else if (path == "ratio") {
         this->ratio = CLAMP(val.getDouble(), 0.0, 0.9);
+    } else if (path == "offset") {
+        this->offset = CLAMP(val.getDouble(), -1000.0, 1000.0);
+    } else if (path == "overlap") {
+        this->overlap = val.getBool();
     }
 }
 
@@ -307,6 +316,16 @@ static double get_move_standard_deviation(SprayTool *tc)
     return tc->standard_deviation;
 }
 
+static double get_offset(SprayTool *tc)
+{
+    return tc->offset;
+}
+
+static double get_overlap(SprayTool *tc)
+{
+    return tc->overlap;
+}
+
 /**
  * Method to handle the distribution of the items
  * @param[out]  radius : radius of the position of the sprayed object
@@ -335,22 +354,22 @@ static void random_position(double &radius, double &angle, double &a, double &s,
 
 }
 static bool fit_item(SPDesktop *desktop,
-                     SPItem * item_copied,
+                     Geom::OptRect bbox,
                      SPItem * item,
                      gchar const * spray_origin,
-                     Geom::Point center,
-                     double _scale,
+                     double scale,
                      double scale_variation,
-                     double &scale,
-                     double angle,
-                     Geom::Point p,
-                     Geom::Point move){
-    Geom::OptRect bbox = item_copied->desktopVisualBounds();
-    std::vector<SPItem*> items = desktop->getDocument()->getItemsPartiallyInBox(desktop->dkey, *bbox);
-    for (std::vector<SPItem*>::const_iterator i=items.begin(); i!=items.end(); i++) {
+                     std::vector<SPItem*> hidding_items)
+{
+    std::vector<SPItem*> items_down = desktop->getDocument()->getItemsPartiallyInBox(desktop->dkey, *bbox);
+    for (std::vector<SPItem*>::const_iterator i=items_down.begin(); i!=items_down.end(); i++) {
         SPItem *item_down = *i;
-        bbox = item_down->desktopVisualBounds();
-        if(item_down->getId() == item->getId() || (item_down->getAttribute("inkscape:spray-origin") && item_down != item_copied && strcmp(item_down->getAttribute("inkscape:spray-origin"),spray_origin) == 0)){
+        gchar const * item_down_sharp = g_strdup_printf("#%s", item_down->getId());
+        if(item_down_sharp == spray_origin ||
+          (item_down->getAttribute("inkscape:spray-origin") && 
+           strcmp(item_down->getAttribute("inkscape:spray-origin"),spray_origin) == 0 
+           )
+        ){
 //            if(!SP_IS_GROUP(item) && 1>2){
 //                SPShape *down_item_shape = dynamic_cast<SPShape *>(item_down);
 //                if (down_item_shape) {
@@ -381,28 +400,38 @@ static bool fit_item(SPDesktop *desktop,
 //                    }
 //                }
 //            }
-            sp_item_move_rel(item_copied, Geom::Translate(-move[Geom::X], move[Geom::Y]));
-            sp_spray_rotate_rel(center,desktop,item_copied, Geom::Rotate(angle).inverse());
-            sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(scale,scale).inverse());
-            sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(_scale, _scale).inverse());
-            
-            double min_scale = (1.0 - scale_variation / 100.0);
-            _scale = min_scale + ((_scale - min_scale)/2); 
-            sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(_scale, _scale));
-            sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(scale,scale));
-            sp_spray_rotate_rel(center,desktop,item_copied, Geom::Rotate(angle));
-            sp_item_move_rel(item_copied, Geom::Translate(move[Geom::X], -move[Geom::Y]));
-            bbox = item_copied->desktopVisualBounds();
-            if(bbox->intersects(item_down->desktopVisualBounds())){
-                std::cout << "deleted\n";
-                item_copied->deleteObject();
-                return false;
-            } else {
-                std::cout << "applied\n";
-                //if the element fit no other can be down so saefly return
-                return true;
-            }
+//            sp_item_move_rel(item_copied, Geom::Translate(-move[Geom::X], move[Geom::Y]));
+//            sp_spray_rotate_rel(center,desktop,item_copied, Geom::Rotate(angle).inverse());
+//            sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(scale,scale).inverse());
+//            sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(_scale, _scale).inverse());
+//            
+//            double min_scale = (1.0 - scale_variation / 100.0);
+//            _scale = min_scale + ((_scale - min_scale)/2); 
+//            sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(_scale, _scale));
+//            sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(scale,scale));
+//            sp_spray_rotate_rel(center,desktop,item_copied, Geom::Rotate(angle));
+//            sp_item_move_rel(item_copied, Geom::Translate(move[Geom::X], -move[Geom::Y]));
+//            Geom::Point center = item_copied->getCenter();
+//            sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(scale).inverse());
+//            double min_scale = (1.0 - scale_variation / 100.0);
+//            scale = g_random_double_range(min_scale, 0.8); 
+//            sp_spray_scale_rel(center, desktop, item_copied, Geom::Scale(scale));
+//            bbox = item_copied->desktopVisualBounds();
+//            if(bbox->intersects(item_down->desktopVisualBounds()) ||
+//               bbox->contains(item_down->desktopVisualBounds())
+//               )
+//            {
+//                //this hack is for speed draw, moved and on release delete all at this point
+//                //item_copied->deleteObject();
+//                item_copied->setHidden(true);
+//                hidding_items.push_back(item_copied);
+//                return true;
+//            } else {
+//                std::cout << "applied\n";
+//            }
+        return false;
         }
+        std::cout << "not\n";
     }
     return true;
 }
@@ -423,7 +452,8 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                double ratio,
                                double tilt,
                                double rotation_variation,
-                               gint _distrib)
+                               gint _distrib,
+                               std::vector<SPItem*> hidding_items)
 {
     bool did = false;
 
@@ -446,36 +476,52 @@ static bool sp_spray_recursive(SPDesktop *desktop,
     if (mode == SPRAY_MODE_COPY) {
         Geom::OptRect a = item->documentVisualBounds();
         if (a) {
-            SPItem *item_copied;
             if(_fid <= population)
             {
+                gchar const * spray_origin;
+                if(!item->getAttribute("inkscape:spray-origin")){
+                    spray_origin = g_strdup_printf("#%s", item->getId());
+                } else {
+                    spray_origin = item->getAttribute("inkscape:spray-origin");
+                }
+                Geom::Point center=item->getCenter();
+                Geom::Rect rect(Geom::Point(a->top(), a->left()),Geom::Point(a->bottom(), a->right()));
+                Geom::Translate const s(center);
+                rect *= item->i2dt_affine() * s.inverse() * Geom::Scale(_scale) * s;
+                rect *= item->i2dt_affine() * s.inverse() * Geom::Scale(scale) * s;
+                rect *= item->i2dt_affine() * s.inverse() * Geom::Rotate(angle) * s;
+                Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
+                rect *= item->i2dt_affine() * s.inverse() * Geom::Translate(move[Geom::X], -move[Geom::Y]) * s;
+                Geom::OptRect bbox_transformed(Geom::Point(rect.top(), rect.left()),Geom::Point(rect.bottom(), rect.right()));
+                if(!fit_item(desktop, bbox_transformed, item, spray_origin, _scale, scale_variation, hidding_items)){
+                    double min_scale = (1.0 - scale_variation / 100.0);
+                    _scale = g_random_double_range(min_scale, 0.8); 
+                    center=item->getCenter();
+                    Geom::Translate const moved_center(center);
+                    rect *= item->i2dt_affine() * moved_center.inverse() * Geom::Scale(_scale) * moved_center;
+                    Geom::OptRect bbox_transformed2(Geom::Point(rect.top(), rect.left()),Geom::Point(rect.bottom(), rect.right()));
+                    if(!fit_item(desktop, bbox_transformed2, item, spray_origin, _scale, scale_variation, hidding_items)){
+                        return false;
+                    }
+                }
+                SPItem *item_copied;
                 // Duplicate
                 SPDocument *doc = item->document;
                 Inkscape::XML::Document* xml_doc = doc->getReprDoc();
                 Inkscape::XML::Node *old_repr = item->getRepr();
                 Inkscape::XML::Node *parent = old_repr->parent();
                 Inkscape::XML::Node *copy = old_repr->duplicate(xml_doc);
-                gchar const * spray_origin;
-                if(!copy->attribute("inkscape:spray-origin")){
-                    spray_origin = g_strdup_printf("#%s", old_repr->attribute("id"));
-                    copy->setAttribute("inkscape:spray-origin", spray_origin);
-                } else {
-                    spray_origin = copy->attribute("inkscape:spray-origin");
-                }
                 parent->appendChild(copy);
-
+                copy->setAttribute("inkscape:spray-origin", spray_origin);
                 SPObject *new_obj = doc->getObjectByRepr(copy);
                 item_copied = dynamic_cast<SPItem *>(new_obj);   // Conversion object->item
-                Geom::Point center=item->getCenter();
                 sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(_scale,_scale));
                 sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(scale,scale));
-
                 sp_spray_rotate_rel(center,desktop,item_copied, Geom::Rotate(angle));
                 // Move the cursor p
-                Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 sp_item_move_rel(item_copied, Geom::Translate(move[Geom::X], -move[Geom::Y]));
                 Inkscape::GC::release(copy);
-                did = fit_item(desktop, item_copied, item, spray_origin, center, scale_variation, _scale, scale, angle, p , move);
+                did = true;
             }
         }
 #ifdef ENABLE_SPRAY_MODE_SINGLE_PATH
@@ -537,7 +583,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                     sp_selected_path_union_skip_undo(selection, selection->desktop());
                     selection->add(parent_item);
                     Inkscape::GC::release(copy);
-                    did = fit_item(desktop, item_copied, parent_item, spray_origin, center, scale_variation, _scale, scale, angle, p , move);
+                    did = true;
                 }
             }
         }
@@ -579,8 +625,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 sp_item_move_rel(item_copied, Geom::Translate(move[Geom::X], -move[Geom::Y]));
 
                 Inkscape::GC::release(clone);
-
-                did = fit_item(desktop, item_copied, item, spray_origin, center, scale_variation, _scale, scale, angle, p , move);
+                did = true;
             }
         }
     }
@@ -588,7 +633,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
     return did;
 }
 
-static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point p, Geom::Point vector, bool reverse)
+static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point p, Geom::Point vector, bool reverse, std::vector<SPItem*> hidding_items)
 {
     SPDesktop *desktop = tc->desktop;
     Inkscape::Selection *selection = desktop->getSelection();
@@ -627,7 +672,7 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
             SPItem *item = *i;
             g_assert(item != NULL);
 
-            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib)) {
+            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, hidding_items)) {
                 did = true;
             }
         }
@@ -687,7 +732,7 @@ bool SprayTool::root_handler(GdkEvent* event) {
                 this->has_dilated = false;
 
                 if(this->is_dilating && event->button.button == 1 && !this->space_panning) {
-                    sp_spray_dilate(this, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT(event));
+                    sp_spray_dilate(this, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT(event), this->hidding_items);
                 }
 
                 this->has_dilated = true;
@@ -717,7 +762,7 @@ bool SprayTool::root_handler(GdkEvent* event) {
 
             // Dilating:
             if (this->is_drawing && ( event->motion.state & GDK_BUTTON1_MASK )) {
-                sp_spray_dilate(this, motion_w, motion_doc, motion_doc - this->last_push, event->button.state & GDK_SHIFT_MASK? true : false);
+                sp_spray_dilate(this, motion_w, motion_doc, motion_doc - this->last_push, event->button.state & GDK_SHIFT_MASK? true : false, this->hidding_items);
                 //this->last_push = motion_doc;
                 this->has_dilated = true;
 
@@ -750,7 +795,7 @@ bool SprayTool::root_handler(GdkEvent* event) {
                         this->is_dilating = true;
                         this->has_dilated = false;
                         if(this->is_dilating && !this->space_panning) {
-                            sp_spray_dilate(this, scroll_w, desktop->dt2doc(scroll_dt), Geom::Point(0,0), false);
+                            sp_spray_dilate(this, scroll_w, desktop->dt2doc(scroll_dt), Geom::Point(0,0), false, this->hidding_items);
                         }
                         this->has_dilated = true;
                         
@@ -780,7 +825,7 @@ bool SprayTool::root_handler(GdkEvent* event) {
                 if (!this->has_dilated) {
                     // If we did not rub, do a light tap
                     this->pressure = 0.03;
-                    sp_spray_dilate(this, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT(event));
+                    sp_spray_dilate(this, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT(event), this->hidding_items);
                 }
                 this->is_dilating = false;
                 this->has_dilated = false;
@@ -798,6 +843,11 @@ bool SprayTool::root_handler(GdkEvent* event) {
                                            SP_VERB_CONTEXT_SPRAY, _("Spray in single path"));
                         break;
                 }
+                for (std::vector<SPItem*>::const_iterator i=this->hidding_items.begin(); i!=this->hidding_items.end(); i++) {
+                    SPItem *item = *i;
+                    this->hidding_items.erase(i);
+                    item->deleteObject();
+                }
             }
             break;
         }
diff --git a/src/ui/tools/spray-tool.h b/src/ui/tools/spray-tool.h
index 8df730201..1a931135f 100644
--- a/src/ui/tools/spray-tool.h
+++ b/src/ui/tools/spray-tool.h
@@ -86,7 +86,9 @@ public:
     bool has_dilated;
     Geom::Point last_push;
     SPCanvasItem *dilate_area;
-
+    bool overlap;
+    double offset;
+    std::vector<SPItem*> hidding_items;
     sigc::connection style_set_connection;
 
     static const std::string prefsPath;
-- 
cgit v1.2.3


From 648022706dc3a441eb79436f319540dd53cba629 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 24 Oct 2015 23:42:10 +0200
Subject: Improving Spray tool

(bzr r14422.1.8)
---
 src/ui/tools/spray-tool.cpp | 125 +++++++++++++++++++++++++++++---------------
 src/ui/tools/spray-tool.h   |   1 -
 2 files changed, 82 insertions(+), 44 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 21fbeccd0..cc5536173 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -49,6 +49,7 @@
 #include "path-chemistry.h"
 
 #include "sp-text.h"
+#include "sp-root.h"
 #include "sp-flowtext.h"
 #include "display/sp-canvas.h"
 #include "display/canvas-bpath.h"
@@ -131,6 +132,29 @@ static void sp_spray_scale_rel(Geom::Point c, SPDesktop */*desktop*/, SPItem *it
     item->set_i2d_affine(item->i2dt_affine() * s.inverse() * scale * s);
     item->doWriteTransform(item->getRepr(), item->transform);
 }
+///* Method to scale items */
+//static Geom::Affine sp_spray_scale_rel(Geom::Point c, SPDesktop *desktop, SPItem *item, Geom::Scale const &scale, bool write)
+//{
+//    //Maybe isbetter create a metod inverse to set_i2d_affine to calculate transforms
+//    // whith objects not in tree
+//    Geom::Translate const s(c);
+//    Geom::Affine scale_computed = item->i2dt_affine() * s.inverse() * scale * s;
+//    Geom::Affine dt2p; /* desktop to item parent transform */
+//    if (item->parent) {
+//        dt2p = static_cast<SPItem *>(item->parent)->i2dt_affine().inverse();
+//    } else {
+//        dt2p = desktop->dt2doc();
+//    }
+//    Geom::Affine i2p( scale_computed * dt2p );
+//    if(!write){
+//        i2p = scale_computed * dt2p * desktop->dt2doc().inverse();
+//    }
+//    if(write) {
+//        item->set_item_transform(i2p);
+//        item->doWriteTransform(item->getRepr(), item->transform);
+//    }
+//    return i2p;
+//}
 
 SprayTool::SprayTool()
     : ToolBase(cursor_spray_xpm, 4, 4, false)
@@ -156,7 +180,6 @@ SprayTool::SprayTool()
     , dilate_area(NULL)
     , overlap(false)
     , offset(0)
-    , hidding_items()
 {
 }
 
@@ -355,21 +378,21 @@ static void random_position(double &radius, double &angle, double &a, double &s,
 }
 static bool fit_item(SPDesktop *desktop,
                      Geom::OptRect bbox,
-                     SPItem * item,
-                     gchar const * spray_origin,
-                     double scale,
-                     double scale_variation,
-                     std::vector<SPItem*> hidding_items)
+                     gchar const * spray_origin)
 {
     std::vector<SPItem*> items_down = desktop->getDocument()->getItemsPartiallyInBox(desktop->dkey, *bbox);
+    //std::cout << bbox->top() << "top" << bbox->left() << "left" << bbox->bottom() << "bottom" << bbox->right() << "rightINSIDE\n";
+    std::cout << "eeeeeenter\n";
     for (std::vector<SPItem*>::const_iterator i=items_down.begin(); i!=items_down.end(); i++) {
         SPItem *item_down = *i;
         gchar const * item_down_sharp = g_strdup_printf("#%s", item_down->getId());
-        if(item_down_sharp == spray_origin ||
+        std::cout << "BUUUCCCLLLLEEEE\n";
+        if(strcmp(item_down_sharp, spray_origin) == 0 ||
           (item_down->getAttribute("inkscape:spray-origin") && 
            strcmp(item_down->getAttribute("inkscape:spray-origin"),spray_origin) == 0 
            )
         ){
+        
 //            if(!SP_IS_GROUP(item) && 1>2){
 //                SPShape *down_item_shape = dynamic_cast<SPShape *>(item_down);
 //                if (down_item_shape) {
@@ -429,11 +452,12 @@ static bool fit_item(SPDesktop *desktop,
 //            } else {
 //                std::cout << "applied\n";
 //            }
-        return false;
+std::cout << "coincide\n";
+        return true;
         }
         std::cout << "not\n";
     }
-    return true;
+    return false;
 }
 
 static bool sp_spray_recursive(SPDesktop *desktop,
@@ -452,8 +476,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                double ratio,
                                double tilt,
                                double rotation_variation,
-                               gint _distrib,
-                               std::vector<SPItem*> hidding_items)
+                               gint _distrib)
 {
     bool did = false;
 
@@ -478,6 +501,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
         if (a) {
             if(_fid <= population)
             {
+                SPDocument *doc = item->document;
                 gchar const * spray_origin;
                 if(!item->getAttribute("inkscape:spray-origin")){
                     spray_origin = g_strdup_printf("#%s", item->getId());
@@ -485,43 +509,63 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                     spray_origin = item->getAttribute("inkscape:spray-origin");
                 }
                 Geom::Point center=item->getCenter();
-                Geom::Rect rect(Geom::Point(a->top(), a->left()),Geom::Point(a->bottom(), a->right()));
+                Geom::Path path;
+                path.start(Geom::Point(a->left(), a->top()));
+                path.appendNew<Geom::LineSegment>(Geom::Point(a->right(), a->top()));
+                path.appendNew<Geom::LineSegment>(Geom::Point(a->right(), a->bottom()));
+                path.appendNew<Geom::LineSegment>(Geom::Point(a->left(), a->bottom()));
+                path.close(true);
                 Geom::Translate const s(center);
-                rect *= item->i2dt_affine() * s.inverse() * Geom::Scale(_scale) * s;
-                rect *= item->i2dt_affine() * s.inverse() * Geom::Scale(scale) * s;
-                rect *= item->i2dt_affine() * s.inverse() * Geom::Rotate(angle) * s;
+                path *= item->transform.inverse() * doc->getRoot()->c2p.inverse() * item->i2dt_affine() * s.inverse() * Geom::Scale(_scale) * s * item->i2dt_affine().inverse() * doc->getRoot()->c2p * item->transform;
+                path *= item->transform.inverse() * doc->getRoot()->c2p.inverse() * item->i2dt_affine() * s.inverse() * Geom::Scale(scale) * s * item->i2dt_affine().inverse() * doc->getRoot()->c2p * item->transform;
+                path *= item->transform.inverse() * doc->getRoot()->c2p.inverse() * item->i2dt_affine() * s.inverse() * Geom::Rotate(angle) * s * item->i2dt_affine().inverse() * doc->getRoot()->c2p * item->transform;
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
-                rect *= item->i2dt_affine() * s.inverse() * Geom::Translate(move[Geom::X], -move[Geom::Y]) * s;
-                Geom::OptRect bbox_transformed(Geom::Point(rect.top(), rect.left()),Geom::Point(rect.bottom(), rect.right()));
-                if(!fit_item(desktop, bbox_transformed, item, spray_origin, _scale, scale_variation, hidding_items)){
-                    double min_scale = (1.0 - scale_variation / 100.0);
-                    _scale = g_random_double_range(min_scale, 0.8); 
-                    center=item->getCenter();
-                    Geom::Translate const moved_center(center);
-                    rect *= item->i2dt_affine() * moved_center.inverse() * Geom::Scale(_scale) * moved_center;
-                    Geom::OptRect bbox_transformed2(Geom::Point(rect.top(), rect.left()),Geom::Point(rect.bottom(), rect.right()));
-                    if(!fit_item(desktop, bbox_transformed2, item, spray_origin, _scale, scale_variation, hidding_items)){
-                        return false;
-                    }
-                }
+                path *= Geom::Translate(move[Geom::X], move[Geom::Y]);
+                path *= desktop->doc2dt();
+                //std::cout << rect.top() << "top" << rect.left() << "left" << rect.bottom() << "bottom" << rect.right() << "transformed\n";
+                Geom::OptRect bbox = path.boundsFast();
+                std::cout << bbox->top() << "top" << bbox->left() << "left" << bbox->bottom() << "bottom" << bbox->right() << "PREV\n";
+                //std::cout << "ppp\n";
+                if(!fit_item(desktop, bbox, spray_origin)){
+                    //std::cout << "aaa\n";
+
+                        //return true;
+
+//                    double min_scale = (1.0 - scale_variation / 100.0);
+//                    _scale = g_random_double_range(min_scale, 0.8); 
+//                    center=item->getCenter();
+//                    Geom::Translate const moved_center(center);
+//                    rect *= item->i2dt_affine() * moved_center.inverse() * Geom::Scale(_scale) * moved_center;
+//                    Geom::OptRect bbox_transformed2(Geom::Point(rect.left(), rect.top()),Geom::Point(rect.right(), rect.bottom()));
+//                    if(!fit_item(desktop, bbox_transformed2, spray_origin)){
+//                        return true;
+//                    }
+                
+                //std::cout << "ccc";
                 SPItem *item_copied;
                 // Duplicate
-                SPDocument *doc = item->document;
                 Inkscape::XML::Document* xml_doc = doc->getReprDoc();
                 Inkscape::XML::Node *old_repr = item->getRepr();
                 Inkscape::XML::Node *parent = old_repr->parent();
                 Inkscape::XML::Node *copy = old_repr->duplicate(xml_doc);
+                if(!copy->attribute("inkscape:spray-origin")){
+                    copy->setAttribute("inkscape:spray-origin", spray_origin);
+                }
                 parent->appendChild(copy);
-                copy->setAttribute("inkscape:spray-origin", spray_origin);
                 SPObject *new_obj = doc->getObjectByRepr(copy);
                 item_copied = dynamic_cast<SPItem *>(new_obj);   // Conversion object->item
-                sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(_scale,_scale));
-                sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(scale,scale));
+                sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(_scale));
+                sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(scale));
                 sp_spray_rotate_rel(center,desktop,item_copied, Geom::Rotate(angle));
                 // Move the cursor p
                 sp_item_move_rel(item_copied, Geom::Translate(move[Geom::X], -move[Geom::Y]));
+                bbox = item_copied->documentVisualBounds();
+                std::cout << bbox->top() << "top" << bbox->left() << "left" << bbox->bottom() << "bottom" << bbox->right() << "POST\n";
                 Inkscape::GC::release(copy);
                 did = true;
+                } else {
+                    did = false;
+                }
             }
         }
 #ifdef ENABLE_SPRAY_MODE_SINGLE_PATH
@@ -633,7 +677,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
     return did;
 }
 
-static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point p, Geom::Point vector, bool reverse, std::vector<SPItem*> hidding_items)
+static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point p, Geom::Point vector, bool reverse)
 {
     SPDesktop *desktop = tc->desktop;
     Inkscape::Selection *selection = desktop->getSelection();
@@ -672,7 +716,7 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
             SPItem *item = *i;
             g_assert(item != NULL);
 
-            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, hidding_items)) {
+            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib)) {
                 did = true;
             }
         }
@@ -732,7 +776,7 @@ bool SprayTool::root_handler(GdkEvent* event) {
                 this->has_dilated = false;
 
                 if(this->is_dilating && event->button.button == 1 && !this->space_panning) {
-                    sp_spray_dilate(this, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT(event), this->hidding_items);
+                    sp_spray_dilate(this, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT(event));
                 }
 
                 this->has_dilated = true;
@@ -762,7 +806,7 @@ bool SprayTool::root_handler(GdkEvent* event) {
 
             // Dilating:
             if (this->is_drawing && ( event->motion.state & GDK_BUTTON1_MASK )) {
-                sp_spray_dilate(this, motion_w, motion_doc, motion_doc - this->last_push, event->button.state & GDK_SHIFT_MASK? true : false, this->hidding_items);
+                sp_spray_dilate(this, motion_w, motion_doc, motion_doc - this->last_push, event->button.state & GDK_SHIFT_MASK? true : false);
                 //this->last_push = motion_doc;
                 this->has_dilated = true;
 
@@ -795,7 +839,7 @@ bool SprayTool::root_handler(GdkEvent* event) {
                         this->is_dilating = true;
                         this->has_dilated = false;
                         if(this->is_dilating && !this->space_panning) {
-                            sp_spray_dilate(this, scroll_w, desktop->dt2doc(scroll_dt), Geom::Point(0,0), false, this->hidding_items);
+                            sp_spray_dilate(this, scroll_w, desktop->dt2doc(scroll_dt), Geom::Point(0,0), false);
                         }
                         this->has_dilated = true;
                         
@@ -825,7 +869,7 @@ bool SprayTool::root_handler(GdkEvent* event) {
                 if (!this->has_dilated) {
                     // If we did not rub, do a light tap
                     this->pressure = 0.03;
-                    sp_spray_dilate(this, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT(event), this->hidding_items);
+                    sp_spray_dilate(this, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT(event));
                 }
                 this->is_dilating = false;
                 this->has_dilated = false;
@@ -843,11 +887,6 @@ bool SprayTool::root_handler(GdkEvent* event) {
                                            SP_VERB_CONTEXT_SPRAY, _("Spray in single path"));
                         break;
                 }
-                for (std::vector<SPItem*>::const_iterator i=this->hidding_items.begin(); i!=this->hidding_items.end(); i++) {
-                    SPItem *item = *i;
-                    this->hidding_items.erase(i);
-                    item->deleteObject();
-                }
             }
             break;
         }
diff --git a/src/ui/tools/spray-tool.h b/src/ui/tools/spray-tool.h
index 1a931135f..acdff4cb0 100644
--- a/src/ui/tools/spray-tool.h
+++ b/src/ui/tools/spray-tool.h
@@ -88,7 +88,6 @@ public:
     SPCanvasItem *dilate_area;
     bool overlap;
     double offset;
-    std::vector<SPItem*> hidding_items;
     sigc::connection style_set_connection;
 
     static const std::string prefsPath;
-- 
cgit v1.2.3


From 7f606e3eb5e38a645c4dc5e0c22bbe1136a1f674 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 25 Oct 2015 02:55:48 +0100
Subject: Fixed some toolbox definition and minor tweaks

(bzr r14393.1.30)
---
 src/ui/tools/measure-tool.cpp | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 87e8d5804..e6f56674a 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -347,14 +347,20 @@ MeasureTool::MeasureTool()
     this->knot_end->setStroke(0x0000007f, 0x0000007f, 0x0000007f);
     this->knot_end->setShape(SP_KNOT_SHAPE_CIRCLE);
     this->knot_end->updateCtrl();
-    Geom::Rect display_area = desktop->get_display_area () ;
+    Geom::Rect display_area = desktop->get_display_area();
     if(display_area.interiorContains(start_p) && display_area.interiorContains(end_p) && end_p != Geom::Point()) {
         this->knot_start->moveto(start_p);
         this->knot_start->show();
         this->knot_end->moveto(end_p);
         this->knot_end->show();
         showCanvasItems();
+    } else {
+        start_p = Geom::Point(0,0);
+        end_p = Geom::Point(0,0);
+        writeMeasurePoint(start_p, true);
+        writeMeasurePoint(end_p, false);
     }
+
     this->_knot_start_moved_connection = this->knot_start->moved_signal.connect(sigc::mem_fun(*this, &MeasureTool::knotStartMovedHandler));
     this->_knot_start_ungrabbed_connection = this->knot_start->ungrabbed_signal.connect(sigc::mem_fun(*this, &MeasureTool::knotUngrabbedHandler));
     this->_knot_end_moved_connection = this->knot_end->moved_signal.connect(sigc::mem_fun(*this, &MeasureTool::knotEndMovedHandler));
@@ -612,7 +618,6 @@ bool MeasureTool::root_handler(GdkEvent* event)
     case GDK_BUTTON_RELEASE: {
         this->knot_start->moveto(start_p);
         this->knot_start->show();
-        end_p = end_p;
         if(last_end) {
             end_p = desktop->w2d(*last_end);
             if (event->button.state & GDK_CONTROL_MASK) {
@@ -630,6 +635,7 @@ bool MeasureTool::root_handler(GdkEvent* event)
         this->knot_end->moveto(end_p);
         this->knot_end->show();
         showCanvasItems();
+
         if (this->grabbed) {
             sp_canvas_item_ungrab(this->grabbed, event->button.time);
             this->grabbed = NULL;
@@ -698,6 +704,9 @@ void MeasureTool::setMarker(bool isStart)
 void MeasureTool::toGuides()
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    if(!desktop || !start_p.isFinite() || !end_p.isFinite() || start_p == end_p) {
+        return;
+    }
     SPDocument *doc = desktop->getDocument();
     Geom::Point start = desktop->doc2dt(start_p) * desktop->doc2dt();
     Geom::Point end = desktop->doc2dt(end_p) * desktop->doc2dt();
@@ -726,12 +735,15 @@ void MeasureTool::toGuides()
 void MeasureTool::toItem()
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    if(!desktop || !start_p.isFinite() || !end_p.isFinite() || start_p == end_p) {
+        return;
+    }
     SPDocument *doc = desktop->getDocument();
     Geom::Ray ray(start_p,end_p);
     guint32 line_color_primary = 0x0000ff7f;
     Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
     Inkscape::XML::Node *rgroup = xml_doc->createElement("svg:g");
-    showCanvasItems(false, true,rgroup);
+    showCanvasItems(false, true, rgroup);
     setLine(start_p,end_p, false, line_color_primary, rgroup);
     SPItem *measure_item = SP_ITEM(desktop->currentLayer()->appendChildRepr(rgroup));
     Inkscape::GC::release(rgroup);
@@ -744,6 +756,9 @@ void MeasureTool::toItem()
 void MeasureTool::toMarkDimension()
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    if(!desktop || !start_p.isFinite() || !end_p.isFinite() || start_p == end_p) {
+        return;
+    }
     SPDocument *doc = desktop->getDocument();
     setMarkers();
     Geom::Ray ray(start_p,end_p);
@@ -1218,7 +1233,7 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
 
     // draw main control line
     {
-        setMeasureCanvasControlLine(start_p, end_p, false, CTLINE_SECONDARY, measure_repr);
+        setMeasureCanvasControlLine(start_p, end_p, false, CTLINE_PRIMARY, measure_repr);
         double length = std::abs((end_p - start_p).length());
         Geom::Point anchorEnd = start_p;
         anchorEnd[Geom::X] += length;
-- 
cgit v1.2.3


From 6b73445c7de7d4dd58b47056f6ace72e3e49223c Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 25 Oct 2015 17:47:19 +0100
Subject: End adding no overlap to spray tool

(bzr r14422.1.9)
---
 src/ui/tools/spray-tool.cpp | 275 ++++++++++++++++++++------------------------
 src/ui/tools/spray-tool.h   |   1 +
 2 files changed, 124 insertions(+), 152 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index cc5536173..69a6f0435 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -12,6 +12,7 @@
  *   Steren GIANNINI (steren.giannini@gmail.com)
  *   Jon A. Cruz <jon@joncruz.org>
  *   Abhishek Sharma
+ *   Jabiertxo Arraiza <jabier.arraiza@marker.es>
  *
  * Copyright (C) 2009 authors
  *
@@ -132,29 +133,6 @@ static void sp_spray_scale_rel(Geom::Point c, SPDesktop */*desktop*/, SPItem *it
     item->set_i2d_affine(item->i2dt_affine() * s.inverse() * scale * s);
     item->doWriteTransform(item->getRepr(), item->transform);
 }
-///* Method to scale items */
-//static Geom::Affine sp_spray_scale_rel(Geom::Point c, SPDesktop *desktop, SPItem *item, Geom::Scale const &scale, bool write)
-//{
-//    //Maybe isbetter create a metod inverse to set_i2d_affine to calculate transforms
-//    // whith objects not in tree
-//    Geom::Translate const s(c);
-//    Geom::Affine scale_computed = item->i2dt_affine() * s.inverse() * scale * s;
-//    Geom::Affine dt2p; /* desktop to item parent transform */
-//    if (item->parent) {
-//        dt2p = static_cast<SPItem *>(item->parent)->i2dt_affine().inverse();
-//    } else {
-//        dt2p = desktop->dt2doc();
-//    }
-//    Geom::Affine i2p( scale_computed * dt2p );
-//    if(!write){
-//        i2p = scale_computed * dt2p * desktop->dt2doc().inverse();
-//    }
-//    if(write) {
-//        item->set_item_transform(i2p);
-//        item->doWriteTransform(item->getRepr(), item->transform);
-//    }
-//    return i2p;
-//}
 
 SprayTool::SprayTool()
     : ToolBase(cursor_spray_xpm, 4, 4, false)
@@ -339,16 +317,6 @@ static double get_move_standard_deviation(SprayTool *tc)
     return tc->standard_deviation;
 }
 
-static double get_offset(SprayTool *tc)
-{
-    return tc->offset;
-}
-
-static double get_overlap(SprayTool *tc)
-{
-    return tc->overlap;
-}
-
 /**
  * Method to handle the distribution of the items
  * @param[out]  radius : radius of the position of the sprayed object
@@ -376,88 +344,63 @@ static void random_position(double &radius, double &angle, double &a, double &s,
     radius = pow(radius_temp, 0.5);
 
 }
+
+static void sp_spray_transform_path(SPItem * item, Geom::Path &path, Geom::Affine affine, Geom::Point center){
+    SPDocument *doc = item->document;
+    path *= doc->getRoot()->c2p.inverse();
+    path *= item->transform.inverse();
+    Geom::Affine dt2p;
+    if (item->parent) {
+        dt2p = static_cast<SPItem *>(item->parent)->i2dt_affine().inverse();
+    } else {
+        SPDesktop *dt = SP_ACTIVE_DESKTOP;
+        dt2p = dt->dt2doc();
+    }
+    Geom::Affine i2dt = item->i2dt_affine() * Geom::Translate(center).inverse() * affine * Geom::Translate(center);
+    path *= i2dt * dt2p;
+    path *= doc->getRoot()->c2p;
+}
+
 static bool fit_item(SPDesktop *desktop,
+                     SPItem *item,
                      Geom::OptRect bbox,
-                     gchar const * spray_origin)
+                     gchar const * spray_origin,
+                     Geom::Point move,
+                     Geom::Point center,
+                     double angle,
+                     double _scale,
+                     double scale,
+                     double offset)
 {
+    if(offset < 0){
+        offset = std::min(std::min(std::abs(offset), bbox->width()/2.0),std::min(std::abs(offset), bbox->height()/2.0)) * -1;
+    }
+    bbox = Geom::Rect(Geom::Point(bbox->left() - offset, bbox->top() - offset),Geom::Point(bbox->right() + offset, bbox->bottom() + offset));
+    Geom::Path path;
+    path.start(Geom::Point(bbox->left(), bbox->top()));
+    path.appendNew<Geom::LineSegment>(Geom::Point(bbox->right(), bbox->top()));
+    path.appendNew<Geom::LineSegment>(Geom::Point(bbox->right(), bbox->bottom()));
+    path.appendNew<Geom::LineSegment>(Geom::Point(bbox->left(), bbox->bottom()));
+    path.close(true);
+    Geom::Translate const s(center);
+    sp_spray_transform_path(item, path, Geom::Scale(_scale), center);
+    sp_spray_transform_path(item, path, Geom::Scale(scale), center);
+    sp_spray_transform_path(item, path, Geom::Rotate(angle), center);
+    path *= Geom::Translate(move[Geom::X], move[Geom::Y]);
+    path *= desktop->doc2dt();
+    bbox = path.boundsFast();
     std::vector<SPItem*> items_down = desktop->getDocument()->getItemsPartiallyInBox(desktop->dkey, *bbox);
-    //std::cout << bbox->top() << "top" << bbox->left() << "left" << bbox->bottom() << "bottom" << bbox->right() << "rightINSIDE\n";
-    std::cout << "eeeeeenter\n";
     for (std::vector<SPItem*>::const_iterator i=items_down.begin(); i!=items_down.end(); i++) {
         SPItem *item_down = *i;
         gchar const * item_down_sharp = g_strdup_printf("#%s", item_down->getId());
-        std::cout << "BUUUCCCLLLLEEEE\n";
         if(strcmp(item_down_sharp, spray_origin) == 0 ||
           (item_down->getAttribute("inkscape:spray-origin") && 
-           strcmp(item_down->getAttribute("inkscape:spray-origin"),spray_origin) == 0 
-           )
-        ){
-        
-//            if(!SP_IS_GROUP(item) && 1>2){
-//                SPShape *down_item_shape = dynamic_cast<SPShape *>(item_down);
-//                if (down_item_shape) {
-//                    Geom::PathVector pathv;
-//                    SPPath *down_item_path = dynamic_cast<SPPath *>(down_item_shape);
-//                    if (down_item_path) {
-//                        pathv = down_item_path->get_curve()->get_pathvector();
-//                    } else {
-//                        pathv = down_item_shape->getCurve()->get_pathvector();
-//                    }
-//                    if (!pathv.empty()) {
-//                        SPShape *copied_item_shape = dynamic_cast<SPShape *>(item_copied);
-//                        if (copied_item_shape) {
-//                            Geom::PathVector pathv_other;
-//                            SPPath *copied_item_path = dynamic_cast<SPPath *>(copied_item_shape);
-//                            if (copied_item_path) {
-//                                pathv_other = copied_item_path->get_curve()->get_pathvector();
-//                            } else {
-//                                pathv_other = copied_item_shape->getCurve()->get_pathvector();
-//                            }
-//                            if (!pathv_other.empty()) {
-//                                Geom::CrossingSet cs = Geom::crossings(pathv, pathv_other);
-//                                if(cs[0].size() == 0){
-//                                    continue;
-//                                }
-//                            }
-//                        }
-//                    }
-//                }
-//            }
-//            sp_item_move_rel(item_copied, Geom::Translate(-move[Geom::X], move[Geom::Y]));
-//            sp_spray_rotate_rel(center,desktop,item_copied, Geom::Rotate(angle).inverse());
-//            sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(scale,scale).inverse());
-//            sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(_scale, _scale).inverse());
-//            
-//            double min_scale = (1.0 - scale_variation / 100.0);
-//            _scale = min_scale + ((_scale - min_scale)/2); 
-//            sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(_scale, _scale));
-//            sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(scale,scale));
-//            sp_spray_rotate_rel(center,desktop,item_copied, Geom::Rotate(angle));
-//            sp_item_move_rel(item_copied, Geom::Translate(move[Geom::X], -move[Geom::Y]));
-//            Geom::Point center = item_copied->getCenter();
-//            sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(scale).inverse());
-//            double min_scale = (1.0 - scale_variation / 100.0);
-//            scale = g_random_double_range(min_scale, 0.8); 
-//            sp_spray_scale_rel(center, desktop, item_copied, Geom::Scale(scale));
-//            bbox = item_copied->desktopVisualBounds();
-//            if(bbox->intersects(item_down->desktopVisualBounds()) ||
-//               bbox->contains(item_down->desktopVisualBounds())
-//               )
-//            {
-//                //this hack is for speed draw, moved and on release delete all at this point
-//                //item_copied->deleteObject();
-//                item_copied->setHidden(true);
-//                hidding_items.push_back(item_copied);
-//                return true;
-//            } else {
-//                std::cout << "applied\n";
-//            }
-std::cout << "coincide\n";
-        return true;
+           strcmp(item_down->getAttribute("inkscape:spray-origin"),spray_origin) == 0 ))
+        {
+            return false;
         }
-        std::cout << "not\n";
     }
-    return false;
+    return true;
 }
 
 static bool sp_spray_recursive(SPDesktop *desktop,
@@ -476,7 +419,10 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                double ratio,
                                double tilt,
                                double rotation_variation,
-                               gint _distrib)
+                               gint _distrib,
+                               bool overlap,
+                               double offset,
+                               size_t &limit)
 {
     bool did = false;
 
@@ -508,40 +454,39 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 } else {
                     spray_origin = item->getAttribute("inkscape:spray-origin");
                 }
-                Geom::Point center=item->getCenter();
-                Geom::Path path;
-                path.start(Geom::Point(a->left(), a->top()));
-                path.appendNew<Geom::LineSegment>(Geom::Point(a->right(), a->top()));
-                path.appendNew<Geom::LineSegment>(Geom::Point(a->right(), a->bottom()));
-                path.appendNew<Geom::LineSegment>(Geom::Point(a->left(), a->bottom()));
-                path.close(true);
-                Geom::Translate const s(center);
-                path *= item->transform.inverse() * doc->getRoot()->c2p.inverse() * item->i2dt_affine() * s.inverse() * Geom::Scale(_scale) * s * item->i2dt_affine().inverse() * doc->getRoot()->c2p * item->transform;
-                path *= item->transform.inverse() * doc->getRoot()->c2p.inverse() * item->i2dt_affine() * s.inverse() * Geom::Scale(scale) * s * item->i2dt_affine().inverse() * doc->getRoot()->c2p * item->transform;
-                path *= item->transform.inverse() * doc->getRoot()->c2p.inverse() * item->i2dt_affine() * s.inverse() * Geom::Rotate(angle) * s * item->i2dt_affine().inverse() * doc->getRoot()->c2p * item->transform;
+                Geom::Point center = item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
-                path *= Geom::Translate(move[Geom::X], move[Geom::Y]);
-                path *= desktop->doc2dt();
-                //std::cout << rect.top() << "top" << rect.left() << "left" << rect.bottom() << "bottom" << rect.right() << "transformed\n";
-                Geom::OptRect bbox = path.boundsFast();
-                std::cout << bbox->top() << "top" << bbox->left() << "left" << bbox->bottom() << "bottom" << bbox->right() << "PREV\n";
-                //std::cout << "ppp\n";
-                if(!fit_item(desktop, bbox, spray_origin)){
-                    //std::cout << "aaa\n";
-
-                        //return true;
-
-//                    double min_scale = (1.0 - scale_variation / 100.0);
-//                    _scale = g_random_double_range(min_scale, 0.8); 
-//                    center=item->getCenter();
-//                    Geom::Translate const moved_center(center);
-//                    rect *= item->i2dt_affine() * moved_center.inverse() * Geom::Scale(_scale) * moved_center;
-//                    Geom::OptRect bbox_transformed2(Geom::Point(rect.left(), rect.top()),Geom::Point(rect.right(), rect.bottom()));
-//                    if(!fit_item(desktop, bbox_transformed2, spray_origin)){
-//                        return true;
-//                    }
-                
-                //std::cout << "ccc";
+                if(overlap){
+                    if(!fit_item(desktop, item, a, spray_origin, move, center, angle, _scale, scale, offset)){
+                         limit += 1;
+                         //Limit recursion to 10 levels
+                         //Seems enoght to chech if thete is place to put new copie
+                         if(limit < 11){
+                             return sp_spray_recursive(desktop,
+                                   selection,
+                                   item,
+                                   p,
+                                   Geom::Point(),
+                                   mode,
+                                   radius,
+                                   population,
+                                   scale,
+                                   scale_variation,
+                                   false,
+                                   mean,
+                                   standard_deviation,
+                                   ratio,
+                                   tilt,
+                                   rotation_variation,
+                                   _distrib,
+                                   overlap,
+                                   offset,
+                                   limit);
+                         } else {
+                            return false;
+                         }
+                    }
+                }
                 SPItem *item_copied;
                 // Duplicate
                 Inkscape::XML::Document* xml_doc = doc->getReprDoc();
@@ -559,13 +504,8 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 sp_spray_rotate_rel(center,desktop,item_copied, Geom::Rotate(angle));
                 // Move the cursor p
                 sp_item_move_rel(item_copied, Geom::Translate(move[Geom::X], -move[Geom::Y]));
-                bbox = item_copied->documentVisualBounds();
-                std::cout << bbox->top() << "top" << bbox->left() << "left" << bbox->bottom() << "bottom" << bbox->right() << "POST\n";
                 Inkscape::GC::release(copy);
                 did = true;
-                } else {
-                    did = false;
-                }
             }
         }
 #ifdef ENABLE_SPRAY_MODE_SINGLE_PATH
@@ -636,8 +576,45 @@ static bool sp_spray_recursive(SPDesktop *desktop,
         Geom::OptRect a = item->documentVisualBounds();
         if (a) {
             if(_fid <= population) {
-                SPItem *item_copied;
                 SPDocument *doc = item->document;
+                gchar const * spray_origin;
+                if(!item->getAttribute("inkscape:spray-origin")){
+                    spray_origin = g_strdup_printf("#%s", item->getId());
+                } else {
+                    spray_origin = item->getAttribute("inkscape:spray-origin");
+                }
+                Geom::Point center=item->getCenter();
+                Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
+                if(overlap){
+                    if(!fit_item(desktop, item, a, spray_origin, move, center, angle, _scale, scale, offset)){
+                         limit += 1;
+                         if(limit < 11){
+                             return sp_spray_recursive(desktop,
+                                   selection,
+                                   item,
+                                   p,
+                                   Geom::Point(),
+                                   mode,
+                                   radius,
+                                   population,
+                                   scale,
+                                   scale_variation,
+                                   false,
+                                   mean,
+                                   standard_deviation,
+                                   ratio,
+                                   tilt,
+                                   rotation_variation,
+                                   _distrib,
+                                   overlap,
+                                   offset,
+                                   limit);
+                         } else {
+                            return false;
+                         }
+                    }
+                }
+                SPItem *item_copied;
                 Inkscape::XML::Document* xml_doc = doc->getReprDoc();
                 Inkscape::XML::Node *old_repr = item->getRepr();
                 Inkscape::XML::Node *parent = old_repr->parent();
@@ -647,12 +624,8 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 // Ad the clone to the list of the parent's children
                 parent->appendChild(clone);
                 // Generates the link between parent and child attributes
-                gchar const * spray_origin;
                 if(!clone->attribute("inkscape:spray-origin")){
-                    spray_origin = g_strdup_printf("#%s", old_repr->attribute("id"));
                     clone->setAttribute("inkscape:spray-origin", spray_origin);
-                } else {
-                    spray_origin = clone->attribute("inkscape:spray-origin");
                 }
                 gchar *href_str = g_strdup_printf("#%s", old_repr->attribute("id"));
                 clone->setAttribute("xlink:href", href_str, false); 
@@ -661,11 +634,9 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 SPObject *clone_object = doc->getObjectByRepr(clone);
                 // Conversion object->item
                 item_copied = dynamic_cast<SPItem *>(clone_object);
-                Geom::Point center = item->getCenter();
                 sp_spray_scale_rel(center, desktop, item_copied, Geom::Scale(_scale, _scale));
                 sp_spray_scale_rel(center, desktop, item_copied, Geom::Scale(scale, scale));
                 sp_spray_rotate_rel(center, desktop, item_copied, Geom::Rotate(angle));
-                Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 sp_item_move_rel(item_copied, Geom::Translate(move[Geom::X], -move[Geom::Y]));
 
                 Inkscape::GC::release(clone);
@@ -715,8 +686,8 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
         for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
             SPItem *item = *i;
             g_assert(item != NULL);
-
-            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib)) {
+            size_t limit = 0;
+            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->overlap, tc->offset, limit)) {
                 did = true;
             }
         }
diff --git a/src/ui/tools/spray-tool.h b/src/ui/tools/spray-tool.h
index acdff4cb0..a46f2cc90 100644
--- a/src/ui/tools/spray-tool.h
+++ b/src/ui/tools/spray-tool.h
@@ -12,6 +12,7 @@
  *   Benoît LAVORATA
  *   Vincent MONTAGNE
  *   Pierre BARBRY-BLOT
+ *   Jabiertxo Arraiza JABIERTXOF
  *
  * Copyright (C) 2009 authors
  *
-- 
cgit v1.2.3


From 0ab5eb11dba2f130c7582753f5717ab002dd383e Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 26 Oct 2015 10:36:22 +0100
Subject: Fixed typos from Mc Removed unnecesary added headers Put overlap
 default to false

(bzr r14422.1.12)
---
 src/ui/tools/spray-tool.cpp | 5 +----
 src/ui/tools/spray-tool.h   | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 69a6f0435..67502591f 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -59,9 +59,6 @@
 #include "livarot/Shape.h"
 #include <2geom/circle.h>
 #include <2geom/transforms.h>
-#include <2geom/path-intersection.h>
-#include <2geom/pathvector.h>
-#include <2geom/crossing.h>
 #include "preferences.h"
 #include "style.h"
 #include "box3d.h"
@@ -460,7 +457,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                     if(!fit_item(desktop, item, a, spray_origin, move, center, angle, _scale, scale, offset)){
                          limit += 1;
                          //Limit recursion to 10 levels
-                         //Seems enoght to chech if thete is place to put new copie
+                         //Seems enough to chech if there is place to put new copie
                          if(limit < 11){
                              return sp_spray_recursive(desktop,
                                    selection,
diff --git a/src/ui/tools/spray-tool.h b/src/ui/tools/spray-tool.h
index a46f2cc90..20c59bcf7 100644
--- a/src/ui/tools/spray-tool.h
+++ b/src/ui/tools/spray-tool.h
@@ -12,7 +12,7 @@
  *   Benoît LAVORATA
  *   Vincent MONTAGNE
  *   Pierre BARBRY-BLOT
- *   Jabiertxo Arraiza JABIERTXOF
+ *   Jabiertxo ARRAIZA
  *
  * Copyright (C) 2009 authors
  *
-- 
cgit v1.2.3


From 7211d5adafb749b04d2de1ed3a2e679f4f9f869e Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 26 Oct 2015 17:22:18 +0100
Subject: Add option to not overlap if multiple elements are selected to spray

(bzr r14422.1.13)
---
 src/ui/tools/spray-tool.cpp | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 67502591f..a49887f89 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -361,7 +361,6 @@ static void sp_spray_transform_path(SPItem * item, Geom::Path &path, Geom::Affin
 static bool fit_item(SPDesktop *desktop,
                      SPItem *item,
                      Geom::OptRect bbox,
-                     gchar const * spray_origin,
                      Geom::Point move,
                      Geom::Point center,
                      double angle,
@@ -387,14 +386,28 @@ static bool fit_item(SPDesktop *desktop,
     path *= desktop->doc2dt();
     bbox = path.boundsFast();
     std::vector<SPItem*> items_down = desktop->getDocument()->getItemsPartiallyInBox(desktop->dkey, *bbox);
+    Inkscape::Selection *selection = desktop->getSelection();
+    if (selection->isEmpty()) {
+        return false;
+    }
+    std::vector<SPItem*> const items_selected(selection->itemList());
     for (std::vector<SPItem*>::const_iterator i=items_down.begin(); i!=items_down.end(); i++) {
         SPItem *item_down = *i;
         gchar const * item_down_sharp = g_strdup_printf("#%s", item_down->getId());
-        if(strcmp(item_down_sharp, spray_origin) == 0 ||
-          (item_down->getAttribute("inkscape:spray-origin") && 
-           strcmp(item_down->getAttribute("inkscape:spray-origin"),spray_origin) == 0 ))
-        {
-            return false;
+        for (std::vector<SPItem*>::const_iterator j=items_selected.begin(); j!=items_selected.end(); j++) {
+            SPItem *item_selected = *j;
+            gchar const * spray_origin;
+            if(!item->getAttribute("inkscape:spray-origin")){
+                spray_origin = g_strdup_printf("#%s", item_selected->getId());
+            } else {
+                spray_origin = item_selected->getAttribute("inkscape:spray-origin");
+            }
+            if(strcmp(item_down_sharp, spray_origin) == 0 ||
+              (item_down->getAttribute("inkscape:spray-origin") && 
+               strcmp(item_down->getAttribute("inkscape:spray-origin"),spray_origin) == 0 ))
+            {
+                return false;
+            }
         }
     }
     return true;
@@ -454,7 +467,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point center = item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 if(overlap){
-                    if(!fit_item(desktop, item, a, spray_origin, move, center, angle, _scale, scale, offset)){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, offset)){
                          limit += 1;
                          //Limit recursion to 10 levels
                          //Seems enough to chech if there is place to put new copie
@@ -583,7 +596,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point center=item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 if(overlap){
-                    if(!fit_item(desktop, item, a, spray_origin, move, center, angle, _scale, scale, offset)){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, offset)){
                          limit += 1;
                          if(limit < 11){
                              return sp_spray_recursive(desktop,
-- 
cgit v1.2.3


From 0d4e511c524d9102d90adbf2defea4f644eb3edd Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Mon, 26 Oct 2015 23:50:52 +0100
Subject: add gtk3 experimental support in CMake

Fixed bugs:
  - https://launchpad.net/bugs/1509969

(bzr r14430)
---
 src/ui/dialog/text-edit.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'src/ui')

diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp
index 7575cc854..cf53e1441 100644
--- a/src/ui/dialog/text-edit.cpp
+++ b/src/ui/dialog/text-edit.cpp
@@ -175,6 +175,19 @@ TextEdit::TextEdit()
     gtk_text_view_set_wrap_mode ((GtkTextView *) text_view, GTK_WRAP_WORD);
 
 #ifdef WITH_GTKSPELL
+#ifdef WITH_GTKMM_3_0
+/*
+       TODO: Use computed xml:lang attribute of relevant element, if present, to specify the
+       language (either as 2nd arg of gtkspell_new_attach, or with explicit
+       gtkspell_set_language call in; see advanced.c example in gtkspell docs).
+       onReadSelection looks like a suitable place.
+*/
+    GtkSpellChecker * speller = gtk_spell_checker_new();
+
+    if (! gtk_spell_checker_attach(speller, GTK_TEXT_VIEW(text_view))) {
+        g_print("gtkspell error:\n");
+    }
+#else
     GError *error = NULL;
 
 /*
@@ -187,6 +200,7 @@ TextEdit::TextEdit()
         g_print("gtkspell error: %s\n", error->message);
         g_error_free(error);
     }
+#endif
 #endif
 
     gtk_widget_set_size_request (text_view, -1, 64);
-- 
cgit v1.2.3


From ce4d5cefcf234870d5f345f184256c9fab354777 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 27 Oct 2015 00:07:29 +0100
Subject: Added a option to pick down color

(bzr r14422.1.14)
---
 src/ui/tools/spray-tool.cpp | 70 +++++++++++++++++++++++++++++++++++++++++----
 src/ui/tools/spray-tool.h   |  1 +
 2 files changed, 65 insertions(+), 6 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index a49887f89..4f02d9b33 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -49,6 +49,13 @@
 #include "sp-path.h"
 #include "path-chemistry.h"
 
+// For color picking
+#include "display/drawing.h"
+#include "display/drawing-context.h"
+#include "display/cairo-utils.h"
+#include "desktop-style.h"
+#include "svg/svg-color.h"
+
 #include "sp-text.h"
 #include "sp-root.h"
 #include "sp-flowtext.h"
@@ -154,6 +161,7 @@ SprayTool::SprayTool()
     , has_dilated(false)
     , dilate_area(NULL)
     , overlap(false)
+    , picker(false)
     , offset(0)
 {
 }
@@ -228,6 +236,7 @@ void SprayTool::setup() {
     sp_event_context_read(this, "usepressure");
     sp_event_context_read(this, "Scale");
     sp_event_context_read(this, "offset");
+    sp_event_context_read(this, "picker");
     sp_event_context_read(this, "overlap");
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -268,6 +277,8 @@ void SprayTool::set(const Inkscape::Preferences::Entry& val) {
         this->ratio = CLAMP(val.getDouble(), 0.0, 0.9);
     } else if (path == "offset") {
         this->offset = CLAMP(val.getDouble(), -1000.0, 1000.0);
+    } else if (path == "picker") {
+        this->picker =  val.getBool();
     } else if (path == "overlap") {
         this->overlap = val.getBool();
     }
@@ -366,7 +377,9 @@ static bool fit_item(SPDesktop *desktop,
                      double angle,
                      double _scale,
                      double scale,
-                     double offset)
+                     bool picker,
+                     double offset,
+                     SPCSSAttr *css)
 {
     if(offset < 0){
         offset = std::min(std::min(std::abs(offset), bbox->width()/2.0),std::min(std::abs(offset), bbox->height()/2.0)) * -1;
@@ -378,7 +391,6 @@ static bool fit_item(SPDesktop *desktop,
     path.appendNew<Geom::LineSegment>(Geom::Point(bbox->right(), bbox->bottom()));
     path.appendNew<Geom::LineSegment>(Geom::Point(bbox->left(), bbox->bottom()));
     path.close(true);
-    Geom::Translate const s(center);
     sp_spray_transform_path(item, path, Geom::Scale(_scale), center);
     sp_spray_transform_path(item, path, Geom::Scale(scale), center);
     sp_spray_transform_path(item, path, Geom::Rotate(angle), center);
@@ -410,6 +422,42 @@ static bool fit_item(SPDesktop *desktop,
             }
         }
     }
+    if(picker){
+        Geom::IntRect area = Geom::IntRect::from_xywh(floor(desktop->d2w(bbox->midpoint())[Geom::X]), floor(desktop->d2w(bbox->midpoint())[Geom::Y]), 1, 1);
+        double R = 0, G = 0, B = 0, A = 0;
+        cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 1, 1);
+        sp_canvas_arena_render_surface(SP_CANVAS_ARENA(desktop->getDrawing()), s, area);
+        ink_cairo_surface_average_color_premul(s, R, G, B, A);
+        cairo_surface_destroy(s);
+        
+    //    Inkscape::Drawing *pick_drawing = new Inkscape::Drawing();
+    //    pick_drawing->update();
+    //    Geom::Rect box( center_bbox[Geom::X]-1, center_bbox[Geom::Y]-1,
+    //                    center_bbox[Geom::X]+1, center_bbox[Geom::Y]+1 );
+
+    //    /* Item integer bbox in points */
+    //    Geom::IntRect ibox = box.roundOutwards();
+
+    //    /* Find visible area */
+    //    cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, ibox.width(), ibox.height());
+    //    Inkscape::DrawingContext dc(s, ibox.min());
+
+    //    /* Render copy and pick color */
+    //    pick_drawing->render(dc, ibox);
+    //    double R = 0, G = 0, B = 0, A = 0;
+    //    ink_cairo_surface_average_color(s, R, G, B, A);
+    //    cairo_surface_destroy(s);
+        // status message
+        guint32 c32 = SP_RGBA32_F_COMPOSE(R, G, B, A);
+        gchar c[64];
+        sp_svg_write_color(c, sizeof(c), c32);
+        sp_repr_css_set_property(css, "fill", c);
+        gchar const * fill_opacity = g_strdup_printf("%f", A);
+        sp_repr_css_set_property(css, "fill-opacity", fill_opacity);
+        if(R == 1 && G == 1 && B == 1 && A == 0){
+            return false;
+        }
+    }
     return true;
 }
 
@@ -431,6 +479,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                double rotation_variation,
                                gint _distrib,
                                bool overlap,
+                               bool picker,
                                double offset,
                                size_t &limit)
 {
@@ -466,8 +515,9 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 }
                 Geom::Point center = item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
+                SPCSSAttr *css = sp_repr_css_attr_new();
                 if(overlap){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, offset)){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, offset, css)){
                          limit += 1;
                          //Limit recursion to 10 levels
                          //Seems enough to chech if there is place to put new copie
@@ -490,6 +540,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                    rotation_variation,
                                    _distrib,
                                    overlap,
+                                   picker,
                                    offset,
                                    limit);
                          } else {
@@ -515,6 +566,9 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 // Move the cursor p
                 sp_item_move_rel(item_copied, Geom::Translate(move[Geom::X], -move[Geom::Y]));
                 Inkscape::GC::release(copy);
+                if(picker){
+                    sp_desktop_apply_css_recursive(item_copied, css, true);
+                }
                 did = true;
             }
         }
@@ -595,8 +649,9 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 }
                 Geom::Point center=item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
+                SPCSSAttr *css = sp_repr_css_attr_new();
                 if(overlap){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, offset)){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, offset, css)){
                          limit += 1;
                          if(limit < 11){
                              return sp_spray_recursive(desktop,
@@ -617,6 +672,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                    rotation_variation,
                                    _distrib,
                                    overlap,
+                                   picker,
                                    offset,
                                    limit);
                          } else {
@@ -648,7 +704,9 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 sp_spray_scale_rel(center, desktop, item_copied, Geom::Scale(scale, scale));
                 sp_spray_rotate_rel(center, desktop, item_copied, Geom::Rotate(angle));
                 sp_item_move_rel(item_copied, Geom::Translate(move[Geom::X], -move[Geom::Y]));
-
+                if(picker){
+                    sp_desktop_apply_css_recursive(item_copied, css, true);
+                }
                 Inkscape::GC::release(clone);
                 did = true;
             }
@@ -697,7 +755,7 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
             SPItem *item = *i;
             g_assert(item != NULL);
             size_t limit = 0;
-            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->overlap, tc->offset, limit)) {
+            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->overlap,tc->picker, tc->offset, limit)) {
                 did = true;
             }
         }
diff --git a/src/ui/tools/spray-tool.h b/src/ui/tools/spray-tool.h
index 20c59bcf7..f65e0a223 100644
--- a/src/ui/tools/spray-tool.h
+++ b/src/ui/tools/spray-tool.h
@@ -88,6 +88,7 @@ public:
     Geom::Point last_push;
     SPCanvasItem *dilate_area;
     bool overlap;
+    bool picker;
     double offset;
     sigc::connection style_set_connection;
 
-- 
cgit v1.2.3


From bb1f811f9932106d5fd4aaba87f3194fc55de6be Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 27 Oct 2015 00:09:21 +0100
Subject: removed dead code

(bzr r14422.1.16)
---
 src/ui/tools/spray-tool.cpp | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 4f02d9b33..bacb1105c 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -429,25 +429,6 @@ static bool fit_item(SPDesktop *desktop,
         sp_canvas_arena_render_surface(SP_CANVAS_ARENA(desktop->getDrawing()), s, area);
         ink_cairo_surface_average_color_premul(s, R, G, B, A);
         cairo_surface_destroy(s);
-        
-    //    Inkscape::Drawing *pick_drawing = new Inkscape::Drawing();
-    //    pick_drawing->update();
-    //    Geom::Rect box( center_bbox[Geom::X]-1, center_bbox[Geom::Y]-1,
-    //                    center_bbox[Geom::X]+1, center_bbox[Geom::Y]+1 );
-
-    //    /* Item integer bbox in points */
-    //    Geom::IntRect ibox = box.roundOutwards();
-
-    //    /* Find visible area */
-    //    cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, ibox.width(), ibox.height());
-    //    Inkscape::DrawingContext dc(s, ibox.min());
-
-    //    /* Render copy and pick color */
-    //    pick_drawing->render(dc, ibox);
-    //    double R = 0, G = 0, B = 0, A = 0;
-    //    ink_cairo_surface_average_color(s, R, G, B, A);
-    //    cairo_surface_destroy(s);
-        // status message
         guint32 c32 = SP_RGBA32_F_COMPOSE(R, G, B, A);
         gchar c[64];
         sp_svg_write_color(c, sizeof(c), c32);
-- 
cgit v1.2.3


From b0de24888aea4410596e237f947a201b349b0097 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 27 Oct 2015 20:10:06 +0100
Subject: Now the picker work with alphas and also in no overlap mode Offset
 dropdown disabled if no overlap Changed offset to percent based

(bzr r14422.1.18)
---
 src/ui/tools/spray-tool.cpp | 78 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 64 insertions(+), 14 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index bacb1105c..25e9dbd73 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -378,13 +378,19 @@ static bool fit_item(SPDesktop *desktop,
                      double _scale,
                      double scale,
                      bool picker,
+                     bool overlap,
                      double offset,
                      SPCSSAttr *css)
 {
-    if(offset < 0){
-        offset = std::min(std::min(std::abs(offset), bbox->width()/2.0),std::min(std::abs(offset), bbox->height()/2.0)) * -1;
+    SPDocument *doc = item->document;
+    double width = bbox->width();
+    double height = bbox->height();
+    double size = std::min(width,height);
+    double offset_min = (offset * size)/100.0 - (size);
+    if(offset_min < 0 ){
+        offset_min = 0;
     }
-    bbox = Geom::Rect(Geom::Point(bbox->left() - offset, bbox->top() - offset),Geom::Point(bbox->right() + offset, bbox->bottom() + offset));
+    bbox = Geom::Rect(Geom::Point(bbox->left() - offset_min, bbox->top() - offset_min),Geom::Point(bbox->right() + offset_min, bbox->bottom() + offset_min));
     Geom::Path path;
     path.start(Geom::Point(bbox->left(), bbox->top()));
     path.appendNew<Geom::LineSegment>(Geom::Point(bbox->right(), bbox->top()));
@@ -397,6 +403,16 @@ static bool fit_item(SPDesktop *desktop,
     path *= Geom::Translate(move[Geom::X], move[Geom::Y]);
     path *= desktop->doc2dt();
     bbox = path.boundsFast();
+    double bbox_left_main = bbox->left();
+    double bbox_top_main = bbox->top();
+    double width_transformed = bbox->width();
+    double height_transformed = bbox->height();
+    size = std::min(width_transformed,height_transformed);
+    if(offset < 100 ){
+        offset_min = ((99.0 - offset) * size)/100.0 - size;
+    } else {
+        offset_min = 0;
+    }
     std::vector<SPItem*> items_down = desktop->getDocument()->getItemsPartiallyInBox(desktop->dkey, *bbox);
     Inkscape::Selection *selection = desktop->getSelection();
     if (selection->isEmpty()) {
@@ -405,6 +421,11 @@ static bool fit_item(SPDesktop *desktop,
     std::vector<SPItem*> const items_selected(selection->itemList());
     for (std::vector<SPItem*>::const_iterator i=items_down.begin(); i!=items_down.end(); i++) {
         SPItem *item_down = *i;
+        Geom::OptRect bbox_down = item_down->documentVisualBounds();
+        width = bbox_down->width();
+        height = bbox_down->height();
+        double bbox_left = bbox_down->left();
+        double bbox_top = bbox_down->top();
         gchar const * item_down_sharp = g_strdup_printf("#%s", item_down->getId());
         for (std::vector<SPItem*>::const_iterator j=items_selected.begin(); j!=items_selected.end(); j++) {
             SPItem *item_selected = *j;
@@ -415,27 +436,56 @@ static bool fit_item(SPDesktop *desktop,
                 spray_origin = item_selected->getAttribute("inkscape:spray-origin");
             }
             if(strcmp(item_down_sharp, spray_origin) == 0 ||
-              (item_down->getAttribute("inkscape:spray-origin") && 
-               strcmp(item_down->getAttribute("inkscape:spray-origin"),spray_origin) == 0 ))
+                (item_down->getAttribute("inkscape:spray-origin") && 
+                strcmp(item_down->getAttribute("inkscape:spray-origin"),spray_origin) == 0 ))
             {
-                return false;
+                if(overlap){
+                    if(!(offset_min < 0 && std::abs(bbox_left - bbox_left_main) > std::abs(offset_min) && 
+                std::abs(bbox_top - bbox_top_main) > std::abs(offset_min))){
+                        return false;
+                    }
+                } else if(picker){
+                    item_down->setHidden(true);
+                    item_down->updateRepr();
+                }
             }
         }
     }
     if(picker){
-        Geom::IntRect area = Geom::IntRect::from_xywh(floor(desktop->d2w(bbox->midpoint())[Geom::X]), floor(desktop->d2w(bbox->midpoint())[Geom::Y]), 1, 1);
+        if(!overlap){
+            doc->ensureUpToDate();
+        }
+        Geom::Point mid_point = bbox->midpoint();
+        Geom::IntRect area = Geom::IntRect::from_xywh(floor(desktop->d2w(mid_point)[Geom::X]), floor(desktop->d2w(mid_point)[Geom::Y]), 1, 1);
         double R = 0, G = 0, B = 0, A = 0;
         cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 1, 1);
         sp_canvas_arena_render_surface(SP_CANVAS_ARENA(desktop->getDrawing()), s, area);
         ink_cairo_surface_average_color_premul(s, R, G, B, A);
         cairo_surface_destroy(s);
+        if (fabs(A) < 1e-4) {
+            A = 0; // suppress exponentials, CSS does not allow that
+        }
+        if (A > 0) {
+            R /= A;
+            G /= A;
+            B /= A;
+        }
         guint32 c32 = SP_RGBA32_F_COMPOSE(R, G, B, A);
         gchar c[64];
         sp_svg_write_color(c, sizeof(c), c32);
         sp_repr_css_set_property(css, "fill", c);
-        gchar const * fill_opacity = g_strdup_printf("%f", A);
-        sp_repr_css_set_property(css, "fill-opacity", fill_opacity);
-        if(R == 1 && G == 1 && B == 1 && A == 0){
+        std::stringstream fill_opacity;
+        fill_opacity.imbue(std::locale::classic());
+        fill_opacity << float(A);
+        sp_repr_css_set_property(css, "fill-opacity", fill_opacity.str().c_str());
+        if(!overlap){
+            for (std::vector<SPItem *>::const_iterator k=items_down.begin(); k!=items_down.end(); k++) {
+                SPItem *item_hidden = *k;
+                item_hidden->setHidden(false);
+                item_hidden->updateRepr();
+            }
+        }
+        if(A == 0){
             return false;
         }
     }
@@ -497,8 +547,8 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point center = item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
-                if(overlap){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, offset, css)){
+                if(overlap || picker){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, overlap, offset, css)){
                          limit += 1;
                          //Limit recursion to 10 levels
                          //Seems enough to chech if there is place to put new copie
@@ -631,8 +681,8 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point center=item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
-                if(overlap){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, offset, css)){
+                if(overlap || picker){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, overlap, offset, css)){
                          limit += 1;
                          if(limit < 11){
                              return sp_spray_recursive(desktop,
-- 
cgit v1.2.3


From 18dd2576ee9fa17b4d8d31f6d6e4150e4e92caac Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 27 Oct 2015 20:45:58 +0100
Subject: little tweak

(bzr r14422.1.19)
---
 src/ui/tools/spray-tool.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 25e9dbd73..269afbbbf 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -455,8 +455,8 @@ static bool fit_item(SPDesktop *desktop,
         if(!overlap){
             doc->ensureUpToDate();
         }
-        Geom::Point mid_point = bbox->midpoint();
-        Geom::IntRect area = Geom::IntRect::from_xywh(floor(desktop->d2w(mid_point)[Geom::X]), floor(desktop->d2w(mid_point)[Geom::Y]), 1, 1);
+        Geom::Point mid_point = desktop->d2w(bbox->midpoint());
+        Geom::IntRect area = Geom::IntRect::from_xywh(floor(mid_point[Geom::X]), floor(mid_point[Geom::Y]), 1, 1);
         double R = 0, G = 0, B = 0, A = 0;
         cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 1, 1);
         sp_canvas_arena_render_surface(SP_CANVAS_ARENA(desktop->getDrawing()), s, area);
-- 
cgit v1.2.3


From db7f8af5407653016d6b2847f779ce59f568cdaa Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 28 Oct 2015 18:43:39 +0100
Subject: Fix the problems on transformed layers

(bzr r14422.1.20)
---
 src/ui/tools/spray-tool.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 269afbbbf..fd7c99d91 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -355,7 +355,7 @@ static void random_position(double &radius, double &angle, double &a, double &s,
 
 static void sp_spray_transform_path(SPItem * item, Geom::Path &path, Geom::Affine affine, Geom::Point center){
     SPDocument *doc = item->document;
-    path *= doc->getRoot()->c2p.inverse();
+    path *= i2anc_affine(static_cast<SPItem *>(item->parent), NULL).inverse();
     path *= item->transform.inverse();
     Geom::Affine dt2p;
     if (item->parent) {
@@ -366,7 +366,7 @@ static void sp_spray_transform_path(SPItem * item, Geom::Path &path, Geom::Affin
     }
     Geom::Affine i2dt = item->i2dt_affine() * Geom::Translate(center).inverse() * affine * Geom::Translate(center);
     path *= i2dt * dt2p;
-    path *= doc->getRoot()->c2p;
+    path *= i2anc_affine(static_cast<SPItem *>(item->parent), NULL);
 }
 
 static bool fit_item(SPDesktop *desktop,
-- 
cgit v1.2.3


From 598dbc9628a3f31e877a4848896b9d0421683106 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 28 Oct 2015 19:09:21 +0100
Subject: add a ignore transparent areas option

(bzr r14422.1.21)
---
 src/ui/tools/spray-tool.cpp | 49 +++++++++++++++++++++++++++------------------
 src/ui/tools/spray-tool.h   |  1 +
 2 files changed, 30 insertions(+), 20 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index fd7c99d91..e1c5b36b2 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -162,6 +162,7 @@ SprayTool::SprayTool()
     , dilate_area(NULL)
     , overlap(false)
     , picker(false)
+    , visible(false)
     , offset(0)
 {
 }
@@ -237,6 +238,7 @@ void SprayTool::setup() {
     sp_event_context_read(this, "Scale");
     sp_event_context_read(this, "offset");
     sp_event_context_read(this, "picker");
+    sp_event_context_read(this, "visible");
     sp_event_context_read(this, "overlap");
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -279,6 +281,8 @@ void SprayTool::set(const Inkscape::Preferences::Entry& val) {
         this->offset = CLAMP(val.getDouble(), -1000.0, 1000.0);
     } else if (path == "picker") {
         this->picker =  val.getBool();
+    } else if (path == "visible") {
+        this->visible =  val.getBool();
     } else if (path == "overlap") {
         this->overlap = val.getBool();
     }
@@ -354,7 +358,6 @@ static void random_position(double &radius, double &angle, double &a, double &s,
 }
 
 static void sp_spray_transform_path(SPItem * item, Geom::Path &path, Geom::Affine affine, Geom::Point center){
-    SPDocument *doc = item->document;
     path *= i2anc_affine(static_cast<SPItem *>(item->parent), NULL).inverse();
     path *= item->transform.inverse();
     Geom::Affine dt2p;
@@ -378,6 +381,7 @@ static bool fit_item(SPDesktop *desktop,
                      double _scale,
                      double scale,
                      bool picker,
+                     bool visible,
                      bool overlap,
                      double offset,
                      SPCSSAttr *css)
@@ -444,14 +448,14 @@ static bool fit_item(SPDesktop *desktop,
                 std::abs(bbox_top - bbox_top_main) > std::abs(offset_min))){
                         return false;
                     }
-                } else if(picker){
+                } else if(picker || visible){
                     item_down->setHidden(true);
                     item_down->updateRepr();
                 }
             }
         }
     }
-    if(picker){
+    if(picker || visible){
         if(!overlap){
             doc->ensureUpToDate();
         }
@@ -465,19 +469,21 @@ static bool fit_item(SPDesktop *desktop,
         if (fabs(A) < 1e-4) {
             A = 0; // suppress exponentials, CSS does not allow that
         }
-        if (A > 0) {
-            R /= A;
-            G /= A;
-            B /= A;
+        if(picker){
+            if (A > 0) {
+                R /= A;
+                G /= A;
+                B /= A;
+            }
+            guint32 c32 = SP_RGBA32_F_COMPOSE(R, G, B, A);
+            gchar c[64];
+            sp_svg_write_color(c, sizeof(c), c32);
+            sp_repr_css_set_property(css, "fill", c);
+            std::stringstream fill_opacity;
+            fill_opacity.imbue(std::locale::classic());
+            fill_opacity << float(A);
+            sp_repr_css_set_property(css, "fill-opacity", fill_opacity.str().c_str());
         }
-        guint32 c32 = SP_RGBA32_F_COMPOSE(R, G, B, A);
-        gchar c[64];
-        sp_svg_write_color(c, sizeof(c), c32);
-        sp_repr_css_set_property(css, "fill", c);
-        std::stringstream fill_opacity;
-        fill_opacity.imbue(std::locale::classic());
-        fill_opacity << float(A);
-        sp_repr_css_set_property(css, "fill-opacity", fill_opacity.str().c_str());
         if(!overlap){
             for (std::vector<SPItem *>::const_iterator k=items_down.begin(); k!=items_down.end(); k++) {
                 SPItem *item_hidden = *k;
@@ -511,6 +517,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                gint _distrib,
                                bool overlap,
                                bool picker,
+                               bool visible,
                                double offset,
                                size_t &limit)
 {
@@ -547,8 +554,8 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point center = item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
-                if(overlap || picker){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, overlap, offset, css)){
+                if(overlap || picker || visible){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, visible, overlap, offset, css)){
                          limit += 1;
                          //Limit recursion to 10 levels
                          //Seems enough to chech if there is place to put new copie
@@ -572,6 +579,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                    _distrib,
                                    overlap,
                                    picker,
+                                   visible,
                                    offset,
                                    limit);
                          } else {
@@ -681,8 +689,8 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point center=item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
-                if(overlap || picker){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, overlap, offset, css)){
+                if(overlap || picker || visible){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, visible, overlap, offset, css)){
                          limit += 1;
                          if(limit < 11){
                              return sp_spray_recursive(desktop,
@@ -704,6 +712,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                    _distrib,
                                    overlap,
                                    picker,
+                                   visible,
                                    offset,
                                    limit);
                          } else {
@@ -786,7 +795,7 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
             SPItem *item = *i;
             g_assert(item != NULL);
             size_t limit = 0;
-            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->overlap,tc->picker, tc->offset, limit)) {
+            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->overlap, tc->picker, tc->visible, tc->offset, limit)) {
                 did = true;
             }
         }
diff --git a/src/ui/tools/spray-tool.h b/src/ui/tools/spray-tool.h
index f65e0a223..8f000e095 100644
--- a/src/ui/tools/spray-tool.h
+++ b/src/ui/tools/spray-tool.h
@@ -89,6 +89,7 @@ public:
     SPCanvasItem *dilate_area;
     bool overlap;
     bool picker;
+    bool visible;
     double offset;
     sigc::connection style_set_connection;
 
-- 
cgit v1.2.3


From b0541736ec1d94e0c3db41c5dae5a11fefa65989 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 28 Oct 2015 20:12:17 +0100
Subject: Improvement to the css stored on change colors

(bzr r14422.1.22)
---
 src/ui/tools/spray-tool.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index e1c5b36b2..41e209cc1 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -553,7 +553,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 }
                 Geom::Point center = item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
-                SPCSSAttr *css = sp_repr_css_attr_new();
+                SPCSSAttr *css = sp_repr_css_attr(item->getRepr(), "style");
                 if(overlap || picker || visible){
                     if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, visible, overlap, offset, css)){
                          limit += 1;
@@ -688,7 +688,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 }
                 Geom::Point center=item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
-                SPCSSAttr *css = sp_repr_css_attr_new();
+                SPCSSAttr *css = sp_repr_css_attr(item->getRepr(), "style");
                 if(overlap || picker || visible){
                     if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, visible, overlap, offset, css)){
                          limit += 1;
-- 
cgit v1.2.3


From eb0dca3297aed737b3c0fdae7473413da9204346 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 28 Oct 2015 21:23:02 +0100
Subject: Increase recursion levels

(bzr r14422.1.23)
---
 src/ui/tools/spray-tool.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 41e209cc1..6376f1e19 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -559,7 +559,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                          limit += 1;
                          //Limit recursion to 10 levels
                          //Seems enough to chech if there is place to put new copie
-                         if(limit < 11){
+                         if(limit < 21){
                              return sp_spray_recursive(desktop,
                                    selection,
                                    item,
@@ -692,7 +692,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 if(overlap || picker || visible){
                     if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, visible, overlap, offset, css)){
                          limit += 1;
-                         if(limit < 11){
+                         if(limit < 21){
                              return sp_spray_recursive(desktop,
                                    selection,
                                    item,
-- 
cgit v1.2.3


From f0c7823bd854087fcd2989d205a178d9deea1a9a Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 28 Oct 2015 23:14:01 +0100
Subject: Fix a regression updating CSS data

(bzr r14422.1.24)
---
 src/ui/tools/spray-tool.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 6376f1e19..f64e56a5b 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -553,7 +553,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 }
                 Geom::Point center = item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
-                SPCSSAttr *css = sp_repr_css_attr(item->getRepr(), "style");
+                SPCSSAttr *css = sp_repr_css_attr_new();
                 if(overlap || picker || visible){
                     if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, visible, overlap, offset, css)){
                          limit += 1;
@@ -688,7 +688,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 }
                 Geom::Point center=item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
-                SPCSSAttr *css = sp_repr_css_attr(item->getRepr(), "style");
+                SPCSSAttr *css = sp_repr_css_attr_new();
                 if(overlap || picker || visible){
                     if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, visible, overlap, offset, css)){
                          limit += 1;
-- 
cgit v1.2.3


From 6a0b7c70e7e07839551be32aba63ae4a6badee81 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Thu, 29 Oct 2015 02:37:02 +0100
Subject: Removed recursion from code because no speed improvements Added swith
 to 100 on toogle no overlap button pointed by Mc. Fixed crash pointed by Mc
 selecting all+no overlap+click

(bzr r14422.1.25)
---
 src/ui/tools/spray-tool.cpp | 66 ++++-----------------------------------------
 1 file changed, 5 insertions(+), 61 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index f64e56a5b..29bfe1641 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -434,7 +434,7 @@ static bool fit_item(SPDesktop *desktop,
         for (std::vector<SPItem*>::const_iterator j=items_selected.begin(); j!=items_selected.end(); j++) {
             SPItem *item_selected = *j;
             gchar const * spray_origin;
-            if(!item->getAttribute("inkscape:spray-origin")){
+            if(!item_selected->getAttribute("inkscape:spray-origin")){
                 spray_origin = g_strdup_printf("#%s", item_selected->getId());
             } else {
                 spray_origin = item_selected->getAttribute("inkscape:spray-origin");
@@ -518,8 +518,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                bool overlap,
                                bool picker,
                                bool visible,
-                               double offset,
-                               size_t &limit)
+                               double offset)
 {
     bool did = false;
 
@@ -556,35 +555,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 SPCSSAttr *css = sp_repr_css_attr_new();
                 if(overlap || picker || visible){
                     if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, visible, overlap, offset, css)){
-                         limit += 1;
-                         //Limit recursion to 10 levels
-                         //Seems enough to chech if there is place to put new copie
-                         if(limit < 21){
-                             return sp_spray_recursive(desktop,
-                                   selection,
-                                   item,
-                                   p,
-                                   Geom::Point(),
-                                   mode,
-                                   radius,
-                                   population,
-                                   scale,
-                                   scale_variation,
-                                   false,
-                                   mean,
-                                   standard_deviation,
-                                   ratio,
-                                   tilt,
-                                   rotation_variation,
-                                   _distrib,
-                                   overlap,
-                                   picker,
-                                   visible,
-                                   offset,
-                                   limit);
-                         } else {
-                            return false;
-                         }
+                        return false;
                     }
                 }
                 SPItem *item_copied;
@@ -691,33 +662,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 SPCSSAttr *css = sp_repr_css_attr_new();
                 if(overlap || picker || visible){
                     if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, visible, overlap, offset, css)){
-                         limit += 1;
-                         if(limit < 21){
-                             return sp_spray_recursive(desktop,
-                                   selection,
-                                   item,
-                                   p,
-                                   Geom::Point(),
-                                   mode,
-                                   radius,
-                                   population,
-                                   scale,
-                                   scale_variation,
-                                   false,
-                                   mean,
-                                   standard_deviation,
-                                   ratio,
-                                   tilt,
-                                   rotation_variation,
-                                   _distrib,
-                                   overlap,
-                                   picker,
-                                   visible,
-                                   offset,
-                                   limit);
-                         } else {
-                            return false;
-                         }
+                        return false;
                     }
                 }
                 SPItem *item_copied;
@@ -794,8 +739,7 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
         for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
             SPItem *item = *i;
             g_assert(item != NULL);
-            size_t limit = 0;
-            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->overlap, tc->picker, tc->visible, tc->offset, limit)) {
+            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->overlap, tc->picker, tc->visible, tc->offset)) {
                 did = true;
             }
         }
-- 
cgit v1.2.3


From 109427b9ee5b74661b6bb2d5eb9efcc83d1a1082 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Fri, 30 Oct 2015 01:38:22 +0100
Subject: Add optional presure to width and to size Start showing trace dialog

(bzr r14422.1.27)
---
 src/ui/dialog/clonetiler.cpp | 11 +++++++----
 src/ui/tools/spray-tool.cpp  | 43 +++++++++++++++++++++++++++++++++++--------
 src/ui/tools/spray-tool.h    |  4 +++-
 3 files changed, 45 insertions(+), 13 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index da1c6d9fb..0b1d0ecf2 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -85,7 +85,7 @@ CloneTiler::CloneTiler () :
 {
     Gtk::Box *contents = _getContents();
     contents->set_spacing(0);
-
+    
     {
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
@@ -777,7 +777,6 @@ CloneTiler::CloneTiler () :
         {
             GtkWidget *vb = clonetiler_new_tab (nb, _("_Trace"));
 
-
         {
 #if GTK_CHECK_VERSION(3,0,0)
             GtkWidget *hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VB_MARGIN);
@@ -787,7 +786,12 @@ CloneTiler::CloneTiler () :
 #endif
             gtk_box_pack_start (GTK_BOX (vb), hb, FALSE, FALSE, 0);
 
-            GtkWidget *b  = gtk_check_button_new_with_label (_("Trace the drawing under the tiles"));
+            Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+            if(prefs->getBool("/dialogs/clonetiler/opentrace", false)){
+                gtk_notebook_set_current_page (GTK_NOTEBOOK(nb),5);
+            }
+
+            GtkWidget *b  = gtk_check_button_new_with_label (_("Trace the drawing under the tiles/spray tool"));
             g_object_set_data (G_OBJECT(b), "uncheckable", GINT_TO_POINTER(TRUE));
             bool old = prefs->getBool(prefs_path + "dotrace");
             gtk_toggle_button_set_active ((GtkToggleButton *) b, old);
@@ -1289,7 +1293,6 @@ CloneTiler::CloneTiler () :
         }
 
         gtk_widget_show_all (mainbox);
-
     }
 
     show_all();
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 29bfe1641..e78f5787e 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -142,7 +142,9 @@ SprayTool::SprayTool()
     : ToolBase(cursor_spray_xpm, 4, 4, false)
     , pressure(TC_DEFAULT_PRESSURE)
     , dragging(false)
-    , usepressure(false)
+    , usepressurewidth(false)
+    , usepressurepopulation(false)
+    , usepressurescale(false)
     , usetilt(false)
     , usetext(false)
     , width(0.2)
@@ -234,7 +236,9 @@ void SprayTool::setup() {
     sp_event_context_read(this, "population");
     sp_event_context_read(this, "mean");
     sp_event_context_read(this, "standard_deviation");
-    sp_event_context_read(this, "usepressure");
+    sp_event_context_read(this, "usepressurewidth");
+    sp_event_context_read(this, "usepressurepopulation");
+    sp_event_context_read(this, "usepressurescale");
     sp_event_context_read(this, "Scale");
     sp_event_context_read(this, "offset");
     sp_event_context_read(this, "picker");
@@ -258,8 +262,12 @@ void SprayTool::set(const Inkscape::Preferences::Entry& val) {
         this->update_cursor(false);
     } else if (path == "width") {
         this->width = 0.01 * CLAMP(val.getInt(10), 1, 100);
-    } else if (path == "usepressure") {
-        this->usepressure = val.getBool();
+    } else if (path == "usepressurewidth") {
+        this->usepressurewidth = val.getBool();
+    } else if (path == "usepressurepopulation") {
+        this->usepressurepopulation = val.getBool();
+    } else if (path == "usepressurescale") {
+        this->usepressurescale = val.getBool();
     } else if (path == "population") {
         this->population = 0.01 * CLAMP(val.getInt(10), 1, 100);
     } else if (path == "rotation_variation") {
@@ -297,9 +305,16 @@ static void sp_spray_extinput(SprayTool *tc, GdkEvent *event)
     }
 }
 
+static double get_width(SprayTool *tc)
+{
+    double pressure = (tc->usepressurewidth? tc->pressure / TC_DEFAULT_PRESSURE : 1);
+    //g_warning("Pressure, population: %f, %f", pressure, pressure * tc->population);
+    return pressure * tc->width;
+}
+
 static double get_dilate_radius(SprayTool *tc)
 {
-    return 250 * tc->width/SP_EVENT_CONTEXT(tc)->desktop->current_zoom();
+    return 250 * get_width(tc)/SP_EVENT_CONTEXT(tc)->desktop->current_zoom();
 }
 
 static double get_path_mean(SprayTool *tc)
@@ -314,11 +329,18 @@ static double get_path_standard_deviation(SprayTool *tc)
 
 static double get_population(SprayTool *tc)
 {
-    double pressure = (tc->usepressure? tc->pressure / TC_DEFAULT_PRESSURE : 1);
+    double pressure = (tc->usepressurepopulation? tc->pressure / TC_DEFAULT_PRESSURE : 1);
     //g_warning("Pressure, population: %f, %f", pressure, pressure * tc->population);
     return pressure * tc->population;
 }
 
+static double get_pressure(SprayTool *tc)
+{
+    double pressure = (tc->usepressurepopulation? tc->pressure / TC_DEFAULT_PRESSURE : 1);
+    //g_warning("Pressure, population: %f, %f", pressure, pressure * tc->population);
+    return pressure;
+}
+
 static double get_move_mean(SprayTool *tc)
 {
     return tc->mean;
@@ -518,7 +540,9 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                bool overlap,
                                bool picker,
                                bool visible,
-                               double offset)
+                               double offset,
+                               bool usepressurescale,
+                               double pressure)
 {
     bool did = false;
 
@@ -534,6 +558,9 @@ static bool sp_spray_recursive(SPDesktop *desktop,
     double _fid = g_random_double_range(0, 1);
     double angle = g_random_double_range( - rotation_variation / 100.0 * M_PI , rotation_variation / 100.0 * M_PI );
     double _scale = g_random_double_range( 1.0 - scale_variation / 100.0, 1.0 + scale_variation / 100.0 );
+    if(usepressurescale){
+        _scale = pressure * 2.0;
+    }
     double dr; double dp;
     random_position( dr, dp, mean, standard_deviation, _distrib );
     dr=dr*radius;
@@ -739,7 +766,7 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
         for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
             SPItem *item = *i;
             g_assert(item != NULL);
-            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->overlap, tc->picker, tc->visible, tc->offset)) {
+            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->overlap, tc->picker, tc->visible, tc->offset, tc->usepressurescale, get_pressure(tc))) {
                 did = true;
             }
         }
diff --git a/src/ui/tools/spray-tool.h b/src/ui/tools/spray-tool.h
index 8f000e095..112ab77e9 100644
--- a/src/ui/tools/spray-tool.h
+++ b/src/ui/tools/spray-tool.h
@@ -63,7 +63,9 @@ public:
 
     /* attributes */
     bool dragging;           /* mouse state: mouse is dragging */
-    bool usepressure;
+    bool usepressurewidth;
+    bool usepressurepopulation;
+    bool usepressurescale;
     bool usetilt;
     bool usetext;
 
-- 
cgit v1.2.3


From 670abe866479007812bdd5c5b29eff5116e06c8a Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Fri, 30 Oct 2015 11:58:17 +0100
Subject: Some fixes to new pressure options

(bzr r14422.1.29)
---
 src/ui/tools/spray-tool.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index e78f5787e..a763e50a7 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -336,7 +336,7 @@ static double get_population(SprayTool *tc)
 
 static double get_pressure(SprayTool *tc)
 {
-    double pressure = (tc->usepressurepopulation? tc->pressure / TC_DEFAULT_PRESSURE : 1);
+    double pressure = tc->pressure / TC_DEFAULT_PRESSURE;
     //g_warning("Pressure, population: %f, %f", pressure, pressure * tc->population);
     return pressure;
 }
@@ -559,7 +559,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
     double angle = g_random_double_range( - rotation_variation / 100.0 * M_PI , rotation_variation / 100.0 * M_PI );
     double _scale = g_random_double_range( 1.0 - scale_variation / 100.0, 1.0 + scale_variation / 100.0 );
     if(usepressurescale){
-        _scale = pressure * 2.0;
+        _scale = pressure;
     }
     double dr; double dp;
     random_position( dr, dp, mean, standard_deviation, _distrib );
-- 
cgit v1.2.3


From 0798ff4618d8e961cab364fdf827993c18aa69ac Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Fri, 30 Oct 2015 17:45:39 +0100
Subject: Open trace dialog on click on pick toogle

(bzr r14422.1.30)
---
 src/ui/dialog/clonetiler.cpp | 14 ++++++++++----
 src/ui/dialog/clonetiler.h   |  4 +++-
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index 0b1d0ecf2..266d61ed5 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -101,7 +101,7 @@ CloneTiler::CloneTiler () :
 
         contents->pack_start (*Gtk::manage(Glib::wrap(mainbox)), true, true, 0);
 
-        GtkWidget *nb = gtk_notebook_new ();
+        nb = gtk_notebook_new ();
         gtk_box_pack_start (GTK_BOX (mainbox), nb, FALSE, FALSE, 0);
 
 
@@ -776,7 +776,6 @@ CloneTiler::CloneTiler () :
         // Trace
         {
             GtkWidget *vb = clonetiler_new_tab (nb, _("_Trace"));
-
         {
 #if GTK_CHECK_VERSION(3,0,0)
             GtkWidget *hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VB_MARGIN);
@@ -791,11 +790,11 @@ CloneTiler::CloneTiler () :
                 gtk_notebook_set_current_page (GTK_NOTEBOOK(nb),5);
             }
 
-            GtkWidget *b  = gtk_check_button_new_with_label (_("Trace the drawing under the tiles/spray tool"));
+            b  = gtk_check_button_new_with_label (_("Trace the drawing under the tiles/spray tool"));
             g_object_set_data (G_OBJECT(b), "uncheckable", GINT_TO_POINTER(TRUE));
             bool old = prefs->getBool(prefs_path + "dotrace");
             gtk_toggle_button_set_active ((GtkToggleButton *) b, old);
-            gtk_widget_set_tooltip_text (b, _("For each clone, pick a value from the drawing in that clone's location and apply it to the clone"));
+            gtk_widget_set_tooltip_text (b, _("For each clone/ Sprayed item, pick a value from the drawing in that clone's or item spayed location and apply it"));
             gtk_box_pack_start (GTK_BOX (hb), b, FALSE, FALSE, 0);
 
             g_signal_connect(G_OBJECT(b), "toggled",
@@ -3008,6 +3007,13 @@ void CloneTiler::clonetiler_do_pick_toggled(GtkToggleButton *tb, GtkWidget *dlg)
     }
 }
 
+void CloneTiler::show_page_trace()
+{
+    gtk_notebook_set_current_page(GTK_NOTEBOOK(nb),6);
+    gtk_toggle_button_set_active ((GtkToggleButton *) b, true);
+}
+
+
 }
 }
 }
diff --git a/src/ui/dialog/clonetiler.h b/src/ui/dialog/clonetiler.h
index e5f5638b2..a8f1df0a0 100644
--- a/src/ui/dialog/clonetiler.h
+++ b/src/ui/dialog/clonetiler.h
@@ -31,7 +31,7 @@ public:
     virtual ~CloneTiler();
 
     static CloneTiler &getInstance() { return *new CloneTiler(); }
-
+    void show_page_trace();
 protected:
 
     GtkWidget * clonetiler_new_tab(GtkWidget *nb, const gchar *label);
@@ -113,6 +113,8 @@ private:
     CloneTiler& operator=(CloneTiler const &d);
 
     GtkWidget *dlg;
+    GtkWidget *nb;
+    GtkWidget *b;
     SPDesktop *desktop;
     DesktopTracker deskTrack;
     Inkscape::UI::Widget::ColorPicker *color_picker;
-- 
cgit v1.2.3


From 2b4566e6d203b6b3cf90bca23b7de48f576cc361 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Fri, 30 Oct 2015 19:45:10 +0100
Subject: Now picker use all features of trace clones

(bzr r14422.1.31)
---
 src/ui/tools/spray-tool.cpp | 218 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 176 insertions(+), 42 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index a763e50a7..d0ea62caa 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -97,6 +97,17 @@ namespace Inkscape {
 namespace UI {
 namespace Tools {
 
+enum {
+    PICK_COLOR,
+    PICK_OPACITY,
+    PICK_R,
+    PICK_G,
+    PICK_B,
+    PICK_H,
+    PICK_S,
+    PICK_L
+};
+
 const std::string& SprayTool::getPrefsPath() {
     return SprayTool::prefsPath;
 }
@@ -164,7 +175,6 @@ SprayTool::SprayTool()
     , dilate_area(NULL)
     , overlap(false)
     , picker(false)
-    , visible(false)
     , offset(0)
 {
 }
@@ -242,7 +252,6 @@ void SprayTool::setup() {
     sp_event_context_read(this, "Scale");
     sp_event_context_read(this, "offset");
     sp_event_context_read(this, "picker");
-    sp_event_context_read(this, "visible");
     sp_event_context_read(this, "overlap");
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -289,8 +298,6 @@ void SprayTool::set(const Inkscape::Preferences::Entry& val) {
         this->offset = CLAMP(val.getDouble(), -1000.0, 1000.0);
     } else if (path == "picker") {
         this->picker =  val.getBool();
-    } else if (path == "visible") {
-        this->visible =  val.getBool();
     } else if (path == "overlap") {
         this->overlap = val.getBool();
     }
@@ -394,19 +401,33 @@ static void sp_spray_transform_path(SPItem * item, Geom::Path &path, Geom::Affin
     path *= i2anc_affine(static_cast<SPItem *>(item->parent), NULL);
 }
 
+/**
+Randomizes \a val by \a rand, with 0 < val < 1 and all values (including 0, 1) having the same
+probability of being displaced.
+ */
+double randomize01(double val, double rand)
+{
+    double base = MIN (val - rand, 1 - 2*rand);
+    if (base < 0) {
+        base = 0;
+    }
+    val = base + g_random_double_range (0, MIN (2 * rand, 1 - base));
+    return CLAMP(val, 0, 1); // this should be unnecessary with the above provisions, but just in case...
+}
+
 static bool fit_item(SPDesktop *desktop,
                      SPItem *item,
                      Geom::OptRect bbox,
                      Geom::Point move,
                      Geom::Point center,
                      double angle,
-                     double _scale,
+                     double &_scale,
                      double scale,
                      bool picker,
-                     bool visible,
                      bool overlap,
                      double offset,
-                     SPCSSAttr *css)
+                     SPCSSAttr *css,
+                     bool trace_scale)
 {
     SPDocument *doc = item->document;
     double width = bbox->width();
@@ -416,30 +437,30 @@ static bool fit_item(SPDesktop *desktop,
     if(offset_min < 0 ){
         offset_min = 0;
     }
-    bbox = Geom::Rect(Geom::Point(bbox->left() - offset_min, bbox->top() - offset_min),Geom::Point(bbox->right() + offset_min, bbox->bottom() + offset_min));
+    Geom::OptRect bbox_procesed = Geom::Rect(Geom::Point(bbox->left() - offset_min, bbox->top() - offset_min),Geom::Point(bbox->right() + offset_min, bbox->bottom() + offset_min));
     Geom::Path path;
-    path.start(Geom::Point(bbox->left(), bbox->top()));
-    path.appendNew<Geom::LineSegment>(Geom::Point(bbox->right(), bbox->top()));
-    path.appendNew<Geom::LineSegment>(Geom::Point(bbox->right(), bbox->bottom()));
-    path.appendNew<Geom::LineSegment>(Geom::Point(bbox->left(), bbox->bottom()));
+    path.start(Geom::Point(bbox_procesed->left(), bbox_procesed->top()));
+    path.appendNew<Geom::LineSegment>(Geom::Point(bbox_procesed->right(), bbox_procesed->top()));
+    path.appendNew<Geom::LineSegment>(Geom::Point(bbox_procesed->right(), bbox_procesed->bottom()));
+    path.appendNew<Geom::LineSegment>(Geom::Point(bbox_procesed->left(), bbox_procesed->bottom()));
     path.close(true);
     sp_spray_transform_path(item, path, Geom::Scale(_scale), center);
     sp_spray_transform_path(item, path, Geom::Scale(scale), center);
     sp_spray_transform_path(item, path, Geom::Rotate(angle), center);
     path *= Geom::Translate(move[Geom::X], move[Geom::Y]);
     path *= desktop->doc2dt();
-    bbox = path.boundsFast();
-    double bbox_left_main = bbox->left();
-    double bbox_top_main = bbox->top();
-    double width_transformed = bbox->width();
-    double height_transformed = bbox->height();
+    bbox_procesed = path.boundsFast();
+    double bbox_left_main = bbox_procesed->left();
+    double bbox_top_main = bbox_procesed->top();
+    double width_transformed = bbox_procesed->width();
+    double height_transformed = bbox_procesed->height();
     size = std::min(width_transformed,height_transformed);
     if(offset < 100 ){
         offset_min = ((99.0 - offset) * size)/100.0 - size;
     } else {
         offset_min = 0;
     }
-    std::vector<SPItem*> items_down = desktop->getDocument()->getItemsPartiallyInBox(desktop->dkey, *bbox);
+    std::vector<SPItem*> items_down = desktop->getDocument()->getItemsPartiallyInBox(desktop->dkey, *bbox_procesed);
     Inkscape::Selection *selection = desktop->getSelection();
     if (selection->isEmpty()) {
         return false;
@@ -470,18 +491,29 @@ static bool fit_item(SPDesktop *desktop,
                 std::abs(bbox_top - bbox_top_main) > std::abs(offset_min))){
                         return false;
                     }
-                } else if(picker || visible){
+                } else if(picker){
                     item_down->setHidden(true);
                     item_down->updateRepr();
                 }
             }
         }
     }
-    if(picker || visible){
+    if(picker){
+        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         if(!overlap){
             doc->ensureUpToDate();
         }
-        Geom::Point mid_point = desktop->d2w(bbox->midpoint());
+        int    pick = prefs->getInt("/dialogs/clonetiler/pick");
+        bool   pick_to_presence = prefs->getBool("/dialogs/clonetiler/pick_to_presence");
+        bool   pick_to_size = prefs->getBool("/dialogs/clonetiler/pick_to_size");
+        bool   pick_to_color = prefs->getBool("/dialogs/clonetiler/pick_to_color");
+        bool   pick_to_opacity = prefs->getBool("/dialogs/clonetiler/pick_to_opacity");
+        double rand_picked = 0.01 * prefs->getDoubleLimited("/dialogs/clonetiler/rand_picked", 0, 0, 100);
+        bool   invert_picked = prefs->getBool("/dialogs/clonetiler/invert_picked");
+        double gamma_picked = prefs->getDoubleLimited("/dialogs/clonetiler/gamma_picked", 0, -10, 10);
+        double opacity = 1.0;
+        gchar color_string[32]; *color_string = 0;
+        Geom::Point mid_point = desktop->d2w(bbox_procesed->midpoint());
         Geom::IntRect area = Geom::IntRect::from_xywh(floor(mid_point[Geom::X]), floor(mid_point[Geom::Y]), 1, 1);
         double R = 0, G = 0, B = 0, A = 0;
         cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 1, 1);
@@ -491,20 +523,126 @@ static bool fit_item(SPDesktop *desktop,
         if (fabs(A) < 1e-4) {
             A = 0; // suppress exponentials, CSS does not allow that
         }
+        if(A == 0 && R == 0 && G == 0 && B == 0){
+            R = 1;
+            G = 1;
+            B = 1;
+        }
         if(picker){
-            if (A > 0) {
-                R /= A;
-                G /= A;
-                B /= A;
+//            if (A > 0) {
+//                R /= A;
+//                G /= A;
+//                B /= A;
+//            }
+            guint32 rgba = SP_RGBA32_F_COMPOSE(R, G, B, A);
+            float r = SP_RGBA32_R_F(rgba);
+            float g = SP_RGBA32_G_F(rgba);
+            float b = SP_RGBA32_B_F(rgba);
+            float a = SP_RGBA32_A_F(rgba);
+
+            float hsl[3];
+            sp_color_rgb_to_hsl_floatv (hsl, r, g, b);
+
+            gdouble val = 0;
+            switch (pick) {
+            case PICK_COLOR:
+                val = 1 - hsl[2]; // inverse lightness; to match other picks where black = max
+                break;
+            case PICK_OPACITY:
+                val = a;
+                break;
+            case PICK_R:
+                val = r;
+                break;
+            case PICK_G:
+                val = g;
+                break;
+            case PICK_B:
+                val = b;
+                break;
+            case PICK_H:
+                val = hsl[0];
+                break;
+            case PICK_S:
+                val = hsl[1];
+                break;
+            case PICK_L:
+                val = 1 - hsl[2];
+                break;
+            default:
+                break;
+            }
+
+            if (rand_picked > 0) {
+                val = randomize01 (val, rand_picked);
+                r = randomize01 (r, rand_picked);
+                g = randomize01 (g, rand_picked);
+                b = randomize01 (b, rand_picked);
+            }
+
+            if (gamma_picked != 0) {
+                double power;
+                if (gamma_picked > 0)
+                    power = 1/(1 + fabs(gamma_picked));
+                else
+                    power = 1 + fabs(gamma_picked);
+
+                val = pow (val, power);
+                r = pow (r, power);
+                g = pow (g, power);
+                b = pow (b, power);
+            }
+
+            if (invert_picked) {
+                val = 1 - val;
+                r = 1 - r;
+                g = 1 - g;
+                b = 1 - b;
+            }
+
+            val = CLAMP (val, 0, 1);
+            r = CLAMP (r, 0, 1);
+            g = CLAMP (g, 0, 1);
+            b = CLAMP (b, 0, 1);
+
+            // recompose tweaked color
+            rgba = SP_RGBA32_F_COMPOSE(r, g, b, a);
+            if (pick_to_presence) {
+                //this line I think is wrong in original code clonetiler
+                //if (g_random_double_range (0, 1) > val) {
+                if(a == 0){
+                    return false;
+                }
+            }
+            if (pick_to_size) {
+                if(!trace_scale){
+                    _scale = 2 - (val * 1.7);
+                    return fit_item(desktop,
+                         item,
+                         bbox,
+                         move,
+                         center,
+                         angle,
+                         _scale,
+                         scale,
+                         picker,
+                         overlap,
+                         offset,
+                         css,
+                         true);
+                }
+            }
+            if (pick_to_opacity) {
+                opacity *= a;
+                std::stringstream fill_opacity;
+                fill_opacity.imbue(std::locale::classic());
+                fill_opacity << float(opacity);
+                sp_repr_css_set_property(css, "fill-opacity", fill_opacity.str().c_str());
+            }
+            if (pick_to_color) {
+                sp_svg_write_color(color_string, sizeof(color_string), rgba);
+                sp_repr_css_set_property(css, "fill", color_string);
             }
-            guint32 c32 = SP_RGBA32_F_COMPOSE(R, G, B, A);
-            gchar c[64];
-            sp_svg_write_color(c, sizeof(c), c32);
-            sp_repr_css_set_property(css, "fill", c);
-            std::stringstream fill_opacity;
-            fill_opacity.imbue(std::locale::classic());
-            fill_opacity << float(A);
-            sp_repr_css_set_property(css, "fill-opacity", fill_opacity.str().c_str());
         }
         if(!overlap){
             for (std::vector<SPItem *>::const_iterator k=items_down.begin(); k!=items_down.end(); k++) {
@@ -513,9 +651,6 @@ static bool fit_item(SPDesktop *desktop,
                 item_hidden->updateRepr();
             }
         }
-        if(A == 0){
-            return false;
-        }
     }
     return true;
 }
@@ -539,7 +674,6 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                gint _distrib,
                                bool overlap,
                                bool picker,
-                               bool visible,
                                double offset,
                                bool usepressurescale,
                                double pressure)
@@ -580,8 +714,8 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point center = item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
-                if(overlap || picker || visible){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, visible, overlap, offset, css)){
+                if(overlap || picker){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, overlap, offset, css, false)){
                         return false;
                     }
                 }
@@ -687,8 +821,8 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point center=item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
-                if(overlap || picker || visible){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, visible, overlap, offset, css)){
+                if(overlap || picker){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, overlap, offset, css, false)){
                         return false;
                     }
                 }
@@ -766,7 +900,7 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
         for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
             SPItem *item = *i;
             g_assert(item != NULL);
-            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->overlap, tc->picker, tc->visible, tc->offset, tc->usepressurescale, get_pressure(tc))) {
+            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->overlap, tc->picker, tc->offset, tc->usepressurescale, get_pressure(tc))) {
                 did = true;
             }
         }
-- 
cgit v1.2.3


From 0f6203288f49de2a3958b4adf3318b5777817169 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Fri, 30 Oct 2015 20:58:42 +0100
Subject: Fix a bug compiling on pow

(bzr r14422.1.32)
---
 src/ui/tools/spray-tool.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index d0ea62caa..f81a274d1 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -588,9 +588,9 @@ static bool fit_item(SPDesktop *desktop,
                     power = 1 + fabs(gamma_picked);
 
                 val = pow (val, power);
-                r = pow (r, power);
-                g = pow (g, power);
-                b = pow (b, power);
+                r = pow ((double)r, (double)power);
+                g = pow ((double)g, (double)power);
+                b = pow ((double)b, (double)power);
             }
 
             if (invert_picked) {
-- 
cgit v1.2.3


From ee0d08e599aae484a6e8354499b126596dc4aa73 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 31 Oct 2015 21:51:10 +0100
Subject: Working on picker

(bzr r14422.1.33)
---
 src/ui/dialog/clonetiler.cpp |  16 +++++-
 src/ui/tools/spray-tool.cpp  | 128 ++++++++++++++++++++++++++++---------------
 src/ui/tools/spray-tool.h    |   3 +
 3 files changed, 102 insertions(+), 45 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index 266d61ed5..da6cc5192 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -662,7 +662,7 @@ CloneTiler::CloneTiler () :
             gtk_box_pack_start (GTK_BOX (hb), l, FALSE, FALSE, 0);
 
             guint32 rgba = 0x000000ff | sp_svg_read_color (prefs->getString(prefs_path + "initial_color").data(), 0x000000ff);
-            color_picker = new Inkscape::UI::Widget::ColorPicker (*new Glib::ustring(_("Initial color of tiled clones")), *new Glib::ustring(_("Initial color for clones (works only if the original has unset fill or stroke)")), rgba, false);
+            color_picker = new Inkscape::UI::Widget::ColorPicker (*new Glib::ustring(_("Initial color of tiled clones")), *new Glib::ustring(_("Initial color for clones (works only if the original has unset fill or stroke or on spray tool in copy mode)")), rgba, false);
             color_changed_connection = color_picker->connectChanged (sigc::ptr_fun(on_picker_color_changed));
 
             gtk_box_pack_start (GTK_BOX (hb), reinterpret_cast<GtkWidget*>(color_picker->gobj()), FALSE, FALSE, 0);
@@ -1003,7 +1003,19 @@ CloneTiler::CloneTiler () :
            gtk_widget_set_sensitive (vvb, prefs->getBool(prefs_path + "dotrace"));
         }
         }
-
+        // Info 
+        {
+#if GTK_CHECK_VERSION(3,0,0)
+            GtkWidget *hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VB_MARGIN);
+            gtk_box_set_homogeneous(GTK_BOX(hb), FALSE);
+#else
+            GtkWidget *hb = gtk_hbox_new(FALSE, VB_MARGIN);
+#endif
+            gtk_box_pack_start (GTK_BOX (mainbox), hb, FALSE, FALSE, 0);
+            GtkWidget *l = gtk_label_new(_(""));
+            gtk_label_set_markup (GTK_LABEL(l), _("Apply to tiled clones:"));
+            gtk_box_pack_start (GTK_BOX (hb), l, FALSE, FALSE, 0);
+        }
         // Rows/columns, width/height
         {
 #if GTK_CHECK_VERSION(3,0,0)
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index f81a274d1..0b54d3779 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -175,6 +175,10 @@ SprayTool::SprayTool()
     , dilate_area(NULL)
     , overlap(false)
     , picker(false)
+    , pickinversescale(false)
+    , pickfill(false)
+    , pickstroke(false)
+    , visible(false)
     , offset(0)
 {
 }
@@ -252,6 +256,10 @@ void SprayTool::setup() {
     sp_event_context_read(this, "Scale");
     sp_event_context_read(this, "offset");
     sp_event_context_read(this, "picker");
+    sp_event_context_read(this, "pickinversescale");
+    sp_event_context_read(this, "pickfill");
+    sp_event_context_read(this, "pickstroke");
+    sp_event_context_read(this, "visible");
     sp_event_context_read(this, "overlap");
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -298,6 +306,14 @@ void SprayTool::set(const Inkscape::Preferences::Entry& val) {
         this->offset = CLAMP(val.getDouble(), -1000.0, 1000.0);
     } else if (path == "picker") {
         this->picker =  val.getBool();
+    } else if (path == "pickinversescale") {
+        this->pickinversescale =  val.getBool();
+    } else if (path == "pickfill") {
+        this->pickfill =  val.getBool();
+    } else if (path == "pickstroke") {
+        this->pickstroke =  val.getBool();
+    } else if (path == "visible") {
+        this->visible =  val.getBool();
     } else if (path == "overlap") {
         this->overlap = val.getBool();
     }
@@ -424,6 +440,10 @@ static bool fit_item(SPDesktop *desktop,
                      double &_scale,
                      double scale,
                      bool picker,
+                     bool pickinversescale,
+                     bool pickfill,
+                     bool pickstroke,
+                     bool visible,
                      bool overlap,
                      double offset,
                      SPCSSAttr *css,
@@ -491,21 +511,21 @@ static bool fit_item(SPDesktop *desktop,
                 std::abs(bbox_top - bbox_top_main) > std::abs(offset_min))){
                         return false;
                     }
-                } else if(picker){
+                } else if(picker || visible){
                     item_down->setHidden(true);
                     item_down->updateRepr();
                 }
             }
         }
     }
-    if(picker){
+    if(picker || visible){
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         if(!overlap){
             doc->ensureUpToDate();
         }
         int    pick = prefs->getInt("/dialogs/clonetiler/pick");
-        bool   pick_to_presence = prefs->getBool("/dialogs/clonetiler/pick_to_presence");
         bool   pick_to_size = prefs->getBool("/dialogs/clonetiler/pick_to_size");
+        bool   pick_to_presence = prefs->getBool("/dialogs/clonetiler/pick_to_presence", false);
         bool   pick_to_color = prefs->getBool("/dialogs/clonetiler/pick_to_color");
         bool   pick_to_opacity = prefs->getBool("/dialogs/clonetiler/pick_to_opacity");
         double rand_picked = 0.01 * prefs->getDoubleLimited("/dialogs/clonetiler/rand_picked", 0, 0, 100);
@@ -518,28 +538,24 @@ static bool fit_item(SPDesktop *desktop,
         double R = 0, G = 0, B = 0, A = 0;
         cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 1, 1);
         sp_canvas_arena_render_surface(SP_CANVAS_ARENA(desktop->getDrawing()), s, area);
-        ink_cairo_surface_average_color_premul(s, R, G, B, A);
+        ink_cairo_surface_average_color(s, R, G, B, A);
         cairo_surface_destroy(s);
-        if (fabs(A) < 1e-4) {
-            A = 0; // suppress exponentials, CSS does not allow that
+        guint32 rgba = SP_RGBA32_F_COMPOSE(R, G, B, A);
+        float r = SP_RGBA32_R_F(rgba);
+        float g = SP_RGBA32_G_F(rgba);
+        float b = SP_RGBA32_B_F(rgba);
+        float a = SP_RGBA32_A_F(rgba);
+        //this can fix the bug #1511998 if confirmed 
+        if( a == 0 && r == 0 && g == 0 && b == 0){
+            r = 1;
+            g = 1;
+            b = 1;
         }
-        if(A == 0 && R == 0 && G == 0 && B == 0){
-            R = 1;
-            G = 1;
-            B = 1;
+        if(visible && (a == 0 || a < 1e-6)){
+            return false;
         }
-        if(picker){
-//            if (A > 0) {
-//                R /= A;
-//                G /= A;
-//                B /= A;
-//            }
-            guint32 rgba = SP_RGBA32_F_COMPOSE(R, G, B, A);
-            float r = SP_RGBA32_R_F(rgba);
-            float g = SP_RGBA32_G_F(rgba);
-            float b = SP_RGBA32_B_F(rgba);
-            float a = SP_RGBA32_A_F(rgba);
 
+        if(picker){
             float hsl[3];
             sp_color_rgb_to_hsl_floatv (hsl, r, g, b);
 
@@ -607,17 +623,17 @@ static bool fit_item(SPDesktop *desktop,
 
             // recompose tweaked color
             rgba = SP_RGBA32_F_COMPOSE(r, g, b, a);
-            if (pick_to_presence) {
-                //this line I think is wrong in original code clonetiler
-                //if (g_random_double_range (0, 1) > val) {
-                if(a == 0){
-                    return false;
-                }
-            }
             if (pick_to_size) {
                 if(!trace_scale){
-                    _scale = 2 - (val * 1.7);
-                    return fit_item(desktop,
+                    if(pickinversescale){
+                        _scale = 1.0 - val;
+                    } else {
+                        _scale = val;
+                    }
+                    if _scale == 0.0){
+                        return false;
+                    }
+                    if(!fit_item(desktop,
                          item,
                          bbox,
                          move,
@@ -626,25 +642,47 @@ static bool fit_item(SPDesktop *desktop,
                          _scale,
                          scale,
                          picker,
+                         pickinversescale,
+                         pickfill,
+                         pickstroke,
+                         visible,
                          overlap,
                          offset,
                          css,
-                         true);
+                         true)){
+                            return false;
+                         }
                 }
             }
+
             if (pick_to_opacity) {
-                opacity *= a;
-                std::stringstream fill_opacity;
-                fill_opacity.imbue(std::locale::classic());
-                fill_opacity << float(opacity);
-                sp_repr_css_set_property(css, "fill-opacity", fill_opacity.str().c_str());
+                opacity *= val;
+                std::stringstream opacity_str;
+                opacity_str.imbue(std::locale::classic());
+                opacity_str << opacity;
+                sp_repr_css_set_property(css, "opacity", opacity_str.str().c_str());
+            }
+            if (pick_to_presence) {
+                if (g_random_double_range (0, 1) > val) {
+                    //Hidding the element is a way to retain original
+                    //beabiohur of tiled clones for presence option.
+                    sp_repr_css_set_property(css, "opacity", "0");
+                }
             }
             if (pick_to_color) {
                 sp_svg_write_color(color_string, sizeof(color_string), rgba);
-                sp_repr_css_set_property(css, "fill", color_string);
+                if(pickfill){
+                    sp_repr_css_set_property(css, "fill", color_string);
+                }
+                if(pickstroke){
+                    sp_repr_css_set_property(css, "stroke", color_string);
+                }
+            }
+            if (opacity < 1e-6) { // invisibly transparent, skip
+                return false;
             }
         }
-        if(!overlap){
+        if(!overlap && (picker || visible)){
             for (std::vector<SPItem *>::const_iterator k=items_down.begin(); k!=items_down.end(); k++) {
                 SPItem *item_hidden = *k;
                 item_hidden->setHidden(false);
@@ -674,6 +712,10 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                gint _distrib,
                                bool overlap,
                                bool picker,
+                               bool pickinversescale,
+                               bool pickfill,
+                               bool pickstroke,
+                               bool visible,
                                double offset,
                                bool usepressurescale,
                                double pressure)
@@ -714,8 +756,8 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point center = item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
-                if(overlap || picker){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, overlap, offset, css, false)){
+                if(overlap || picker || visible){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversescale, pickfill, pickstroke, visible, overlap, offset, css, false)){
                         return false;
                     }
                 }
@@ -821,8 +863,8 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point center=item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
-                if(overlap || picker){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, overlap, offset, css, false)){
+                if(overlap || picker || visible){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversescale, pickfill, pickstroke, visible, overlap, offset, css, false)){
                         return false;
                     }
                 }
@@ -900,7 +942,7 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
         for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
             SPItem *item = *i;
             g_assert(item != NULL);
-            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->overlap, tc->picker, tc->offset, tc->usepressurescale, get_pressure(tc))) {
+            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->overlap, tc->picker, tc->pickinversescale, tc->pickfill, tc->pickstroke, tc->visible, tc->offset, tc->usepressurescale, get_pressure(tc))) {
                 did = true;
             }
         }
diff --git a/src/ui/tools/spray-tool.h b/src/ui/tools/spray-tool.h
index 112ab77e9..89a06dee9 100644
--- a/src/ui/tools/spray-tool.h
+++ b/src/ui/tools/spray-tool.h
@@ -91,6 +91,9 @@ public:
     SPCanvasItem *dilate_area;
     bool overlap;
     bool picker;
+    bool pickinversescale;
+    bool pickfill;
+    bool pickstroke;
     bool visible;
     double offset;
     sigc::connection style_set_connection;
-- 
cgit v1.2.3


From be64ba3e07ac16e14712929756739de6b4465fef Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 31 Oct 2015 23:50:21 +0100
Subject: 'End' of picker work

(bzr r14422.1.35)
---
 src/ui/dialog/clonetiler.cpp |  5 -----
 src/ui/tools/spray-tool.cpp  | 48 ++++++++++++++++++++++----------------------
 src/ui/tools/spray-tool.h    |  4 ++--
 3 files changed, 26 insertions(+), 31 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index da6cc5192..e842cf78f 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -785,11 +785,6 @@ CloneTiler::CloneTiler () :
 #endif
             gtk_box_pack_start (GTK_BOX (vb), hb, FALSE, FALSE, 0);
 
-            Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-            if(prefs->getBool("/dialogs/clonetiler/opentrace", false)){
-                gtk_notebook_set_current_page (GTK_NOTEBOOK(nb),5);
-            }
-
             b  = gtk_check_button_new_with_label (_("Trace the drawing under the tiles/spray tool"));
             g_object_set_data (G_OBJECT(b), "uncheckable", GINT_TO_POINTER(TRUE));
             bool old = prefs->getBool(prefs_path + "dotrace");
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 0b54d3779..d9a5de377 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -173,9 +173,9 @@ SprayTool::SprayTool()
     , is_dilating(false)
     , has_dilated(false)
     , dilate_area(NULL)
-    , overlap(false)
+    , nooverlap(false)
     , picker(false)
-    , pickinversescale(false)
+    , pickinversesize(false)
     , pickfill(false)
     , pickstroke(false)
     , visible(false)
@@ -256,11 +256,11 @@ void SprayTool::setup() {
     sp_event_context_read(this, "Scale");
     sp_event_context_read(this, "offset");
     sp_event_context_read(this, "picker");
-    sp_event_context_read(this, "pickinversescale");
+    sp_event_context_read(this, "pickinversesize");
     sp_event_context_read(this, "pickfill");
     sp_event_context_read(this, "pickstroke");
     sp_event_context_read(this, "visible");
-    sp_event_context_read(this, "overlap");
+    sp_event_context_read(this, "nooverlap");
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     if (prefs->getBool("/tools/spray/selcue")) {
@@ -306,16 +306,16 @@ void SprayTool::set(const Inkscape::Preferences::Entry& val) {
         this->offset = CLAMP(val.getDouble(), -1000.0, 1000.0);
     } else if (path == "picker") {
         this->picker =  val.getBool();
-    } else if (path == "pickinversescale") {
-        this->pickinversescale =  val.getBool();
+    } else if (path == "pickinversesize") {
+        this->pickinversesize =  val.getBool();
     } else if (path == "pickfill") {
         this->pickfill =  val.getBool();
     } else if (path == "pickstroke") {
         this->pickstroke =  val.getBool();
     } else if (path == "visible") {
         this->visible =  val.getBool();
-    } else if (path == "overlap") {
-        this->overlap = val.getBool();
+    } else if (path == "nooverlap") {
+        this->nooverlap = val.getBool();
     }
 }
 
@@ -440,11 +440,11 @@ static bool fit_item(SPDesktop *desktop,
                      double &_scale,
                      double scale,
                      bool picker,
-                     bool pickinversescale,
+                     bool pickinversesize,
                      bool pickfill,
                      bool pickstroke,
                      bool visible,
-                     bool overlap,
+                     bool nooverlap,
                      double offset,
                      SPCSSAttr *css,
                      bool trace_scale)
@@ -506,7 +506,7 @@ static bool fit_item(SPDesktop *desktop,
                 (item_down->getAttribute("inkscape:spray-origin") && 
                 strcmp(item_down->getAttribute("inkscape:spray-origin"),spray_origin) == 0 ))
             {
-                if(overlap){
+                if(nooverlap){
                     if(!(offset_min < 0 && std::abs(bbox_left - bbox_left_main) > std::abs(offset_min) && 
                 std::abs(bbox_top - bbox_top_main) > std::abs(offset_min))){
                         return false;
@@ -520,7 +520,7 @@ static bool fit_item(SPDesktop *desktop,
     }
     if(picker || visible){
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-        if(!overlap){
+        if(!nooverlap){
             doc->ensureUpToDate();
         }
         int    pick = prefs->getInt("/dialogs/clonetiler/pick");
@@ -625,12 +625,12 @@ static bool fit_item(SPDesktop *desktop,
             rgba = SP_RGBA32_F_COMPOSE(r, g, b, a);
             if (pick_to_size) {
                 if(!trace_scale){
-                    if(pickinversescale){
+                    if(pickinversesize) {
                         _scale = 1.0 - val;
                     } else {
                         _scale = val;
                     }
-                    if _scale == 0.0){
+                    if(_scale == 0.0) {
                         return false;
                     }
                     if(!fit_item(desktop,
@@ -642,11 +642,11 @@ static bool fit_item(SPDesktop *desktop,
                          _scale,
                          scale,
                          picker,
-                         pickinversescale,
+                         pickinversesize,
                          pickfill,
                          pickstroke,
                          visible,
-                         overlap,
+                         nooverlap,
                          offset,
                          css,
                          true)){
@@ -682,7 +682,7 @@ static bool fit_item(SPDesktop *desktop,
                 return false;
             }
         }
-        if(!overlap && (picker || visible)){
+        if(!nooverlap && (picker || visible)){
             for (std::vector<SPItem *>::const_iterator k=items_down.begin(); k!=items_down.end(); k++) {
                 SPItem *item_hidden = *k;
                 item_hidden->setHidden(false);
@@ -710,9 +710,9 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                double tilt,
                                double rotation_variation,
                                gint _distrib,
-                               bool overlap,
+                               bool nooverlap,
                                bool picker,
-                               bool pickinversescale,
+                               bool pickinversesize,
                                bool pickfill,
                                bool pickstroke,
                                bool visible,
@@ -756,8 +756,8 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point center = item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
-                if(overlap || picker || visible){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversescale, pickfill, pickstroke, visible, overlap, offset, css, false)){
+                if(nooverlap || picker || visible){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversesize, pickfill, pickstroke, visible, nooverlap, offset, css, false)){
                         return false;
                     }
                 }
@@ -863,8 +863,8 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point center=item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
-                if(overlap || picker || visible){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversescale, pickfill, pickstroke, visible, overlap, offset, css, false)){
+                if(nooverlap || picker || visible){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversesize, pickfill, pickstroke, visible, nooverlap, offset, css, false)){
                         return false;
                     }
                 }
@@ -942,7 +942,7 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
         for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
             SPItem *item = *i;
             g_assert(item != NULL);
-            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->overlap, tc->picker, tc->pickinversescale, tc->pickfill, tc->pickstroke, tc->visible, tc->offset, tc->usepressurescale, get_pressure(tc))) {
+            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->nooverlap, tc->picker, tc->pickinversesize, tc->pickfill, tc->pickstroke, tc->visible, tc->offset, tc->usepressurescale, get_pressure(tc))) {
                 did = true;
             }
         }
diff --git a/src/ui/tools/spray-tool.h b/src/ui/tools/spray-tool.h
index 89a06dee9..212948c77 100644
--- a/src/ui/tools/spray-tool.h
+++ b/src/ui/tools/spray-tool.h
@@ -89,9 +89,9 @@ public:
     bool has_dilated;
     Geom::Point last_push;
     SPCanvasItem *dilate_area;
-    bool overlap;
+    bool nooverlap;
     bool picker;
-    bool pickinversescale;
+    bool pickinversesize;
     bool pickfill;
     bool pickstroke;
     bool visible;
-- 
cgit v1.2.3


From e5ef21e284cd3bd7da7f15fcee7f4d1999457b2e Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 1 Nov 2015 00:51:14 +0100
Subject: Order disposition of icons Add inverse also to opacity

(bzr r14422.1.37)
---
 src/ui/tools/spray-tool.cpp | 28 ++++++++++++++++------------
 src/ui/tools/spray-tool.h   |  2 +-
 2 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index d9a5de377..f7762ad8a 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -175,7 +175,7 @@ SprayTool::SprayTool()
     , dilate_area(NULL)
     , nooverlap(false)
     , picker(false)
-    , pickinversesize(false)
+    , pickinversevalue(false)
     , pickfill(false)
     , pickstroke(false)
     , visible(false)
@@ -256,7 +256,7 @@ void SprayTool::setup() {
     sp_event_context_read(this, "Scale");
     sp_event_context_read(this, "offset");
     sp_event_context_read(this, "picker");
-    sp_event_context_read(this, "pickinversesize");
+    sp_event_context_read(this, "pickinversevalue");
     sp_event_context_read(this, "pickfill");
     sp_event_context_read(this, "pickstroke");
     sp_event_context_read(this, "visible");
@@ -306,8 +306,8 @@ void SprayTool::set(const Inkscape::Preferences::Entry& val) {
         this->offset = CLAMP(val.getDouble(), -1000.0, 1000.0);
     } else if (path == "picker") {
         this->picker =  val.getBool();
-    } else if (path == "pickinversesize") {
-        this->pickinversesize =  val.getBool();
+    } else if (path == "pickinversevalue") {
+        this->pickinversevalue =  val.getBool();
     } else if (path == "pickfill") {
         this->pickfill =  val.getBool();
     } else if (path == "pickstroke") {
@@ -440,7 +440,7 @@ static bool fit_item(SPDesktop *desktop,
                      double &_scale,
                      double scale,
                      bool picker,
-                     bool pickinversesize,
+                     bool pickinversevalue,
                      bool pickfill,
                      bool pickstroke,
                      bool visible,
@@ -625,7 +625,7 @@ static bool fit_item(SPDesktop *desktop,
             rgba = SP_RGBA32_F_COMPOSE(r, g, b, a);
             if (pick_to_size) {
                 if(!trace_scale){
-                    if(pickinversesize) {
+                    if(pickinversevalue) {
                         _scale = 1.0 - val;
                     } else {
                         _scale = val;
@@ -642,7 +642,7 @@ static bool fit_item(SPDesktop *desktop,
                          _scale,
                          scale,
                          picker,
-                         pickinversesize,
+                         pickinversevalue,
                          pickfill,
                          pickstroke,
                          visible,
@@ -656,7 +656,11 @@ static bool fit_item(SPDesktop *desktop,
             }
 
             if (pick_to_opacity) {
-                opacity *= val;
+                if(pickinversevalue) {
+                    opacity *= 1.0 - val;
+                } else {
+                    opacity *= val;
+                }
                 std::stringstream opacity_str;
                 opacity_str.imbue(std::locale::classic());
                 opacity_str << opacity;
@@ -712,7 +716,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                gint _distrib,
                                bool nooverlap,
                                bool picker,
-                               bool pickinversesize,
+                               bool pickinversevalue,
                                bool pickfill,
                                bool pickstroke,
                                bool visible,
@@ -757,7 +761,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
                 if(nooverlap || picker || visible){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversesize, pickfill, pickstroke, visible, nooverlap, offset, css, false)){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversevalue, pickfill, pickstroke, visible, nooverlap, offset, css, false)){
                         return false;
                     }
                 }
@@ -864,7 +868,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
                 if(nooverlap || picker || visible){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversesize, pickfill, pickstroke, visible, nooverlap, offset, css, false)){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversevalue, pickfill, pickstroke, visible, nooverlap, offset, css, false)){
                         return false;
                     }
                 }
@@ -942,7 +946,7 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
         for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
             SPItem *item = *i;
             g_assert(item != NULL);
-            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->nooverlap, tc->picker, tc->pickinversesize, tc->pickfill, tc->pickstroke, tc->visible, tc->offset, tc->usepressurescale, get_pressure(tc))) {
+            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->nooverlap, tc->picker, tc->pickinversevalue, tc->pickfill, tc->pickstroke, tc->visible, tc->offset, tc->usepressurescale, get_pressure(tc))) {
                 did = true;
             }
         }
diff --git a/src/ui/tools/spray-tool.h b/src/ui/tools/spray-tool.h
index 212948c77..ca0c20375 100644
--- a/src/ui/tools/spray-tool.h
+++ b/src/ui/tools/spray-tool.h
@@ -91,7 +91,7 @@ public:
     SPCanvasItem *dilate_area;
     bool nooverlap;
     bool picker;
-    bool pickinversesize;
+    bool pickinversevalue;
     bool pickfill;
     bool pickstroke;
     bool visible;
-- 
cgit v1.2.3


From 326bf4284ba296b71c9584962e2ec232a7a89fb3 Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Sun, 1 Nov 2015 13:50:42 +0100
Subject: i18n. Strings disambiguation (thanks, Maren!). Translation.
 Translation template update. Translation. French translation update.

(bzr r14440)
---
 src/ui/dialog/inkscape-preferences.cpp |  4 +-
 src/ui/dialog/objects.cpp              | 10 ++---
 src/ui/widget/font-variants.cpp        | 70 +++++++++++++++++-----------------
 3 files changed, 42 insertions(+), 42 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 14eaa65aa..fec49d484 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -601,7 +601,7 @@ void InkscapePreferences::initPageUI()
                               _("Set the language for menus and number formats"), false);
 
     {
-        Glib::ustring sizeLabels[] = {_("Large"), _("Small"), _("Smaller")};
+        Glib::ustring sizeLabels[] = {C_("Icon size", "Large"), C_("Icon size", "Small"), C_("Icon size", "Smaller")};
         int sizeValues[] = {0, 1, 2};
 
         _misc_small_tools.init( "/toolbox/tools/small", sizeLabels, sizeValues, G_N_ELEMENTS(sizeLabels), 0 );
@@ -686,7 +686,7 @@ void InkscapePreferences::initPageUI()
     _win_ontop_agressive.init ( _("Aggressive"), "/options/transientpolicy/value", 2, false, &_win_ontop_none);
 
     {
-        Glib::ustring defaultSizeLabels[] = {_("Small"), _("Large"), _("Maximized")};
+        Glib::ustring defaultSizeLabels[] = {C_("Window size", "Small"), C_("Window size", "Large"), C_("Window size", "Maximized")};
         int defaultSizeValues[] = {0, 1, 2};
 
         _win_default_size.init( "/options/defaultwindowsize/value", defaultSizeLabels, defaultSizeValues, G_N_ELEMENTS(defaultSizeLabels), 1 );
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index 835ecf35b..d72dda028 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -1614,11 +1614,11 @@ ObjectsPanel::ObjectsPanel() :
     _pending(0),
     _toggleEvent(0),
     _defer_target(),
-    _visibleHeader(_("V")),
-    _lockHeader(_("L")),
-    _typeHeader(_("T")),
-    _clipmaskHeader(_("CM")),
-    _highlightHeader(_("HL")),
+    _visibleHeader(C_("Visibility", "V")),
+    _lockHeader(C_("Lock", "L")),
+    _typeHeader(C_("Type", "T")),
+    _clipmaskHeader(C_("Clip and mask", "CM")),
+    _highlightHeader(C_("Highlight", "HL")),
     _nameHeader(_("Label")),
     _composite_vbox(false, 0),
     _opacity_vbox(false, 0),
diff --git a/src/ui/widget/font-variants.cpp b/src/ui/widget/font-variants.cpp
index 5d1e40971..62598dead 100644
--- a/src/ui/widget/font-variants.cpp
+++ b/src/ui/widget/font-variants.cpp
@@ -35,41 +35,41 @@ namespace Widget {
 
   FontVariants::FontVariants () :
     Gtk::VBox (),
-    _ligatures_frame          ( Glib::ustring(_("Ligatures"    )) ),
-    _ligatures_common         ( Glib::ustring(_("Common"       )) ),
-    _ligatures_discretionary  ( Glib::ustring(_("Discretionary")) ),
-    _ligatures_historical     ( Glib::ustring(_("Historical"   )) ),
-    _ligatures_contextual     ( Glib::ustring(_("Contextual"   )) ),
-
-    _position_frame           ( Glib::ustring(_("Position"     )) ),
-    _position_normal          ( Glib::ustring(_("Normal"       )) ),
-    _position_sub             ( Glib::ustring(_("Subscript"    )) ),
-    _position_super           ( Glib::ustring(_("Superscript"  )) ),
-
-    _caps_frame               ( Glib::ustring(_("Capitals"     )) ),
-    _caps_normal              ( Glib::ustring(_("Normal"       )) ),
-    _caps_small               ( Glib::ustring(_("Small"        )) ),
-    _caps_all_small           ( Glib::ustring(_("All small"    )) ),
-    _caps_petite              ( Glib::ustring(_("Petite"       )) ),
-    _caps_all_petite          ( Glib::ustring(_("All petite"   )) ),
-    _caps_unicase             ( Glib::ustring(_("Unicase"      )) ),
-    _caps_titling             ( Glib::ustring(_("Titling"      )) ),
-
-    _numeric_frame            ( Glib::ustring(_("Numeric"      )) ),
-    _numeric_lining           ( Glib::ustring(_("Lining"       )) ),
-    _numeric_old_style        ( Glib::ustring(_("Old Style"    )) ),
-    _numeric_default_style    ( Glib::ustring(_("Default Style")) ),
-    _numeric_proportional     ( Glib::ustring(_("Proportional" )) ),
-    _numeric_tabular          ( Glib::ustring(_("Tabular"      )) ),
-    _numeric_default_width    ( Glib::ustring(_("Default Width")) ),
-    _numeric_diagonal         ( Glib::ustring(_("Diagonal"     )) ),
-    _numeric_stacked          ( Glib::ustring(_("Stacked"      )) ),
-    _numeric_default_fractions( Glib::ustring(_("Default Fractions")) ),
-    _numeric_ordinal          ( Glib::ustring(_("Ordinal"      )) ),
-    _numeric_slashed_zero     ( Glib::ustring(_("Slashed Zero" )) ),
-
-    _feature_frame            ( Glib::ustring(_("Feature Settings")) ),
-    _feature_label            ( Glib::ustring(_("Selection has different Feature Settings!")) ),
+    _ligatures_frame          ( Glib::ustring(C_("Font variant", "Ligatures"    )) ),
+    _ligatures_common         ( Glib::ustring(C_("Font variant", "Common"       )) ),
+    _ligatures_discretionary  ( Glib::ustring(C_("Font variant", "Discretionary")) ),
+    _ligatures_historical     ( Glib::ustring(C_("Font variant", "Historical"   )) ),
+    _ligatures_contextual     ( Glib::ustring(C_("Font variant", "Contextual"   )) ),
+
+    _position_frame           ( Glib::ustring(C_("Font variant", "Position"     )) ),
+    _position_normal          ( Glib::ustring(C_("Font variant", "Normal"       )) ),
+    _position_sub             ( Glib::ustring(C_("Font variant", "Subscript"    )) ),
+    _position_super           ( Glib::ustring(C_("Font variant", "Superscript"  )) ),
+
+    _caps_frame               ( Glib::ustring(C_("Font variant", "Capitals"     )) ),
+    _caps_normal              ( Glib::ustring(C_("Font variant", "Normal"       )) ),
+    _caps_small               ( Glib::ustring(C_("Font variant", "Small"        )) ),
+    _caps_all_small           ( Glib::ustring(C_("Font variant", "All small"    )) ),
+    _caps_petite              ( Glib::ustring(C_("Font variant", "Petite"       )) ),
+    _caps_all_petite          ( Glib::ustring(C_("Font variant", "All petite"   )) ),
+    _caps_unicase             ( Glib::ustring(C_("Font variant", "Unicase"      )) ),
+    _caps_titling             ( Glib::ustring(C_("Font variant", "Titling"      )) ),
+
+    _numeric_frame            ( Glib::ustring(C_("Font variant", "Numeric"      )) ),
+    _numeric_lining           ( Glib::ustring(C_("Font variant", "Lining"       )) ),
+    _numeric_old_style        ( Glib::ustring(C_("Font variant", "Old Style"    )) ),
+    _numeric_default_style    ( Glib::ustring(C_("Font variant", "Default Style")) ),
+    _numeric_proportional     ( Glib::ustring(C_("Font variant", "Proportional" )) ),
+    _numeric_tabular          ( Glib::ustring(C_("Font variant", "Tabular"      )) ),
+    _numeric_default_width    ( Glib::ustring(C_("Font variant", "Default Width")) ),
+    _numeric_diagonal         ( Glib::ustring(C_("Font variant", "Diagonal"     )) ),
+    _numeric_stacked          ( Glib::ustring(C_("Font variant", "Stacked"      )) ),
+    _numeric_default_fractions( Glib::ustring(C_("Font variant", "Default Fractions")) ),
+    _numeric_ordinal          ( Glib::ustring(C_("Font variant", "Ordinal"      )) ),
+    _numeric_slashed_zero     ( Glib::ustring(C_("Font variant", "Slashed Zero" )) ),
+
+    _feature_frame            ( Glib::ustring(C_("Font variant", "Feature Settings")) ),
+    _feature_label            ( Glib::ustring(C_("Font variant", "Selection has different Feature Settings!")) ),
     
     _ligatures_changed( false ),
     _position_changed( false ),
-- 
cgit v1.2.3


From a555ac58d0b5827d577d61f810e9df668fa55470 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 1 Nov 2015 17:13:04 +0100
Subject: improve apply value to clones in scale mode

(bzr r14422.1.38)
---
 src/ui/tools/spray-tool.cpp | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index f7762ad8a..03a225b6e 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -434,7 +434,7 @@ double randomize01(double val, double rand)
 static bool fit_item(SPDesktop *desktop,
                      SPItem *item,
                      Geom::OptRect bbox,
-                     Geom::Point move,
+                     Geom::Point &move,
                      Geom::Point center,
                      double angle,
                      double &_scale,
@@ -457,6 +457,11 @@ static bool fit_item(SPDesktop *desktop,
     if(offset_min < 0 ){
         offset_min = 0;
     }
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    bool pick_to_size = prefs->getBool("/dialogs/clonetiler/pick_to_size");
+    if(picker && pick_to_size && !trace_scale){
+        _scale = 0.1;
+    }
     Geom::OptRect bbox_procesed = Geom::Rect(Geom::Point(bbox->left() - offset_min, bbox->top() - offset_min),Geom::Point(bbox->right() + offset_min, bbox->bottom() + offset_min));
     Geom::Path path;
     path.start(Geom::Point(bbox_procesed->left(), bbox_procesed->top()));
@@ -467,13 +472,24 @@ static bool fit_item(SPDesktop *desktop,
     sp_spray_transform_path(item, path, Geom::Scale(_scale), center);
     sp_spray_transform_path(item, path, Geom::Scale(scale), center);
     sp_spray_transform_path(item, path, Geom::Rotate(angle), center);
-    path *= Geom::Translate(move[Geom::X], move[Geom::Y]);
+    path *= Geom::Translate(move);
     path *= desktop->doc2dt();
     bbox_procesed = path.boundsFast();
     double bbox_left_main = bbox_procesed->left();
     double bbox_top_main = bbox_procesed->top();
     double width_transformed = bbox_procesed->width();
     double height_transformed = bbox_procesed->height();
+    Geom::Point mid_point = desktop->d2w(bbox_procesed->midpoint());
+    Geom::IntRect area = Geom::IntRect::from_xywh(floor(mid_point[Geom::X]), floor(mid_point[Geom::Y]), 1, 1);
+    double R = 0, G = 0, B = 0, A = 0;
+    cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 1, 1);
+    sp_canvas_arena_render_surface(SP_CANVAS_ARENA(desktop->getDrawing()), s, area);
+    ink_cairo_surface_average_color(s, R, G, B, A);
+    cairo_surface_destroy(s);
+    guint32 rgba = SP_RGBA32_F_COMPOSE(R, G, B, A);
+    if(nooverlap && visible && (A==0 || A < 1e-6)){
+        return false;
+    }
     size = std::min(width_transformed,height_transformed);
     if(offset < 100 ){
         offset_min = ((99.0 - offset) * size)/100.0 - size;
@@ -519,12 +535,10 @@ static bool fit_item(SPDesktop *desktop,
         }
     }
     if(picker || visible){
-        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         if(!nooverlap){
             doc->ensureUpToDate();
         }
         int    pick = prefs->getInt("/dialogs/clonetiler/pick");
-        bool   pick_to_size = prefs->getBool("/dialogs/clonetiler/pick_to_size");
         bool   pick_to_presence = prefs->getBool("/dialogs/clonetiler/pick_to_presence", false);
         bool   pick_to_color = prefs->getBool("/dialogs/clonetiler/pick_to_color");
         bool   pick_to_opacity = prefs->getBool("/dialogs/clonetiler/pick_to_opacity");
@@ -533,20 +547,12 @@ static bool fit_item(SPDesktop *desktop,
         double gamma_picked = prefs->getDoubleLimited("/dialogs/clonetiler/gamma_picked", 0, -10, 10);
         double opacity = 1.0;
         gchar color_string[32]; *color_string = 0;
-        Geom::Point mid_point = desktop->d2w(bbox_procesed->midpoint());
-        Geom::IntRect area = Geom::IntRect::from_xywh(floor(mid_point[Geom::X]), floor(mid_point[Geom::Y]), 1, 1);
-        double R = 0, G = 0, B = 0, A = 0;
-        cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 1, 1);
-        sp_canvas_arena_render_surface(SP_CANVAS_ARENA(desktop->getDrawing()), s, area);
-        ink_cairo_surface_average_color(s, R, G, B, A);
-        cairo_surface_destroy(s);
-        guint32 rgba = SP_RGBA32_F_COMPOSE(R, G, B, A);
         float r = SP_RGBA32_R_F(rgba);
         float g = SP_RGBA32_G_F(rgba);
         float b = SP_RGBA32_B_F(rgba);
         float a = SP_RGBA32_A_F(rgba);
         //this can fix the bug #1511998 if confirmed 
-        if( a == 0 && r == 0 && g == 0 && b == 0){
+        if( a == 0 || a < 1e-6){
             r = 1;
             g = 1;
             b = 1;
-- 
cgit v1.2.3


From e90bd3cd9a9bcc57551c4f37c035cf28cd01e30a Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 3 Nov 2015 22:46:41 +0100
Subject: Fix a localization problem storing attribute

(bzr r14393.1.32)
---
 src/ui/tools/measure-tool.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index e6f56674a..31977b8b1 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -415,9 +415,11 @@ void MeasureTool::writeMeasurePoint(Geom::Point point, bool is_start) {
     if(!namedview) {
         return;
     }
-    gchar *str =  g_strdup_printf("%f,%f", point[Geom::X], point[Geom::Y]);
+    std::stringstream meassure_point_str;
+    meassure_point_str.imbue(std::locale::classic());
+    meassure_point_str << point[Geom::X] << "," << point[Geom::Y];
     gchar const *measure_point = is_start ? "inkscape:measure-start" : "inkscape:measure-end";
-    namedview->setAttribute (measure_point, str);
+    namedview->setAttribute (measure_point, meassure_point_str.str().c_str());
     g_free(str);
 }
 
-- 
cgit v1.2.3


From 01f40289c4b069d0b3d8ad80b4c59c69950dd937 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 3 Nov 2015 23:57:43 +0100
Subject: Fix a bug compiling

(bzr r14393.1.34)
---
 src/ui/tools/measure-tool.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 31977b8b1..06f32ba5c 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -420,7 +420,6 @@ void MeasureTool::writeMeasurePoint(Geom::Point point, bool is_start) {
     meassure_point_str << point[Geom::X] << "," << point[Geom::Y];
     gchar const *measure_point = is_start ? "inkscape:measure-start" : "inkscape:measure-end";
     namedview->setAttribute (measure_point, meassure_point_str.str().c_str());
-    g_free(str);
 }
 
 //This function is used to reverse the Measure, I do it in two steps because when move the knot the 
-- 
cgit v1.2.3


From 23935ad410a79d6f82e0ce90e5efba32a55cda4c Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Thu, 5 Nov 2015 22:27:44 +0100
Subject: static code analysis

(bzr r14446)
---
 src/ui/clipboard.cpp                | 10 +++++-----
 src/ui/dialog/export.cpp            |  6 +++---
 src/ui/dialog/font-substitution.cpp |  2 +-
 src/ui/dialog/glyphs.cpp            |  4 ++--
 src/ui/dialog/icon-preview.cpp      |  2 +-
 src/ui/dialog/pixelartdialog.cpp    |  2 +-
 src/ui/dialog/polar-arrange-tab.cpp |  2 +-
 src/ui/dialog/tags.cpp              |  4 ++--
 src/ui/dialog/text-edit.cpp         |  6 +++---
 src/ui/dialog/transformation.cpp    |  8 ++++----
 src/ui/tools/eraser-tool.cpp        |  8 ++++----
 src/ui/tools/lpe-tool.cpp           |  2 +-
 12 files changed, 28 insertions(+), 28 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 0792fb9c5..354fa45dc 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -525,7 +525,7 @@ bool ClipboardManagerImpl::pasteSize(SPDesktop *desktop, bool separately, bool a
         // resize each object in the selection
         if (separately) {
             std::vector<SPItem*> itemlist=selection->itemList();
-            for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++){
+            for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();++i){
                 SPItem *item = *i;
                 if (item) {
                     Geom::OptRect obj_size = item->desktopVisualBounds();
@@ -581,7 +581,7 @@ bool ClipboardManagerImpl::pastePathEffect(SPDesktop *desktop)
                 // make sure all selected items are converted to paths first (i.e. rectangles)
                 sp_selected_to_lpeitems(desktop);
                 std::vector<SPItem*> itemlist=selection->itemList();
-                for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++){
+                for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();++i){
                     SPItem *item = *i;
                     _applyPathEffect(item, effectstack);
                 }
@@ -665,7 +665,7 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection)
     // copy the defs used by all items
     std::vector<SPItem*> itemlist=selection->itemList();
     cloned_elements.clear();
-    for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++){
+    for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();++i){
         SPItem *item = *i;
         if (item) {
             _copyUsedDefs(item);
@@ -676,7 +676,7 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection)
 
     // copy the representation of the items
     std::vector<SPObject*> sorted_items;
-    for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++)
+    for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();++i)
         sorted_items.push_back(*i);
     sort(sorted_items.begin(),sorted_items.end(),sp_object_compare_position_bool);
 
@@ -692,7 +692,7 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection)
 
     sorted_items.insert(sorted_items.end(),cloned_elements.begin(),cloned_elements.end());
 
-    for(std::vector<SPObject*>::const_iterator i=sorted_items.begin();i!=sorted_items.end();i++){
+    for(std::vector<SPObject*>::const_iterator i=sorted_items.begin();i!=sorted_items.end();++i){
         SPItem *item = dynamic_cast<SPItem*>(*i);
         if (item) {
             Inkscape::XML::Node *obj = item->getRepr();
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 59fab7771..2fb5f9e3b 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -821,7 +821,7 @@ void Export::onAreaToggled ()
                 if (filename.empty()) {
                     const gchar * id = "object";
                     const std::vector<XML::Node*> reprlst = SP_ACTIVE_DESKTOP->getSelection()->reprList();
-                    for(std::vector<XML::Node*>::const_iterator i=reprlst.begin(); reprlst.end() != i; i++) {
+                    for(std::vector<XML::Node*>::const_iterator i=reprlst.begin(); reprlst.end() != i; ++i) {
                         Inkscape::XML::Node * repr = *i;
                         if (repr->attribute("id")) {
                             id = repr->attribute("id");
@@ -1030,7 +1030,7 @@ void Export::onExport ()
         gint export_count = 0;
 
         std::vector<SPItem*> itemlist=desktop->getSelection()->itemList();
-        for(std::vector<SPItem*>::const_iterator i = itemlist.begin();i!=itemlist.end() && !interrupted ;i++){
+        for(std::vector<SPItem*>::const_iterator i = itemlist.begin();i!=itemlist.end() && !interrupted ;++i){
             SPItem *item = *i;
 
             prog_dlg->set_data("current", GINT_TO_POINTER(n));
@@ -1239,7 +1239,7 @@ void Export::onExport ()
             DocumentUndo::setUndoSensitive(doc, false);
             reprlst = desktop->getSelection()->reprList();
 
-            for(std::vector<Inkscape::XML::Node*>::const_iterator i=reprlst.begin(); reprlst.end() != i; i++) {
+            for(std::vector<Inkscape::XML::Node*>::const_iterator i=reprlst.begin(); reprlst.end() != i; ++i) {
                 Inkscape::XML::Node * repr = *i;
                 const gchar * temp_string;
                 Glib::ustring dir = Glib::path_get_dirname(filename.c_str());
diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp
index 19506c6a3..f219f3db6 100644
--- a/src/ui/dialog/font-substitution.cpp
+++ b/src/ui/dialog/font-substitution.cpp
@@ -154,7 +154,7 @@ std::vector<SPItem*> FontSubstitution::getFontReplacedItems(SPDocument* doc, Gli
     std::map<SPItem *, Glib::ustring> mapFontStyles;
 
     allList = get_all_items(x, doc->getRoot(), desktop, false, false, true, y);
-    for(std::vector<SPItem*>::const_iterator i = allList.begin();i!=allList.end();i++){
+    for(std::vector<SPItem*>::const_iterator i = allList.begin();i!=allList.end();++i){
         SPItem *item = *i;
         SPStyle *style = item->style;
         Glib::ustring family = "";
diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp
index 7ca277ea2..56b001291 100644
--- a/src/ui/dialog/glyphs.cpp
+++ b/src/ui/dialog/glyphs.cpp
@@ -579,7 +579,7 @@ void GlyphsPanel::insertText()
 {
     SPItem *textItem = 0;
     std::vector<SPItem*> itemlist=targetDesktop->selection->itemList();
-        for(std::vector<SPItem*>::const_iterator i=itemlist.begin(); itemlist.end() != i; i++) {
+        for(std::vector<SPItem*>::const_iterator i=itemlist.begin(); itemlist.end() != i; ++i) {
             if (SP_IS_TEXT(*i) || SP_IS_FLOWTEXT(*i)) {
             textItem = *i;
             break;
@@ -689,7 +689,7 @@ void GlyphsPanel::calcCanInsert()
 {
     int items = 0;
     std::vector<SPItem*> itemlist=targetDesktop->selection->itemList();
-    for(std::vector<SPItem*>::const_iterator i=itemlist.begin(); itemlist.end() != i; i++) {
+    for(std::vector<SPItem*>::const_iterator i=itemlist.begin(); itemlist.end() != i; ++i) {
         if (SP_IS_TEXT(*i) || SP_IS_FLOWTEXT(*i)) {
             ++items;
         }
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index 77f120e1a..83656a1f2 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -363,7 +363,7 @@ void IconPreviewPanel::refreshPreview()
                     //g_message("found a selection to play with");
 
                 	std::vector<SPItem*> const items = sel->itemList();
-                    for(std::vector<SPItem*>::const_iterator i=items.begin();!target && i!=items.end();i++){
+                    for(std::vector<SPItem*>::const_iterator i=items.begin();!target && i!=items.end();++i){
                         SPItem* item = *i;
                         gchar const *id = item->getId();
                         if ( id ) {
diff --git a/src/ui/dialog/pixelartdialog.cpp b/src/ui/dialog/pixelartdialog.cpp
index 760391df6..f557ff0fc 100644
--- a/src/ui/dialog/pixelartdialog.cpp
+++ b/src/ui/dialog/pixelartdialog.cpp
@@ -373,7 +373,7 @@ void PixelArtDialogImpl::vectorize()
     }
 
     std::vector<SPItem*> const items = desktop->selection->itemList();
-    for(std::vector<SPItem*>::const_iterator i=items.begin(); i!=items.end();i++){
+    for(std::vector<SPItem*>::const_iterator i=items.begin(); i!=items.end();++i){
         if ( !SP_IS_IMAGE(*i) )
             continue;
 
diff --git a/src/ui/dialog/polar-arrange-tab.cpp b/src/ui/dialog/polar-arrange-tab.cpp
index af1386e27..a93cebee8 100644
--- a/src/ui/dialog/polar-arrange-tab.cpp
+++ b/src/ui/dialog/polar-arrange-tab.cpp
@@ -304,7 +304,7 @@ void PolarArrangeTab::arrange()
 	bool arrangeOnFirstEllipse = arrangeOnEllipse && arrangeOnFirstCircleRadio.get_active();
 
 	int count = 0;
-	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();i++)
+	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();++i)
 	{
 		if(arrangeOnEllipse)
 		{
diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp
index f36e3f18d..9b6f3219f 100644
--- a/src/ui/dialog/tags.cpp
+++ b/src/ui/dialog/tags.cpp
@@ -353,7 +353,7 @@ void TagsPanel::_objectsSelected( Selection *sel ) {
     _selectedConnection.block();
     _tree.get_selection()->unselect_all();
     std::vector<SPObject*> tmp=sel->list();
-	for(std::vector<SPObject*>::const_iterator i=tmp.begin();i!=tmp.end();i++)
+	for(std::vector<SPObject*>::const_iterator i=tmp.begin();i!=tmp.end();++i)
     {
         SPObject *obj = *i;
         _store->foreach(sigc::bind<SPObject *>( sigc::mem_fun(*this, &TagsPanel::_checkForSelected), obj));
@@ -651,7 +651,7 @@ bool TagsPanel::_handleButtonEvent(GdkEventButton* event)
                         if (SP_IS_TAG(obj)) {
                             bool wasadded = false;
                             std::vector<SPItem*> items=_desktop->selection->itemList();
-                        	for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+                        	for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();++i){
                                 SPObject *newobj = *i;
                                 bool addchild = true;
                                 for ( SPObject *child = obj->children; child != NULL; child = child->next) {
diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp
index cf53e1441..05cf3a388 100644
--- a/src/ui/dialog/text-edit.cpp
+++ b/src/ui/dialog/text-edit.cpp
@@ -444,7 +444,7 @@ SPItem *TextEdit::getSelectedTextItem (void)
         return NULL;
 
     std::vector<SPItem*> tmp=SP_ACTIVE_DESKTOP->getSelection()->itemList();
-	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();i++)
+	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();++i)
     {
         if (SP_IS_TEXT(*i) || SP_IS_FLOWTEXT(*i))
             return *i;
@@ -462,7 +462,7 @@ unsigned TextEdit::getSelectedTextCount (void)
     unsigned int items = 0;
 
     std::vector<SPItem*> tmp=SP_ACTIVE_DESKTOP->getSelection()->itemList();
-	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();i++)
+	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();++i)
     {
         if (SP_IS_TEXT(*i) || SP_IS_FLOWTEXT(*i))
             ++items;
@@ -572,7 +572,7 @@ void TextEdit::onApply()
     SPCSSAttr *css = fillTextStyle ();
     sp_desktop_set_style(desktop, css, true);
 
-	for(std::vector<SPItem*>::const_iterator i=item_list.begin();i!=item_list.end();i++){
+	for(std::vector<SPItem*>::const_iterator i=item_list.begin();i!=item_list.end();++i){
         // apply style to the reprs of all text objects in the selection
         if (SP_IS_TEXT (*i)) {
 
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index 6049368f5..ae972bbbd 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -812,7 +812,7 @@ void Transformation::applyPageScale(Inkscape::Selection *selection)
     bool preserve = prefs->getBool("/options/preservetransform/value", false);
     if (prefs->getBool("/dialogs/transformation/applyseparately")) {
     	std::vector<SPItem*> tmp=selection->itemList();
-    	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();i++){
+    	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();++i){
             SPItem *item = *i;
             Geom::OptRect bbox_pref = item->desktopPreferredBounds();
             Geom::OptRect bbox_geom = item->desktopGeometricBounds();
@@ -876,7 +876,7 @@ void Transformation::applyPageRotate(Inkscape::Selection *selection)
 
     if (prefs->getBool("/dialogs/transformation/applyseparately")) {
     	std::vector<SPItem*> tmp=selection->itemList();
-    	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();i++){
+    	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();++i){
             SPItem *item = *i;
             sp_item_rotate_rel(item, Geom::Rotate (angle*M_PI/180.0));
         }
@@ -896,7 +896,7 @@ void Transformation::applyPageSkew(Inkscape::Selection *selection)
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     if (prefs->getBool("/dialogs/transformation/applyseparately")) {
     	std::vector<SPItem*> items=selection->itemList();
-    	for(std::vector<SPItem*>::const_iterator i = items.begin();i!=items.end();i++){
+    	for(std::vector<SPItem*>::const_iterator i = items.begin();i!=items.end();++i){
             SPItem *item = *i;
 
             if (!_units_skew.isAbsolute()) { // percentage
@@ -998,7 +998,7 @@ void Transformation::applyPageTransform(Inkscape::Selection *selection)
 
     if (_check_replace_matrix.get_active()) {
     	std::vector<SPItem*> tmp=selection->itemList();
-    	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();i++){
+    	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();++i){
             SPItem *item = *i;
             item->set_item_transform(displayed);
             item->updateRepr();
diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp
index e416fd7ef..83ecf7a0a 100644
--- a/src/ui/tools/eraser-tool.cpp
+++ b/src/ui/tools/eraser-tool.cpp
@@ -682,7 +682,7 @@ void EraserTool::set_to_accumulated() {
 
             if ( !toWorkOn.empty() ) {
                 if ( eraserMode ) {
-                    for (std::vector<SPItem*>::const_iterator i = toWorkOn.begin(); i != toWorkOn.end(); i++){
+                    for (std::vector<SPItem*>::const_iterator i = toWorkOn.begin(); i != toWorkOn.end(); ++i){
                     SPItem *item = *i;
 
                         if ( eraserMode ) {
@@ -701,7 +701,7 @@ void EraserTool::set_to_accumulated() {
                                 if ( !selection->isEmpty() ) {
                                     // If the item was not completely erased, track the new remainder.
                                 	std::vector<SPItem*> nowSel(selection->itemList());
-                                    for (std::vector<SPItem*>::const_iterator i2 = nowSel.begin();i2!=nowSel.end();i2++) {
+                                    for (std::vector<SPItem*>::const_iterator i2 = nowSel.begin();i2!=nowSel.end();++i2) {
                                         remainingItems.push_back(*i2);
                                     }
                                 }
@@ -711,11 +711,11 @@ void EraserTool::set_to_accumulated() {
                         }
                     }
                 } else {
-                    for (std::vector<SPItem*> ::const_iterator i = toWorkOn.begin();i!=toWorkOn.end();i++) {
+                    for (std::vector<SPItem*> ::const_iterator i = toWorkOn.begin();i!=toWorkOn.end();++i) {
                         sp_object_ref( *i, 0 );
                     }
 
-                    for (std::vector<SPItem*>::const_iterator i = toWorkOn.begin();i!=toWorkOn.end();i++) {
+                    for (std::vector<SPItem*>::const_iterator i = toWorkOn.begin();i!=toWorkOn.end();++i) {
                         SPItem *item = *i;
                         item->deleteObject(true);
                         sp_object_unref(item);
diff --git a/src/ui/tools/lpe-tool.cpp b/src/ui/tools/lpe-tool.cpp
index 13e47f3a6..9bbc1ac20 100644
--- a/src/ui/tools/lpe-tool.cpp
+++ b/src/ui/tools/lpe-tool.cpp
@@ -397,7 +397,7 @@ lpetool_create_measuring_items(LpeTool *lc, Inkscape::Selection *selection)
     gchar *arc_length;
     double lengthval;
     std::vector<SPItem*> items=selection->itemList();
-    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();++i){
         if (SP_IS_PATH(*i)) {
             path = SP_PATH(*i);
             curve = path->getCurve();
-- 
cgit v1.2.3


From ac14e8884b153cf94b7c88d21ad06efadd9373ce Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 7 Nov 2015 21:57:55 +0100
Subject: Use color if trace dialog is disabled

(bzr r14422.1.43)
---
 src/ui/dialog/clonetiler.cpp |  2 +-
 src/ui/tools/spray-tool.cpp  | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index e842cf78f..1ea80e9f7 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -3017,7 +3017,7 @@ void CloneTiler::clonetiler_do_pick_toggled(GtkToggleButton *tb, GtkWidget *dlg)
 void CloneTiler::show_page_trace()
 {
     gtk_notebook_set_current_page(GTK_NOTEBOOK(nb),6);
-    gtk_toggle_button_set_active ((GtkToggleButton *) b, true);
+    gtk_toggle_button_set_active ((GtkToggleButton *) b, false);
 }
 
 
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 03a225b6e..a57d1db5e 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -538,6 +538,7 @@ static bool fit_item(SPDesktop *desktop,
         if(!nooverlap){
             doc->ensureUpToDate();
         }
+        bool   trace = prefs->getBool("/dialogs/clonetiler/dotrace");
         int    pick = prefs->getInt("/dialogs/clonetiler/pick");
         bool   pick_to_presence = prefs->getBool("/dialogs/clonetiler/pick_to_presence", false);
         bool   pick_to_color = prefs->getBool("/dialogs/clonetiler/pick_to_color");
@@ -561,7 +562,7 @@ static bool fit_item(SPDesktop *desktop,
             return false;
         }
 
-        if(picker){
+        if(picker && trace){
             float hsl[3];
             sp_color_rgb_to_hsl_floatv (hsl, r, g, b);
 
@@ -675,7 +676,7 @@ static bool fit_item(SPDesktop *desktop,
             if (pick_to_presence) {
                 if (g_random_double_range (0, 1) > val) {
                     //Hidding the element is a way to retain original
-                    //beabiohur of tiled clones for presence option.
+                    //behabiohur of tiled clones for presence option.
                     sp_repr_css_set_property(css, "opacity", "0");
                 }
             }
@@ -692,6 +693,15 @@ static bool fit_item(SPDesktop *desktop,
                 return false;
             }
         }
+        if(!trace){
+            sp_svg_write_color(color_string, sizeof(color_string), rgba);
+            if(pickfill){
+                sp_repr_css_set_property(css, "fill", color_string);
+            }
+            if(pickstroke){
+                sp_repr_css_set_property(css, "stroke", color_string);
+            }
+        }
         if(!nooverlap && (picker || visible)){
             for (std::vector<SPItem *>::const_iterator k=items_down.begin(); k!=items_down.end(); k++) {
                 SPItem *item_hidden = *k;
-- 
cgit v1.2.3


From d2b9a1e46cd23379f3800ea65cd3f3337f4d1f1e Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 7 Nov 2015 22:27:41 +0100
Subject: Fix for scale bug pointed by Mc-

(bzr r14422.1.45)
---
 src/ui/tools/spray-tool.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index a57d1db5e..6af30b5fc 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -459,7 +459,8 @@ static bool fit_item(SPDesktop *desktop,
     }
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     bool pick_to_size = prefs->getBool("/dialogs/clonetiler/pick_to_size");
-    if(picker && pick_to_size && !trace_scale){
+    bool trace = prefs->getBool("/dialogs/clonetiler/dotrace");
+    if(picker && pick_to_size && !trace_scale && trace){
         _scale = 0.1;
     }
     Geom::OptRect bbox_procesed = Geom::Rect(Geom::Point(bbox->left() - offset_min, bbox->top() - offset_min),Geom::Point(bbox->right() + offset_min, bbox->bottom() + offset_min));
@@ -538,7 +539,6 @@ static bool fit_item(SPDesktop *desktop,
         if(!nooverlap){
             doc->ensureUpToDate();
         }
-        bool   trace = prefs->getBool("/dialogs/clonetiler/dotrace");
         int    pick = prefs->getInt("/dialogs/clonetiler/pick");
         bool   pick_to_presence = prefs->getBool("/dialogs/clonetiler/pick_to_presence", false);
         bool   pick_to_color = prefs->getBool("/dialogs/clonetiler/pick_to_color");
-- 
cgit v1.2.3


From 26783ada6dd88c1f2df732707628bae6a4d68e42 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 8 Nov 2015 00:18:24 +0100
Subject: Fixes from review form Mc-

(bzr r14422.1.46)
---
 src/ui/dialog/clonetiler.cpp | 6 +++---
 src/ui/tools/spray-tool.cpp  | 5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index 1ea80e9f7..fd8afd4a3 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -785,11 +785,11 @@ CloneTiler::CloneTiler () :
 #endif
             gtk_box_pack_start (GTK_BOX (vb), hb, FALSE, FALSE, 0);
 
-            b  = gtk_check_button_new_with_label (_("Trace the drawing under the tiles/spray tool"));
+            b  = gtk_check_button_new_with_label (_("Trace the drawing under the clones/sprayed items"));
             g_object_set_data (G_OBJECT(b), "uncheckable", GINT_TO_POINTER(TRUE));
             bool old = prefs->getBool(prefs_path + "dotrace");
             gtk_toggle_button_set_active ((GtkToggleButton *) b, old);
-            gtk_widget_set_tooltip_text (b, _("For each clone/ Sprayed item, pick a value from the drawing in that clone's or item spayed location and apply it"));
+            gtk_widget_set_tooltip_text (b, _("For each clone/sparayed item, pick a value from the drawing in its location and apply it"));
             gtk_box_pack_start (GTK_BOX (hb), b, FALSE, FALSE, 0);
 
             g_signal_connect(G_OBJECT(b), "toggled",
@@ -998,7 +998,7 @@ CloneTiler::CloneTiler () :
            gtk_widget_set_sensitive (vvb, prefs->getBool(prefs_path + "dotrace"));
         }
         }
-        // Info 
+
         {
 #if GTK_CHECK_VERSION(3,0,0)
             GtkWidget *hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VB_MARGIN);
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 6af30b5fc..17b82fe1d 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -331,7 +331,6 @@ static void sp_spray_extinput(SprayTool *tc, GdkEvent *event)
 static double get_width(SprayTool *tc)
 {
     double pressure = (tc->usepressurewidth? tc->pressure / TC_DEFAULT_PRESSURE : 1);
-    //g_warning("Pressure, population: %f, %f", pressure, pressure * tc->population);
     return pressure * tc->width;
 }
 
@@ -353,14 +352,12 @@ static double get_path_standard_deviation(SprayTool *tc)
 static double get_population(SprayTool *tc)
 {
     double pressure = (tc->usepressurepopulation? tc->pressure / TC_DEFAULT_PRESSURE : 1);
-    //g_warning("Pressure, population: %f, %f", pressure, pressure * tc->population);
     return pressure * tc->population;
 }
 
 static double get_pressure(SprayTool *tc)
 {
     double pressure = tc->pressure / TC_DEFAULT_PRESSURE;
-    //g_warning("Pressure, population: %f, %f", pressure, pressure * tc->population);
     return pressure;
 }
 
@@ -676,7 +673,7 @@ static bool fit_item(SPDesktop *desktop,
             if (pick_to_presence) {
                 if (g_random_double_range (0, 1) > val) {
                     //Hidding the element is a way to retain original
-                    //behabiohur of tiled clones for presence option.
+                    //behaviour of tiled clones for presence option.
                     sp_repr_css_set_property(css, "opacity", "0");
                 }
             }
-- 
cgit v1.2.3


From 298e5a9a28984e062b3901172cdc356836266d58 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 8 Nov 2015 10:49:26 +0100
Subject: Fix a typo

(bzr r14422.1.47)
---
 src/ui/dialog/clonetiler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index fd8afd4a3..fbd050f8e 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -789,7 +789,7 @@ CloneTiler::CloneTiler () :
             g_object_set_data (G_OBJECT(b), "uncheckable", GINT_TO_POINTER(TRUE));
             bool old = prefs->getBool(prefs_path + "dotrace");
             gtk_toggle_button_set_active ((GtkToggleButton *) b, old);
-            gtk_widget_set_tooltip_text (b, _("For each clone/sparayed item, pick a value from the drawing in its location and apply it"));
+            gtk_widget_set_tooltip_text (b, _("For each clone/sprayed item, pick a value from the drawing in its location and apply it"));
             gtk_box_pack_start (GTK_BOX (hb), b, FALSE, FALSE, 0);
 
             g_signal_connect(G_OBJECT(b), "toggled",
-- 
cgit v1.2.3


From 94f3d50ddcbd6ceca8d3d834554a5100142648e4 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Mon, 9 Nov 2015 00:46:25 +0000
Subject: Enable builds without flood/trace on systems without Potrace

(bzr r14449.1.4)
---
 src/ui/dialog/Makefile_insert    | 10 ++++++++--
 src/ui/dialog/dialog-manager.cpp | 14 +++++++++++++-
 src/ui/tool-factory.cpp          |  8 +++++++-
 src/ui/tools/Makefile_insert     | 10 ++++++++--
 4 files changed, 36 insertions(+), 6 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/Makefile_insert b/src/ui/dialog/Makefile_insert
index cbdae1cb0..793988a7d 100644
--- a/src/ui/dialog/Makefile_insert
+++ b/src/ui/dialog/Makefile_insert
@@ -106,8 +106,6 @@ ink_common_sources +=		\
 	ui/dialog/text-edit.h			\
 	ui/dialog/tile.cpp			\
 	ui/dialog/tile.h			\
-	ui/dialog/tracedialog.cpp		\
-	ui/dialog/tracedialog.h			\
 	ui/dialog/pixelartdialog.cpp		\
 	ui/dialog/pixelartdialog.h		\
 	ui/dialog/transformation.cpp		\
@@ -123,3 +121,11 @@ ink_common_sources +=		\
 	ui/dialog/lpe-fillet-chamfer-properties.cpp		\
 	ui/dialog/lpe-fillet-chamfer-properties.h		\
 	$(inkboard_dialogs)
+
+if HAVE_POTRACE
+
+ink_common_sources +=		\
+	ui/dialog/tracedialog.cpp		\
+	ui/dialog/tracedialog.h
+
+endif
diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index 7b1b36908..49853277c 100644
--- a/src/ui/dialog/dialog-manager.cpp
+++ b/src/ui/dialog/dialog-manager.cpp
@@ -34,7 +34,11 @@
 #include "ui/dialog/messages.h"
 #include "ui/dialog/symbols.h"
 #include "ui/dialog/tile.h"
-#include "ui/dialog/tracedialog.h"
+
+#if HAVE_POTRACE
+# include "ui/dialog/tracedialog.h"
+#endif
+
 #include "ui/dialog/pixelartdialog.h"
 #include "ui/dialog/transformation.h"
 #include "ui/dialog/undo-history.h"
@@ -124,7 +128,11 @@ DialogManager::DialogManager() {
         registerFactory("Swatches",            &create<SwatchesPanel,        FloatingBehavior>);
         registerFactory("TileDialog",          &create<ArrangeDialog,        FloatingBehavior>);
         registerFactory("Symbols",             &create<SymbolsDialog,        FloatingBehavior>);
+
+#if HAVE_POTRACE
         registerFactory("Trace",               &create<TraceDialog,          FloatingBehavior>);
+#endif
+
         registerFactory("PixelArt",            &create<PixelArtDialog,       FloatingBehavior>);
         registerFactory("Transformation",      &create<Transformation,       FloatingBehavior>);
         registerFactory("UndoHistory",         &create<UndoHistory,          FloatingBehavior>);
@@ -159,7 +167,11 @@ DialogManager::DialogManager() {
         registerFactory("Swatches",            &create<SwatchesPanel,        DockBehavior>);
         registerFactory("TileDialog",          &create<ArrangeDialog,        DockBehavior>);
         registerFactory("Symbols",             &create<SymbolsDialog,        DockBehavior>);
+
+#if HAVE_POTRACE
         registerFactory("Trace",               &create<TraceDialog,          DockBehavior>);
+#endif
+
         registerFactory("PixelArt",            &create<PixelArtDialog,       DockBehavior>);
         registerFactory("Transformation",      &create<Transformation,       DockBehavior>);
         registerFactory("UndoHistory",         &create<UndoHistory,          DockBehavior>);
diff --git a/src/ui/tool-factory.cpp b/src/ui/tool-factory.cpp
index 700bd40ce..c6c579c9e 100644
--- a/src/ui/tool-factory.cpp
+++ b/src/ui/tool-factory.cpp
@@ -16,7 +16,11 @@
 #include "ui/tools/connector-tool.h"
 #include "ui/tools/dropper-tool.h"
 #include "ui/tools/eraser-tool.h"
-#include "ui/tools/flood-tool.h"
+
+#if HAVE_POTRACE
+# include "ui/tools/flood-tool.h"
+#endif
+
 #include "ui/tools/gradient-tool.h"
 #include "ui/tools/lpe-tool.h"
 #include "ui/tools/measure-tool.h"
@@ -52,8 +56,10 @@ ToolBase *ToolFactory::createObject(std::string const& id)
         tool = new DropperTool;
     else if (id == "/tools/eraser")
         tool = new EraserTool;
+#if HAVE_POTRACE
     else if (id == "/tools/paintbucket")
         tool = new FloodTool;
+#endif
     else if (id == "/tools/gradient")
         tool = new GradientTool;
     else if (id == "/tools/lpetool")
diff --git a/src/ui/tools/Makefile_insert b/src/ui/tools/Makefile_insert
index cd09a3230..686dfedd8 100644
--- a/src/ui/tools/Makefile_insert
+++ b/src/ui/tools/Makefile_insert
@@ -8,7 +8,6 @@ ink_common_sources += \
 	ui/tools/dropper-tool.cpp ui/tools/dropper-tool.h				\
 	ui/tools/dynamic-base.cpp ui/tools/dynamic-base.h				\
 	ui/tools/eraser-tool.cpp ui/tools/eraser-tool.h					\
-	ui/tools/flood-tool.cpp ui/tools/flood-tool.h					\
 	ui/tools/freehand-base.cpp ui/tools/freehand-base.h				\
 	ui/tools/gradient-tool.cpp ui/tools/gradient-tool.h				\
 	ui/tools/lpe-tool.cpp ui/tools/lpe-tool.h						\
@@ -25,4 +24,11 @@ ink_common_sources += \
 	ui/tools/text-tool.cpp ui/tools/text-tool.h						\
 	ui/tools/tool-base.cpp ui/tools/tool-base.h						\
 	ui/tools/tweak-tool.cpp ui/tools/tweak-tool.h					\
-	ui/tools/zoom-tool.cpp ui/tools/zoom-tool.h
\ No newline at end of file
+	ui/tools/zoom-tool.cpp ui/tools/zoom-tool.h
+
+if HAVE_POTRACE
+
+ink_common_sources += \
+	ui/tools/flood-tool.cpp ui/tools/flood-tool.h
+
+endif
-- 
cgit v1.2.3


From 31aa6219ac721c59cb1a98788dbca7b7a58c5000 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 10 Nov 2015 18:23:11 +0100
Subject: Spray Tool: Change hide invisibe by over visible and over invisible,
 sugested by Ivan Louette

(bzr r14453)
---
 src/ui/tools/spray-tool.cpp | 47 +++++++++++++++++++++++++++++----------------
 src/ui/tools/spray-tool.h   |  3 ++-
 2 files changed, 32 insertions(+), 18 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 17b82fe1d..99cb78936 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -178,7 +178,8 @@ SprayTool::SprayTool()
     , pickinversevalue(false)
     , pickfill(false)
     , pickstroke(false)
-    , visible(false)
+    , overtransparent(true)
+    , overnotransparent(true)
     , offset(0)
 {
 }
@@ -259,7 +260,8 @@ void SprayTool::setup() {
     sp_event_context_read(this, "pickinversevalue");
     sp_event_context_read(this, "pickfill");
     sp_event_context_read(this, "pickstroke");
-    sp_event_context_read(this, "visible");
+    sp_event_context_read(this, "overnotransparent");
+    sp_event_context_read(this, "overtransparent");
     sp_event_context_read(this, "nooverlap");
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -312,8 +314,10 @@ void SprayTool::set(const Inkscape::Preferences::Entry& val) {
         this->pickfill =  val.getBool();
     } else if (path == "pickstroke") {
         this->pickstroke =  val.getBool();
-    } else if (path == "visible") {
-        this->visible =  val.getBool();
+    } else if (path == "overnotransparent") {
+        this->overnotransparent =  val.getBool();
+    } else if (path == "overtransparent") {
+        this->overtransparent =  val.getBool();
     } else if (path == "nooverlap") {
         this->nooverlap = val.getBool();
     }
@@ -440,7 +444,8 @@ static bool fit_item(SPDesktop *desktop,
                      bool pickinversevalue,
                      bool pickfill,
                      bool pickstroke,
-                     bool visible,
+                     bool overnotransparent,
+                     bool overtransparent,
                      bool nooverlap,
                      double offset,
                      SPCSSAttr *css,
@@ -485,7 +490,10 @@ static bool fit_item(SPDesktop *desktop,
     ink_cairo_surface_average_color(s, R, G, B, A);
     cairo_surface_destroy(s);
     guint32 rgba = SP_RGBA32_F_COMPOSE(R, G, B, A);
-    if(nooverlap && visible && (A==0 || A < 1e-6)){
+    if(nooverlap && !overtransparent && (A==0 || A < 1e-6)){
+        return false;
+    }
+    if(nooverlap && !overnotransparent && A>0){
         return false;
     }
     size = std::min(width_transformed,height_transformed);
@@ -525,14 +533,14 @@ static bool fit_item(SPDesktop *desktop,
                 std::abs(bbox_top - bbox_top_main) > std::abs(offset_min))){
                         return false;
                     }
-                } else if(picker || visible){
+                } else if(picker || !overtransparent || !overnotransparent){
                     item_down->setHidden(true);
                     item_down->updateRepr();
                 }
             }
         }
     }
-    if(picker || visible){
+    if(picker || !overtransparent || !overnotransparent){
         if(!nooverlap){
             doc->ensureUpToDate();
         }
@@ -555,7 +563,10 @@ static bool fit_item(SPDesktop *desktop,
             g = 1;
             b = 1;
         }
-        if(visible && (a == 0 || a < 1e-6)){
+        if(!overtransparent && (a == 0 || a < 1e-6)){
+            return false;
+        }
+        if(!overnotransparent && a >0){
             return false;
         }
 
@@ -649,7 +660,8 @@ static bool fit_item(SPDesktop *desktop,
                          pickinversevalue,
                          pickfill,
                          pickstroke,
-                         visible,
+                         overnotransparent,
+                         overtransparent,
                          nooverlap,
                          offset,
                          css,
@@ -699,7 +711,7 @@ static bool fit_item(SPDesktop *desktop,
                 sp_repr_css_set_property(css, "stroke", color_string);
             }
         }
-        if(!nooverlap && (picker || visible)){
+        if(!nooverlap && (picker || !overtransparent || !overnotransparent)){
             for (std::vector<SPItem *>::const_iterator k=items_down.begin(); k!=items_down.end(); k++) {
                 SPItem *item_hidden = *k;
                 item_hidden->setHidden(false);
@@ -732,7 +744,8 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                bool pickinversevalue,
                                bool pickfill,
                                bool pickstroke,
-                               bool visible,
+                               bool overnotransparent,
+                               bool overtransparent,
                                double offset,
                                bool usepressurescale,
                                double pressure)
@@ -773,8 +786,8 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point center = item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
-                if(nooverlap || picker || visible){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversevalue, pickfill, pickstroke, visible, nooverlap, offset, css, false)){
+                if(nooverlap || picker || !overtransparent || !overnotransparent){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversevalue, pickfill, pickstroke, overnotransparent, overtransparent, nooverlap, offset, css, false)){
                         return false;
                     }
                 }
@@ -880,8 +893,8 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point center=item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
-                if(nooverlap || picker || visible){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversevalue, pickfill, pickstroke, visible, nooverlap, offset, css, false)){
+                if(nooverlap || picker || !overtransparent || !overnotransparent){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversevalue, pickfill, pickstroke, overnotransparent, overtransparent, nooverlap, offset, css, false)){
                         return false;
                     }
                 }
@@ -959,7 +972,7 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
         for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
             SPItem *item = *i;
             g_assert(item != NULL);
-            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->nooverlap, tc->picker, tc->pickinversevalue, tc->pickfill, tc->pickstroke, tc->visible, tc->offset, tc->usepressurescale, get_pressure(tc))) {
+            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->nooverlap, tc->picker, tc->pickinversevalue, tc->pickfill, tc->pickstroke, tc->overnotransparent, tc->overtransparent, tc->offset, tc->usepressurescale, get_pressure(tc))) {
                 did = true;
             }
         }
diff --git a/src/ui/tools/spray-tool.h b/src/ui/tools/spray-tool.h
index ca0c20375..ba4e75f70 100644
--- a/src/ui/tools/spray-tool.h
+++ b/src/ui/tools/spray-tool.h
@@ -94,7 +94,8 @@ public:
     bool pickinversevalue;
     bool pickfill;
     bool pickstroke;
-    bool visible;
+    bool overtransparent;
+    bool overnotransparent;
     double offset;
     sigc::connection style_set_connection;
 
-- 
cgit v1.2.3


From de44c6059f00e773cef5c22534e12a1adc50b3a4 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 11 Nov 2015 01:02:03 +0100
Subject: Improvements to the over visible/invisible to minimize the colisions,
 sprayed items fit on background whith overlap visible or invisible areas Add
 option in picker mode to compute the center/or average area of sprayed item
 Now reverse work without adbanced trace dialog inverting the color. By this
 all buttons have a utility in advanced and in normal mode

(bzr r14454)
---
 src/ui/tools/spray-tool.cpp | 115 ++++++++++++++++++++++++++++++++++++--------
 src/ui/tools/spray-tool.h   |   1 +
 2 files changed, 96 insertions(+), 20 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 99cb78936..1ec7815c5 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -175,6 +175,7 @@ SprayTool::SprayTool()
     , dilate_area(NULL)
     , nooverlap(false)
     , picker(false)
+    , pickcenter(true)
     , pickinversevalue(false)
     , pickfill(false)
     , pickstroke(false)
@@ -257,6 +258,7 @@ void SprayTool::setup() {
     sp_event_context_read(this, "Scale");
     sp_event_context_read(this, "offset");
     sp_event_context_read(this, "picker");
+    sp_event_context_read(this, "pickcenter");
     sp_event_context_read(this, "pickinversevalue");
     sp_event_context_read(this, "pickfill");
     sp_event_context_read(this, "pickstroke");
@@ -308,6 +310,8 @@ void SprayTool::set(const Inkscape::Preferences::Entry& val) {
         this->offset = CLAMP(val.getDouble(), -1000.0, 1000.0);
     } else if (path == "picker") {
         this->picker =  val.getBool();
+    } else if (path == "pickcenter") {
+        this->pickcenter =  val.getBool();
     } else if (path == "pickinversevalue") {
         this->pickinversevalue =  val.getBool();
     } else if (path == "pickfill") {
@@ -432,6 +436,33 @@ double randomize01(double val, double rand)
     return CLAMP(val, 0, 1); // this should be unnecessary with the above provisions, but just in case...
 }
 
+guint32 getPickerData(Geom::IntRect area){
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    double R = 0, G = 0, B = 0, A = 0;
+    cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, area.width(), area.height());
+    sp_canvas_arena_render_surface(SP_CANVAS_ARENA(desktop->getDrawing()), s, area);
+    ink_cairo_surface_average_color(s, R, G, B, A);
+    cairo_surface_destroy(s);
+    return SP_RGBA32_F_COMPOSE(R, G, B, A);
+}
+
+bool isTrans(Geom::Point N){
+    gint32 rgba = getPickerData(Geom::IntRect::from_xywh(floor(N[Geom::X]), floor(N[Geom::Y]), 1, 1));
+    return SP_RGBA32_A_F(rgba)==0 || SP_RGBA32_A_F(rgba) < 1e-6;
+}
+
+bool overTrans(Geom::Point A, Geom::Point B, Geom::Point C, Geom::Point D){
+    return isTrans(A) || isTrans(B) || isTrans(C) || isTrans(D);
+}
+
+static void showHidden(std::vector<SPItem *> items_down){
+    for (std::vector<SPItem *>::const_iterator k=items_down.begin(); k!=items_down.end(); k++) {
+        SPItem *item_hidden = *k;
+        item_hidden->setHidden(false);
+        item_hidden->updateRepr();
+    }
+}
+
 static bool fit_item(SPDesktop *desktop,
                      SPItem *item,
                      Geom::OptRect bbox,
@@ -441,6 +472,7 @@ static bool fit_item(SPDesktop *desktop,
                      double &_scale,
                      double scale,
                      bool picker,
+                     bool pickcenter,
                      bool pickinversevalue,
                      bool pickfill,
                      bool pickstroke,
@@ -479,21 +511,32 @@ static bool fit_item(SPDesktop *desktop,
     path *= desktop->doc2dt();
     bbox_procesed = path.boundsFast();
     double bbox_left_main = bbox_procesed->left();
+    double bbox_right_main = bbox_procesed->right();
     double bbox_top_main = bbox_procesed->top();
+    double bbox_bottom_main = bbox_procesed->bottom();
     double width_transformed = bbox_procesed->width();
     double height_transformed = bbox_procesed->height();
     Geom::Point mid_point = desktop->d2w(bbox_procesed->midpoint());
+    Geom::Rect rect_sprayed(mid_point, mid_point);
+    rect_sprayed.expandBy(width_transformed/2.0, height_transformed/2.0);
     Geom::IntRect area = Geom::IntRect::from_xywh(floor(mid_point[Geom::X]), floor(mid_point[Geom::Y]), 1, 1);
-    double R = 0, G = 0, B = 0, A = 0;
-    cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 1, 1);
-    sp_canvas_arena_render_surface(SP_CANVAS_ARENA(desktop->getDrawing()), s, area);
-    ink_cairo_surface_average_color(s, R, G, B, A);
-    cairo_surface_destroy(s);
-    guint32 rgba = SP_RGBA32_F_COMPOSE(R, G, B, A);
-    if(nooverlap && !overtransparent && (A==0 || A < 1e-6)){
+    if (!rect_sprayed.hasZeroArea() && (!pickcenter || (overtransparent && !overnotransparent))) {
+        area = rect_sprayed.roundOutwards();
+    }
+    guint32 rgba = getPickerData(area);
+    if(!overtransparent && overnotransparent){
+        Geom::Point lt = desktop->d2w(Geom::Point(floor(bbox_left_main),floor(bbox_top_main)));
+        Geom::Point rt = desktop->d2w(Geom::Point(floor(bbox_right_main),floor(bbox_top_main)));
+        Geom::Point rb = desktop->d2w(Geom::Point(floor(bbox_right_main),floor(bbox_bottom_main)));
+        Geom::Point lb = desktop->d2w(Geom::Point(floor(bbox_left_main),floor(bbox_bottom_main)));
+        if(overTrans(lt, rt, rb, lb)){
+            return false;
+        }
+    }
+    if(nooverlap && !overtransparent && (SP_RGBA32_A_F(rgba)==0 || SP_RGBA32_A_F(rgba) < 1e-6)){
         return false;
     }
-    if(nooverlap && !overnotransparent && A>0){
+    if(nooverlap && !overnotransparent && SP_RGBA32_A_F(rgba)>0){
         return false;
     }
     size = std::min(width_transformed,height_transformed);
@@ -533,16 +576,29 @@ static bool fit_item(SPDesktop *desktop,
                 std::abs(bbox_top - bbox_top_main) > std::abs(offset_min))){
                         return false;
                     }
-                } else if(picker || !overtransparent || !overnotransparent){
+                } else if(picker || overtransparent || overnotransparent){
                     item_down->setHidden(true);
                     item_down->updateRepr();
                 }
             }
         }
     }
-    if(picker || !overtransparent || !overnotransparent){
+    if(picker || overtransparent || overnotransparent){
         if(!nooverlap){
             doc->ensureUpToDate();
+            rgba = getPickerData(area);
+        }
+        if(!overtransparent && overnotransparent){
+            Geom::Point lt = desktop->d2w(Geom::Point(floor(bbox_left_main),floor(bbox_top_main)));
+            Geom::Point rt = desktop->d2w(Geom::Point(floor(bbox_right_main),floor(bbox_top_main)));
+            Geom::Point rb = desktop->d2w(Geom::Point(floor(bbox_right_main),floor(bbox_bottom_main)));
+            Geom::Point lb = desktop->d2w(Geom::Point(floor(bbox_left_main),floor(bbox_bottom_main)));
+            if(overTrans(lt, rt, rb, lb)){
+                if(!nooverlap && (picker || overtransparent || overnotransparent)){
+                    showHidden(items_down);
+                }
+                return false;
+            }
         }
         int    pick = prefs->getInt("/dialogs/clonetiler/pick");
         bool   pick_to_presence = prefs->getBool("/dialogs/clonetiler/pick_to_presence", false);
@@ -564,9 +620,15 @@ static bool fit_item(SPDesktop *desktop,
             b = 1;
         }
         if(!overtransparent && (a == 0 || a < 1e-6)){
+            if(!nooverlap && (picker || overtransparent || overnotransparent)){
+                showHidden(items_down);
+            }
             return false;
         }
-        if(!overnotransparent && a >0){
+        if(!overnotransparent && a > 0){
+            if(!nooverlap && (picker || overtransparent || overnotransparent)){
+                showHidden(items_down);
+            }
             return false;
         }
 
@@ -646,6 +708,9 @@ static bool fit_item(SPDesktop *desktop,
                         _scale = val;
                     }
                     if(_scale == 0.0) {
+                        if(!nooverlap && (picker || overtransparent || overnotransparent)){
+                            showHidden(items_down);
+                        }
                         return false;
                     }
                     if(!fit_item(desktop,
@@ -657,6 +722,7 @@ static bool fit_item(SPDesktop *desktop,
                          _scale,
                          scale,
                          picker,
+                         pickcenter,
                          pickinversevalue,
                          pickfill,
                          pickstroke,
@@ -666,6 +732,9 @@ static bool fit_item(SPDesktop *desktop,
                          offset,
                          css,
                          true)){
+                            if(!nooverlap && (picker || overtransparent || overnotransparent)){
+                                showHidden(items_down);
+                            }
                             return false;
                          }
                 }
@@ -699,10 +768,19 @@ static bool fit_item(SPDesktop *desktop,
                 }
             }
             if (opacity < 1e-6) { // invisibly transparent, skip
+                if(!nooverlap && (picker || overtransparent || overnotransparent)){
+                    showHidden(items_down);
+                }
                 return false;
             }
         }
         if(!trace){
+            if (pickinversevalue) {
+                r = 1 - r;
+                g = 1 - g;
+                b = 1 - b;
+            }
+            rgba = SP_RGBA32_F_COMPOSE(r, g, b, a);
             sp_svg_write_color(color_string, sizeof(color_string), rgba);
             if(pickfill){
                 sp_repr_css_set_property(css, "fill", color_string);
@@ -711,12 +789,8 @@ static bool fit_item(SPDesktop *desktop,
                 sp_repr_css_set_property(css, "stroke", color_string);
             }
         }
-        if(!nooverlap && (picker || !overtransparent || !overnotransparent)){
-            for (std::vector<SPItem *>::const_iterator k=items_down.begin(); k!=items_down.end(); k++) {
-                SPItem *item_hidden = *k;
-                item_hidden->setHidden(false);
-                item_hidden->updateRepr();
-            }
+        if(!nooverlap && (picker || overtransparent || overnotransparent)){
+            showHidden(items_down);
         }
     }
     return true;
@@ -741,6 +815,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                gint _distrib,
                                bool nooverlap,
                                bool picker,
+                               bool pickcenter,
                                bool pickinversevalue,
                                bool pickfill,
                                bool pickstroke,
@@ -787,7 +862,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
                 if(nooverlap || picker || !overtransparent || !overnotransparent){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversevalue, pickfill, pickstroke, overnotransparent, overtransparent, nooverlap, offset, css, false)){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickcenter, pickinversevalue, pickfill, pickstroke, overnotransparent, overtransparent, nooverlap, offset, css, false)){
                         return false;
                     }
                 }
@@ -894,7 +969,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
                 if(nooverlap || picker || !overtransparent || !overnotransparent){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversevalue, pickfill, pickstroke, overnotransparent, overtransparent, nooverlap, offset, css, false)){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickcenter, pickinversevalue, pickfill, pickstroke, overnotransparent, overtransparent, nooverlap, offset, css, false)){
                         return false;
                     }
                 }
@@ -972,7 +1047,7 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
         for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
             SPItem *item = *i;
             g_assert(item != NULL);
-            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->nooverlap, tc->picker, tc->pickinversevalue, tc->pickfill, tc->pickstroke, tc->overnotransparent, tc->overtransparent, tc->offset, tc->usepressurescale, get_pressure(tc))) {
+            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->nooverlap, tc->picker, tc->pickcenter, tc->pickinversevalue, tc->pickfill, tc->pickstroke, tc->overnotransparent, tc->overtransparent, tc->offset, tc->usepressurescale, get_pressure(tc))) {
                 did = true;
             }
         }
diff --git a/src/ui/tools/spray-tool.h b/src/ui/tools/spray-tool.h
index ba4e75f70..066ced00e 100644
--- a/src/ui/tools/spray-tool.h
+++ b/src/ui/tools/spray-tool.h
@@ -91,6 +91,7 @@ public:
     SPCanvasItem *dilate_area;
     bool nooverlap;
     bool picker;
+    bool pickcenter;
     bool pickinversevalue;
     bool pickfill;
     bool pickstroke;
-- 
cgit v1.2.3


From 75f6b25acdf6f51f5772e55d2150076b539b6e67 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 11 Nov 2015 09:34:01 +0100
Subject: Add option to spray tool to no overlap between colors

(bzr r14455)
---
 src/ui/tools/spray-tool.cpp | 59 ++++++++++++++++++++++++++-------------------
 src/ui/tools/spray-tool.h   |  1 +
 2 files changed, 35 insertions(+), 25 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 1ec7815c5..1c9656a38 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -179,6 +179,7 @@ SprayTool::SprayTool()
     , pickinversevalue(false)
     , pickfill(false)
     , pickstroke(false)
+    , picknooverlap(false)
     , overtransparent(true)
     , overnotransparent(true)
     , offset(0)
@@ -262,6 +263,7 @@ void SprayTool::setup() {
     sp_event_context_read(this, "pickinversevalue");
     sp_event_context_read(this, "pickfill");
     sp_event_context_read(this, "pickstroke");
+    sp_event_context_read(this, "picknooverlap");
     sp_event_context_read(this, "overnotransparent");
     sp_event_context_read(this, "overtransparent");
     sp_event_context_read(this, "nooverlap");
@@ -318,6 +320,8 @@ void SprayTool::set(const Inkscape::Preferences::Entry& val) {
         this->pickfill =  val.getBool();
     } else if (path == "pickstroke") {
         this->pickstroke =  val.getBool();
+    } else if (path == "picknooverlap") {
+        this->picknooverlap =  val.getBool();
     } else if (path == "overnotransparent") {
         this->overnotransparent =  val.getBool();
     } else if (path == "overtransparent") {
@@ -451,12 +455,18 @@ bool isTrans(Geom::Point N){
     return SP_RGBA32_A_F(rgba)==0 || SP_RGBA32_A_F(rgba) < 1e-6;
 }
 
-bool overTrans(Geom::Point A, Geom::Point B, Geom::Point C, Geom::Point D){
-    return isTrans(A) || isTrans(B) || isTrans(C) || isTrans(D);
+bool overTrans(std::vector<Geom::Point> points){
+    for (std::vector<Geom::Point>::const_iterator k=points.begin(); k!=points.end(); ++k) {
+        Geom::Point point = *k;
+        if(isTrans(point)){
+            return true;
+        }
+    }
+    return false;
 }
 
 static void showHidden(std::vector<SPItem *> items_down){
-    for (std::vector<SPItem *>::const_iterator k=items_down.begin(); k!=items_down.end(); k++) {
+    for (std::vector<SPItem *>::const_iterator k=items_down.begin(); k!=items_down.end(); ++k) {
         SPItem *item_hidden = *k;
         item_hidden->setHidden(false);
         item_hidden->updateRepr();
@@ -476,6 +486,7 @@ static bool fit_item(SPDesktop *desktop,
                      bool pickinversevalue,
                      bool pickfill,
                      bool pickstroke,
+                     bool picknooverlap,
                      bool overnotransparent,
                      bool overtransparent,
                      bool nooverlap,
@@ -511,28 +522,24 @@ static bool fit_item(SPDesktop *desktop,
     path *= desktop->doc2dt();
     bbox_procesed = path.boundsFast();
     double bbox_left_main = bbox_procesed->left();
-    double bbox_right_main = bbox_procesed->right();
     double bbox_top_main = bbox_procesed->top();
-    double bbox_bottom_main = bbox_procesed->bottom();
     double width_transformed = bbox_procesed->width();
     double height_transformed = bbox_procesed->height();
     Geom::Point mid_point = desktop->d2w(bbox_procesed->midpoint());
     Geom::Rect rect_sprayed(mid_point, mid_point);
     rect_sprayed.expandBy(width_transformed/2.0, height_transformed/2.0);
     Geom::IntRect area = Geom::IntRect::from_xywh(floor(mid_point[Geom::X]), floor(mid_point[Geom::Y]), 1, 1);
-    if (!rect_sprayed.hasZeroArea() && (!pickcenter || (overtransparent && !overnotransparent))) {
-        area = rect_sprayed.roundOutwards();
-    }
-    guint32 rgba = getPickerData(area);
-    if(!overtransparent && overnotransparent){
-        Geom::Point lt = desktop->d2w(Geom::Point(floor(bbox_left_main),floor(bbox_top_main)));
-        Geom::Point rt = desktop->d2w(Geom::Point(floor(bbox_right_main),floor(bbox_top_main)));
-        Geom::Point rb = desktop->d2w(Geom::Point(floor(bbox_right_main),floor(bbox_bottom_main)));
-        Geom::Point lb = desktop->d2w(Geom::Point(floor(bbox_left_main),floor(bbox_bottom_main)));
-        if(overTrans(lt, rt, rb, lb)){
+    guint32 rgba;
+    if(picknooverlap && !rect_sprayed.hasZeroArea()){
+        if(getPickerData(area) != getPickerData(rect_sprayed.roundOutwards())){
             return false;
         }
     }
+    if (!rect_sprayed.hasZeroArea() && !pickcenter) {
+        rgba = getPickerData(rect_sprayed.roundOutwards());
+    } else {
+        rgba = getPickerData(area);
+    }
     if(nooverlap && !overtransparent && (SP_RGBA32_A_F(rgba)==0 || SP_RGBA32_A_F(rgba) < 1e-6)){
         return false;
     }
@@ -586,14 +593,14 @@ static bool fit_item(SPDesktop *desktop,
     if(picker || overtransparent || overnotransparent){
         if(!nooverlap){
             doc->ensureUpToDate();
-            rgba = getPickerData(area);
+            if (!rect_sprayed.hasZeroArea() && !pickcenter) {
+                rgba = getPickerData(rect_sprayed.roundOutwards());
+            } else {
+                rgba = getPickerData(area);
+            }
         }
-        if(!overtransparent && overnotransparent){
-            Geom::Point lt = desktop->d2w(Geom::Point(floor(bbox_left_main),floor(bbox_top_main)));
-            Geom::Point rt = desktop->d2w(Geom::Point(floor(bbox_right_main),floor(bbox_top_main)));
-            Geom::Point rb = desktop->d2w(Geom::Point(floor(bbox_right_main),floor(bbox_bottom_main)));
-            Geom::Point lb = desktop->d2w(Geom::Point(floor(bbox_left_main),floor(bbox_bottom_main)));
-            if(overTrans(lt, rt, rb, lb)){
+        if(picknooverlap && !rect_sprayed.hasZeroArea()){
+            if(getPickerData(area) != getPickerData(rect_sprayed.roundOutwards())){
                 if(!nooverlap && (picker || overtransparent || overnotransparent)){
                     showHidden(items_down);
                 }
@@ -726,6 +733,7 @@ static bool fit_item(SPDesktop *desktop,
                          pickinversevalue,
                          pickfill,
                          pickstroke,
+                         picknooverlap,
                          overnotransparent,
                          overtransparent,
                          nooverlap,
@@ -819,6 +827,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                bool pickinversevalue,
                                bool pickfill,
                                bool pickstroke,
+                               bool picknooverlap,
                                bool overnotransparent,
                                bool overtransparent,
                                double offset,
@@ -862,7 +871,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
                 if(nooverlap || picker || !overtransparent || !overnotransparent){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickcenter, pickinversevalue, pickfill, pickstroke, overnotransparent, overtransparent, nooverlap, offset, css, false)){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickcenter, pickinversevalue, pickfill, pickstroke, picknooverlap, overnotransparent, overtransparent, nooverlap, offset, css, false)){
                         return false;
                     }
                 }
@@ -969,7 +978,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
                 if(nooverlap || picker || !overtransparent || !overnotransparent){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickcenter, pickinversevalue, pickfill, pickstroke, overnotransparent, overtransparent, nooverlap, offset, css, false)){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickcenter, pickinversevalue, pickfill, pickstroke, picknooverlap, overnotransparent, overtransparent, nooverlap, offset, css, false)){
                         return false;
                     }
                 }
@@ -1047,7 +1056,7 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
         for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
             SPItem *item = *i;
             g_assert(item != NULL);
-            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->nooverlap, tc->picker, tc->pickcenter, tc->pickinversevalue, tc->pickfill, tc->pickstroke, tc->overnotransparent, tc->overtransparent, tc->offset, tc->usepressurescale, get_pressure(tc))) {
+            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->nooverlap, tc->picker, tc->pickcenter, tc->pickinversevalue, tc->pickfill, tc->pickstroke, tc->picknooverlap, tc->overnotransparent, tc->overtransparent, tc->offset, tc->usepressurescale, get_pressure(tc))) {
                 did = true;
             }
         }
diff --git a/src/ui/tools/spray-tool.h b/src/ui/tools/spray-tool.h
index 066ced00e..377893f0d 100644
--- a/src/ui/tools/spray-tool.h
+++ b/src/ui/tools/spray-tool.h
@@ -95,6 +95,7 @@ public:
     bool pickinversevalue;
     bool pickfill;
     bool pickstroke;
+    bool picknooverlap;
     bool overtransparent;
     bool overnotransparent;
     double offset;
-- 
cgit v1.2.3


From e015bb069e1722492e5d677b92ce4a5d089cb2fa Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 11 Nov 2015 09:36:54 +0100
Subject: Remove unused functions

(bzr r14456)
---
 src/ui/tools/spray-tool.cpp | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 1c9656a38..9fde142e5 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -450,21 +450,6 @@ guint32 getPickerData(Geom::IntRect area){
     return SP_RGBA32_F_COMPOSE(R, G, B, A);
 }
 
-bool isTrans(Geom::Point N){
-    gint32 rgba = getPickerData(Geom::IntRect::from_xywh(floor(N[Geom::X]), floor(N[Geom::Y]), 1, 1));
-    return SP_RGBA32_A_F(rgba)==0 || SP_RGBA32_A_F(rgba) < 1e-6;
-}
-
-bool overTrans(std::vector<Geom::Point> points){
-    for (std::vector<Geom::Point>::const_iterator k=points.begin(); k!=points.end(); ++k) {
-        Geom::Point point = *k;
-        if(isTrans(point)){
-            return true;
-        }
-    }
-    return false;
-}
-
 static void showHidden(std::vector<SPItem *> items_down){
     for (std::vector<SPItem *>::const_iterator k=items_down.begin(); k!=items_down.end(); ++k) {
         SPItem *item_hidden = *k;
-- 
cgit v1.2.3


From b5c716ade5ee3e23f9c56c6b7a0227acf2118f36 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 11 Nov 2015 15:35:50 +0100
Subject: Improve offseting calculation Improve no picoverlap feature

(bzr r14457)
---
 src/ui/tools/spray-tool.cpp | 88 +++++++++++++++++++++++++--------------------
 1 file changed, 50 insertions(+), 38 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 9fde142e5..0f8404b8e 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -447,6 +447,12 @@ guint32 getPickerData(Geom::IntRect area){
     sp_canvas_arena_render_surface(SP_CANVAS_ARENA(desktop->getDrawing()), s, area);
     ink_cairo_surface_average_color(s, R, G, B, A);
     cairo_surface_destroy(s);
+    //this can fix the bug #1511998 if confirmed 
+    if( A == 0 || A < 1e-6){
+        R = 1;
+        G = 1;
+        B = 1;
+    }
     return SP_RGBA32_F_COMPOSE(R, G, B, A);
 }
 
@@ -457,7 +463,7 @@ static void showHidden(std::vector<SPItem *> items_down){
         item_hidden->updateRepr();
     }
 }
-
+//todo: maybe move same parameter to preferences
 static bool fit_item(SPDesktop *desktop,
                      SPItem *item,
                      Geom::OptRect bbox,
@@ -482,18 +488,21 @@ static bool fit_item(SPDesktop *desktop,
     SPDocument *doc = item->document;
     double width = bbox->width();
     double height = bbox->height();
-    double size = std::min(width,height);
-    double offset_min = (offset * size)/100.0 - (size);
-    if(offset_min < 0 ){
-        offset_min = 0;
+    double offset_width = (offset * width)/100.0 - (width);
+    if(offset_width < 0 ){
+        offset_width = 0;
+    }
+    double offset_height = (offset * height)/100.0 - (height);
+    if(offset_height < 0 ){
+        offset_height = 0;
     }
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     bool pick_to_size = prefs->getBool("/dialogs/clonetiler/pick_to_size");
-    bool trace = prefs->getBool("/dialogs/clonetiler/dotrace");
-    if(picker && pick_to_size && !trace_scale && trace){
+    bool do_trace = prefs->getBool("/dialogs/clonetiler/dotrace");
+    if(picker && pick_to_size && !trace_scale && do_trace){
         _scale = 0.1;
     }
-    Geom::OptRect bbox_procesed = Geom::Rect(Geom::Point(bbox->left() - offset_min, bbox->top() - offset_min),Geom::Point(bbox->right() + offset_min, bbox->bottom() + offset_min));
+    Geom::OptRect bbox_procesed = Geom::Rect(Geom::Point(bbox->left() - offset_width, bbox->top() - offset_height),Geom::Point(bbox->right() + offset_width, bbox->bottom() + offset_height));
     Geom::Path path;
     path.start(Geom::Point(bbox_procesed->left(), bbox_procesed->top()));
     path.appendNew<Geom::LineSegment>(Geom::Point(bbox_procesed->right(), bbox_procesed->top()));
@@ -507,35 +516,39 @@ static bool fit_item(SPDesktop *desktop,
     path *= desktop->doc2dt();
     bbox_procesed = path.boundsFast();
     double bbox_left_main = bbox_procesed->left();
+    double bbox_right_main = bbox_procesed->right();
     double bbox_top_main = bbox_procesed->top();
+    double bbox_bottom_main = bbox_procesed->bottom();
     double width_transformed = bbox_procesed->width();
     double height_transformed = bbox_procesed->height();
     Geom::Point mid_point = desktop->d2w(bbox_procesed->midpoint());
-    Geom::Rect rect_sprayed(mid_point, mid_point);
-    rect_sprayed.expandBy(width_transformed/2.0, height_transformed/2.0);
     Geom::IntRect area = Geom::IntRect::from_xywh(floor(mid_point[Geom::X]), floor(mid_point[Geom::Y]), 1, 1);
-    guint32 rgba;
-    if(picknooverlap && !rect_sprayed.hasZeroArea()){
-        if(getPickerData(area) != getPickerData(rect_sprayed.roundOutwards())){
+    guint32 rgba = getPickerData(area);
+    guint32 rgba2 = 0xffffff00;
+    Geom::Rect rect_sprayed(desktop->d2w(Geom::Point(bbox_left_main,bbox_top_main)), desktop->d2w(Geom::Point(bbox_right_main,bbox_bottom_main)));
+    if (!rect_sprayed.hasZeroArea()) {
+        rgba2 = getPickerData(rect_sprayed.roundOutwards());
+    }
+    if(picknooverlap){
+        if(rgba != rgba2){
             return false;
         }
     }
-    if (!rect_sprayed.hasZeroArea() && !pickcenter) {
-        rgba = getPickerData(rect_sprayed.roundOutwards());
-    } else {
-        rgba = getPickerData(area);
+    if(!pickcenter){
+        rgba = rgba2;
     }
-    if(nooverlap && !overtransparent && (SP_RGBA32_A_F(rgba)==0 || SP_RGBA32_A_F(rgba) < 1e-6)){
+    if(!overtransparent && (SP_RGBA32_A_F(rgba) == 0 || SP_RGBA32_A_F(rgba) < 1e-6)){
         return false;
     }
-    if(nooverlap && !overnotransparent && SP_RGBA32_A_F(rgba)>0){
+    if(!overnotransparent && SP_RGBA32_A_F(rgba) > 0){
         return false;
     }
-    size = std::min(width_transformed,height_transformed);
     if(offset < 100 ){
-        offset_min = ((99.0 - offset) * size)/100.0 - size;
+        offset_width = ((99.0 - offset) * width_transformed)/100.0 - width_transformed;
+        offset_height = ((99.0 - offset) * height_transformed)/100.0 - height_transformed;
     } else {
-        offset_min = 0;
+        offset_width = 0;
+        offset_height = 0;
     }
     std::vector<SPItem*> items_down = desktop->getDocument()->getItemsPartiallyInBox(desktop->dkey, *bbox_procesed);
     Inkscape::Selection *selection = desktop->getSelection();
@@ -564,8 +577,11 @@ static bool fit_item(SPDesktop *desktop,
                 strcmp(item_down->getAttribute("inkscape:spray-origin"),spray_origin) == 0 ))
             {
                 if(nooverlap){
-                    if(!(offset_min < 0 && std::abs(bbox_left - bbox_left_main) > std::abs(offset_min) && 
-                std::abs(bbox_top - bbox_top_main) > std::abs(offset_min))){
+                    if(!(offset_width < 0 && offset_height < 0 && std::abs(bbox_left - bbox_left_main) > std::abs(offset_width) && 
+                std::abs(bbox_top - bbox_top_main) > std::abs(offset_height))){
+                        if(!nooverlap && (picker || overtransparent || overnotransparent)){
+                            showHidden(items_down);
+                        }
                         return false;
                     }
                 } else if(picker || overtransparent || overnotransparent){
@@ -578,20 +594,22 @@ static bool fit_item(SPDesktop *desktop,
     if(picker || overtransparent || overnotransparent){
         if(!nooverlap){
             doc->ensureUpToDate();
-            if (!rect_sprayed.hasZeroArea() && !pickcenter) {
-                rgba = getPickerData(rect_sprayed.roundOutwards());
-            } else {
-                rgba = getPickerData(area);
+            rgba = getPickerData(area);
+            if (!rect_sprayed.hasZeroArea()) {
+                rgba2 = getPickerData(rect_sprayed.roundOutwards());
             }
         }
-        if(picknooverlap && !rect_sprayed.hasZeroArea()){
-            if(getPickerData(area) != getPickerData(rect_sprayed.roundOutwards())){
+        if(picknooverlap){
+            if(rgba != rgba2){
                 if(!nooverlap && (picker || overtransparent || overnotransparent)){
                     showHidden(items_down);
                 }
                 return false;
             }
         }
+        if(!pickcenter){
+            rgba = rgba2;
+        }
         int    pick = prefs->getInt("/dialogs/clonetiler/pick");
         bool   pick_to_presence = prefs->getBool("/dialogs/clonetiler/pick_to_presence", false);
         bool   pick_to_color = prefs->getBool("/dialogs/clonetiler/pick_to_color");
@@ -605,12 +623,6 @@ static bool fit_item(SPDesktop *desktop,
         float g = SP_RGBA32_G_F(rgba);
         float b = SP_RGBA32_B_F(rgba);
         float a = SP_RGBA32_A_F(rgba);
-        //this can fix the bug #1511998 if confirmed 
-        if( a == 0 || a < 1e-6){
-            r = 1;
-            g = 1;
-            b = 1;
-        }
         if(!overtransparent && (a == 0 || a < 1e-6)){
             if(!nooverlap && (picker || overtransparent || overnotransparent)){
                 showHidden(items_down);
@@ -624,7 +636,7 @@ static bool fit_item(SPDesktop *desktop,
             return false;
         }
 
-        if(picker && trace){
+        if(picker && do_trace){
             float hsl[3];
             sp_color_rgb_to_hsl_floatv (hsl, r, g, b);
 
@@ -767,7 +779,7 @@ static bool fit_item(SPDesktop *desktop,
                 return false;
             }
         }
-        if(!trace){
+        if(!do_trace){
             if (pickinversevalue) {
                 r = 1 - r;
                 g = 1 - g;
-- 
cgit v1.2.3


From 5be1dd71bf1bf0bb5559c3a5cac3cafba44bd960 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 11 Nov 2015 19:28:19 +0100
Subject: Refactor of code, minor bugs fixed.

(bzr r14458)
---
 src/ui/tools/spray-tool.cpp | 385 ++++++++++++++++++++++++++++++--------------
 src/ui/tools/spray-tool.h   |  26 ++-
 2 files changed, 281 insertions(+), 130 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 0f8404b8e..10a10f49f 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -173,16 +173,25 @@ SprayTool::SprayTool()
     , is_dilating(false)
     , has_dilated(false)
     , dilate_area(NULL)
-    , nooverlap(false)
+    , no_overlap(false)
     , picker(false)
-    , pickcenter(true)
-    , pickinversevalue(false)
-    , pickfill(false)
-    , pickstroke(false)
-    , picknooverlap(false)
-    , overtransparent(true)
-    , overnotransparent(true)
+    , pick_center(true)
+    , pick_inverse_value(false)
+    , pick_fill(false)
+    , pick_stroke(false)
+    , pick_no_overlap(false)
+    , over_transparent(true)
+    , over_no_transparent(true)
     , offset(0)
+    , pick(0)
+    , do_trace(false)
+    , pick_to_size(false)
+    , pick_to_presence(false)
+    , pick_to_color(false)
+    , pick_to_opacity(false)
+    , invert_picked(false)
+    , gamma_picked(0)
+    , rand_picked(0)
 {
 }
 
@@ -259,14 +268,14 @@ void SprayTool::setup() {
     sp_event_context_read(this, "Scale");
     sp_event_context_read(this, "offset");
     sp_event_context_read(this, "picker");
-    sp_event_context_read(this, "pickcenter");
-    sp_event_context_read(this, "pickinversevalue");
-    sp_event_context_read(this, "pickfill");
-    sp_event_context_read(this, "pickstroke");
-    sp_event_context_read(this, "picknooverlap");
-    sp_event_context_read(this, "overnotransparent");
-    sp_event_context_read(this, "overtransparent");
-    sp_event_context_read(this, "nooverlap");
+    sp_event_context_read(this, "pick_center");
+    sp_event_context_read(this, "pick_inverse_value");
+    sp_event_context_read(this, "pick_fill");
+    sp_event_context_read(this, "pick_stroke");
+    sp_event_context_read(this, "pick_no_overlap");
+    sp_event_context_read(this, "over_no_transparent");
+    sp_event_context_read(this, "over_transparent");
+    sp_event_context_read(this, "no_overlap");
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     if (prefs->getBool("/tools/spray/selcue")) {
@@ -277,6 +286,19 @@ void SprayTool::setup() {
     }
 }
 
+void SprayTool::setCloneTilerPrefs() {
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    this->do_trace = prefs->getBool("/dialogs/clonetiler/dotrace", false);
+    this->pick = prefs->getInt("/dialogs/clonetiler/pick");
+    this->pick_to_size = prefs->getBool("/dialogs/clonetiler/pick_to_size", false);
+    this->pick_to_presence = prefs->getBool("/dialogs/clonetiler/pick_to_presence", false);
+    this->pick_to_color = prefs->getBool("/dialogs/clonetiler/pick_to_color", false);
+    this->pick_to_opacity = prefs->getBool("/dialogs/clonetiler/pick_to_opacity", false);
+    this->rand_picked = 0.01 * prefs->getDoubleLimited("/dialogs/clonetiler/rand_picked", 0, 0, 100);
+    this->invert_picked = prefs->getBool("/dialogs/clonetiler/invert_picked", false);
+    this->gamma_picked = prefs->getDoubleLimited("/dialogs/clonetiler/gamma_picked", 0, -10, 10);
+}
+
 void SprayTool::set(const Inkscape::Preferences::Entry& val) {
     Glib::ustring path = val.getEntryName();
 
@@ -309,25 +331,25 @@ void SprayTool::set(const Inkscape::Preferences::Entry& val) {
     } else if (path == "ratio") {
         this->ratio = CLAMP(val.getDouble(), 0.0, 0.9);
     } else if (path == "offset") {
-        this->offset = CLAMP(val.getDouble(), -1000.0, 1000.0);
+        this->offset = val.getDoubleLimited(100.0, 0, 1000.0);
+    } else if (path == "pick_center") {
+        this->pick_center =  val.getBool(true);
+    } else if (path == "pick_inverse_value") {
+        this->pick_inverse_value =  val.getBool(false);
+    } else if (path == "pick_fill") {
+        this->pick_fill =  val.getBool(false);
+    } else if (path == "pick_stroke") {
+        this->pick_stroke =  val.getBool(false);
+    } else if (path == "pick_no_overlap") {
+        this->pick_no_overlap =  val.getBool(false);
+    } else if (path == "over_no_transparent") {
+        this->over_no_transparent =  val.getBool(true);
+    } else if (path == "over_transparent") {
+        this->over_transparent =  val.getBool(true);
+    } else if (path == "no_overlap") {
+        this->no_overlap = val.getBool(false);
     } else if (path == "picker") {
-        this->picker =  val.getBool();
-    } else if (path == "pickcenter") {
-        this->pickcenter =  val.getBool();
-    } else if (path == "pickinversevalue") {
-        this->pickinversevalue =  val.getBool();
-    } else if (path == "pickfill") {
-        this->pickfill =  val.getBool();
-    } else if (path == "pickstroke") {
-        this->pickstroke =  val.getBool();
-    } else if (path == "picknooverlap") {
-        this->picknooverlap =  val.getBool();
-    } else if (path == "overnotransparent") {
-        this->overnotransparent =  val.getBool();
-    } else if (path == "overtransparent") {
-        this->overtransparent =  val.getBool();
-    } else if (path == "nooverlap") {
-        this->nooverlap = val.getBool();
+        this->picker =  val.getBool(false);
     }
 }
 
@@ -473,17 +495,26 @@ static bool fit_item(SPDesktop *desktop,
                      double &_scale,
                      double scale,
                      bool picker,
-                     bool pickcenter,
-                     bool pickinversevalue,
-                     bool pickfill,
-                     bool pickstroke,
-                     bool picknooverlap,
-                     bool overnotransparent,
-                     bool overtransparent,
-                     bool nooverlap,
+                     bool pick_center,
+                     bool pick_inverse_value,
+                     bool pick_fill,
+                     bool pick_stroke,
+                     bool pick_no_overlap,
+                     bool over_no_transparent,
+                     bool over_transparent,
+                     bool no_overlap,
                      double offset,
                      SPCSSAttr *css,
-                     bool trace_scale)
+                     bool trace_scale,
+                     int pick,
+                     bool do_trace,
+                     bool pick_to_size,
+                     bool pick_to_presence,
+                     bool pick_to_color,
+                     bool pick_to_opacity,
+                     bool invert_picked,
+                     double gamma_picked ,
+                     double rand_picked)
 {
     SPDocument *doc = item->document;
     double width = bbox->width();
@@ -496,9 +527,6 @@ static bool fit_item(SPDesktop *desktop,
     if(offset_height < 0 ){
         offset_height = 0;
     }
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    bool pick_to_size = prefs->getBool("/dialogs/clonetiler/pick_to_size");
-    bool do_trace = prefs->getBool("/dialogs/clonetiler/dotrace");
     if(picker && pick_to_size && !trace_scale && do_trace){
         _scale = 0.1;
     }
@@ -529,18 +557,18 @@ static bool fit_item(SPDesktop *desktop,
     if (!rect_sprayed.hasZeroArea()) {
         rgba2 = getPickerData(rect_sprayed.roundOutwards());
     }
-    if(picknooverlap){
+    if(pick_no_overlap){
         if(rgba != rgba2){
             return false;
         }
     }
-    if(!pickcenter){
+    if(!pick_center){
         rgba = rgba2;
     }
-    if(!overtransparent && (SP_RGBA32_A_F(rgba) == 0 || SP_RGBA32_A_F(rgba) < 1e-6)){
+    if(!over_transparent && (SP_RGBA32_A_F(rgba) == 0 || SP_RGBA32_A_F(rgba) < 1e-6)){
         return false;
     }
-    if(!overnotransparent && SP_RGBA32_A_F(rgba) > 0){
+    if(!over_no_transparent && SP_RGBA32_A_F(rgba) > 0){
         return false;
     }
     if(offset < 100 ){
@@ -576,61 +604,54 @@ static bool fit_item(SPDesktop *desktop,
                 (item_down->getAttribute("inkscape:spray-origin") && 
                 strcmp(item_down->getAttribute("inkscape:spray-origin"),spray_origin) == 0 ))
             {
-                if(nooverlap){
+                if(no_overlap){
                     if(!(offset_width < 0 && offset_height < 0 && std::abs(bbox_left - bbox_left_main) > std::abs(offset_width) && 
                 std::abs(bbox_top - bbox_top_main) > std::abs(offset_height))){
-                        if(!nooverlap && (picker || overtransparent || overnotransparent)){
+                        if(!no_overlap && (picker || over_transparent || over_no_transparent)){
                             showHidden(items_down);
                         }
                         return false;
                     }
-                } else if(picker || overtransparent || overnotransparent){
+                } else if(picker || over_transparent || over_no_transparent){
                     item_down->setHidden(true);
                     item_down->updateRepr();
                 }
             }
         }
     }
-    if(picker || overtransparent || overnotransparent){
-        if(!nooverlap){
+    if(picker || over_transparent || over_no_transparent){
+        if(!no_overlap){
             doc->ensureUpToDate();
             rgba = getPickerData(area);
             if (!rect_sprayed.hasZeroArea()) {
                 rgba2 = getPickerData(rect_sprayed.roundOutwards());
             }
         }
-        if(picknooverlap){
+        if(pick_no_overlap){
             if(rgba != rgba2){
-                if(!nooverlap && (picker || overtransparent || overnotransparent)){
+                if(!no_overlap && (picker || over_transparent || over_no_transparent)){
                     showHidden(items_down);
                 }
                 return false;
             }
         }
-        if(!pickcenter){
+        if(!pick_center){
             rgba = rgba2;
         }
-        int    pick = prefs->getInt("/dialogs/clonetiler/pick");
-        bool   pick_to_presence = prefs->getBool("/dialogs/clonetiler/pick_to_presence", false);
-        bool   pick_to_color = prefs->getBool("/dialogs/clonetiler/pick_to_color");
-        bool   pick_to_opacity = prefs->getBool("/dialogs/clonetiler/pick_to_opacity");
-        double rand_picked = 0.01 * prefs->getDoubleLimited("/dialogs/clonetiler/rand_picked", 0, 0, 100);
-        bool   invert_picked = prefs->getBool("/dialogs/clonetiler/invert_picked");
-        double gamma_picked = prefs->getDoubleLimited("/dialogs/clonetiler/gamma_picked", 0, -10, 10);
         double opacity = 1.0;
         gchar color_string[32]; *color_string = 0;
         float r = SP_RGBA32_R_F(rgba);
         float g = SP_RGBA32_G_F(rgba);
         float b = SP_RGBA32_B_F(rgba);
         float a = SP_RGBA32_A_F(rgba);
-        if(!overtransparent && (a == 0 || a < 1e-6)){
-            if(!nooverlap && (picker || overtransparent || overnotransparent)){
+        if(!over_transparent && (a == 0 || a < 1e-6)){
+            if(!no_overlap && (picker || over_transparent || over_no_transparent)){
                 showHidden(items_down);
             }
             return false;
         }
-        if(!overnotransparent && a > 0){
-            if(!nooverlap && (picker || overtransparent || overnotransparent)){
+        if(!over_no_transparent && a > 0){
+            if(!no_overlap && (picker || over_transparent || over_no_transparent)){
                 showHidden(items_down);
             }
             return false;
@@ -706,47 +727,58 @@ static bool fit_item(SPDesktop *desktop,
             rgba = SP_RGBA32_F_COMPOSE(r, g, b, a);
             if (pick_to_size) {
                 if(!trace_scale){
-                    if(pickinversevalue) {
+                    if(pick_inverse_value) {
                         _scale = 1.0 - val;
                     } else {
                         _scale = val;
                     }
                     if(_scale == 0.0) {
-                        if(!nooverlap && (picker || overtransparent || overnotransparent)){
+                        if(!no_overlap && (picker || over_transparent || over_no_transparent)){
+                            showHidden(items_down);
+                        }
+                        return false;
+                    }
+                    if(!fit_item(desktop
+                                 , item
+                                 , bbox
+                                 , move
+                                 , center
+                                 , angle
+                                 , _scale
+                                 , scale
+                                 , picker
+                                 , pick_center
+                                 , pick_inverse_value
+                                 , pick_fill
+                                 , pick_stroke
+                                 , pick_no_overlap
+                                 , over_no_transparent
+                                 , over_transparent
+                                 , no_overlap
+                                 , offset
+                                 , css
+                                 , true
+                                 , pick
+                                 , do_trace
+                                 , pick_to_size
+                                 , pick_to_presence
+                                 , pick_to_color
+                                 , pick_to_opacity
+                                 , invert_picked
+                                 , gamma_picked
+                                 , rand_picked)
+                        )
+                    {
+                        if(!no_overlap && (picker || over_transparent || over_no_transparent)){
                             showHidden(items_down);
                         }
                         return false;
                     }
-                    if(!fit_item(desktop,
-                         item,
-                         bbox,
-                         move,
-                         center,
-                         angle,
-                         _scale,
-                         scale,
-                         picker,
-                         pickcenter,
-                         pickinversevalue,
-                         pickfill,
-                         pickstroke,
-                         picknooverlap,
-                         overnotransparent,
-                         overtransparent,
-                         nooverlap,
-                         offset,
-                         css,
-                         true)){
-                            if(!nooverlap && (picker || overtransparent || overnotransparent)){
-                                showHidden(items_down);
-                            }
-                            return false;
-                         }
                 }
             }
 
             if (pick_to_opacity) {
-                if(pickinversevalue) {
+                if(pick_inverse_value) {
                     opacity *= 1.0 - val;
                 } else {
                     opacity *= val;
@@ -765,36 +797,43 @@ static bool fit_item(SPDesktop *desktop,
             }
             if (pick_to_color) {
                 sp_svg_write_color(color_string, sizeof(color_string), rgba);
-                if(pickfill){
+                if(pick_fill){
                     sp_repr_css_set_property(css, "fill", color_string);
                 }
-                if(pickstroke){
+                if(pick_stroke){
                     sp_repr_css_set_property(css, "stroke", color_string);
                 }
             }
             if (opacity < 1e-6) { // invisibly transparent, skip
-                if(!nooverlap && (picker || overtransparent || overnotransparent)){
+                if(!no_overlap && (picker || over_transparent || over_no_transparent)){
                     showHidden(items_down);
                 }
                 return false;
             }
         }
         if(!do_trace){
-            if (pickinversevalue) {
-                r = 1 - r;
-                g = 1 - g;
-                b = 1 - b;
+            if(!pick_center){
+                rgba = rgba2;
+            }
+            if (pick_inverse_value) {
+                r = 1 - SP_RGBA32_R_F(rgba);
+                g = 1 - SP_RGBA32_G_F(rgba);
+                b = 1 - SP_RGBA32_G_F(rgba);
+            } else {
+                r = SP_RGBA32_R_F(rgba);
+                g = SP_RGBA32_G_F(rgba);
+                b = SP_RGBA32_G_F(rgba);
             }
             rgba = SP_RGBA32_F_COMPOSE(r, g, b, a);
             sp_svg_write_color(color_string, sizeof(color_string), rgba);
-            if(pickfill){
+            if(pick_fill){
                 sp_repr_css_set_property(css, "fill", color_string);
             }
-            if(pickstroke){
+            if(pick_stroke){
                 sp_repr_css_set_property(css, "stroke", color_string);
             }
         }
-        if(!nooverlap && (picker || overtransparent || overnotransparent)){
+        if(!no_overlap && (picker || over_transparent || over_no_transparent)){
             showHidden(items_down);
         }
     }
@@ -818,18 +857,27 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                double tilt,
                                double rotation_variation,
                                gint _distrib,
-                               bool nooverlap,
+                               bool no_overlap,
                                bool picker,
-                               bool pickcenter,
-                               bool pickinversevalue,
-                               bool pickfill,
-                               bool pickstroke,
-                               bool picknooverlap,
-                               bool overnotransparent,
-                               bool overtransparent,
+                               bool pick_center,
+                               bool pick_inverse_value,
+                               bool pick_fill,
+                               bool pick_stroke,
+                               bool pick_no_overlap,
+                               bool over_no_transparent,
+                               bool over_transparent,
                                double offset,
                                bool usepressurescale,
-                               double pressure)
+                               double pressure,
+                               int pick,
+                               bool do_trace,
+                               bool pick_to_size,
+                               bool pick_to_presence,
+                               bool pick_to_color,
+                               bool pick_to_opacity,
+                               bool invert_picked,
+                               double gamma_picked ,
+                               double rand_picked)
 {
     bool did = false;
 
@@ -867,8 +915,36 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point center = item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
-                if(nooverlap || picker || !overtransparent || !overnotransparent){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickcenter, pickinversevalue, pickfill, pickstroke, picknooverlap, overnotransparent, overtransparent, nooverlap, offset, css, false)){
+                if(no_overlap || picker || !over_transparent || !over_no_transparent){
+                    if(!fit_item(desktop
+                                 , item
+                                 , a
+                                 , move
+                                 , center
+                                 , angle
+                                 , _scale
+                                 , scale
+                                 , picker
+                                 , pick_center
+                                 , pick_inverse_value
+                                 , pick_fill
+                                 , pick_stroke
+                                 , pick_no_overlap
+                                 , over_no_transparent
+                                 , over_transparent
+                                 , no_overlap
+                                 , offset
+                                 , css
+                                 , false
+                                 , pick
+                                 , do_trace
+                                 , pick_to_size
+                                 , pick_to_presence
+                                 , pick_to_color
+                                 , pick_to_opacity
+                                 , invert_picked
+                                 , gamma_picked
+                                 , rand_picked)){
                         return false;
                     }
                 }
@@ -974,8 +1050,37 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point center=item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
-                if(nooverlap || picker || !overtransparent || !overnotransparent){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickcenter, pickinversevalue, pickfill, pickstroke, picknooverlap, overnotransparent, overtransparent, nooverlap, offset, css, false)){
+                if(no_overlap || picker || !over_transparent || !over_no_transparent){
+                    if(!fit_item(desktop
+                                 , item
+                                 , a
+                                 , move
+                                 , center
+                                 , angle
+                                 , _scale
+                                 , scale
+                                 , picker
+                                 , pick_center
+                                 , pick_inverse_value
+                                 , pick_fill
+                                 , pick_stroke
+                                 , pick_no_overlap
+                                 , over_no_transparent
+                                 , over_transparent
+                                 , no_overlap
+                                 , offset
+                                 , css
+                                 , true
+                                 , pick
+                                 , do_trace
+                                 , pick_to_size
+                                 , pick_to_presence
+                                 , pick_to_color
+                                 , pick_to_opacity
+                                 , invert_picked
+                                 , gamma_picked
+                                 , rand_picked))
+                    {
                         return false;
                     }
                 }
@@ -1053,7 +1158,43 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
         for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
             SPItem *item = *i;
             g_assert(item != NULL);
-            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->nooverlap, tc->picker, tc->pickcenter, tc->pickinversevalue, tc->pickfill, tc->pickstroke, tc->picknooverlap, tc->overnotransparent, tc->overtransparent, tc->offset, tc->usepressurescale, get_pressure(tc))) {
+            if (sp_spray_recursive(desktop
+                                , selection
+                                , item
+                                , p, vector
+                                , tc->mode
+                                , radius
+                                , population
+                                , tc->scale
+                                , tc->scale_variation
+                                , reverse
+                                , move_mean
+                                , move_standard_deviation
+                                , tc->ratio
+                                , tc->tilt
+                                , tc->rotation_variation
+                                , tc->distrib
+                                , tc->no_overlap
+                                , tc->picker
+                                , tc->pick_center
+                                , tc->pick_inverse_value
+                                , tc->pick_fill
+                                , tc->pick_stroke
+                                , tc->pick_no_overlap
+                                , tc->over_no_transparent
+                                , tc->over_transparent
+                                , tc->offset
+                                , tc->usepressurescale
+                                , get_pressure(tc)
+                                , tc->pick
+                                , tc->do_trace
+                                , tc->pick_to_size
+                                , tc->pick_to_presence
+                                , tc->pick_to_color
+                                , tc->pick_to_opacity
+                                , tc->invert_picked
+                                , tc->gamma_picked
+                                , tc->rand_picked)) {
                 did = true;
             }
         }
@@ -1100,7 +1241,7 @@ bool SprayTool::root_handler(GdkEvent* event) {
                 if (Inkscape::have_viable_layer(desktop, this->message_context) == false) {
                     return TRUE;
                 }
-
+                this->setCloneTilerPrefs();
                 Geom::Point const motion_w(event->button.x, event->button.y);
                 Geom::Point const motion_dt(desktop->w2d(motion_w));
                 this->last_push = desktop->dt2doc(motion_dt);
diff --git a/src/ui/tools/spray-tool.h b/src/ui/tools/spray-tool.h
index 377893f0d..438318bf4 100644
--- a/src/ui/tools/spray-tool.h
+++ b/src/ui/tools/spray-tool.h
@@ -89,22 +89,32 @@ public:
     bool has_dilated;
     Geom::Point last_push;
     SPCanvasItem *dilate_area;
-    bool nooverlap;
+    bool no_overlap;
     bool picker;
-    bool pickcenter;
-    bool pickinversevalue;
-    bool pickfill;
-    bool pickstroke;
-    bool picknooverlap;
-    bool overtransparent;
-    bool overnotransparent;
+    bool pick_center;
+    bool pick_inverse_value;
+    bool pick_fill;
+    bool pick_stroke;
+    bool pick_no_overlap;
+    bool over_transparent;
+    bool over_no_transparent;
     double offset;
+    int pick;
+    bool do_trace;
+    bool pick_to_size;
+    bool pick_to_presence;
+    bool pick_to_color;
+    bool pick_to_opacity;
+    bool invert_picked;
+    double gamma_picked;
+    double rand_picked;
     sigc::connection style_set_connection;
 
     static const std::string prefsPath;
 
     virtual void setup();
     virtual void set(const Inkscape::Preferences::Entry& val);
+    virtual void setCloneTilerPrefs();
     virtual bool root_handler(GdkEvent* event);
 
     virtual const std::string& getPrefsPath();
-- 
cgit v1.2.3


From 1bdb2511c92fd5390527aa51a9aa45de01421d2b Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 11 Nov 2015 20:50:35 +0100
Subject: Add erase mode to spray. Bugfixes.

(bzr r14459)
---
 src/ui/tools/spray-tool.cpp | 39 +++++++++++++++++++++++++++------------
 src/ui/tools/spray-tool.h   |  3 ++-
 2 files changed, 29 insertions(+), 13 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 10a10f49f..84b0ad431 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -252,6 +252,15 @@ void SprayTool::setup() {
 
     this->is_drawing = false;
 
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    prefs->setBool("/dialogs/clonetiler/dotrace", false);
+    if (prefs->getBool("/tools/spray/selcue")) {
+        this->enableSelectionCue();
+    }
+    if (prefs->getBool("/tools/spray/gradientdrag")) {
+        this->enableGrDrag();
+    }
+
     sp_event_context_read(this, "distrib");
     sp_event_context_read(this, "width");
     sp_event_context_read(this, "ratio");
@@ -276,14 +285,6 @@ void SprayTool::setup() {
     sp_event_context_read(this, "over_no_transparent");
     sp_event_context_read(this, "over_transparent");
     sp_event_context_read(this, "no_overlap");
-
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    if (prefs->getBool("/tools/spray/selcue")) {
-        this->enableSelectionCue();
-    }
-    if (prefs->getBool("/tools/spray/gradientdrag")) {
-        this->enableGrDrag();
-    }
 }
 
 void SprayTool::setCloneTilerPrefs() {
@@ -491,6 +492,7 @@ static bool fit_item(SPDesktop *desktop,
                      Geom::OptRect bbox,
                      Geom::Point &move,
                      Geom::Point center,
+                     gint mode,
                      double angle,
                      double &_scale,
                      double scale,
@@ -604,7 +606,11 @@ static bool fit_item(SPDesktop *desktop,
                 (item_down->getAttribute("inkscape:spray-origin") && 
                 strcmp(item_down->getAttribute("inkscape:spray-origin"),spray_origin) == 0 ))
             {
-                if(no_overlap){
+                if(mode == SPRAY_MODE_ERASER){
+                    if(strcmp(item_down_sharp, spray_origin) != 0 ){
+                        item_down->deleteObject();
+                    }
+                }else if(no_overlap){
                     if(!(offset_width < 0 && offset_height < 0 && std::abs(bbox_left - bbox_left_main) > std::abs(offset_width) && 
                 std::abs(bbox_top - bbox_top_main) > std::abs(offset_height))){
                         if(!no_overlap && (picker || over_transparent || over_no_transparent)){
@@ -619,6 +625,12 @@ static bool fit_item(SPDesktop *desktop,
             }
         }
     }
+    if(mode == SPRAY_MODE_ERASER){
+        if(!no_overlap && (picker || over_transparent || over_no_transparent)){
+            showHidden(items_down);
+        }
+        return false;
+    }
     if(picker || over_transparent || over_no_transparent){
         if(!no_overlap){
             doc->ensureUpToDate();
@@ -743,6 +755,7 @@ static bool fit_item(SPDesktop *desktop,
                                  , bbox
                                  , move
                                  , center
+                                 , mode
                                  , angle
                                  , _scale
                                  , scale
@@ -818,11 +831,11 @@ static bool fit_item(SPDesktop *desktop,
             if (pick_inverse_value) {
                 r = 1 - SP_RGBA32_R_F(rgba);
                 g = 1 - SP_RGBA32_G_F(rgba);
-                b = 1 - SP_RGBA32_G_F(rgba);
+                b = 1 - SP_RGBA32_B_F(rgba);
             } else {
                 r = SP_RGBA32_R_F(rgba);
                 g = SP_RGBA32_G_F(rgba);
-                b = SP_RGBA32_G_F(rgba);
+                b = SP_RGBA32_B_F(rgba);
             }
             rgba = SP_RGBA32_F_COMPOSE(r, g, b, a);
             sp_svg_write_color(color_string, sizeof(color_string), rgba);
@@ -900,7 +913,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
     random_position( dr, dp, mean, standard_deviation, _distrib );
     dr=dr*radius;
 
-    if (mode == SPRAY_MODE_COPY) {
+    if (mode == SPRAY_MODE_COPY || mode == SPRAY_MODE_ERASER) {
         Geom::OptRect a = item->documentVisualBounds();
         if (a) {
             if(_fid <= population)
@@ -921,6 +934,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                  , a
                                  , move
                                  , center
+                                 , mode
                                  , angle
                                  , _scale
                                  , scale
@@ -1056,6 +1070,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                  , a
                                  , move
                                  , center
+                                 , mode
                                  , angle
                                  , _scale
                                  , scale
diff --git a/src/ui/tools/spray-tool.h b/src/ui/tools/spray-tool.h
index 438318bf4..c81110b37 100644
--- a/src/ui/tools/spray-tool.h
+++ b/src/ui/tools/spray-tool.h
@@ -47,7 +47,8 @@ namespace Tools {
 enum {
     SPRAY_MODE_COPY,
     SPRAY_MODE_CLONE,
-    SPRAY_MODE_SINGLE_PATH,    
+    SPRAY_MODE_SINGLE_PATH,
+    SPRAY_MODE_ERASER,
     SPRAY_OPTION,
 };
 
-- 
cgit v1.2.3


From 56215c1d1b93e249c0a4cddddc67868dc4f3dd56 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Thu, 12 Nov 2015 16:05:46 +0100
Subject: Fix crashes in erase mode of spray

(bzr r14461)
---
 src/ui/tools/spray-tool.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 84b0ad431..0d3405dbd 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -586,6 +586,7 @@ static bool fit_item(SPDesktop *desktop,
         return false;
     }
     std::vector<SPItem*> const items_selected(selection->itemList());
+    std::vector<SPItem*> items_down_erased;
     for (std::vector<SPItem*>::const_iterator i=items_down.begin(); i!=items_down.end(); i++) {
         SPItem *item_down = *i;
         Geom::OptRect bbox_down = item_down->documentVisualBounds();
@@ -594,6 +595,7 @@ static bool fit_item(SPDesktop *desktop,
         double bbox_left = bbox_down->left();
         double bbox_top = bbox_down->top();
         gchar const * item_down_sharp = g_strdup_printf("#%s", item_down->getId());
+        items_down_erased.push_back(item_down);
         for (std::vector<SPItem*>::const_iterator j=items_selected.begin(); j!=items_selected.end(); j++) {
             SPItem *item_selected = *j;
             gchar const * spray_origin;
@@ -607,8 +609,10 @@ static bool fit_item(SPDesktop *desktop,
                 strcmp(item_down->getAttribute("inkscape:spray-origin"),spray_origin) == 0 ))
             {
                 if(mode == SPRAY_MODE_ERASER){
-                    if(strcmp(item_down_sharp, spray_origin) != 0 ){
+                    if(strcmp(item_down_sharp, spray_origin) != 0 && !selection->includes(item_down) ){
                         item_down->deleteObject();
+                        items_down_erased.pop_back();
+                        break;
                     }
                 }else if(no_overlap){
                     if(!(offset_width < 0 && offset_height < 0 && std::abs(bbox_left - bbox_left_main) > std::abs(offset_width) && 
@@ -627,7 +631,7 @@ static bool fit_item(SPDesktop *desktop,
     }
     if(mode == SPRAY_MODE_ERASER){
         if(!no_overlap && (picker || over_transparent || over_no_transparent)){
-            showHidden(items_down);
+            showHidden(items_down_erased);
         }
         return false;
     }
-- 
cgit v1.2.3


From ec3c0a24bb14d96bfcef72cdd72326fce2790eff Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Thu, 12 Nov 2015 23:44:26 +0000
Subject: Fix CMake build

(bzr r14449.1.6)
---
 src/ui/CMakeLists.txt | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 58af7d935..46b0af6bb 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -34,7 +34,6 @@ set(ui_SRC
 	tools/dropper-tool.cpp
 	tools/dynamic-base.cpp
 	tools/eraser-tool.cpp
-	tools/flood-tool.cpp
 	tools/freehand-base.cpp
 	tools/gradient-tool.cpp
 	tools/lpe-tool.cpp
@@ -107,7 +106,6 @@ set(ui_SRC
 	dialog/template-widget.cpp
 	dialog/text-edit.cpp
 	dialog/tile.cpp
-	dialog/tracedialog.cpp
 	dialog/transformation.cpp
 	dialog/undo-history.cpp
 	dialog/xml-tree.cpp
@@ -248,7 +246,6 @@ set(ui_SRC
 	dialog/template-widget.h
 	dialog/text-edit.h
 	dialog/tile.h
-	dialog/tracedialog.h
 	dialog/transformation.h
 	dialog/undo-history.h
 	dialog/xml-tree.h
@@ -276,7 +273,6 @@ set(ui_SRC
 	tools/dropper-tool.h
 	tools/dynamic-base.h
 	tools/eraser-tool.h
-	tools/flood-tool.h
 	tools/freehand-base.h
 	tools/gradient-tool.h
 	tools/lpe-tool.h
@@ -364,3 +360,14 @@ endif()
 
 # add_inkscape_lib(ui_LIB "${ui_SRC}")
 add_inkscape_source("${ui_SRC}")
+
+set ( ui_flood_and_trace_SRC
+	tools/flood-tool.h
+	tools/flood-tool.cpp
+	dialog/tracedialog.cpp
+	dialog/tracedialog.h
+)
+
+if ("${HAVE_POTRACE}")
+	add_inkscape_source("${ui_flood_and_trace_SRC}")
+endif()
-- 
cgit v1.2.3


From 7c7b311cb7ff307a4e865341c3b78ec669e73fc7 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Fri, 13 Nov 2015 18:53:22 +0100
Subject: static code analysis

(bzr r14463)
---
 src/ui/dialog/filter-effects-dialog.cpp |  6 +++---
 src/ui/dialog/find.cpp                  | 16 ++++++++--------
 src/ui/dialog/grid-arrange-tab.cpp      |  6 +++---
 src/ui/dialog/objects.cpp               |  2 +-
 src/ui/dialog/polar-arrange-tab.cpp     |  2 +-
 src/ui/tools/connector-tool.cpp         |  2 +-
 src/ui/tools/gradient-tool.cpp          |  4 ++--
 src/ui/tools/spray-tool.cpp             |  8 ++++----
 src/ui/tools/tweak-tool.cpp             |  2 +-
 9 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 22c8c76f2..08a58291d 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -1474,7 +1474,7 @@ void FilterEffectsDialog::FilterModifier::update_selection(Selection *sel)
 
     std::set<SPObject*> used;
     std::vector<SPItem*> itemlist=sel->itemList();
-    for(std::vector<SPItem*>::const_iterator i=itemlist.begin(); itemlist.end() != i; i++) {
+    for(std::vector<SPItem*>::const_iterator i=itemlist.begin(); itemlist.end() != i; ++i) {
         SPObject *obj = *i;
         SPStyle *style = obj->style;
         if (!style || !SP_IS_ITEM(obj)) {
@@ -1555,7 +1555,7 @@ void FilterEffectsDialog::FilterModifier::on_selection_toggled(const Glib::ustri
             filter = 0;
 
         std::vector<SPItem*> itemlist=sel->itemList();
-        for(std::vector<SPItem*>::const_iterator i=itemlist.begin(); itemlist.end() != i; i++) {
+        for(std::vector<SPItem*>::const_iterator i=itemlist.begin(); itemlist.end() != i; ++i) {
             SPItem * item = *i;
             SPStyle *style = item->style;
             g_assert(style != NULL);
@@ -1669,7 +1669,7 @@ void FilterEffectsDialog::FilterModifier::remove_filter()
         // Delete all references to this filter
         std::vector<SPItem*> x,y;
         std::vector<SPItem*> all = get_all_items(x, _desktop->currentRoot(), _desktop, false, false, true, y);
-        for(std::vector<SPItem*>::const_iterator i=all.begin(); all.end() != i; i++) {
+        for(std::vector<SPItem*>::const_iterator i=all.begin(); all.end() != i; ++i) {
             if (!SP_IS_ITEM(*i)) {
                 continue;
             }
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index a8ac42a1b..0f368c5ac 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -561,7 +561,7 @@ std::vector<SPItem*> Find::filter_fields (std::vector<SPItem*> &l, bool exact, b
     std::vector<SPItem*> out;
 
     if (check_searchin_text.get_active()) {
-        for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
+        for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; ++i) {
             SPObject *obj = *i;
             SPItem *item = dynamic_cast<SPItem *>(obj);
             g_assert(item != NULL);
@@ -584,7 +584,7 @@ std::vector<SPItem*> Find::filter_fields (std::vector<SPItem*> &l, bool exact, b
         bool attrvalue = check_attributevalue.get_active();
 
         if (ids) {
-            for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
+            for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; ++i) {
                 SPObject *obj = *i;
                 SPItem *item = dynamic_cast<SPItem *>(obj);
                 if (item_id_match(item, text, exact, casematch)) {
@@ -600,7 +600,7 @@ std::vector<SPItem*> Find::filter_fields (std::vector<SPItem*> &l, bool exact, b
 
 
         if (style) {
-            for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
+            for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; ++i) {
                 SPObject *obj = *i;
                 SPItem *item = dynamic_cast<SPItem *>(obj);
                 g_assert(item != NULL);
@@ -617,7 +617,7 @@ std::vector<SPItem*> Find::filter_fields (std::vector<SPItem*> &l, bool exact, b
 
 
         if (attrname) {
-            for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
+            for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; ++i) {
                 SPObject *obj = *i;
                 SPItem *item = dynamic_cast<SPItem *>(obj);
                 g_assert(item != NULL);
@@ -634,7 +634,7 @@ std::vector<SPItem*> Find::filter_fields (std::vector<SPItem*> &l, bool exact, b
 
 
         if (attrvalue) {
-            for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
+            for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; ++i) {
                 SPObject *obj = *i;
                 SPItem *item = dynamic_cast<SPItem *>(obj);
                 g_assert(item != NULL);
@@ -651,7 +651,7 @@ std::vector<SPItem*> Find::filter_fields (std::vector<SPItem*> &l, bool exact, b
 
 
         if (font) {
-            for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
+            for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; ++i) {
                 SPObject *obj = *i;
                 SPItem *item = dynamic_cast<SPItem *>(obj);
                 g_assert(item != NULL);
@@ -718,7 +718,7 @@ bool Find::item_type_match (SPItem *item)
 std::vector<SPItem*> Find::filter_types (std::vector<SPItem*> &l)
 {
     std::vector<SPItem*> n;
-    for(std::vector<SPItem*>::const_reverse_iterator i=l.rbegin(); l.rend() != i; i++) {
+    for(std::vector<SPItem*>::const_reverse_iterator i=l.rbegin(); l.rend() != i; ++i) {
         SPObject *obj = *i;
         SPItem *item = dynamic_cast<SPItem *>(obj);
         g_assert(item != NULL);
@@ -762,7 +762,7 @@ std::vector<SPItem*> &Find::all_items (SPObject *r, std::vector<SPItem*> &l, boo
 std::vector<SPItem*> &Find::all_selection_items (Inkscape::Selection *s, std::vector<SPItem*> &l, SPObject *ancestor, bool hidden, bool locked)
 {
 	std::vector<SPItem*> itemlist=s->itemList();
-    for(std::vector<SPItem*>::const_reverse_iterator i=itemlist.rbegin(); itemlist.rend() != i; i++) {
+    for(std::vector<SPItem*>::const_reverse_iterator i=itemlist.rbegin(); itemlist.rend() != i; ++i) {
         SPObject *obj = *i;
         SPItem *item = dynamic_cast<SPItem *>(obj);
         g_assert(item != NULL);
diff --git a/src/ui/dialog/grid-arrange-tab.cpp b/src/ui/dialog/grid-arrange-tab.cpp
index 086cbe45f..53c25c3d5 100644
--- a/src/ui/dialog/grid-arrange-tab.cpp
+++ b/src/ui/dialog/grid-arrange-tab.cpp
@@ -164,7 +164,7 @@ void GridArrangeTab::arrange()
 
     Inkscape::Selection *selection = desktop->getSelection();
     const std::vector<SPItem*> items = selection ? selection->itemList() : std::vector<SPItem*>();
-    for(std::vector<SPItem*>::const_iterator i = items.begin();i!=items.end();i++){
+    for(std::vector<SPItem*>::const_iterator i = items.begin();i!=items.end(); ++i){
         SPItem *item = *i;
         Geom::OptRect b = item->documentVisualBounds();
         if (!b) {
@@ -202,7 +202,7 @@ void GridArrangeTab::arrange()
 
         cnt=0;
         const std::vector<SPItem*> sizes(sorted);
-        for (std::vector<SPItem*>::const_iterator i = sizes.begin();i!=sizes.end();i++) {
+        for (std::vector<SPItem*>::const_iterator i = sizes.begin();i!=sizes.end(); ++i) {
             SPItem *item = *i;
             Geom::OptRect b = item->documentVisualBounds();
             if (b) {
@@ -301,7 +301,7 @@ g_print("\n row = %f     col = %f selection x= %f selection y = %f", total_row_h
 
     cnt=0;
     std::vector<SPItem*>::iterator it = sorted.begin();
-    for (row_cnt=0; ((it != sorted.end()) && (row_cnt<NoOfRows)); row_cnt++) {
+    for (row_cnt=0; ((it != sorted.end()) && (row_cnt<NoOfRows)); ++row_cnt) {
 
              GSList *current_row = NULL;
              col_cnt = 0;
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index d72dda028..726df9a61 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -479,7 +479,7 @@ void ObjectsPanel::_objectsSelected( Selection *sel ) {
     _tree.get_selection()->unselect_all();
     SPItem *item = NULL;
     std::vector<SPItem*> const items = sel->itemList();
-    for(std::vector<SPItem*>::const_iterator i=items.begin(); i!=items.end();i++){
+    for(std::vector<SPItem*>::const_iterator i=items.begin(); i!=items.end(); ++i){
         item = *i;
         if (setOpacity)
         {
diff --git a/src/ui/dialog/polar-arrange-tab.cpp b/src/ui/dialog/polar-arrange-tab.cpp
index a93cebee8..5ec1285c1 100644
--- a/src/ui/dialog/polar-arrange-tab.cpp
+++ b/src/ui/dialog/polar-arrange-tab.cpp
@@ -373,7 +373,7 @@ void PolarArrangeTab::arrange()
 	Geom::Point realCenter = Geom::Point(cx, cy) * transformation;
 
 	int i = 0;
-	for(std::vector<SPItem*>::const_iterator it=tmp.begin();it!=tmp.end();it++)
+	for(std::vector<SPItem*>::const_iterator it=tmp.begin();it!=tmp.end(); ++it)
 	{
 		SPItem *item = *it;
 
diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp
index 0a36877ff..b84d16686 100644
--- a/src/ui/tools/connector-tool.cpp
+++ b/src/ui/tools/connector-tool.cpp
@@ -1307,7 +1307,7 @@ void cc_selection_set_avoid(bool const set_avoid)
     int changes = 0;
 
     std::vector<SPItem*> l = selection->itemList();
-    for(std::vector<SPItem*>::const_iterator i=l.begin();i!=l.end();i++) {
+    for(std::vector<SPItem*>::const_iterator i=l.begin();i!=l.end(); ++i) {
         SPItem *item = *i;
 
         char const *value = (set_avoid) ? "true" : NULL;
diff --git a/src/ui/tools/gradient-tool.cpp b/src/ui/tools/gradient-tool.cpp
index 603458983..bcb0b12b7 100644
--- a/src/ui/tools/gradient-tool.cpp
+++ b/src/ui/tools/gradient-tool.cpp
@@ -495,7 +495,7 @@ bool GradientTool::root_handler(GdkEvent* event) {
                 sp_gradient_context_add_stop_near_point(this, SP_ITEM(selection->itemList().front()), this->mousepoint_doc, event->button.time);
             } else {
             	std::vector<SPItem*>  items=selection->itemList();
-                for (std::vector<SPItem*>::const_iterator i = items.begin();i!=items.end();i++) {
+                for (std::vector<SPItem*>::const_iterator i = items.begin();i!=items.end();++i) {
                     SPItem *item = *i;
                     SPGradientType new_type = (SPGradientType) prefs->getInt("/tools/gradient/newgradient", SP_GRADIENT_TYPE_LINEAR);
                     Inkscape::PaintTarget fsmode = (prefs->getInt("/tools/gradient/newfillorstroke", 1) != 0) ? Inkscape::FOR_FILL : Inkscape::FOR_STROKE;
@@ -910,7 +910,7 @@ static void sp_gradient_drag(GradientTool &rc, Geom::Point const pt, guint /*sta
         sp_repr_css_set_property(css, "fill-opacity", "1.0");
 
         std::vector<SPItem*> itemlist = selection->itemList();
-        for (std::vector<SPItem*>::const_iterator i = itemlist.begin();i!=itemlist.end();i++) {
+        for (std::vector<SPItem*>::const_iterator i = itemlist.begin();i!=itemlist.end();++i) {
 
             //FIXME: see above
             sp_repr_css_change_recursive((*i)->getRepr(), css, "style");
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 0d3405dbd..e9b319bbb 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -999,7 +999,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
 
         int i=1;
         std::vector<SPItem*> items=selection->itemList();
-        for(std::vector<SPItem*>::const_iterator it=items.begin();it!=items.end();it++){
+        for(std::vector<SPItem*>::const_iterator it=items.begin();it!=items.end(); ++it){
             SPItem *item1 = *it;
             if (i == 1) {
                 parent_item = item1;
@@ -1168,13 +1168,13 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
     {
         std::vector<SPItem*> const items(selection->itemList());
 
-        for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+        for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end(); ++i){
             SPItem *item = *i;
             g_assert(item != NULL);
             sp_object_ref(item);
         }
 
-        for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+        for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end(); ++i){
             SPItem *item = *i;
             g_assert(item != NULL);
             if (sp_spray_recursive(desktop
@@ -1218,7 +1218,7 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
             }
         }
 
-        for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+        for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end(); ++i){
             SPItem *item = *i;
             g_assert(item != NULL);
             sp_object_unref(item);
diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp
index 94f7aa135..39a7a3f0b 100644
--- a/src/ui/tools/tweak-tool.cpp
+++ b/src/ui/tools/tweak-tool.cpp
@@ -1077,7 +1077,7 @@ sp_tweak_dilate (TweakTool *tc, Geom::Point event_p, Geom::Point p, Geom::Point
     double color_force = MIN(sqrt(path_force)/20.0, 1);
 
     std::vector<SPItem*> items=selection->itemList();
-    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end(); ++i){
         SPItem *item = *i;
 
         if (is_color_mode (tc->mode)) {
-- 
cgit v1.2.3


From d8637ea8e848bd9727c14c584c59a9f61d1930c8 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 14 Nov 2015 14:17:29 +0100
Subject: Fix erase mode in no overlap mode, pointed by Ivan Louette

(bzr r14469)
---
 src/ui/tools/spray-tool.cpp | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index e9b319bbb..7de2a0b04 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -559,21 +559,27 @@ static bool fit_item(SPDesktop *desktop,
     if (!rect_sprayed.hasZeroArea()) {
         rgba2 = getPickerData(rect_sprayed.roundOutwards());
     }
-    if(pick_no_overlap){
-        if(rgba != rgba2){
-            return false;
+    if(pick_no_overlap) {
+        if(rgba != rgba2) {
+            if(mode != SPRAY_MODE_ERASER) {
+                return false;
+            }
         }
     }
-    if(!pick_center){
+    if(!pick_center) {
         rgba = rgba2;
     }
-    if(!over_transparent && (SP_RGBA32_A_F(rgba) == 0 || SP_RGBA32_A_F(rgba) < 1e-6)){
-        return false;
+    if(!over_transparent && (SP_RGBA32_A_F(rgba) == 0 || SP_RGBA32_A_F(rgba) < 1e-6)) {
+        if(mode != SPRAY_MODE_ERASER) {
+            return false;
+        }
     }
-    if(!over_no_transparent && SP_RGBA32_A_F(rgba) > 0){
-        return false;
+    if(!over_no_transparent && SP_RGBA32_A_F(rgba) > 0) {
+        if(mode != SPRAY_MODE_ERASER) {
+            return false;
+        }
     }
-    if(offset < 100 ){
+    if(offset < 100 ) {
         offset_width = ((99.0 - offset) * width_transformed)/100.0 - width_transformed;
         offset_height = ((99.0 - offset) * height_transformed)/100.0 - height_transformed;
     } else {
@@ -608,13 +614,13 @@ static bool fit_item(SPDesktop *desktop,
                 (item_down->getAttribute("inkscape:spray-origin") && 
                 strcmp(item_down->getAttribute("inkscape:spray-origin"),spray_origin) == 0 ))
             {
-                if(mode == SPRAY_MODE_ERASER){
+                if(mode == SPRAY_MODE_ERASER) {
                     if(strcmp(item_down_sharp, spray_origin) != 0 && !selection->includes(item_down) ){
                         item_down->deleteObject();
                         items_down_erased.pop_back();
                         break;
                     }
-                }else if(no_overlap){
+                } else if(no_overlap) {
                     if(!(offset_width < 0 && offset_height < 0 && std::abs(bbox_left - bbox_left_main) > std::abs(offset_width) && 
                 std::abs(bbox_top - bbox_top_main) > std::abs(offset_height))){
                         if(!no_overlap && (picker || over_transparent || over_no_transparent)){
@@ -622,7 +628,7 @@ static bool fit_item(SPDesktop *desktop,
                         }
                         return false;
                     }
-                } else if(picker || over_transparent || over_no_transparent){
+                } else if(picker || over_transparent || over_no_transparent) {
                     item_down->setHidden(true);
                     item_down->updateRepr();
                 }
-- 
cgit v1.2.3


From 2e52e187d8d3ef5cb99d2ab64c297969e5f0c931 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Mon, 16 Nov 2015 21:54:28 +0100
Subject: static code analysis

(bzr r14474)
---
 src/ui/tools/spray-tool.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 7de2a0b04..71cad5c0d 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -593,16 +593,14 @@ static bool fit_item(SPDesktop *desktop,
     }
     std::vector<SPItem*> const items_selected(selection->itemList());
     std::vector<SPItem*> items_down_erased;
-    for (std::vector<SPItem*>::const_iterator i=items_down.begin(); i!=items_down.end(); i++) {
+    for (std::vector<SPItem*>::const_iterator i=items_down.begin(); i!=items_down.end(); ++i) {
         SPItem *item_down = *i;
         Geom::OptRect bbox_down = item_down->documentVisualBounds();
-        width = bbox_down->width();
-        height = bbox_down->height();
         double bbox_left = bbox_down->left();
         double bbox_top = bbox_down->top();
         gchar const * item_down_sharp = g_strdup_printf("#%s", item_down->getId());
         items_down_erased.push_back(item_down);
-        for (std::vector<SPItem*>::const_iterator j=items_selected.begin(); j!=items_selected.end(); j++) {
+        for (std::vector<SPItem*>::const_iterator j=items_selected.begin(); j!=items_selected.end(); ++j) {
             SPItem *item_selected = *j;
             gchar const * spray_origin;
             if(!item_selected->getAttribute("inkscape:spray-origin")){
-- 
cgit v1.2.3


From 71048dcd8efdf44f04dd7052081c564030bc042f Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Mon, 16 Nov 2015 23:03:08 +0100
Subject: null pointer dereference fix

(bzr r14474.1.1)
---
 src/ui/interface.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 9a4e1d773..0f719b40f 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -846,13 +846,11 @@ static void sp_ui_build_dyn_menus(Inkscape::XML::Node *menus, GtkWidget *menu, I
 #endif
                     }
                 } else if (menu_pntr->attribute("check") != NULL) {
-                    SPAction *action = NULL;
                     if (verb->get_code() != SP_VERB_NONE) {
-                        action = verb->get_action(Inkscape::ActionContext(view));
-                    }
-                    sp_ui_menu_append_check_item_from_verb(GTK_MENU(menu), view, action->name, action->tip, NULL,
+                        SPAction *action = verb->get_action(Inkscape::ActionContext(view));
+                        sp_ui_menu_append_check_item_from_verb(GTK_MENU(menu), view, action->name, action->tip, NULL,
                             checkitem_toggled, checkitem_update, verb);
-
+                    }
                 } else {
                     sp_ui_menu_append_item_from_verb(GTK_MENU(menu), verb, view);
                     group = NULL;
-- 
cgit v1.2.3


From 8bd87961810251cac534f8f308a4b91e5d21afe0 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Mon, 16 Nov 2015 23:57:28 +0100
Subject: removes warnings when compiling with c++11 using uniqueptr instead of
 autoptr

(bzr r14475)
---
 src/ui/control-manager.h              | 6 ++++--
 src/ui/dialog/filter-effects-dialog.h | 8 ++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/control-manager.h b/src/ui/control-manager.h
index 05a53f6a0..964ad0a29 100644
--- a/src/ui/control-manager.h
+++ b/src/ui/control-manager.h
@@ -74,9 +74,11 @@ public:
 
 private:
     ControlManager();
-
+#if __cplusplus <= 199711L
     std::auto_ptr<ControlManagerImpl> _impl;
-
+#else
+    std::unique_ptr<ControlManagerImpl> _impl;
+#endif
     friend class ControlManagerImpl;
 };
 
diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h
index a067cd70c..283abb5b0 100644
--- a/src/ui/dialog/filter-effects-dialog.h
+++ b/src/ui/dialog/filter-effects-dialog.h
@@ -127,7 +127,11 @@ private:
         Gtk::Button _add;
         Glib::RefPtr<Gtk::Menu> _menu;
         sigc::signal<void> _signal_filter_changed;
+#if __cplusplus <= 199711L
         std::auto_ptr<Inkscape::XML::SignalObserver> _observer;
+#else
+        std::unique_ptr<Inkscape::XML::SignalObserver> _observer;
+#endif
     };
 
     class PrimitiveColumns : public Gtk::TreeModel::ColumnRecord
@@ -243,7 +247,11 @@ private:
         sigc::connection _scroll_connection;
         int _autoscroll_y;
         int _autoscroll_x;
+#if __cplusplus <= 199711L
         std::auto_ptr<Inkscape::XML::SignalObserver> _observer;
+#else
+        std::unique_ptr<Inkscape::XML::SignalObserver> _observer;
+#endif
         int _input_type_width;
         int _input_type_height;
     };
-- 
cgit v1.2.3


From 37c1a351b7db98d0d09531f811e310615abd955e Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Sat, 21 Nov 2015 11:57:48 +0000
Subject: Hide unused verbs if Potrace is not available

(bzr r14449.1.7)
---
 src/ui/dialog/inkscape-preferences.cpp | 2 ++
 src/ui/dialog/inkscape-preferences.h   | 8 ++++++++
 src/ui/tools-switch.h                  | 8 ++++++++
 3 files changed, 18 insertions(+)

(limited to 'src/ui')

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index fec49d484..b6d7e25ec 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -478,10 +478,12 @@ void InkscapePreferences::initPageTools()
     this->AddPage(_page_eraser, _("Eraser"), iter_tools, PREFS_PAGE_TOOLS_ERASER);
     this->AddNewObjectsStyle(_page_eraser, "/tools/eraser");
 
+#if HAVE_POTRACE
     //Paint Bucket
     this->AddPage(_page_paintbucket, _("Paint Bucket"), iter_tools, PREFS_PAGE_TOOLS_PAINTBUCKET);
     this->AddSelcueCheckbox(_page_paintbucket, "/tools/paintbucket", false);
     this->AddNewObjectsStyle(_page_paintbucket, "/tools/paintbucket");
+#endif
 
     //Gradient
     this->AddPage(_page_gradient, _("Gradient"), iter_tools, PREFS_PAGE_TOOLS_GRADIENT);
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index 7e0184c55..b7696ab8c 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -15,6 +15,10 @@
 #ifndef INKSCAPE_UI_DIALOG_INKSCAPE_PREFERENCES_H
 #define INKSCAPE_UI_DIALOG_INKSCAPE_PREFERENCES_H
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <iostream>
 #include <vector>
 #include "ui/widget/preferences-widget.h"
@@ -56,7 +60,11 @@ enum {
     PREFS_PAGE_TOOLS_TEXT,
     PREFS_PAGE_TOOLS_SPRAY,
     PREFS_PAGE_TOOLS_ERASER,
+
+#if HAVE_POTRACE
     PREFS_PAGE_TOOLS_PAINTBUCKET,
+#endif
+
     PREFS_PAGE_TOOLS_GRADIENT,
     PREFS_PAGE_TOOLS_DROPPER,
     PREFS_PAGE_TOOLS_CONNECTOR,
diff --git a/src/ui/tools-switch.h b/src/ui/tools-switch.h
index 280837e87..d396597ca 100644
--- a/src/ui/tools-switch.h
+++ b/src/ui/tools-switch.h
@@ -12,6 +12,10 @@
 #ifndef SEEN_TOOLS_SWITCH_H
 #define SEEN_TOOLS_SWITCH_H
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 class SPDesktop;
 class SPItem;
 namespace Geom {
@@ -40,7 +44,11 @@ enum {
   TOOLS_MEASURE,
   TOOLS_DROPPER,
   TOOLS_CONNECTOR,
+
+#if HAVE_POTRACE
   TOOLS_PAINTBUCKET,
+#endif
+
   TOOLS_ERASER,
   TOOLS_LPETOOL
 };
-- 
cgit v1.2.3


From b3595c96864bd1e5f8e641fbd6444d7c92deaeba Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Wed, 25 Nov 2015 11:16:49 +0100
Subject: Fix undo of mesh creation.

(bzr r14491)
---
 src/ui/tools/mesh-tool.cpp | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp
index 303757493..794296329 100644
--- a/src/ui/tools/mesh-tool.cpp
+++ b/src/ui/tools/mesh-tool.cpp
@@ -57,7 +57,7 @@ namespace Inkscape {
 namespace UI {
 namespace Tools {
 
-static void sp_mesh_drag(MeshTool &rc, Geom::Point const pt, guint state, guint32 etime);
+static void sp_mesh_end_drag(MeshTool &rc);
 
 const std::string& MeshTool::getPrefsPath() {
 	return MeshTool::prefsPath;
@@ -560,8 +560,9 @@ bool MeshTool::root_handler(GdkEvent* event) {
                 Inkscape::Rubberband::get(desktop)->move(motion_dt);
                 this->defaultMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Draw around</b> handles to select them"));
             } else {
-                // Create new gradient with coordinates determined by drag.
-                sp_mesh_drag(*this, motion_dt, event->motion.state, event->motion.time);
+                // Do nothing. For a linear/radial gradient we follow the drag, updating the
+                // gradient as the end node is dragged. For a mesh gradient, the gradient is always
+                // created to fill the object when the drag ends.
             }
 
             gobble_motion_events(GDK_BUTTON1_MASK);
@@ -649,7 +650,7 @@ bool MeshTool::root_handler(GdkEvent* event) {
                 }
 
                 if (!this->within_tolerance) {
-                    // we've been dragging, either do nothing (grdrag handles that),
+                    // we've been dragging, either create a new gradient
                     // or rubberband-select if we have rubberband
                     Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
 
@@ -659,6 +660,9 @@ bool MeshTool::root_handler(GdkEvent* event) {
                             Geom::OptRect const b = r->getRectangle();
                             drag->selectRect(*b);
                         }
+                    } else {
+                        // Create a new mesh gradient
+                        sp_mesh_end_drag(*this);
                     }
                 } else if (this->item_to_select) {
                     if (over_line && line) {
@@ -922,7 +926,7 @@ bool MeshTool::root_handler(GdkEvent* event) {
     return ret;
 }
 
-static void sp_mesh_drag(MeshTool &rc, Geom::Point const /*pt*/, guint /*state*/, guint32 /*etime*/) {
+static void sp_mesh_end_drag(MeshTool &rc) {
     SPDesktop *desktop = SP_EVENT_CONTEXT(&rc)->desktop;
     Inkscape::Selection *selection = desktop->getSelection();
     SPDocument *document = desktop->getDocument();
@@ -963,19 +967,8 @@ static void sp_mesh_drag(MeshTool &rc, Geom::Point const /*pt*/, guint /*state*/
  
             (*i)->requestModified(SP_OBJECT_MODIFIED_FLAG);
         }
-        // if (ec->_grdrag) {
-        //     ec->_grdrag->updateDraggers();
-        //     // prevent regenerating draggers by selection modified signal, which sometimes
-        //     // comes too late and thus destroys the knot which we will now grab:
-        //     ec->_grdrag->local_change = true;
-        //     // give the grab out-of-bounds values of xp/yp because we're already dragging
-        //     // and therefore are already out of tolerance
-        //     ec->_grdrag->grabKnot (SP_ITEM(selection->itemList()->data),
-        //                            type == SP_GRADIENT_TYPE_LINEAR? POINT_LG_END : POINT_RG_R1,
-        //                            -1, // ignore number (though it is always 1)
-        //                            fill_or_stroke, 99999, 99999, etime);
-        // }
-        // We did an undoable action, but SPDocumentUndo::done will be called by the knot when released
+
+        DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MESH, _("Create mesh"));
 
         // status text; we do not track coords because this branch is run once, not all the time
         // during drag
-- 
cgit v1.2.3


From 067752b1cf216b8aa55c9e52926496553673cdb7 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 2 Dec 2015 18:24:10 +0100
Subject: Add lock to guides

(bzr r14500.1.1)
---
 src/ui/dialog/guides.cpp | 22 ++++++++++++++++++++++
 src/ui/dialog/guides.h   |  1 +
 2 files changed, 23 insertions(+)

(limited to 'src/ui')

diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp
index af8e2cc31..4951cf39c 100644
--- a/src/ui/dialog/guides.cpp
+++ b/src/ui/dialog/guides.cpp
@@ -44,6 +44,7 @@ namespace Dialogs {
 
 GuidelinePropertiesDialog::GuidelinePropertiesDialog(SPGuide *guide, SPDesktop *desktop)
 : _desktop(desktop), _guide(guide),
+  _locked_toggle(_("Lo_cked"), _("Lock the movement of guides")),
   _relative_toggle(_("Rela_tive change"), _("Move and/or rotate the guide relative to current settings")),
   _spin_button_x(C_("Guides", "_X:"), "", UNIT_TYPE_LINEAR, "", "", &_unit_menu),
   _spin_button_y(C_("Guides", "_Y:"), "", UNIT_TYPE_LINEAR, "", "", &_unit_menu),
@@ -100,6 +101,9 @@ void GuidelinePropertiesDialog::_onOK()
         double rad_angle = Geom::deg_to_rad( deg_angle );
         normal = Geom::rot90(Geom::Point::polar(rad_angle, 1.0));
     }
+    //To allow reposition from dialog
+    _guide->set_locked(false, true);
+
     _guide->set_normal(normal, true);
 
     double const points_x = _spin_button_x.getValue("px");
@@ -113,6 +117,11 @@ void GuidelinePropertiesDialog::_onOK()
     const gchar* name = g_strdup( _label_entry.getEntry()->get_text().c_str() );
 
     _guide->set_label(name, true);
+    
+    const bool locked = _locked_toggle.get_active();
+
+    _guide->set_locked(locked, true);
+    
     g_free((gpointer) name);
 
 #if WITH_GTKMM_3_0
@@ -269,6 +278,12 @@ void GuidelinePropertiesDialog::_setup() {
     _relative_toggle.set_valign(Gtk::ALIGN_FILL);
     _relative_toggle.set_hexpand();
     _layout_table.attach(_relative_toggle, 1, 7, 2, 1);
+
+    // locked radio button
+    _locked_toggle.set_halign(Gtk::ALIGN_FILL);
+    _locked_toggle.set_valign(Gtk::ALIGN_FILL);
+    _locked_toggle.set_hexpand();
+    _layout_table.attach(_locked_toggle, 1, 8, 2, 1);
 #else
     _layout_table.attach(_spin_angle,
                          1, 3, 6, 7, Gtk::EXPAND | Gtk::FILL, Gtk::FILL);
@@ -276,11 +291,18 @@ void GuidelinePropertiesDialog::_setup() {
     // mode radio button
     _layout_table.attach(_relative_toggle,
                          1, 3, 7, 8, Gtk::EXPAND | Gtk::FILL, Gtk::FILL);
+
+    // locked radio button
+    _layout_table.attach(_locked_toggle,
+                         1, 3, 8, 9, Gtk::EXPAND | Gtk::FILL, Gtk::FILL);
 #endif
 
     _relative_toggle.signal_toggled().connect(sigc::mem_fun(*this, &GuidelinePropertiesDialog::_modeChanged));
     _relative_toggle.set_active(_relative_toggle_status);
 
+    std::cout << _guide->getLocked() << "_guide->getLocked()\n";
+    _locked_toggle.set_active(_guide->getLocked());
+
     // don't know what this exactly does, but it results in that the dialog closes when entering a value and pressing enter (see LP bug 484187)
     g_signal_connect_swapped(G_OBJECT(_spin_button_x.getWidget()->gobj()), "activate",
                               G_CALLBACK(gtk_window_activate_default), gobj());
diff --git a/src/ui/dialog/guides.h b/src/ui/dialog/guides.h
index 4ff7b4fde..5dce0d6ed 100644
--- a/src/ui/dialog/guides.h
+++ b/src/ui/dialog/guides.h
@@ -79,6 +79,7 @@ private:
 
     Gtk::Label  _label_name;
     Gtk::Label  _label_descr;
+    Inkscape::UI::Widget::CheckButton _locked_toggle;
     Inkscape::UI::Widget::CheckButton _relative_toggle;
     static bool _relative_toggle_status; // remember the status of the _relative_toggle_status button across instances
     Inkscape::UI::Widget::UnitMenu _unit_menu;
-- 
cgit v1.2.3


From 1cab611c173b2903512268994343f58ef83883ec Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Thu, 3 Dec 2015 21:51:29 +0100
Subject: Add global lock guides to the rulers

(bzr r14500.1.5)
---
 src/ui/dialog/guides.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp
index 4951cf39c..faba71615 100644
--- a/src/ui/dialog/guides.cpp
+++ b/src/ui/dialog/guides.cpp
@@ -300,7 +300,11 @@ void GuidelinePropertiesDialog::_setup() {
     _relative_toggle.signal_toggled().connect(sigc::mem_fun(*this, &GuidelinePropertiesDialog::_modeChanged));
     _relative_toggle.set_active(_relative_toggle_status);
 
-    std::cout << _guide->getLocked() << "_guide->getLocked()\n";
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    bool global_guides_lock = prefs->getBool("/options/guides/guides_lock", false);
+    if(global_guides_lock){
+        _locked_toggle.set_sensitive(false);
+    }
     _locked_toggle.set_active(_guide->getLocked());
 
     // don't know what this exactly does, but it results in that the dialog closes when entering a value and pressing enter (see LP bug 484187)
-- 
cgit v1.2.3


From e649a1d9cd29f39b2d1cf343cec97ccebce9cf08 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 5 Dec 2015 23:55:57 +0100
Subject: Changed from Desktop to namedview to handle multiples documents

(bzr r14500.1.8)
---
 src/ui/dialog/guides.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp
index faba71615..e0efcde36 100644
--- a/src/ui/dialog/guides.cpp
+++ b/src/ui/dialog/guides.cpp
@@ -300,8 +300,7 @@ void GuidelinePropertiesDialog::_setup() {
     _relative_toggle.signal_toggled().connect(sigc::mem_fun(*this, &GuidelinePropertiesDialog::_modeChanged));
     _relative_toggle.set_active(_relative_toggle_status);
 
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    bool global_guides_lock = prefs->getBool("/options/guides/guides_lock", false);
+    bool global_guides_lock = _desktop->namedview->lockguides;
     if(global_guides_lock){
         _locked_toggle.set_sensitive(false);
     }
-- 
cgit v1.2.3


From 266cd1e5c43e6a46cd37f7db5138270b80d0944e Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 6 Dec 2015 22:39:31 +0100
Subject: Fixes UX pointed in suv review

(bzr r14500.1.9)
---
 src/ui/interface.cpp                | 3 +++
 src/ui/view/edit-widget-interface.h | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'src/ui')

diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 0f719b40f..dc49283d5 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -577,6 +577,9 @@ static gboolean checkitem_update(GtkWidget *widget, GdkEventExpose * /*event*/,
         if (!strcmp(action->id, "ToggleGrid")) {
             ison = dt->gridsEnabled();
         }
+        else if (!strcmp(action->id, "EditGuidesToggleLock")) {
+            ison = dt->namedview->lockguides;
+        }
         else if (!strcmp(action->id, "ToggleGuides")) {
             ison = dt->namedview->getGuides();
         }
diff --git a/src/ui/view/edit-widget-interface.h b/src/ui/view/edit-widget-interface.h
index 55683871d..fcba0c6da 100644
--- a/src/ui/view/edit-widget-interface.h
+++ b/src/ui/view/edit-widget-interface.h
@@ -116,6 +116,9 @@ struct EditWidgetInterface
     /// Toggle CMS on/off and set preference value accordingly
     virtual void toggleColorProfAdjust() = 0;
 
+    /// Toggle lock guides on/off and set namedview value accordingly
+    virtual void toggleGuidesLock() = 0;
+
     /// Is CMS on/off
     virtual bool colorProfAdjustEnabled() = 0;
 
-- 
cgit v1.2.3


From 351afb17c6a579d3d1bb03500433b92b00123c03 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 7 Dec 2015 20:59:06 +0100
Subject: Add rect to SP Control point on locked guides

(bzr r14500.1.13)
---
 src/ui/control-manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui')

diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp
index 5a3c5a496..10190a6a7 100644
--- a/src/ui/control-manager.cpp
+++ b/src/ui/control-manager.cpp
@@ -298,7 +298,7 @@ void ControlManagerImpl::updateItem(SPCanvasItem *item)
         double target = _sizeTable[item->ctrlType][_size - 1];
 
         if ((item->ctrlType == CTRL_TYPE_ORIGIN) && SP_IS_CTRLPOINT(item)) {
-            sp_ctrlpoint_set_radius(SP_CTRLPOINT(item), target / 2.0);
+            sp_ctrlpoint_set_lenght(SP_CTRLPOINT(item), target );
         } else {
             if (_sizeChangers.count(item->ctrlType) && _manager.isSelected(item)) {
                 target += 2;
-- 
cgit v1.2.3


From ddc6177836028eca89fb701ad2e5e923cb94ae87 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Mon, 7 Dec 2015 21:18:04 +0100
Subject: static code analysis

(bzr r14508)
---
 src/ui/uxmanager.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp
index 051df691e..036659661 100644
--- a/src/ui/uxmanager.cpp
+++ b/src/ui/uxmanager.cpp
@@ -244,12 +244,13 @@ void UXManagerImpl::delTrack( SPDesktopWidget* dtw )
 
 void UXManagerImpl::connectToDesktop( vector<GtkWidget *> const & toolboxes, SPDesktop *desktop )
 {
-    TrackItem &tracker = trackedBoxes[desktop];
-    vector<GtkWidget*>& tracked = tracker.boxes;
-    if (desktop)
+    if (!desktop)
     {
-        tracker.destroyConn = desktop->connectDestroy(&desktopDestructHandler);
+        return;
     }
+    TrackItem &tracker = trackedBoxes[desktop];
+    vector<GtkWidget*>& tracked = tracker.boxes;
+    tracker.destroyConn = desktop->connectDestroy(&desktopDestructHandler);
 
     for (vector<GtkWidget*>::const_iterator it = toolboxes.begin(); it != toolboxes.end(); ++it ) {
         GtkWidget* toolbox = *it;
-- 
cgit v1.2.3


From 25fbd2cc032dd472c3f85468c957b52e2a10d446 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Mon, 7 Dec 2015 21:20:33 +0100
Subject: static code analysis

(bzr r14510)
---
 src/ui/clipboard.cpp               | 4 ++--
 src/ui/dialog/grid-arrange-tab.cpp | 2 +-
 src/ui/interface.cpp               | 4 ++--
 src/ui/tools/measure-tool.cpp      | 4 ++--
 src/ui/tools/mesh-tool.cpp         | 4 ++--
 src/ui/tools/node-tool.cpp         | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 354fa45dc..f04d8a591 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -682,11 +682,11 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection)
 
     //remove already copied elements from cloned_elements
     std::vector<SPItem*>tr;
-    for(std::set<SPItem*>::iterator it = cloned_elements.begin();it!=cloned_elements.end();it++){
+    for(std::set<SPItem*>::iterator it = cloned_elements.begin();it!=cloned_elements.end();++it){
         if(std::find(sorted_items.begin(),sorted_items.end(),*it)!=sorted_items.end())
             tr.push_back(*it);
     }
-    for(std::vector<SPItem*>::iterator it = tr.begin();it!=tr.end();it++){
+    for(std::vector<SPItem*>::iterator it = tr.begin();it!=tr.end();++it){
         cloned_elements.erase(*it);
     }
 
diff --git a/src/ui/dialog/grid-arrange-tab.cpp b/src/ui/dialog/grid-arrange-tab.cpp
index 53c25c3d5..639e463ea 100644
--- a/src/ui/dialog/grid-arrange-tab.cpp
+++ b/src/ui/dialog/grid-arrange-tab.cpp
@@ -305,7 +305,7 @@ g_print("\n row = %f     col = %f selection x= %f selection y = %f", total_row_h
 
              GSList *current_row = NULL;
              col_cnt = 0;
-             for(;it!=sorted.end()&&col_cnt<NoOfCols;it++) {
+             for(;it!=sorted.end()&&col_cnt<NoOfCols;++it) {
                  current_row = g_slist_append (current_row, *it);
                  col_cnt++;
              }
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 0f719b40f..6fd5bed07 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -239,7 +239,7 @@ sp_create_window(SPViewWidget *vw, bool editable)
         }
         int pos = nui_drop_target_entries;
 
-        for (std::vector<gchar*>::iterator it = types.begin() ; it != types.end() ; it++) {
+        for (std::vector<gchar*>::iterator it = types.begin() ; it != types.end() ; ++it) {
             completeDropTargets[pos].target = *it;
             completeDropTargets[pos].flags = 0;
             completeDropTargets[pos].info = IMAGE_DATA;
@@ -2070,7 +2070,7 @@ void ContextMenu::ImageEdit(void)
 #endif
 
     std::vector<SPItem*> itemlist=_desktop->selection->itemList();
-    for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++){
+    for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();++i){
         Inkscape::XML::Node *ir = (*i)->getRepr();
         const gchar *href = ir->attribute("xlink:href");
         
diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 06f32ba5c..4d17a7ed5 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -1108,7 +1108,7 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
         r->stop();
     }
     std::vector<double> intersection_times;
-    for (std::vector<SPItem*>::const_iterator i=items.begin(); i!=items.end(); i++) {
+    for (std::vector<SPItem*>::const_iterator i=items.begin(); i!=items.end(); ++i) {
         SPItem *item = *i;
         if (SP_IS_SHAPE(item)) {
             calculate_intersections(desktop, item, lineseg, SP_SHAPE(item)->getCurve(), intersection_times);
@@ -1155,7 +1155,7 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
 
     std::vector<Geom::Point> intersections;
     std::sort(intersection_times.begin(), intersection_times.end());
-    for (std::vector<double>::iterator iter_t = intersection_times.begin(); iter_t != intersection_times.end(); iter_t++) {
+    for (std::vector<double>::iterator iter_t = intersection_times.begin(); iter_t != intersection_times.end(); ++iter_t) {
         if(show_in_between) {
             intersections.push_back(lineseg[0].pointAt(*iter_t));
         }
diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp
index 794296329..56ba08789 100644
--- a/src/ui/tools/mesh-tool.cpp
+++ b/src/ui/tools/mesh-tool.cpp
@@ -471,7 +471,7 @@ bool MeshTool::root_handler(GdkEvent* event) {
             } else {
                 // Create a new gradient with default coordinates.
             	std::vector<SPItem*> items=selection->itemList();
-                for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+                for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();++i){
                     SPItem *item = *i;
                     SPGradientType new_type = SP_GRADIENT_TYPE_MESH;
                     Inkscape::PaintTarget fsmode = (prefs->getInt("/tools/gradient/newfillorstroke", 1) != 0) ? Inkscape::FOR_FILL : Inkscape::FOR_STROKE;
@@ -956,7 +956,7 @@ static void sp_mesh_end_drag(MeshTool &rc) {
         sp_repr_css_set_property(css, "fill-opacity", "1.0");
 
         std::vector<SPItem*> items=selection->itemList();
-        for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+        for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();++i){
 
             //FIXME: see above
             sp_repr_css_change_recursive((*i)->getRepr(), css, "style");
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index 6a6ca0b26..cceaca7cb 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -413,7 +413,7 @@ void NodeTool::selection_changed(Inkscape::Selection *sel) {
     std::set<ShapeRecord> shapes;
 
     std::vector<SPItem*> items=sel->itemList();
-    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();++i){
         SPObject *obj = *i;
 
         if (SP_IS_ITEM(obj)) {
-- 
cgit v1.2.3