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

Sketcher: Points color reflect their construction state. Remove Vertex color.

Browse Source
This commit is contained in:
PaddleStroke
2024-03-22 13:38:14 +01:00
committed by Yorik van Havre
parent 81fcfa1dbe
commit f5da655429
8 changed files with 38 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.cpp
View File

@@ -124,10 +124,12 @@ void EditModeGeometryCoinManager::updateGeometryColor(const GeoListFacade& geoli
bool issketchinvalid)
{
// Lambdas for convenience retrieval of geometry information
auto isDefinedGeomPoint = [&geolistfacade](int GeoId) {
auto isDefinedGeomPoint = [&geolistfacade](int GeoId, Sketcher::PointPos PosId) {
auto geom = geolistfacade.getGeometryFacadeFromGeoId(GeoId);
if (geom) {
return geom->isGeoType(Part::GeomPoint::getClassTypeId()) && !geom->getConstruction();
bool isStartOrEnd =
PosId == Sketcher::PointPos::start || PosId == Sketcher::PointPos::end;
return isStartOrEnd && !geom->getConstruction();
}
return false;
};
@@ -185,6 +187,7 @@ void EditModeGeometryCoinManager::updateGeometryColor(const GeoListFacade& geoli
}
else {
int GeoId = coinMapping.getPointGeoId(i, l);
Sketcher::PointPos PosId = coinMapping.getPointPosId(i, l);
bool constrainedElement = isFullyConstraintElement(GeoId);
@@ -197,12 +200,13 @@ void EditModeGeometryCoinManager::updateGeometryColor(const GeoListFacade& geoli
}
}
else {
if (!isDefinedGeomPoint(GeoId)) {
if (!isDefinedGeomPoint(GeoId, PosId)) {
if (constrainedElement) {
pcolor[i] = drawingParameters.FullyConstraintConstructionPointColor;
pcolor[i] =
drawingParameters.FullyConstraintConstructionElementColor;
}
else {
pcolor[i] = drawingParameters.VertexColor;
pcolor[i] = drawingParameters.CurveDraftColor;
}
}
else { // this is a defined GeomPoint