From: prascle Date: Thu, 11 Apr 2013 08:43:00 +0000 (+0000) Subject: PR: dump function must write GEOM.xxx instead of geompy.GEOM.xxx X-Git-Tag: V7_2_0~15 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a05e9c326e3526542a7f9dc4bd1f966b4e9c60f7;p=modules%2Fgeom.git PR: dump function must write GEOM.xxx instead of geompy.GEOM.xxx --- diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx index 017967785..86bc1cd77 100644 --- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx @@ -1101,7 +1101,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric aCI.SetConstructorType(COORD_CONSTRUCTOR); aCI.SetIsClosed(false); aCI.SetCoordinates(aCoordsArray); - aCurveType = "geompy.GEOM.Polyline"; + aCurveType = "GEOM.Polyline"; break; } case Bezier: { @@ -1120,7 +1120,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric aCI.SetConstructorType(COORD_CONSTRUCTOR); aCI.SetIsClosed(false); aCI.SetCoordinates(aCoordsArray); - aCurveType = "geompy.GEOM.Bezier"; + aCurveType = "GEOM.Bezier"; break; } case Interpolation: { @@ -1139,7 +1139,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric aCI.SetIsClosed(false); aCI.SetDoReordering(false); aCI.SetCoordinates(aCoordsArray); - aCurveType = "geompy.GEOM.Interpolation"; + aCurveType = "GEOM.Interpolation"; break; } } diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx index 8f31e75a2..0f91f4b5e 100644 --- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx @@ -2140,22 +2140,22 @@ static GEOM::TPythonDump& operator<< (GEOM::TPythonDump& theDump, { switch (theState) { case GEOMAlgo_ST_IN: - theDump << "geompy.GEOM.ST_IN"; + theDump << "GEOM.ST_IN"; break; case GEOMAlgo_ST_OUT: - theDump << "geompy.GEOM.ST_OUT"; + theDump << "GEOM.ST_OUT"; break; case GEOMAlgo_ST_ON: - theDump << "geompy.GEOM.ST_ON"; + theDump << "GEOM.ST_ON"; break; case GEOMAlgo_ST_ONIN: - theDump << "geompy.GEOM.ST_ONIN"; + theDump << "GEOM.ST_ONIN"; break; case GEOMAlgo_ST_ONOUT: - theDump << "geompy.GEOM.ST_ONOUT"; + theDump << "GEOM.ST_ONOUT"; break; default: - theDump << "geompy.GEOM.ST_UNKNOWN"; + theDump << "GEOM.ST_UNKNOWN"; break; } return theDump; diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index 34ef37119..9bde30e65 100644 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -1236,7 +1236,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(SALOMEDS::Study_ptr theStudy, pd << aGeomObj; j++; } - pd <<"]" << ", " <<"geompy.GEOM."; + pd <<"]" << ", " <<"GEOM."; switch (theFindMethod) { case GEOM::FSM_GetInPlace: pd << "FSM_GetInPlace"; break; @@ -1780,7 +1780,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(SALOMEDS::Study_ptr theStu pd << aGeomObj; j++; } - pd <<"]" << ", " <<"geompy.GEOM."; + pd <<"]" << ", " <<"GEOM."; switch (theFindMethod) { case GEOM::FSM_GetInPlace: pd << "FSM_GetInPlace"; break;