Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Merge branch 'Pre_2.8.0_development'"
[modules/shaper.git]
/
src
/
SketchSolver
/
PlaneGCSSolver
/
PlaneGCSSolver_Solver.h
diff --git
a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.h
b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.h
index 572f2df25ecce3fd5dd38b47e2d6a401c9ebc45f..2e49798a1c90b052a563a735d35c8cfe921f57f1 100644
(file)
--- a/
src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.h
+++ b/
src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.h
@@
-81,11
+81,6
@@
public:
private:
void collectConflicting();
private:
void collectConflicting();
- /// \brief Add fictive constraint if the sketch contains temporary constraints only
- void addFictiveConstraintIfNecessary();
- /// \brief Remove previously added fictive constraint
- void removeFictiveConstraint();
-
private:
typedef std::map<ConstraintID, std::set<GCSConstraintPtr> > ConstraintMap;
private:
typedef std::map<ConstraintID, std::set<GCSConstraintPtr> > ConstraintMap;
@@
-101,8
+96,6
@@
private:
bool myConfCollected;
int myDOF; ///< degrees of freedom
bool myConfCollected;
int myDOF; ///< degrees of freedom
-
- GCS::Constraint* myFictiveConstraint;
};
typedef std::shared_ptr<PlaneGCSSolver_Solver> SolverPtr;
};
typedef std::shared_ptr<PlaneGCSSolver_Solver> SolverPtr;