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

Changes based on wwmayer's comments

Browse Source
This commit is contained in:
AjinkyaDahale 2017-01-31 10:10:44 +05:30 committed by wmayer
parent fb2cd4d7b3
commit e8c822c93e
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,8 +244,8 @@ void finishDistanceConstraint(Gui::Command* cmd, Sketcher::SketchObject* sketch,
void showNoConstraintBetweenExternal() void showNoConstraintBetweenExternal()
{ {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Cannot add a constraint between two external geometries!")); QObject::tr("Cannot add a constraint between two external geometries!"));
} }
bool checkBothExternal(int GeoId1, int GeoId2) bool checkBothExternal(int GeoId1, int GeoId2)
@ -833,7 +833,7 @@ class DrawSketchHandlerGenConstraint: public DrawSketchHandler
{ {
public: public:
DrawSketchHandlerGenConstraint(const char* cursor[], CmdSketcherConstraint *_cmd) DrawSketchHandlerGenConstraint(const char* cursor[], CmdSketcherConstraint *_cmd)
: constraintCursor(cursor), cmd(_cmd) {} : constraintCursor(cursor), cmd(_cmd), selFilterGate(nullptr) {}
virtual ~DrawSketchHandlerGenConstraint() virtual ~DrawSketchHandlerGenConstraint()
{ {
Gui::Selection().rmvSelectionGate(); Gui::Selection().rmvSelectionGate();
@ -841,13 +841,11 @@ public:
virtual void activated(ViewProviderSketch *) virtual void activated(ViewProviderSketch *)
{ {
ongoingSequences = new std::set<int>(); //TODO: make it contain more values
_tempOnSequences = new std::set<int>();
selFilterGate = new GenericConstraintSelection(sketchgui->getObject()); selFilterGate = new GenericConstraintSelection(sketchgui->getObject());
resetOngoingSequences(); resetOngoingSequences();
selSeq = *(new std::vector<SelIdPair>()); selSeq.clear();
Gui::Selection().rmvSelectionGate(); Gui::Selection().rmvSelectionGate();
Gui::Selection().addSelectionGate(selFilterGate); Gui::Selection().addSelectionGate(selFilterGate);
@ -922,10 +920,10 @@ public:
onSketchPos.x, onSketchPos.x,
onSketchPos.y, onSketchPos.y,
0.f); 0.f);
_tempOnSequences->clear(); _tempOnSequences.clear();
allowedSelTypes = 0; allowedSelTypes = 0;
for (std::set<int>::iterator token = ongoingSequences->begin(); for (std::set<int>::iterator token = ongoingSequences.begin();
token != ongoingSequences->end(); ++token) { token != ongoingSequences.end(); ++token) {
if ((cmd->allowedSelSequences).at(*token).at(seqIndex) == newSelType) { if ((cmd->allowedSelSequences).at(*token).at(seqIndex) == newSelType) {
if (seqIndex == (cmd->allowedSelSequences).at(*token).size()-1) { if (seqIndex == (cmd->allowedSelSequences).at(*token).size()-1) {
// TODO: One of the sequences is completed. Pass to cmd->applyConstraint // TODO: One of the sequences is completed. Pass to cmd->applyConstraint
@ -936,7 +934,7 @@ public:
return true; return true;
} }
_tempOnSequences->insert(*token); _tempOnSequences.insert(*token);
allowedSelTypes = allowedSelTypes | (cmd->allowedSelSequences).at(*token).at(seqIndex+1); allowedSelTypes = allowedSelTypes | (cmd->allowedSelSequences).at(*token).at(seqIndex+1);
} }
} }
@ -960,14 +958,14 @@ protected:
int allowedSelTypes = 0; int allowedSelTypes = 0;
/// indices of currently ongoing sequences in cmd->allowedSequences /// indices of currently ongoing sequences in cmd->allowedSequences
std::set<int> *ongoingSequences, *_tempOnSequences; std::set<int> ongoingSequences, _tempOnSequences;
/// Index within the selection sequences active /// Index within the selection sequences active
unsigned int seqIndex; unsigned int seqIndex;
void resetOngoingSequences() { void resetOngoingSequences() {
ongoingSequences->clear(); ongoingSequences.clear();
for (unsigned int i = 0; i < cmd->allowedSelSequences.size(); i++) { for (unsigned int i = 0; i < cmd->allowedSelSequences.size(); i++) {
ongoingSequences->insert(i); ongoingSequences.insert(i);
} }
seqIndex = 0; seqIndex = 0;
@ -1276,6 +1274,9 @@ void CmdSketcherConstrainVertical::activated(int iMsg)
if (selection.size() != 1) { if (selection.size() != 1) {
// QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), // QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
// QObject::tr("Select an edge from the sketch.")); // QObject::tr("Select an edge from the sketch."));
ActivateHandler(getActiveGuiDocument(),
new DrawSketchHandlerGenConstraint(constraintCursor, this));
getSelection().clearSelection();
return; return;
} }