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
Task #3230: Sketcher: create a curve passing through selected points or vertices...
[modules/shaper.git]
/
src
/
SketchSolver
/
PlaneGCSSolver
/
PlaneGCSSolver_Defs.h
diff --git
a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Defs.h
b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Defs.h
index 0f31d2e2c7de02d706d70b2bd5273a063c2a7a36..64d2ab9a90b31a8585b5c07d883697849db9471b 100644
(file)
--- a/
src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Defs.h
+++ b/
src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Defs.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-20
17
CEA/DEN, EDF R&D
+// Copyright (C) 2014-20
20
CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-12,10
+12,9
@@
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA
//
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef PlaneGCSSolver_Defs_H_
//
#ifndef PlaneGCSSolver_Defs_H_
@@
-40,17
+39,23
@@
typedef int ConstraintID;
// Predefined values for identifiers
const ConstraintID CID_UNKNOWN = 0;
const ConstraintID CID_MOVEMENT = -1;
// Predefined values for identifiers
const ConstraintID CID_UNKNOWN = 0;
const ConstraintID CID_MOVEMENT = -1;
-const ConstraintID CID_FICTIVE
= 1024
;
+const ConstraintID CID_FICTIVE
= 99
;
/// Types of entities
enum SketchSolver_EntityType {
ENTITY_UNKNOWN = 0,
/// Types of entities
enum SketchSolver_EntityType {
ENTITY_UNKNOWN = 0,
+ ENTITY_BOOLEAN,
ENTITY_SCALAR,
ENTITY_SCALAR,
+ ENTITY_SCALAR_ARRAY,
ENTITY_ANGLE,
ENTITY_POINT,
ENTITY_ANGLE,
ENTITY_POINT,
+ ENTITY_POINT_ARRAY,
ENTITY_LINE,
ENTITY_CIRCLE,
ENTITY_LINE,
ENTITY_CIRCLE,
- ENTITY_ARC
+ ENTITY_ARC,
+ ENTITY_ELLIPSE,
+ ENTITY_ELLIPTIC_ARC,
+ ENTITY_BSPLINE
};
/// Types of constraints
};
/// Types of constraints
@@
-58,8
+63,7
@@
enum SketchSolver_ConstraintType {
CONSTRAINT_UNKNOWN = 0,
CONSTRAINT_COINCIDENCE, // base coincidence if we don't know exact type yet
CONSTRAINT_PT_PT_COINCIDENT,
CONSTRAINT_UNKNOWN = 0,
CONSTRAINT_COINCIDENCE, // base coincidence if we don't know exact type yet
CONSTRAINT_PT_PT_COINCIDENT,
- CONSTRAINT_PT_ON_LINE,
- CONSTRAINT_PT_ON_CIRCLE,
+ CONSTRAINT_PT_ON_CURVE,
CONSTRAINT_MIDDLE_POINT,
CONSTRAINT_DISTANCE, // base distance if we don't know the measured objects yet
CONSTRAINT_PT_PT_DISTANCE,
CONSTRAINT_MIDDLE_POINT,
CONSTRAINT_DISTANCE, // base distance if we don't know the measured objects yet
CONSTRAINT_PT_PT_DISTANCE,
@@
-73,14
+77,16
@@
enum SketchSolver_ConstraintType {
CONSTRAINT_VERTICAL,
CONSTRAINT_PARALLEL,
CONSTRAINT_PERPENDICULAR,
CONSTRAINT_VERTICAL,
CONSTRAINT_PARALLEL,
CONSTRAINT_PERPENDICULAR,
+ CONSTRAINT_PERPENDICULAR_CURVES,
CONSTRAINT_SYMMETRIC,
CONSTRAINT_EQUAL, // base equality if we don't know the measured objects yet
CONSTRAINT_EQUAL_LINES,
CONSTRAINT_EQUAL_LINE_ARC,
CONSTRAINT_EQUAL_RADIUS,
CONSTRAINT_SYMMETRIC,
CONSTRAINT_EQUAL, // base equality if we don't know the measured objects yet
CONSTRAINT_EQUAL_LINES,
CONSTRAINT_EQUAL_LINE_ARC,
CONSTRAINT_EQUAL_RADIUS,
+ CONSTRAINT_EQUAL_ELLIPSES,
CONSTRAINT_TANGENT, // base tangency if we don't know the measured objects yet
CONSTRAINT_TANGENT_CIRCLE_LINE,
CONSTRAINT_TANGENT, // base tangency if we don't know the measured objects yet
CONSTRAINT_TANGENT_CIRCLE_LINE,
- CONSTRAINT_TANGENT_C
IRCLE_CIRCL
E,
+ CONSTRAINT_TANGENT_C
URVE_CURV
E,
CONSTRAINT_COLLINEAR,
CONSTRAINT_MULTI_TRANSLATION,
CONSTRAINT_MULTI_ROTATION
CONSTRAINT_COLLINEAR,
CONSTRAINT_MULTI_TRANSLATION,
CONSTRAINT_MULTI_ROTATION