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

Solver: Support for Diameter constraint

Browse Source
This commit is contained in:
Abdullah Tahiri
2018-06-15 16:14:52 +02:00
committed by wmayer
parent e54c33d585
commit b320f15909
2 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Mod/Sketcher/App/Sketch.cpp
View File

@@ -1390,6 +1390,19 @@ int Sketch::addConstraint(const Constraint *constraint)
rtn = addRadiusConstraint(constraint->First, c.value,c.driving);
break;
}
case Diameter:
{
c.value = new double(constraint->getValue());
if(c.driving)
FixParameters.push_back(c.value);
else {
Parameters.push_back(c.value);
DrivenParameters.push_back(c.value);
}
rtn = addDiameterConstraint(constraint->First, c.value,c.driving);
break;
}
case Equal:
rtn = addEqualConstraint(constraint->First,constraint->Second);
break;
@@ -2120,6 +2133,25 @@ int Sketch::addRadiusConstraint(int geoId, double * value, bool driving)
return -1;
}
int Sketch::addDiameterConstraint(int geoId, double * value, bool driving)
{
geoId = checkGeoId(geoId);
if (Geoms[geoId].type == Circle) {
GCS::Circle &c = Circles[Geoms[geoId].index];
int tag = ++ConstraintsCounter;
GCSsys.addConstraintCircleDiameter(c, value, tag, driving);
return ConstraintsCounter;
}
else if (Geoms[geoId].type == Arc) {
GCS::Arc &a = Arcs[Geoms[geoId].index];
int tag = ++ConstraintsCounter;
GCSsys.addConstraintArcDiameter(a, value, tag, driving);
return ConstraintsCounter;
}
return -1;
}
// line orientation angle constraint
int Sketch::addAngleConstraint(int geoId, double * value, bool driving)
{
@@ -3039,6 +3071,10 @@ bool Sketch::updateNonDrivingConstraints()
(*it).constr->setValue(std::remainder(*((*it).value), 2.0*M_PI));
}
else if((*it).constr->Type==Diameter) {
(*it).constr->setValue(2.0**((*it).value));
}
else {
(*it).constr->setValue(*((*it).value));
}

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

@@ -261,6 +261,14 @@ public:
* Parameters array, as the case may be.
*/
int addRadiusConstraint(int geoId, double * value, bool driving = true);
/**
* add a radius constraint on a circle or an arc
*
* double * value is a pointer to double allocated in the heap, containing the
* constraint value and already inserted into either the FixParameters or
* Parameters array, as the case may be.
*/
int addDiameterConstraint(int geoId, double * value, bool driving = true);
/**
* add an angle constraint on a line or between two lines
*