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

0001201: Highlight coincident constraint in sketch view when clicking on (coincident) constraint in constraints list

Browse Source
This commit is contained in:
wmayer 2013-08-13 20:12:08 +02:00
parent c9ba79666d
commit 5259ad3d24
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Sketcher/App/Sketch.h
View File

@ -80,6 +80,8 @@ public:
/// get the geometry as python objects
Py::Tuple getPyGeometry(void) const;
/// retrieves the index of a point
int getPointId(int geoId, PointPos pos) const;
/// retrieves a point
Base::Vector3d getPoint(int geoId, PointPos pos);
@ -220,8 +222,6 @@ protected:
bool isFine;
private:
/// retrieves the index of a point
int getPointId(int geoId, PointPos pos) const;
bool updateGeometry(void);

31
src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
View File

@ -1770,41 +1770,52 @@ void ViewProviderSketch::updateColor(void)
SoSeparator *s = dynamic_cast<SoSeparator *>(edit->constrGroup->getChild(i));
// Check Constraint Type
ConstraintType type = getSketchObject()->Constraints.getValues()[i]->Type;
Sketcher::Constraint* constraint = getSketchObject()->Constraints.getValues()[i];
ConstraintType type = constraint->Type;
bool hasDatumLabel = (type == Sketcher::Angle ||
type == Sketcher::Radius ||
type == Sketcher::Symmetric ||
type == Sketcher::Distance ||
type == Sketcher::DistanceX || type == Sketcher::DistanceY);
type == Sketcher::DistanceX ||
type == Sketcher::DistanceY);
// Non DatumLabel Nodes will have a material excluding coincident
bool hasMaterial = false;
SoMaterial *m;
if (!hasDatumLabel && type != Sketcher::Coincident) {
hasMaterial = true;
m = dynamic_cast<SoMaterial *>(s->getChild(0));
hasMaterial = true;
m = dynamic_cast<SoMaterial *>(s->getChild(0));
}
if (edit->SelConstraintSet.find(i) != edit->SelConstraintSet.end()) {
if (hasDatumLabel) {
SoDatumLabel *l = dynamic_cast<SoDatumLabel *>(s->getChild(0));
l->textColor = SelectColor;
} else if (hasMaterial)
m->diffuseColor = SelectColor;
} else if (hasMaterial) {
m->diffuseColor = SelectColor;
} else if (type == Sketcher::Coincident) {
int index;
index = edit->ActSketch.getPointId(constraint->First, constraint->FirstPos) + 1;
if (index >= 0 && index < PtNum) pcolor[index] = SelectColor;
index = edit->ActSketch.getPointId(constraint->Second, constraint->SecondPos) + 1;
if (index >= 0 && index < PtNum) pcolor[index] = SelectColor;
}
} else if (edit->PreselectConstraint == i) {
if (hasDatumLabel) {
SoDatumLabel *l = dynamic_cast<SoDatumLabel *>(s->getChild(0));
l->textColor = PreselectColor;
} else if (hasMaterial)
m->diffuseColor = PreselectColor;
} else if (hasMaterial) {
m->diffuseColor = PreselectColor;
}
}
else {
if (hasDatumLabel) {
SoDatumLabel *l = dynamic_cast<SoDatumLabel *>(s->getChild(0));
l->textColor = ConstrDimColor;
} else if (hasMaterial)
m->diffuseColor = ConstrDimColor;
} else if (hasMaterial) {
m->diffuseColor = ConstrDimColor;
}
}
}