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

EditCoinManager: root point full constrained only when there is another point on top

Browse Source
This commit is contained in:
Abdullah Tahiri
2021-12-22 17:56:37 +01:00
committed by abdullahtahiriyo
parent 053cc36541
commit 0df17613b1
2 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.h
View File

@@ -72,6 +72,7 @@ struct DrawingParameters {
const float zHighLines = 0.007f; // Height used for on top rendered lines
const float zHighLine = 0.008f; // Height for highlighted lines (selected/preselected)
const float zConstr = 0.009f; // Height for rendering constraints
const float zRootPoint = 0.009f; // Height used for bottom rendered points
const float zLowPoints = 0.010f; // Height used for bottom rendered points
const float zHighPoints = 0.011f; // Height used for in-the-middle rendered points
const float zHighlight = 0.012f; // Height for highlighted points (selected/preselected)

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

@@ -218,35 +218,36 @@ void EditModeGeometryCoinManager::updateGeometryColor(const GeoListFacade & geol
for (int i=0; i < PtNum; i++)
pcolor[i] = drawingParameters.InvalidSketchColor;
}
else if (PtNum > 1 && ViewProviderSketchCoinAttorney::isSketchFullyConstrained(viewProvider)) {
for (int i=0; i < PtNum; i++)
pcolor[i] = drawingParameters.FullyConstrainedColor;
}
else {
for (int i=0; i < PtNum; i++) {
int GeoId = coinMapping.getPointGeoId(i, l);
bool constrainedElement = isFullyConstraintElement(GeoId);
if(isInternalAlignedGeom(GeoId)) {
if(constrainedElement)
pcolor[i] = drawingParameters.FullyConstraintInternalAlignmentColor;
else
pcolor[i] = drawingParameters.InternalAlignedGeoColor;
if ( !(i == 0 && l == 0) && ViewProviderSketchCoinAttorney::isSketchFullyConstrained(viewProvider)) {// root point is not coloured
pcolor[i] = drawingParameters.FullyConstrainedColor;
}
else {
if(!isDefinedGeomPoint(GeoId)) {
int GeoId = coinMapping.getPointGeoId(i, l);
bool constrainedElement = isFullyConstraintElement(GeoId);
if(isInternalAlignedGeom(GeoId)) {
if(constrainedElement)
pcolor[i] = drawingParameters.FullyConstraintConstructionPointColor;
pcolor[i] = drawingParameters.FullyConstraintInternalAlignmentColor;
else
pcolor[i] = drawingParameters.VertexColor;
pcolor[i] = drawingParameters.InternalAlignedGeoColor;
}
else { // this is a defined GeomPoint
if(constrainedElement)
pcolor[i] = drawingParameters.FullyConstraintElementColor;
else
pcolor[i] = drawingParameters.CurveColor;
else {
if(!isDefinedGeomPoint(GeoId)) {
if(constrainedElement)
pcolor[i] = drawingParameters.FullyConstraintConstructionPointColor;
else
pcolor[i] = drawingParameters.VertexColor;
}
else { // this is a defined GeomPoint
if(constrainedElement)
pcolor[i] = drawingParameters.FullyConstraintElementColor;
else
pcolor[i] = drawingParameters.CurveColor;
}
}
}
}
@@ -273,15 +274,20 @@ void EditModeGeometryCoinManager::updateGeometryColor(const GeoListFacade & geol
drawingParameters.zLowPoints,
drawingParameters.zLowPoints);
for (int i=0; i < PtNum; i++) { // 0 is the origin
pverts[i].getValue(x,y,z);
auto geom = geolistfacade.getGeometryFacadeFromGeoId(coinMapping.getPointGeoId(i, l));
if(geom && z < drawingParameters.zHighlight) {
if(geom->getConstruction())
pverts[i].setValue(x,y,zConstrPoint);
else
pverts[i].setValue(x,y,zNormPoint);
if( i == 0 && l == 0 ) { // reset root point to lowest
pverts[i].setValue(0, 0, drawingParameters.zRootPoint);
}
else {
pverts[i].getValue(x,y,z);
auto geom = geolistfacade.getGeometryFacadeFromGeoId(coinMapping.getPointGeoId(i, l));
if(geom) {
if(geom->getConstruction())
pverts[i].setValue(x,y,zConstrPoint);
else
pverts[i].setValue(x,y,zNormPoint);
}
}
}