suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ small fixes to the Drawing Page

Browse Source
This commit is contained in:
Yorik van Havre 2011-12-29 23:23:37 -02:00
parent c6b0c86989
commit 529b92cbfe
2 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/Mod/Drawing/App/FeaturePage.cpp
View File

@ -76,34 +76,11 @@ void FeaturePage::onChanged(const App::Property* prop)
}
}
if (prop == &Template) {
// getting editable texts from "freecad:editable" tags in SVG template
if (!this->isRestoring()) {
if (Template.getValue() != "") {
Base::FileInfo tfi(Template.getValue());
if (tfi.isReadable()) {
string tline, tfrag;
ifstream tfile (tfi.filePath().c_str());
while (!tfile.eof()) {
getline (tfile,tline);
tfrag += tline;
tfrag += "--endOfLine--";
}
tfile.close();
boost::regex e ("<text.*?freecad:editable=\"(.*?)\".*?<tspan.*?>(.*?)</tspan>");
string::const_iterator tbegin, tend;
tbegin = tfrag.begin();
tend = tfrag.end();
boost::match_results<std::string::const_iterator> twhat;
std::vector<string> eds;
while (boost::regex_search(tbegin, tend, twhat, e)) {
printf(twhat[1].str().c_str());
eds.push_back(twhat[2]);
tbegin = twhat[0].second;
}
EditableTexts.setValues(eds);
}
}
cout << "setting template " << Template.getValue() << endl;
EditableTexts.setValues(getEditableTexts());
}
else cout << "restoring" << endl;
}
App::DocumentObjectGroup::onChanged(prop);
}
@ -199,3 +176,40 @@ App::DocumentObjectExecReturn *FeaturePage::execute(void)
//}
return App::DocumentObject::StdReturn;
}
std::vector<std::string> FeaturePage::getEditableTexts(void) const {
//getting editable texts from "freecad:editable" tags in SVG template
std::vector<string> eds;
if (Template.getValue() != "") {
Base::FileInfo tfi(Template.getValue());
if (!tfi.isReadable()) {
// if there is a old absolute template file set use a redirect
tfi.setFile(App::Application::getResourceDir() + "Mod/Drawing/Templates/" + tfi.fileName());
// try the redirect
if (!tfi.isReadable()) {
return eds;
}
}
string tline, tfrag;
ifstream tfile (tfi.filePath().c_str());
while (!tfile.eof()) {
getline (tfile,tline);
tfrag += tline;
tfrag += "--endOfLine--";
}
tfile.close();
boost::regex e ("<text.*?freecad:editable=\"(.*?)\".*?<tspan.*?>(.*?)</tspan>");
string::const_iterator tbegin, tend;
tbegin = tfrag.begin();
tend = tfrag.end();
boost::match_results<std::string::const_iterator> twhat;
while (boost::regex_search(tbegin, tend, twhat, e)) {
printf(twhat[1].str().c_str());
eds.push_back(twhat[2]);
tbegin = twhat[0].second;
}
}
return eds;
}

1
src/Mod/Drawing/App/FeaturePage.h
View File

@ -59,6 +59,7 @@ public:
virtual const char* getViewProviderName(void) const {
return "DrawingGui::ViewProviderDrawingPage";
}
virtual std::vector<std::string> getEditableTexts(void) const;
protected:
void onChanged(const App::Property* prop);