kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

+ support of unicode names for sketch constraints

Browse Source
This commit is contained in:
wmayer
2015-09-24 03:17:47 +02:00
parent 35327386e7
commit 92b330bbcb
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Sketcher/Gui/CommandConstraints.cpp
View File

@@ -166,7 +166,7 @@ void openEditDatumDialog(Sketcher::SketchObject* sketch, int ConstrNbr)
QString constraintName = ui_ins_datum.name->text().trimmed();
if (Base::Tools::toStdString(constraintName) != sketch->Constraints[ConstrNbr]->Name) {
std::string escapedstr = Base::Tools::escapedUnicodeFromUtf8(constraintName.toUtf8().constData());
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.renameConstraint(%d, '%s')",
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.renameConstraint(%d, u'%s')",
sketch->getNameInDocument(),
ConstrNbr, escapedstr.c_str());
}
@@ -2442,7 +2442,7 @@ void CmdSketcherConstrainRadius::activated(int iMsg)
QString constraintName = ui_Datum.name->text().trimmed();
if (Base::Tools::toStdString(constraintName) != Obj->Constraints[indexConstr]->Name) {
std::string escapedstr = Base::Tools::escapedUnicodeFromUtf8(constraintName.toUtf8().constData());
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.renameConstraint(%d, '%s')",
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.renameConstraint(%d, u'%s')",
Obj->getNameInDocument(),
indexConstr, escapedstr.c_str());
}

2
src/Mod/Sketcher/Gui/EditDatumDialog.cpp
View File

@@ -175,7 +175,7 @@ void EditDatumDialog::exec(bool atCursor)
QString constraintName = ui_ins_datum.name->text().trimmed();
if (Base::Tools::toStdString(constraintName) != sketch->Constraints[ConstrNbr]->Name) {
std::string escapedstr = Base::Tools::escapedUnicodeFromUtf8(constraintName.toUtf8().constData());
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.renameConstraint(%d, '%s')",
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.renameConstraint(%d, u'%s')",
sketch->getNameInDocument(),
ConstrNbr, escapedstr.c_str());
}

8
src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp
View File

@@ -477,13 +477,13 @@ void ConstraintView::swapNamedOfSelectedItems()
std::string tmpname = ss.str();
Gui::Command::openCommand("Swap constraint names");
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.renameConstraint(%d, '%s')",
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.renameConstraint(%d, u'%s')",
item1->sketch->getNameInDocument(),
item1->ConstraintNbr, tmpname.c_str());
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.renameConstraint(%d, '%s')",
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.renameConstraint(%d, u'%s')",
item2->sketch->getNameInDocument(),
item2->ConstraintNbr, escapedstr1.c_str());
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.renameConstraint(%d, '%s')",
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.renameConstraint(%d, u'%s')",
item1->sketch->getNameInDocument(),
item1->ConstraintNbr, escapedstr2.c_str());
Gui::Command::commitCommand();
@@ -660,7 +660,7 @@ void TaskSketcherConstrains::on_listWidgetConstraints_itemChanged(QListWidgetIte
Gui::Command::openCommand("Rename sketch constraint");
try {
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.renameConstraint(%d, '%s')",
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.renameConstraint(%d, u'%s')",
sketch->getNameInDocument(),
it->ConstraintNbr, escapedstr.c_str());
Gui::Command::commitCommand();