Drawing: Symbols can now contain editable texts

src/Mod/Drawing/App/FeatureViewSymbol.cpp

@@ -28,6 +28,7 @@
 #endif
 
 #include <iomanip>
+#include <boost/regex.hpp>
 
 #include <Base/Exception.h>
 #include <Base/FileInfo.h>
@@ -50,6 +51,7 @@ FeatureViewSymbol::FeatureViewSymbol(void)
     static const char *vgroup = "Drawing view";
 
     ADD_PROPERTY_TYPE(Symbol,(""),vgroup,App::Prop_Hidden,"The SVG code defining this symbol");
+    ADD_PROPERTY_TYPE(EditableTexts,(""),vgroup,App::Prop_None,"Substitution values for the editable strings in this symbol");
 
 }
 
@@ -57,13 +59,67 @@ FeatureViewSymbol::~FeatureViewSymbol()
 {
 }
 
+/// get called by the container when a Property was changed
+void FeatureViewSymbol::onChanged(const App::Property* prop)
+{
+    if (prop == &Symbol) {
+        if (!this->isRestoring()) {
+            std::vector<string> eds;
+            std::string svg = Symbol.getValue();
+            if (!svg.empty()) {
+                boost::regex e ("<text.*?freecad:editable=\"(.*?)\".*?<tspan.*?>(.*?)</tspan>");
+                std::string::const_iterator tbegin, tend;
+                tbegin = svg.begin();
+                tend = svg.end();
+                boost::match_results<std::string::const_iterator> twhat;
+                while (boost::regex_search(tbegin, tend, twhat, e)) {
+                    eds.push_back(twhat[2]);
+                    tbegin = twhat[0].second;
+                }
+                EditableTexts.setValues(eds);
+            }
+        }
+    }
+    Drawing::FeatureView::onChanged(prop);
+}
+
 App::DocumentObjectExecReturn *FeatureViewSymbol::execute(void)
 {
+    std::string svg = Symbol.getValue();
+    const std::vector<std::string>& editText = EditableTexts.getValues();
+    
+    if (!editText.empty()) {
+        boost::regex e1 ("<text.*?freecad:editable=\"(.*?)\".*?<tspan.*?>(.*?)</tspan>");
+        string::const_iterator begin, end;
+        begin = svg.begin();
+        end = svg.end();
+        boost::match_results<std::string::const_iterator> what;
+        std::size_t count = 0;
+        std::string newsvg;
+        newsvg.reserve(svg.size());
+
+        while (boost::regex_search(begin, end, what, e1)) {
+            if (count < editText.size()) {
+                // change values of editable texts. Also strip the "freecad:editable"
+                // attribute so it isn't detected by the page
+                boost::regex e2 ("(<text.*?)(freecad:editable=\""+what[1].str()+"\")(.*?<tspan.*?)>(.*?)(</tspan>)");
+                boost::re_detail::string_out_iterator<std::string > out(newsvg);
+                boost::regex_replace(out, begin, what[0].second, e2, "$1$3>"+editText[count]+"$5");
+            }
+            count++;
+            begin = what[0].second;
+        }
+
+        // now copy the rest
+        newsvg.insert(newsvg.end(), begin, end);
+        svg = newsvg;
+    }
+    
     std::stringstream result;
     result  << "<g transform=\"translate(" << X.getValue() << "," << Y.getValue() << ")"
             << " rotate(" << Rotation.getValue() << ")"
             << " scale(" << Scale.getValue() << ")\">" << endl
-            << Symbol.getValue() << endl
+            << svg << endl
             << "</g>" << endl;
 
     // Apply the resulting fragment

src/Mod/Drawing/App/FeatureViewSymbol.h

@@ -49,6 +49,7 @@ public:
     virtual ~FeatureViewSymbol();
 
     App::PropertyString       Symbol;
+    App::PropertyStringList   EditableTexts;
 
     /** @name methods overide Feature */
     //@{
@@ -60,6 +61,9 @@ public:
     virtual const char* getViewProviderName(void) const {
         return "DrawingGui::ViewProviderDrawingView";
     }
+
+protected:
+    void onChanged(const App::Property* prop);
 };
 
 typedef App::FeaturePythonT<FeatureViewSymbol> FeatureViewSymbolPython;