diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts
index ef6042244..ba2b35507 100644
--- a/src/GEOMGUI/GEOM_msg_en.ts
+++ b/src/GEOMGUI/GEOM_msg_en.ts
@@ -515,6 +515,14 @@ Please, select face, shell or solid and try again
GEOM_CREATE_SINGLE_SOLID
Create a single solid
+
+ GEOM_CRV_BEZIER
+ Bézier Curve
+
+
+ GEOM_CRV_BSPLINE
+ B-Spline Curve
+
GEOM_CURVE
Curve
@@ -555,6 +563,10 @@ Please, select face, shell or solid and try again
GEOM_D2
D2 :
+
+ GEOM_DEGREE
+ Degree :
+
GEOM_DETECT
Detect
@@ -864,6 +876,10 @@ Please, select face, shell or solid and try again
GEOM_FILLING_TOL_3D
Tol. 3D :
+
+ GEOM_FOCAL_LENGTH
+ Focal Length :
+
GEOM_FREE_BOUNDARIES
Free boundaries
@@ -948,6 +964,10 @@ Please, select face, shell or solid and try again
GEOM_HOLES
Holes
+
+ GEOM_HYPERBOLA
+ Hyperbola
+
GEOM_INIT_SHAPE
Initial shape
@@ -988,6 +1008,14 @@ Please, select face, shell or solid and try again
GEOM_KEEP_OBJECT
Keep Object
+
+ GEOM_KNOT_I
+ Knot #%1 :
+
+
+ GEOM_KNOTS
+ Knots
+
GEOM_LENGTH
Length :
@@ -1224,10 +1252,30 @@ Please, select face, shell or solid and try again
GEOM_NODES
Nodes
+
+ GEOM_NON_PERIODIC
+ Non-Periodic
+
+
+ GEOM_NUM_KNOTS
+ Number of knots :
+
+
+ GEOM_NUM_MULTIS
+ Number of multiplicities :
+
+
+ GEOM_NUM_POLES
+ Number of poles :
+
GEOM_NUM_SPLIT_POINTS
Number of splitting points
+
+ GEOM_NUM_WEIGHTS
+ Number of weights :
+
GEOM_OBJECT
Object
@@ -1256,10 +1304,34 @@ Please, select face, shell or solid and try again
GEOM_OFFSET_TITLE
Offset Surface
+
+ GEOM_PARABOLA
+ Parabola
+
+
+ GEOM_PARAMETERS
+ Parameters
+
GEOM_PATTERN
Division pattern
+
+ GEOM_PERIODIC
+ Periodic
+
+
+ GEOM_PERIODICITY
+ Periodicity :
+
+
+ GEOM_POLE_I
+ Pole #%1 :
+
+
+ GEOM_POLES
+ Poles
+
GEOM_PROJECTION_ON_FACE
Projection on Face
diff --git a/src/GEOMGUI/GEOM_msg_fr.ts b/src/GEOMGUI/GEOM_msg_fr.ts
index b58f0550b..b61174223 100644
--- a/src/GEOMGUI/GEOM_msg_fr.ts
+++ b/src/GEOMGUI/GEOM_msg_fr.ts
@@ -515,6 +515,14 @@ Choisissez une face, une coque ou un solide et essayez de nouveau
GEOM_CREATE_SINGLE_SOLID
Créer un solide unique
+
+ GEOM_CRV_BEZIER
+ Courbe de Bézier
+
+
+ GEOM_CRV_BSPLINE
+ Courbe B-Spline
+
GEOM_CURVE
Courbe
@@ -555,6 +563,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau
GEOM_D2
D2 :
+
+ GEOM_DEGREE
+ Degré :
+
GEOM_DETECT
Détecter
@@ -864,6 +876,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau
GEOM_FILLING_TOL_3D
Tol. 3D :
+
+ GEOM_FOCAL_LENGTH
+ Distance Focale :
+
GEOM_FREE_BOUNDARIES
Contours libres
@@ -948,6 +964,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau
GEOM_HOLES
Trous
+
+ GEOM_HYPERBOLA
+ Hyperbole
+
GEOM_INIT_SHAPE
Objet d'origine
@@ -988,6 +1008,14 @@ Choisissez une face, une coque ou un solide et essayez de nouveau
GEOM_KEEP_OBJECT
Garder l'objet
+
+ GEOM_KNOT_I
+ Noeud #%1 :
+
+
+ GEOM_KNOTS
+ Noeuds
+
GEOM_LENGTH
Longueur :
@@ -1224,10 +1252,30 @@ Choisissez une face, une coque ou un solide et essayez de nouveau
GEOM_NODES
Noeuds
+
+ GEOM_NON_PERIODIC
+ Non Périodique
+
+
+ GEOM_NUM_KNOTS
+ Nombre de Noeuds :
+
+
+ GEOM_NUM_MULTIS
+ Nombre de Multiplicités :
+
+
+ GEOM_NUM_POLES
+ Nombre de Pôles :
+
GEOM_NUM_SPLIT_POINTS
Nombre de points de découpe
+
+ GEOM_NUM_WEIGHTS
+ Nombre de Poids :
+
GEOM_OBJECT
Objet
@@ -1256,10 +1304,34 @@ Choisissez une face, une coque ou un solide et essayez de nouveau
GEOM_OFFSET_TITLE
Décaler une surface
+
+ GEOM_PARABOLA
+ Parabole
+
+
+ GEOM_PARAMETERS
+ Paramètres
+
GEOM_PATTERN
Schema de découpe
+
+ GEOM_PERIODIC
+ Périodique
+
+
+ GEOM_PERIODICITY
+ Périodicité :
+
+
+ GEOM_POLE_I
+ Pôle #%1 :
+
+
+ GEOM_POLES
+ Pôles
+
GEOM_PROJECTION_ON_FACE
Projection sur une face
diff --git a/src/GEOMGUI/GEOM_msg_ja.ts b/src/GEOMGUI/GEOM_msg_ja.ts
index 6fbd8f6ef..a485d6a7d 100644
--- a/src/GEOMGUI/GEOM_msg_ja.ts
+++ b/src/GEOMGUI/GEOM_msg_ja.ts
@@ -511,6 +511,14 @@
GEOM_CREATE_SINGLE_SOLID
1 つのソリッドを作成します。
+
+ GEOM_CRV_BEZIER
+ ベジェ曲線
+
+
+ GEOM_CRV_BSPLINE
+ B-スプライン曲線
+
GEOM_CURVE
Curve
@@ -551,6 +559,10 @@
GEOM_D2
D2:
+
+ GEOM_DEGREE
+ 程度 :
+
GEOM_DETECT
検出
@@ -859,6 +871,10 @@
GEOM_FILLING_TOL_3D
Tol. 3D :
+
+ GEOM_FOCAL_LENGTH
+ 焦点距離 :
+
GEOM_FREE_BOUNDARIES
自由境界
@@ -943,6 +959,10 @@
GEOM_HOLES
穴
+
+ GEOM_HYPERBOLA
+ 双曲線
+
GEOM_INIT_SHAPE
元のオブジェクト
@@ -983,6 +1003,14 @@
GEOM_KEEP_OBJECT
オブジェクトを維持します。
+
+ GEOM_KNOT_I
+ 結び目 #%1 :
+
+
+ GEOM_KNOTS
+ 結び目
+
GEOM_LENGTH
長さ:
@@ -1219,10 +1247,30 @@
GEOM_NODES
節点
+
+ GEOM_NON_PERIODIC
+ 非定期的
+
+
+ GEOM_NUM_KNOTS
+ ノット数 :
+
+
+ GEOM_NUM_MULTIS
+ 多重度の数 :
+
+
+ GEOM_NUM_POLES
+ 極数 :
+
GEOM_NUM_SPLIT_POINTS
分割点の数
+
+ GEOM_NUM_WEIGHTS
+ ウェイトの数 :
+
GEOM_OBJECT
オブジェクト
@@ -1251,10 +1299,34 @@
GEOM_OFFSET_TITLE
サーフェスをオフセット
+
+ GEOM_PARABOLA
+ 放物線
+
+
+ GEOM_PARAMETERS
+ パラメーター
+
GEOM_PATTERN
加工図
+
+ GEOM_PERIODIC
+ 定期的
+
+
+ GEOM_PERIODICITY
+ 周期性 :
+
+
+ GEOM_POLE_I
+ 極 #%1 :
+
+
+ GEOM_POLES
+ 極
+
GEOM_PROJECTION_ON_FACE
面上の投影
diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
index 6b507190f..e191364bb 100644
--- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
@@ -749,7 +749,7 @@ GEOMImpl_IMeasureOperations::ShapeKind GEOMImpl_IMeasureOperations::KindOfShape
break;
case GEOMAlgo_KN_CURVEBSPLINE:
{
- // (+) geompy.kind.CRV_BSPLINE np nk nw nm x1 y1 z1 ... xnp ynp znp k1 ... knk w1 ... wnw m1 ... mnm
+ // (+) geompy.kind.CRV_BSPLINE p d np nk nw nm x1 y1 z1 ... xnp ynp znp k1 ... knk w1 ... wnw m1 ... mnm
aKind = SK_CRV_BSPLINE;
Standard_Integer aNbPoles = anInfo.NbPoles();
Standard_Integer aNbKnots = anInfo.NbKnots();
diff --git a/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx b/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx
index a333bd4f9..bf9417691 100644
--- a/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx
@@ -263,6 +263,7 @@ QString MeasureGUI_WhatisDlg::getKindOfShape( QString& theParameters )
return aKindStr;
#define PRINT_DOUBLE(val, tol) QString(" %1").arg( DlgRef::PrintDoubleValue( val, tol ) )
+#define PRINT_INTEGER(val) QString(" %1").arg( val )
#define TITLE(val) QString("%1").arg(tr(val))
#define TITLE_I(val, i) QString("%1").arg(tr(val).arg(i))
switch ( aKind )
@@ -543,7 +544,15 @@ QString MeasureGUI_WhatisDlg::getKindOfShape( QString& theParameters )
"
" + tr( "GEOM_DZ" ) + PRINT_DOUBLE( aDbls[5], aLenPrecision ) +
"
" + TITLE( "GEOM_DIMENSIONS" ) +
"
" + tr( "GEOM_RADIUS_MAJOR" ) + PRINT_DOUBLE( aDbls[6], aLenPrecision ) +
- "
" + tr( "GEOM_RADIUS_MINOR" ) + PRINT_DOUBLE( aDbls[7], aLenPrecision );
+ "
" + tr( "GEOM_RADIUS_MINOR" ) + PRINT_DOUBLE( aDbls[7], aLenPrecision ) +
+ "
" + TITLE( "GEOM_X_AXIS") +
+ "
" + "Xx :" + PRINT_DOUBLE( aDbls[8], aLenPrecision ) +
+ "
" + "Xy :" + PRINT_DOUBLE( aDbls[9], aLenPrecision ) +
+ "
" + "Xz :" + PRINT_DOUBLE( aDbls[10], aLenPrecision ) +
+ "
" + TITLE( "GEOM_Y_AXIS") +
+ "
" + "Yx :" + PRINT_DOUBLE( aDbls[11], aLenPrecision ) +
+ "
" + "Yy :" + PRINT_DOUBLE( aDbls[12], aLenPrecision ) +
+ "
" + "Yz :" + PRINT_DOUBLE( aDbls[13], aLenPrecision );
break;
case GEOM::GEOM_IKindOfShape::ARC_ELLIPSE:
aKindStr = tr( "GEOM_ARC_ELLIPSE" );
@@ -565,7 +574,15 @@ QString MeasureGUI_WhatisDlg::getKindOfShape( QString& theParameters )
"
" + TITLE_I( "GEOM_POINT_I", 2 ) +
"
" + tr( "GEOM_X_I" ).arg( 2 ) + PRINT_DOUBLE( aDbls[11], aLenPrecision ) +
"
" + tr( "GEOM_Y_I" ).arg( 2 ) + PRINT_DOUBLE( aDbls[12], aLenPrecision ) +
- "
" + tr( "GEOM_Z_I" ).arg( 2 ) + PRINT_DOUBLE( aDbls[13], aLenPrecision );
+ "
" + tr( "GEOM_Z_I" ).arg( 2 ) + PRINT_DOUBLE( aDbls[13], aLenPrecision ) +
+ "
" + TITLE( "GEOM_X_AXIS") +
+ "
" + "Xx :" + PRINT_DOUBLE( aDbls[14], aLenPrecision ) +
+ "
" + "Xy :" + PRINT_DOUBLE( aDbls[15], aLenPrecision ) +
+ "
" + "Xz :" + PRINT_DOUBLE( aDbls[16], aLenPrecision ) +
+ "
" + TITLE( "GEOM_Y_AXIS") +
+ "
" + "Yx :" + PRINT_DOUBLE( aDbls[17], aLenPrecision ) +
+ "
" + "Yy :" + PRINT_DOUBLE( aDbls[18], aLenPrecision ) +
+ "
" + "Yz :" + PRINT_DOUBLE( aDbls[19], aLenPrecision );
break;
case GEOM::GEOM_IKindOfShape::LINE:
aKindStr = tr( "GEOM_LINE" );
@@ -589,6 +606,135 @@ QString MeasureGUI_WhatisDlg::getKindOfShape( QString& theParameters )
"
" + tr( "GEOM_Y_I" ).arg( 2 ) + PRINT_DOUBLE( aDbls[4], aLenPrecision ) +
"
" + tr( "GEOM_Z_I" ).arg( 2 ) + PRINT_DOUBLE( aDbls[5], aLenPrecision );
break;
+ case GEOM::GEOM_IKindOfShape::CRV_BSPLINE:
+ {
+ aKindStr = tr( "GEOM_CRV_BSPLINE" );
+ theParameters = TITLE( "GEOM_PARAMETERS" ) +
+ "
" + tr( "GEOM_PERIODICITY" ) + tr( anInts[0] ? "GEOM_PERIODIC" : "GEOM_NON_PERIODIC") +
+ "
" + tr( "GEOM_DEGREE" ) + PRINT_INTEGER( anInts[1] ) +
+ "
" + tr( "GEOM_NUM_POLES" ) + PRINT_INTEGER( anInts[2] ) +
+ "
" + tr( "GEOM_NUM_WEIGHTS" ) + PRINT_INTEGER( anInts[4] ) +
+ "
" + tr( "GEOM_NUM_KNOTS" ) + PRINT_INTEGER( anInts[3] ) +
+ "
" + tr( "GEOM_NUM_MULTIS" ) + PRINT_INTEGER( anInts[5] ) +
+ "
" + TITLE( "GEOM_POLES" );
+ // Show max. 5 poles
+ Standard_Integer i, nb = std::min(5, anInts[2]);
+ if (anInts[4] == anInts[2]) {
+ // Each pole has a specific weight associated
+ Standard_Integer widx = anInts[2] * 3 + anInts[3]; // skip poles and knots
+ for (i=0; i" + tr( "GEOM_POLE_I" ).arg( i+1 ) +
+ "(" + PRINT_DOUBLE( aDbls[i*3], aLenPrecision ) +
+ ", " + PRINT_DOUBLE( aDbls[i*3+1], aLenPrecision ) +
+ ", " + PRINT_DOUBLE( aDbls[i*3+2], aLenPrecision ) +
+ " )\t" + PRINT_DOUBLE( aDbls[widx+i], aLenPrecision );
+ }
+ } else {
+ for (i=0; i" + tr( "GEOM_POLE_I" ).arg( i+1 ) + "(" + PRINT_DOUBLE( aDbls[i*3], aLenPrecision ) +
+ ", " + PRINT_DOUBLE( aDbls[i*3+1], aLenPrecision ) +
+ ", " + PRINT_DOUBLE( aDbls[i*3+2], aLenPrecision ) + " )";
+ }
+ }
+ if (nb < anInts[2])
+ theParameters += "
...";
+ // Show max. 5 knots
+ theParameters += "
" + TITLE( "GEOM_KNOTS" );
+ nb = std::min(5, anInts[3]);
+ Standard_Integer kidx = anInts[2] * 3; // skip poles
+ if (anInts[5] == anInts[3]) {
+ // Each knot has a multiplicity associated
+ for (i=0; i" + tr( "GEOM_KNOT_I" ).arg( i+1 ) + PRINT_DOUBLE( aDbls[kidx+i], aLenPrecision ) +
+ "\t" + PRINT_INTEGER( anInts[6+i] );
+ }
+ } else {
+ // Each pole has a uniform weight of 1 (do not show it)
+ for (i=0; i" + tr( "GEOM_POLE_I" ).arg( i+1 ) + PRINT_DOUBLE( aDbls[kidx+i], aLenPrecision );
+ }
+ }
+ if (nb < anInts[3])
+ theParameters = theParameters + "
...";
+ }
+ break;
+ case GEOM::GEOM_IKindOfShape::CRV_BEZIER:
+ {
+ aKindStr = tr( "GEOM_CRV_BEZIER" );
+ theParameters = TITLE( "GEOM_PARAMETERS" ) +
+ "
" + tr( "GEOM_NUM_POLES" ) + PRINT_INTEGER( anInts[0] ) +
+ "
" + tr( "GEOM_NUM_WEIGHTS" ) + PRINT_INTEGER( anInts[1] ) +
+ "
" + TITLE( "GEOM_POLES" );
+ Standard_Integer i, nb = std::min(5, anInts[0]); // show max. 5 poles
+ if (anInts[1] > 0) {
+ Standard_Integer widx = anInts[2] * 3 + anInts[3];
+ for (i=0; i" + tr( "GEOM_POLE_I" ).arg( i+1 ) + "(" + PRINT_DOUBLE( aDbls[i*3], aLenPrecision ) +
+ ", " + PRINT_DOUBLE( aDbls[i*3+1], aLenPrecision ) +
+ ", " + PRINT_DOUBLE( aDbls[i*3+2], aLenPrecision ) +
+ ") " + PRINT_DOUBLE( aDbls[widx+i], aLenPrecision );
+ }
+ } else {
+ for (i=0; i" + tr( "GEOM_POLE_I" ).arg( i+1 ) + "(" + PRINT_DOUBLE( aDbls[i*3], aLenPrecision ) +
+ ", " + PRINT_DOUBLE( aDbls[i*3+1], aLenPrecision ) +
+ ", " + PRINT_DOUBLE( aDbls[i*3+2], aLenPrecision ) + ")";
+ }
+ }
+ if (nb < anInts[0])
+ theParameters = theParameters + "
...";
+ }
+ break;
+ case GEOM::GEOM_IKindOfShape::HYPERBOLA:
+ aKindStr = tr( "GEOM_HYPERBOLA" );
+ theParameters = TITLE( "GEOM_CENTER" ) +
+ "
" + tr( "GEOM_X_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[0], aLenPrecision ) +
+ "
" + tr( "GEOM_Y_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[1], aLenPrecision ) +
+ "
" + tr( "GEOM_Z_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[2], aLenPrecision ) +
+ "
" + TITLE( "GEOM_NORMAL" ) +
+ "
" + tr( "GEOM_DX" ) + PRINT_DOUBLE( aDbls[3], aLenPrecision ) +
+ "
" + tr( "GEOM_DY" ) + PRINT_DOUBLE( aDbls[4], aLenPrecision ) +
+ "
" + tr( "GEOM_DZ" ) + PRINT_DOUBLE( aDbls[5], aLenPrecision ) +
+ "
" + TITLE( "GEOM_DIMENSIONS" ) +
+ "
" + tr( "GEOM_RADIUS_I" ).arg( 1 ) + PRINT_DOUBLE( aDbls[6], aLenPrecision ) +
+ "
" + tr( "GEOM_RADIUS_I" ).arg( 2 ) + PRINT_DOUBLE( aDbls[7], aLenPrecision ) +
+ "
" + TITLE( "GEOM_X_AXIS") +
+ "
" + "Xx :" + PRINT_DOUBLE( aDbls[8], aLenPrecision ) +
+ "
" + "Xy :" + PRINT_DOUBLE( aDbls[9], aLenPrecision ) +
+ "
" + "Xz :" + PRINT_DOUBLE( aDbls[10], aLenPrecision ) +
+ "
" + TITLE( "GEOM_Y_AXIS") +
+ "
" + "Yx :" + PRINT_DOUBLE( aDbls[11], aLenPrecision ) +
+ "
" + "Yy :" + PRINT_DOUBLE( aDbls[12], aLenPrecision ) +
+ "
" + "Yz :" + PRINT_DOUBLE( aDbls[13], aLenPrecision );
+ break;
+ case GEOM::GEOM_IKindOfShape::PARABOLA:
+ aKindStr = tr( "GEOM_PARABOLA" );
+ theParameters = TITLE( "GEOM_CENTER" ) +
+ "
" + tr( "GEOM_X_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[0], aLenPrecision ) +
+ "
" + tr( "GEOM_Y_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[1], aLenPrecision ) +
+ "
" + tr( "GEOM_Z_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[2], aLenPrecision ) +
+ "
" + TITLE( "GEOM_NORMAL" ) +
+ "
" + tr( "GEOM_DX" ) + PRINT_DOUBLE( aDbls[3], aLenPrecision ) +
+ "
" + tr( "GEOM_DY" ) + PRINT_DOUBLE( aDbls[4], aLenPrecision ) +
+ "
" + tr( "GEOM_DZ" ) + PRINT_DOUBLE( aDbls[5], aLenPrecision ) +
+ "
" + TITLE( "GEOM_DIMENSIONS" ) +
+ "
" + tr( "GEOM_FOCAL_LENGTH" ) + PRINT_DOUBLE( aDbls[6], aLenPrecision ) +
+ "
" + TITLE( "GEOM_X_AXIS") +
+ "
" + "Xx :" + PRINT_DOUBLE( aDbls[7], aLenPrecision ) +
+ "
" + "Xy :" + PRINT_DOUBLE( aDbls[8], aLenPrecision ) +
+ "
" + "Xz :" + PRINT_DOUBLE( aDbls[9], aLenPrecision ) +
+ "
" + TITLE( "GEOM_Y_AXIS") +
+ "
" + "Yx :" + PRINT_DOUBLE( aDbls[10], aLenPrecision ) +
+ "
" + "Yy :" + PRINT_DOUBLE( aDbls[11], aLenPrecision ) +
+ "
" + "Yz :" + PRINT_DOUBLE( aDbls[12], aLenPrecision );
+ break;
+
case GEOM::GEOM_IKindOfShape::EDGE:
aKindStr = tr( "GEOM_EDGE" );
break;