From 3294002e8c2907126cdc1405ae9e3db134b7dd42 Mon Sep 17 00:00:00 2001 From: dpasukhi Date: Sat, 21 Jan 2023 14:58:23 +0000 Subject: [PATCH] // rework XDE modules structure Created for all formats own TK with TKXDE prefix Combined all STEP TK to one Combined all IGES TK to one Moved ExpToCas to own module group - DETools --- adm/MODULES | 3 +- src/DRAWEXE/EXTERNLIB_STATIC | 13 +-- src/TKIGES/EXTERNLIB | 12 --- src/TKIGES/PACKAGES | 18 ---- src/TKQADraw/EXTERNLIB | 6 +- src/TKSTEP/EXTERNLIB | 13 --- src/TKSTEP/PACKAGES | 15 --- src/TKSTEP209/EXTERNLIB | 3 - src/TKSTEP209/PACKAGES | 4 - src/TKSTEPAttr/CMakeLists.txt | 3 - src/TKSTEPAttr/EXTERNLIB | 3 - src/TKSTEPAttr/PACKAGES | 6 -- src/TKSTEPBase/CMakeLists.txt | 3 - src/TKSTEPBase/EXTERNLIB | 3 - src/TKSTEPBase/PACKAGES | 8 -- src/TKSTL/FILES | 2 - src/TKVRML/FILES | 2 - src/TKXDEDRAW/EXTERNLIB | 10 +- src/{TKSTEP209 => TKXDEGLTF}/CMakeLists.txt | 2 +- src/TKXDEGLTF/EXTERNLIB | 13 +++ src/{TKIGES => TKXDEGLTF}/FILES | 0 src/TKXDEGLTF/PACKAGES | 1 + src/TKXDEIGES/EXTERNLIB | 7 +- src/TKXDEIGES/PACKAGES | 18 ++++ src/{TKIGES => TKXDEOBJ}/CMakeLists.txt | 2 +- src/TKXDEOBJ/EXTERNLIB | 12 +++ src/{TKSTEP => TKXDEOBJ}/FILES | 0 src/TKXDEOBJ/PACKAGES | 1 + src/{TKVRML => TKXDEPLY}/CMakeLists.txt | 2 +- src/TKXDEPLY/EXTERNLIB | 12 +++ src/{TKSTEP209 => TKXDEPLY}/FILES | 0 src/TKXDEPLY/PACKAGES | 1 + src/TKXDESTEP/EXTERNLIB | 13 ++- src/TKXDESTEP/PACKAGES | 39 +++++++ src/{TKSTL => TKXDESTL}/CMakeLists.txt | 2 +- src/{TKSTL => TKXDESTL}/EXTERNLIB | 0 src/{TKSTEPAttr => TKXDESTL}/FILES | 0 src/{TKSTL => TKXDESTL}/PACKAGES | 0 src/{TKSTEP => TKXDEVRML}/CMakeLists.txt | 2 +- src/{TKVRML => TKXDEVRML}/EXTERNLIB | 0 src/{TKSTEPBase => TKXDEVRML}/FILES | 0 src/{TKVRML => TKXDEVRML}/PACKAGES | 0 src/TKXSBase/PACKAGES | 6 -- src/TKXSDRAW/EXTERNLIB | 6 -- src/TKXSDRAWBase/EXTERNLIB | 5 - src/TKXSDRAWDEWrapper/EXTERNLIB | 5 - src/TKXSDRAWGLTF/EXTERNLIB | 6 +- src/TKXSDRAWIGES/EXTERNLIB | 6 -- src/TKXSDRAWOBJ/EXTERNLIB | 6 +- src/TKXSDRAWPLY/EXTERNLIB | 6 +- src/TKXSDRAWSTEP/EXTERNLIB | 5 - src/TKXSDRAWSTL/EXTERNLIB | 6 +- src/TKXSDRAWVRML/EXTERNLIB | 6 +- src/XDEDRAW/XDEDRAW.cxx | 6 +- src/XDEDRAW/XDEDRAW_Colors.cxx | 6 +- src/XDEDRAW/XDEDRAW_Common.cxx | 100 +++++++++--------- src/XDEDRAW/XDEDRAW_GDTs.cxx | 6 +- src/XDEDRAW/XDEDRAW_Layers.cxx | 6 +- src/XDEDRAW/XDEDRAW_Props.cxx | 6 +- src/XDEDRAW/XDEDRAW_Shapes.cxx | 6 +- src/XDEDRAW/XDEDRAW_Views.cxx | 6 +- src/XSControl/XSControl_TransferReader.cxx | 80 +++++++-------- src/XSControl/XSControl_TransferReader.hxx | 11 +- src/XSDRAW/XSDRAW.cxx | 8 +- src/XSDRAW/XSDRAW_Functions.cxx | 21 +--- src/XSDRAW/XSDRAW_FunctionsSession.cxx | 107 ++++++-------------- src/XSDRAW/XSDRAW_FunctionsShape.cxx | 22 ++-- src/XSDRAWBase/XSDRAWBase.cxx | 6 +- src/XSDRAWDEWrapper/XSDRAWDEWrapper.cxx | 7 +- src/XSDRAWGLTF/XSDRAWGLTF.cxx | 6 +- src/XSDRAWIGES/XSDRAWIGES.cxx | 6 +- src/XSDRAWOBJ/XSDRAWOBJ.cxx | 6 +- src/XSDRAWPLY/XSDRAWPLY.cxx | 6 +- src/XSDRAWSTEP/XSDRAWSTEP.cxx | 6 +- src/XSDRAWSTL/XSDRAWSTL.cxx | 6 +- tests/perf/heal/bug24596_1 | 2 +- tests/perf/heal/bug24596_2 | 2 +- tests/perf/moddata/bug25487_1 | 2 +- tests/perf/moddata/bug25487_2 | 2 +- tests/perf/moddata/bug27048_2 | 2 +- 80 files changed, 340 insertions(+), 427 deletions(-) delete mode 100755 src/TKIGES/EXTERNLIB delete mode 100755 src/TKIGES/PACKAGES delete mode 100755 src/TKSTEP/EXTERNLIB delete mode 100755 src/TKSTEP/PACKAGES delete mode 100644 src/TKSTEP209/EXTERNLIB delete mode 100755 src/TKSTEP209/PACKAGES delete mode 100644 src/TKSTEPAttr/CMakeLists.txt delete mode 100644 src/TKSTEPAttr/EXTERNLIB delete mode 100755 src/TKSTEPAttr/PACKAGES delete mode 100644 src/TKSTEPBase/CMakeLists.txt delete mode 100644 src/TKSTEPBase/EXTERNLIB delete mode 100755 src/TKSTEPBase/PACKAGES delete mode 100755 src/TKSTL/FILES delete mode 100755 src/TKVRML/FILES rename src/{TKSTEP209 => TKXDEGLTF}/CMakeLists.txt (72%) create mode 100644 src/TKXDEGLTF/EXTERNLIB rename src/{TKIGES => TKXDEGLTF}/FILES (100%) mode change 100755 => 100644 create mode 100644 src/TKXDEGLTF/PACKAGES rename src/{TKIGES => TKXDEOBJ}/CMakeLists.txt (73%) create mode 100644 src/TKXDEOBJ/EXTERNLIB rename src/{TKSTEP => TKXDEOBJ}/FILES (100%) mode change 100755 => 100644 create mode 100644 src/TKXDEOBJ/PACKAGES rename src/{TKVRML => TKXDEPLY}/CMakeLists.txt (73%) create mode 100644 src/TKXDEPLY/EXTERNLIB rename src/{TKSTEP209 => TKXDEPLY}/FILES (100%) mode change 100755 => 100644 create mode 100644 src/TKXDEPLY/PACKAGES rename src/{TKSTL => TKXDESTL}/CMakeLists.txt (73%) rename src/{TKSTL => TKXDESTL}/EXTERNLIB (100%) mode change 100755 => 100644 rename src/{TKSTEPAttr => TKXDESTL}/FILES (100%) mode change 100755 => 100644 rename src/{TKSTL => TKXDESTL}/PACKAGES (100%) mode change 100755 => 100644 rename src/{TKSTEP => TKXDEVRML}/CMakeLists.txt (72%) rename src/{TKVRML => TKXDEVRML}/EXTERNLIB (100%) mode change 100755 => 100644 rename src/{TKSTEPBase => TKXDEVRML}/FILES (100%) mode change 100755 => 100644 rename src/{TKVRML => TKXDEVRML}/PACKAGES (100%) mode change 100755 => 100644 diff --git a/adm/MODULES b/adm/MODULES index e769ea6b35..1344161479 100644 --- a/adm/MODULES +++ b/adm/MODULES @@ -3,5 +3,6 @@ ModelingData TKG2d TKG3d TKGeomBase TKBRep ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing Visualization TKService TKV3d TKOpenGl TKOpenGles TKMeshVS TKIVtk TKD3DHost ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF -DataExchange TKXDE TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh TKXDECascade TKExpress ExpToCasExe +DataExchange TKXDE TKXSBase TKXDESTEP TKXDEIGES TKXDESTL TKXDEVRML TKXDECascade TKXDEOBJ TKXDEGLTF TKXDEPLY TKXCAF TKXmlXCAF TKBinXCAF TKRWMesh +DETools TKExpress ExpToCasExe Draw TKDraw TKTopTest TKOpenGlTest TKOpenGlesTest TKD3DHostTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE TKXSDRAWBase TKXSDRAWDEWrapper TKXSDRAWGLTF TKXSDRAWIGES TKXSDRAWOBJ TKXSDRAWPLY TKXSDRAWSTEP TKXSDRAWSTL TKXSDRAWVRML diff --git a/src/DRAWEXE/EXTERNLIB_STATIC b/src/DRAWEXE/EXTERNLIB_STATIC index ca4c8fa4ee..c6c1a6a8c7 100644 --- a/src/DRAWEXE/EXTERNLIB_STATIC +++ b/src/DRAWEXE/EXTERNLIB_STATIC @@ -12,16 +12,13 @@ TKTObj TKBinTObj TKXmlTObj TKXDESTEP -TKSTEP -TKSTEPAttr -TKSTEP209 -TKSTEPBase -TKXDEIGES -TKIGES TKXSBase -TKVRML -TKSTL +TKXDEVRML +TKXDESTL TKRWMesh +TKXDEGLTF +TKXDEOBJ +TKXDEPLY TKXDE TKBinXCAF TKXmlXCAF diff --git a/src/TKIGES/EXTERNLIB b/src/TKIGES/EXTERNLIB deleted file mode 100755 index 56ddccab59..0000000000 --- a/src/TKIGES/EXTERNLIB +++ /dev/null @@ -1,12 +0,0 @@ -TKBRep -TKernel -TKMath -TKTopAlgo -TKShHealing -TKG2d -TKG3d -TKGeomBase -TKGeomAlgo -TKPrim -TKBool -TKXSBase diff --git a/src/TKIGES/PACKAGES b/src/TKIGES/PACKAGES deleted file mode 100755 index b121c19125..0000000000 --- a/src/TKIGES/PACKAGES +++ /dev/null @@ -1,18 +0,0 @@ -IGESData -IGESFile -IGESBasic -IGESGraph -IGESGeom -IGESDimen -IGESDraw -IGESSolid -IGESDefs -IGESAppli -IGESConvGeom -IGESSelect -IGESToBRep -GeomToIGES -Geom2dToIGES -BRepToIGES -BRepToIGESBRep -IGESControl diff --git a/src/TKQADraw/EXTERNLIB b/src/TKQADraw/EXTERNLIB index 32d736b68b..a342fefdc3 100755 --- a/src/TKQADraw/EXTERNLIB +++ b/src/TKQADraw/EXTERNLIB @@ -23,16 +23,14 @@ TKOffset TKFeat TKCAF TKVCAF -TKIGES +TKXDEIGES TKXSBase TKMesh TKXCAF TKBinXCAF -TKSTEP -TKSTEPBase TKXDESTEP TKXSDRAW -TKSTL +TKXDESTL TKXml TKTObj TKXmlL diff --git a/src/TKSTEP/EXTERNLIB b/src/TKSTEP/EXTERNLIB deleted file mode 100755 index 9423bb5afc..0000000000 --- a/src/TKSTEP/EXTERNLIB +++ /dev/null @@ -1,13 +0,0 @@ -TKernel -TKSTEPAttr -TKSTEP209 -TKSTEPBase -TKBRep -TKMath -TKG2d -TKShHealing -TKTopAlgo -TKG3d -TKGeomBase -TKGeomAlgo -TKXSBase diff --git a/src/TKSTEP/PACKAGES b/src/TKSTEP/PACKAGES deleted file mode 100755 index 70879153d1..0000000000 --- a/src/TKSTEP/PACKAGES +++ /dev/null @@ -1,15 +0,0 @@ -StepAP214 -RWStepAP214 -StepAP203 -RWStepAP203 -STEPConstruct -STEPEdit -GeomToStep -StepToGeom -StepToTopoDS -TopoDSToStep -STEPControl -STEPSelections -StepAP209 -RWStepAP242 -StepAP242 diff --git a/src/TKSTEP209/EXTERNLIB b/src/TKSTEP209/EXTERNLIB deleted file mode 100644 index 28cfbb0e10..0000000000 --- a/src/TKSTEP209/EXTERNLIB +++ /dev/null @@ -1,3 +0,0 @@ -TKernel -TKXSBase -TKSTEPBase diff --git a/src/TKSTEP209/PACKAGES b/src/TKSTEP209/PACKAGES deleted file mode 100755 index 0b6845347f..0000000000 --- a/src/TKSTEP209/PACKAGES +++ /dev/null @@ -1,4 +0,0 @@ -StepElement -StepFEA -RWStepElement -RWStepFEA diff --git a/src/TKSTEPAttr/CMakeLists.txt b/src/TKSTEPAttr/CMakeLists.txt deleted file mode 100644 index 59e2527fd2..0000000000 --- a/src/TKSTEPAttr/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -project(TKSTEPAttr) - -OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) diff --git a/src/TKSTEPAttr/EXTERNLIB b/src/TKSTEPAttr/EXTERNLIB deleted file mode 100644 index 28cfbb0e10..0000000000 --- a/src/TKSTEPAttr/EXTERNLIB +++ /dev/null @@ -1,3 +0,0 @@ -TKernel -TKXSBase -TKSTEPBase diff --git a/src/TKSTEPAttr/PACKAGES b/src/TKSTEPAttr/PACKAGES deleted file mode 100755 index b6bf50c60d..0000000000 --- a/src/TKSTEPAttr/PACKAGES +++ /dev/null @@ -1,6 +0,0 @@ -StepVisual -RWStepVisual -StepDimTol -RWStepDimTol -StepKinematics -RWStepKinematics diff --git a/src/TKSTEPBase/CMakeLists.txt b/src/TKSTEPBase/CMakeLists.txt deleted file mode 100644 index fda0c4623b..0000000000 --- a/src/TKSTEPBase/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -project(TKSTEPBase) - -OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) diff --git a/src/TKSTEPBase/EXTERNLIB b/src/TKSTEPBase/EXTERNLIB deleted file mode 100644 index fb75d58cee..0000000000 --- a/src/TKSTEPBase/EXTERNLIB +++ /dev/null @@ -1,3 +0,0 @@ -TKernel -TKXSBase -TKMath diff --git a/src/TKSTEPBase/PACKAGES b/src/TKSTEPBase/PACKAGES deleted file mode 100755 index 87033cfc73..0000000000 --- a/src/TKSTEPBase/PACKAGES +++ /dev/null @@ -1,8 +0,0 @@ -StepBasic -RWStepBasic -StepRepr -RWStepRepr -StepGeom -RWStepGeom -StepShape -RWStepShape diff --git a/src/TKSTL/FILES b/src/TKSTL/FILES deleted file mode 100755 index ca4f0e567b..0000000000 --- a/src/TKSTL/FILES +++ /dev/null @@ -1,2 +0,0 @@ -EXTERNLIB -PACKAGES diff --git a/src/TKVRML/FILES b/src/TKVRML/FILES deleted file mode 100755 index ca4f0e567b..0000000000 --- a/src/TKVRML/FILES +++ /dev/null @@ -1,2 +0,0 @@ -EXTERNLIB -PACKAGES diff --git a/src/TKXDEDRAW/EXTERNLIB b/src/TKXDEDRAW/EXTERNLIB index 8ee679cab2..89bfa51a34 100755 --- a/src/TKXDEDRAW/EXTERNLIB +++ b/src/TKXDEDRAW/EXTERNLIB @@ -3,7 +3,6 @@ TKCDF TKBRep TKXCAF TKernel -TKIGES TKV3d TKMath TKService @@ -16,9 +15,10 @@ TKTopAlgo TKLCAF TKG3d TKRWMesh -TKSTEPBase -TKSTEP -TKSTL +TKXDEOBJ +TKXDEGLTF +TKXDEPLY +TKXDESTL TKMesh TKXSDRAW TKXDECascade @@ -28,5 +28,5 @@ TKDCAF TKViewerTest TKBinXCAF TKXmlXCAF -TKVRML +TKXDEVRML diff --git a/src/TKSTEP209/CMakeLists.txt b/src/TKXDEGLTF/CMakeLists.txt similarity index 72% rename from src/TKSTEP209/CMakeLists.txt rename to src/TKXDEGLTF/CMakeLists.txt index 78e09c5b81..53cfe33881 100644 --- a/src/TKSTEP209/CMakeLists.txt +++ b/src/TKXDEGLTF/CMakeLists.txt @@ -1,3 +1,3 @@ -project(TKSTEP209) +project(TKXDEGLTF) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) diff --git a/src/TKXDEGLTF/EXTERNLIB b/src/TKXDEGLTF/EXTERNLIB new file mode 100644 index 0000000000..ecd8accb88 --- /dev/null +++ b/src/TKXDEGLTF/EXTERNLIB @@ -0,0 +1,13 @@ +TKernel +TKMath +TKMesh +TKXCAF +TKLCAF +TKV3d +TKBRep +TKG3d +TKXDE +TKService +TKRWMesh +CSF_RapidJSON +CSF_Draco diff --git a/src/TKIGES/FILES b/src/TKXDEGLTF/FILES old mode 100755 new mode 100644 similarity index 100% rename from src/TKIGES/FILES rename to src/TKXDEGLTF/FILES diff --git a/src/TKXDEGLTF/PACKAGES b/src/TKXDEGLTF/PACKAGES new file mode 100644 index 0000000000..7758e9e783 --- /dev/null +++ b/src/TKXDEGLTF/PACKAGES @@ -0,0 +1 @@ +RWGltf diff --git a/src/TKXDEIGES/EXTERNLIB b/src/TKXDEIGES/EXTERNLIB index d40184c29d..9aeae3420e 100755 --- a/src/TKXDEIGES/EXTERNLIB +++ b/src/TKXDEIGES/EXTERNLIB @@ -2,10 +2,15 @@ TKBRep TKXDE TKernel TKMath +TKTopAlgo +TKShHealing TKXSBase +TKGeomBase +TKGeomAlgo +TKBool +TKPrim TKCDF TKLCAF TKG2d TKG3d TKXCAF -TKIGES diff --git a/src/TKXDEIGES/PACKAGES b/src/TKXDEIGES/PACKAGES index 1c6cd9565f..d697b0bc3b 100755 --- a/src/TKXDEIGES/PACKAGES +++ b/src/TKXDEIGES/PACKAGES @@ -1 +1,19 @@ IGESCAFControl +IGESData +IGESFile +IGESBasic +IGESGraph +IGESGeom +IGESDimen +IGESDraw +IGESSolid +IGESDefs +IGESAppli +IGESConvGeom +IGESSelect +IGESToBRep +GeomToIGES +Geom2dToIGES +BRepToIGES +BRepToIGESBRep +IGESControl diff --git a/src/TKIGES/CMakeLists.txt b/src/TKXDEOBJ/CMakeLists.txt similarity index 73% rename from src/TKIGES/CMakeLists.txt rename to src/TKXDEOBJ/CMakeLists.txt index 383e62f9f7..6e22a4f9fd 100644 --- a/src/TKIGES/CMakeLists.txt +++ b/src/TKXDEOBJ/CMakeLists.txt @@ -1,3 +1,3 @@ -project(TKIGES) +project(TKXDEOBJ) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) diff --git a/src/TKXDEOBJ/EXTERNLIB b/src/TKXDEOBJ/EXTERNLIB new file mode 100644 index 0000000000..909559376b --- /dev/null +++ b/src/TKXDEOBJ/EXTERNLIB @@ -0,0 +1,12 @@ +TKernel +TKMath +TKMesh +TKXCAF +TKLCAF +TKV3d +TKBRep +TKG3d +TKXDE +TKService +TKRWMesh +CSF_RapidJSON diff --git a/src/TKSTEP/FILES b/src/TKXDEOBJ/FILES old mode 100755 new mode 100644 similarity index 100% rename from src/TKSTEP/FILES rename to src/TKXDEOBJ/FILES diff --git a/src/TKXDEOBJ/PACKAGES b/src/TKXDEOBJ/PACKAGES new file mode 100644 index 0000000000..d7824f29c4 --- /dev/null +++ b/src/TKXDEOBJ/PACKAGES @@ -0,0 +1 @@ +RWObj diff --git a/src/TKVRML/CMakeLists.txt b/src/TKXDEPLY/CMakeLists.txt similarity index 73% rename from src/TKVRML/CMakeLists.txt rename to src/TKXDEPLY/CMakeLists.txt index 959447f182..dcc4fc53b9 100644 --- a/src/TKVRML/CMakeLists.txt +++ b/src/TKXDEPLY/CMakeLists.txt @@ -1,3 +1,3 @@ -project(TKVRML) +project(TKXDEPLY) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) diff --git a/src/TKXDEPLY/EXTERNLIB b/src/TKXDEPLY/EXTERNLIB new file mode 100644 index 0000000000..909559376b --- /dev/null +++ b/src/TKXDEPLY/EXTERNLIB @@ -0,0 +1,12 @@ +TKernel +TKMath +TKMesh +TKXCAF +TKLCAF +TKV3d +TKBRep +TKG3d +TKXDE +TKService +TKRWMesh +CSF_RapidJSON diff --git a/src/TKSTEP209/FILES b/src/TKXDEPLY/FILES old mode 100755 new mode 100644 similarity index 100% rename from src/TKSTEP209/FILES rename to src/TKXDEPLY/FILES diff --git a/src/TKXDEPLY/PACKAGES b/src/TKXDEPLY/PACKAGES new file mode 100644 index 0000000000..228128af6d --- /dev/null +++ b/src/TKXDEPLY/PACKAGES @@ -0,0 +1 @@ +RWPly diff --git a/src/TKXDESTEP/EXTERNLIB b/src/TKXDESTEP/EXTERNLIB index 547cb01bb2..4630b58437 100755 --- a/src/TKXDESTEP/EXTERNLIB +++ b/src/TKXDESTEP/EXTERNLIB @@ -1,16 +1,23 @@ TKXDE TKBRep -TKSTEPAttr TKernel TKMath TKXSBase TKTopAlgo TKG2d TKCAF -TKSTEPBase TKCDF TKLCAF TKG3d TKXCAF -TKSTEP TKShHealing +TKernel +TKBRep +TKMath +TKG2d +TKShHealing +TKTopAlgo +TKG3d +TKGeomBase +TKGeomAlgo +TKXSBase diff --git a/src/TKXDESTEP/PACKAGES b/src/TKXDESTEP/PACKAGES index 508b92a242..58b4ee81ab 100755 --- a/src/TKXDESTEP/PACKAGES +++ b/src/TKXDESTEP/PACKAGES @@ -1 +1,40 @@ STEPCAFControl +StepAP214 +RWStepAP214 +StepAP203 +RWStepAP203 +STEPConstruct +STEPEdit +GeomToStep +StepToGeom +StepToTopoDS +TopoDSToStep +STEPControl +STEPSelections +StepAP209 +RWStepAP242 +StepAP242 +StepElement +StepFEA +RWStepElement +RWStepFEA +StepVisual +RWStepVisual +StepDimTol +RWStepDimTol +StepKinematics +RWStepKinematics +StepBasic +RWStepBasic +StepRepr +RWStepRepr +StepGeom +RWStepGeom +StepShape +RWStepShape +StepSelect +StepData +StepFile +RWHeaderSection +APIHeaderSection +HeaderSection \ No newline at end of file diff --git a/src/TKSTL/CMakeLists.txt b/src/TKXDESTL/CMakeLists.txt similarity index 73% rename from src/TKSTL/CMakeLists.txt rename to src/TKXDESTL/CMakeLists.txt index 2fe1c1706d..916ffeecd8 100644 --- a/src/TKSTL/CMakeLists.txt +++ b/src/TKXDESTL/CMakeLists.txt @@ -1,3 +1,3 @@ -project(TKSTL) +project(TKXDESTL) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) diff --git a/src/TKSTL/EXTERNLIB b/src/TKXDESTL/EXTERNLIB old mode 100755 new mode 100644 similarity index 100% rename from src/TKSTL/EXTERNLIB rename to src/TKXDESTL/EXTERNLIB diff --git a/src/TKSTEPAttr/FILES b/src/TKXDESTL/FILES old mode 100755 new mode 100644 similarity index 100% rename from src/TKSTEPAttr/FILES rename to src/TKXDESTL/FILES diff --git a/src/TKSTL/PACKAGES b/src/TKXDESTL/PACKAGES old mode 100755 new mode 100644 similarity index 100% rename from src/TKSTL/PACKAGES rename to src/TKXDESTL/PACKAGES diff --git a/src/TKSTEP/CMakeLists.txt b/src/TKXDEVRML/CMakeLists.txt similarity index 72% rename from src/TKSTEP/CMakeLists.txt rename to src/TKXDEVRML/CMakeLists.txt index 2885f9b8e9..dafb694990 100644 --- a/src/TKSTEP/CMakeLists.txt +++ b/src/TKXDEVRML/CMakeLists.txt @@ -1,3 +1,3 @@ -project(TKSTEP) +project(TKXDEVRML) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) diff --git a/src/TKVRML/EXTERNLIB b/src/TKXDEVRML/EXTERNLIB old mode 100755 new mode 100644 similarity index 100% rename from src/TKVRML/EXTERNLIB rename to src/TKXDEVRML/EXTERNLIB diff --git a/src/TKSTEPBase/FILES b/src/TKXDEVRML/FILES old mode 100755 new mode 100644 similarity index 100% rename from src/TKSTEPBase/FILES rename to src/TKXDEVRML/FILES diff --git a/src/TKVRML/PACKAGES b/src/TKXDEVRML/PACKAGES old mode 100755 new mode 100644 similarity index 100% rename from src/TKVRML/PACKAGES rename to src/TKXDEVRML/PACKAGES diff --git a/src/TKXSBase/PACKAGES b/src/TKXSBase/PACKAGES index f384afd8f1..5e726225c1 100755 --- a/src/TKXSBase/PACKAGES +++ b/src/TKXSBase/PACKAGES @@ -4,12 +4,6 @@ IFGraph IFSelect TransferBRep XSControl -StepData -StepFile -HeaderSection -RWHeaderSection -APIHeaderSection -StepSelect XSAlgo LibCtl MoniTool diff --git a/src/TKXSDRAW/EXTERNLIB b/src/TKXSDRAW/EXTERNLIB index 5b7039675c..9d080a7a12 100755 --- a/src/TKXSDRAW/EXTERNLIB +++ b/src/TKXSDRAW/EXTERNLIB @@ -8,18 +8,12 @@ TKMeshVS TKG3d TKViewerTest TKG2d -TKSTEPBase TKTopAlgo TKGeomBase TKGeomAlgo TKMesh TKDraw -TKSTEP -TKIGES -TKSTL -TKVRML TKLCAF TKDCAF TKXCAF -TKRWMesh TKXSDRAWBase \ No newline at end of file diff --git a/src/TKXSDRAWBase/EXTERNLIB b/src/TKXSDRAWBase/EXTERNLIB index 1947db4b4f..b55793ee84 100644 --- a/src/TKXSDRAWBase/EXTERNLIB +++ b/src/TKXSDRAWBase/EXTERNLIB @@ -8,16 +8,11 @@ TKMeshVS TKG3d TKViewerTest TKG2d -TKSTEPBase TKTopAlgo TKGeomBase TKGeomAlgo TKMesh TKDraw -TKSTEP -TKIGES -TKSTL -TKVRML TKLCAF TKDCAF TKXCAF diff --git a/src/TKXSDRAWDEWrapper/EXTERNLIB b/src/TKXSDRAWDEWrapper/EXTERNLIB index fd5b972224..cdbfa490bf 100644 --- a/src/TKXSDRAWDEWrapper/EXTERNLIB +++ b/src/TKXSDRAWDEWrapper/EXTERNLIB @@ -8,16 +8,11 @@ TKMeshVS TKG3d TKViewerTest TKG2d -TKSTEPBase TKTopAlgo TKGeomBase TKGeomAlgo TKMesh TKDraw -TKSTEP -TKIGES -TKSTL -TKVRML TKLCAF TKDCAF TKXCAF diff --git a/src/TKXSDRAWGLTF/EXTERNLIB b/src/TKXSDRAWGLTF/EXTERNLIB index 5b7039675c..c9547e57cf 100644 --- a/src/TKXSDRAWGLTF/EXTERNLIB +++ b/src/TKXSDRAWGLTF/EXTERNLIB @@ -8,18 +8,14 @@ TKMeshVS TKG3d TKViewerTest TKG2d -TKSTEPBase TKTopAlgo TKGeomBase TKGeomAlgo TKMesh TKDraw -TKSTEP -TKIGES -TKSTL -TKVRML TKLCAF TKDCAF TKXCAF TKRWMesh +TKXDEGLTF TKXSDRAWBase \ No newline at end of file diff --git a/src/TKXSDRAWIGES/EXTERNLIB b/src/TKXSDRAWIGES/EXTERNLIB index 98b7ff9935..3c4c3962a3 100644 --- a/src/TKXSDRAWIGES/EXTERNLIB +++ b/src/TKXSDRAWIGES/EXTERNLIB @@ -8,20 +8,14 @@ TKMeshVS TKG3d TKViewerTest TKG2d -TKSTEPBase TKTopAlgo TKGeomBase TKGeomAlgo TKMesh TKDraw -TKSTEP -TKIGES -TKSTL -TKVRML TKLCAF TKDCAF TKXCAF -TKRWMesh TKXSBase TKXDEIGES TKXSDRAWBase \ No newline at end of file diff --git a/src/TKXSDRAWOBJ/EXTERNLIB b/src/TKXSDRAWOBJ/EXTERNLIB index 5b7039675c..22fb5400c0 100644 --- a/src/TKXSDRAWOBJ/EXTERNLIB +++ b/src/TKXSDRAWOBJ/EXTERNLIB @@ -8,18 +8,14 @@ TKMeshVS TKG3d TKViewerTest TKG2d -TKSTEPBase TKTopAlgo TKGeomBase TKGeomAlgo TKMesh TKDraw -TKSTEP -TKIGES -TKSTL -TKVRML TKLCAF TKDCAF TKXCAF TKRWMesh +TKXDEOBJ TKXSDRAWBase \ No newline at end of file diff --git a/src/TKXSDRAWPLY/EXTERNLIB b/src/TKXSDRAWPLY/EXTERNLIB index 5b7039675c..15bdeac30b 100644 --- a/src/TKXSDRAWPLY/EXTERNLIB +++ b/src/TKXSDRAWPLY/EXTERNLIB @@ -8,18 +8,14 @@ TKMeshVS TKG3d TKViewerTest TKG2d -TKSTEPBase TKTopAlgo TKGeomBase TKGeomAlgo TKMesh TKDraw -TKSTEP -TKIGES -TKSTL -TKVRML TKLCAF TKDCAF TKXCAF TKRWMesh +TKXDEPLY TKXSDRAWBase \ No newline at end of file diff --git a/src/TKXSDRAWSTEP/EXTERNLIB b/src/TKXSDRAWSTEP/EXTERNLIB index 769c251788..9d544fdc28 100644 --- a/src/TKXSDRAWSTEP/EXTERNLIB +++ b/src/TKXSDRAWSTEP/EXTERNLIB @@ -8,16 +8,11 @@ TKMeshVS TKG3d TKViewerTest TKG2d -TKSTEPBase TKTopAlgo TKGeomBase TKGeomAlgo TKMesh TKDraw -TKSTEP -TKIGES -TKSTL -TKVRML TKLCAF TKDCAF TKXCAF diff --git a/src/TKXSDRAWSTL/EXTERNLIB b/src/TKXSDRAWSTL/EXTERNLIB index 5b7039675c..078fe4c11f 100644 --- a/src/TKXSDRAWSTL/EXTERNLIB +++ b/src/TKXSDRAWSTL/EXTERNLIB @@ -8,18 +8,14 @@ TKMeshVS TKG3d TKViewerTest TKG2d -TKSTEPBase TKTopAlgo TKGeomBase TKGeomAlgo TKMesh TKDraw -TKSTEP -TKIGES -TKSTL -TKVRML TKLCAF TKDCAF TKXCAF TKRWMesh +TKXDESTL TKXSDRAWBase \ No newline at end of file diff --git a/src/TKXSDRAWVRML/EXTERNLIB b/src/TKXSDRAWVRML/EXTERNLIB index 5b7039675c..c6055e0f2f 100644 --- a/src/TKXSDRAWVRML/EXTERNLIB +++ b/src/TKXSDRAWVRML/EXTERNLIB @@ -8,18 +8,14 @@ TKMeshVS TKG3d TKViewerTest TKG2d -TKSTEPBase TKTopAlgo TKGeomBase TKGeomAlgo TKMesh TKDraw -TKSTEP -TKIGES -TKSTL -TKVRML TKLCAF TKDCAF TKXCAF TKRWMesh +TKXDEVRML TKXSDRAWBase \ No newline at end of file diff --git a/src/XDEDRAW/XDEDRAW.cxx b/src/XDEDRAW/XDEDRAW.cxx index 859ca585d3..d88ea63aae 100644 --- a/src/XDEDRAW/XDEDRAW.cxx +++ b/src/XDEDRAW/XDEDRAW.cxx @@ -1719,12 +1719,12 @@ static Standard_Integer testDoc (Draw_Interpretor&, void XDEDRAW::Init(Draw_Interpretor& di) { - static Standard_Boolean initactor = Standard_False; - if (initactor) + static Standard_Boolean aIsActivated = Standard_False; + if (aIsActivated) { return; } - initactor = Standard_True; + aIsActivated = Standard_True; // Load static variables for STEPCAF (ssv; 16.08.2012) STEPCAFControl_Controller::Init(); diff --git a/src/XDEDRAW/XDEDRAW_Colors.cxx b/src/XDEDRAW/XDEDRAW_Colors.cxx index d4a6404fba..0c2858ae11 100644 --- a/src/XDEDRAW/XDEDRAW_Colors.cxx +++ b/src/XDEDRAW/XDEDRAW_Colors.cxx @@ -1297,12 +1297,12 @@ static Standard_Integer XSetVisMaterial (Draw_Interpretor& , Standard_Integer th void XDEDRAW_Colors::InitCommands(Draw_Interpretor& di) { - static Standard_Boolean initactor = Standard_False; - if (initactor) + static Standard_Boolean aIsActivated = Standard_False; + if (aIsActivated) { return; } - initactor = Standard_True; + aIsActivated = Standard_True; //===================================== // Work with colors diff --git a/src/XDEDRAW/XDEDRAW_Common.cxx b/src/XDEDRAW/XDEDRAW_Common.cxx index c8cc360bfa..e97f43d6ea 100644 --- a/src/XDEDRAW/XDEDRAW_Common.cxx +++ b/src/XDEDRAW/XDEDRAW_Common.cxx @@ -59,26 +59,28 @@ static Standard_Integer SetCurWS(Draw_Interpretor& theDI, Standard_Integer theNbArgs, const char** theArgVec) { - //if (theNbArgs < 2) - //{ - // theDI << "Use: " << theArgVec[0] << " filename \n"; - // return 1; - //} - //const TCollection_AsciiString aSessionName(theArgVec[1]); - //Handle(XSControl_WorkSession) aSession; - //if (!THE_PREVIOUS_WORK_SESSIONS.Find(aSessionName, aSession)) - //{ - // TCollection_AsciiString aWSs; - // for (XSControl_WorkSessionMap::Iterator anIter(THE_PREVIOUS_WORK_SESSIONS); - // anIter.More(); anIter.Next()) - // { - // aWSs += "\""; - // aWSs += anIter.Key(); - // aWSs += "\"\n"; - // } - // theDI << "Error: Can't find active session. Active sessions list:\n" << aWSs; - // return 1; - //} + if (theNbArgs < 2) + { + theDI << "Use: " << theArgVec[0] << " filename \n"; + return 1; + } + const TCollection_AsciiString aSessionName(theArgVec[1]); + Handle(XSControl_WorkSession) aSession; + const XSControl_WorkSessionMap& aWSList = XSDRAWBase::WorkSessionList(); + if (!aWSList.Find(aSessionName, aSession)) + { + TCollection_AsciiString aWSs; + for (XSControl_WorkSessionMap::Iterator anIter(aWSList); + anIter.More(); anIter.Next()) + { + aWSs += "\""; + aWSs += anIter.Key(); + aWSs += "\"\n"; + } + theDI << "Error: Can't find active session. Active sessions list:\n" << aWSs; + return 1; + } + XSDRAWBase::Session() = aSession; return 0; } @@ -90,15 +92,15 @@ static Standard_Integer GetDicWSList(Draw_Interpretor& theDI, Standard_Integer theNbArgs, const char** theArgVec) { - //(void)theNbArgs; - //(void)theArgVec; - //Message::SendInfo() << "Active sessions list:"; - //TCollection_AsciiString aWSs; - //for (XSControl_WorkSessionMap::Iterator anIter(THE_PREVIOUS_WORK_SESSIONS); - // anIter.More(); anIter.Next()) - //{ - // theDI << "\"" << anIter.Key() << "\"\n"; - //} + (void)theNbArgs; + (void)theArgVec; + Message::SendInfo() << "Active sessions list:"; + TCollection_AsciiString aWSs; + for (XSControl_WorkSessionMap::Iterator anIter(XSDRAWBase::WorkSessionList()); + anIter.More(); anIter.Next()) + { + theDI << "\"" << anIter.Key() << "\"\n"; + } return 0; } @@ -125,25 +127,25 @@ static Standard_Integer FromShape(Draw_Interpretor& theDI, Standard_Integer theNbArgs, const char** theArgVec) { - //if (theNbArgs < 2) - //{ - // theDI << theArgVec[0] << " shape: search for shape origin among all last tranalated files\n"; - // return 0; - //} + if (theNbArgs < 2) + { + theDI << theArgVec[0] << " shape: search for shape origin among all last tranalated files\n"; + return 0; + } - //char command[256]; - //Sprintf(command, "fromshape %.200s -1", theArgVec[1]); - //XSControl_WorkSessionMap DictWS = THE_PREVIOUS_WORK_SESSIONS; - //if (DictWS.IsEmpty()) - // return theDI.Eval(command); + char command[256]; + Sprintf(command, "fromshape %.200s -1", theArgVec[1]); + const XSControl_WorkSessionMap& DictWS = XSDRAWBase::WorkSessionList(); + if (DictWS.IsEmpty()) + return theDI.Eval(command); - //Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); - //for (XSControl_WorkSessionMap::Iterator DicIt(DictWS); - // DicIt.More(); DicIt.Next()) - //{ - // Handle(XSControl_WorkSession) CurrentWS = DicIt.Value(); - // theDI.Eval(command); - //} + Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); + for (XSControl_WorkSessionMap::Iterator DicIt(DictWS); + DicIt.More(); DicIt.Next()) + { + Handle(XSControl_WorkSession) CurrentWS = DicIt.Value(); + theDI.Eval(command); + } return 0; } @@ -276,12 +278,12 @@ static Standard_Integer Extract(Draw_Interpretor& theDI, void XDEDRAW_Common::InitCommands(Draw_Interpretor& theDI) { - static Standard_Boolean initactor = Standard_False; - if (initactor) + static Standard_Boolean aIsActivated = Standard_False; + if (aIsActivated) { return; } - initactor = Standard_True; + aIsActivated = Standard_True; Standard_CString g = "XDE translation commands"; diff --git a/src/XDEDRAW/XDEDRAW_GDTs.cxx b/src/XDEDRAW/XDEDRAW_GDTs.cxx index c68504d0c5..b46863d483 100644 --- a/src/XDEDRAW/XDEDRAW_GDTs.cxx +++ b/src/XDEDRAW/XDEDRAW_GDTs.cxx @@ -2691,12 +2691,12 @@ static Standard_Integer setGDTSemanticName(Draw_Interpretor& di, Standard_Intege void XDEDRAW_GDTs::InitCommands(Draw_Interpretor& di) { - static Standard_Boolean initactor = Standard_False; - if (initactor) + static Standard_Boolean aIsActivated = Standard_False; + if (aIsActivated) { return; } - initactor = Standard_True; + aIsActivated = Standard_True; Standard_CString g = "XDE G&DTs commands"; diff --git a/src/XDEDRAW/XDEDRAW_Layers.cxx b/src/XDEDRAW/XDEDRAW_Layers.cxx index c5f65a1808..59a61bfdf3 100644 --- a/src/XDEDRAW/XDEDRAW_Layers.cxx +++ b/src/XDEDRAW/XDEDRAW_Layers.cxx @@ -446,12 +446,12 @@ static Standard_Integer getLayerRefs(Draw_Interpretor& theDI, void XDEDRAW_Layers::InitCommands(Draw_Interpretor& di) { - static Standard_Boolean initactor = Standard_False; - if (initactor) + static Standard_Boolean aIsActivated = Standard_False; + if (aIsActivated) { return; } - initactor = Standard_True; + aIsActivated = Standard_True; //===================================== // Work with layers diff --git a/src/XDEDRAW/XDEDRAW_Props.cxx b/src/XDEDRAW/XDEDRAW_Props.cxx index 03806766dc..0e4b367696 100644 --- a/src/XDEDRAW/XDEDRAW_Props.cxx +++ b/src/XDEDRAW/XDEDRAW_Props.cxx @@ -976,12 +976,12 @@ static Standard_Integer GetValidationProps(Draw_Interpretor& di, Standard_Intege void XDEDRAW_Props::InitCommands(Draw_Interpretor& di) { - static Standard_Boolean initactor = Standard_False; - if (initactor) + static Standard_Boolean aIsActivated = Standard_False; + if (aIsActivated) { return; } - initactor = Standard_True; + aIsActivated = Standard_True; Standard_CString g = "XDE property's commands"; diff --git a/src/XDEDRAW/XDEDRAW_Shapes.cxx b/src/XDEDRAW/XDEDRAW_Shapes.cxx index 8936f71954..0902cead9a 100644 --- a/src/XDEDRAW/XDEDRAW_Shapes.cxx +++ b/src/XDEDRAW/XDEDRAW_Shapes.cxx @@ -1241,12 +1241,12 @@ static Standard_Integer setLocation (Draw_Interpretor& , Standard_Integer theArg void XDEDRAW_Shapes::InitCommands(Draw_Interpretor& di) { - static Standard_Boolean initactor = Standard_False; - if (initactor) + static Standard_Boolean aIsActivated = Standard_False; + if (aIsActivated) { return; } - initactor = Standard_True; + aIsActivated = Standard_True; //===================================== // Work with shapes diff --git a/src/XDEDRAW/XDEDRAW_Views.cxx b/src/XDEDRAW/XDEDRAW_Views.cxx index 1c812747c6..40c3b1b240 100644 --- a/src/XDEDRAW/XDEDRAW_Views.cxx +++ b/src/XDEDRAW/XDEDRAW_Views.cxx @@ -1304,12 +1304,12 @@ static Standard_Integer getClippingPlaneCapping(Draw_Interpretor& di, Standard_I void XDEDRAW_Views::InitCommands(Draw_Interpretor& di) { - static Standard_Boolean initactor = Standard_False; - if (initactor) + static Standard_Boolean aIsActivated = Standard_False; + if (aIsActivated) { return; } - initactor = Standard_True; + aIsActivated = Standard_True; Standard_CString g = "XDE Views commands"; diff --git a/src/XSControl/XSControl_TransferReader.cxx b/src/XSControl/XSControl_TransferReader.cxx index d1f73102bb..576dda6fd3 100644 --- a/src/XSControl/XSControl_TransferReader.cxx +++ b/src/XSControl/XSControl_TransferReader.cxx @@ -974,7 +974,7 @@ void XSControl_TransferReader::PrintStats (Standard_OStream& sout, if (what > 10) { sout<<" *** Not yet implemented"<Messenger()->SendInfo(); - char mess[250]; if (TP.IsNull()) return; - if (what == 0) { TP->PrintStats(0,sout); return; } + if (what == 0) { TP->PrintStats(0, theStream); return; } - sout<<"\n*******************************************************************\n"; - sout << "****** Statistics on Transfer Process (Read) ******"<NbEntities()<NbEntities()<Add(ent,"(not recorded)"); else if (mode == 1 || mode == 2) { - sout<<"["<Print (ent, sout); - sout<<" "<TypeName(ent,Standard_False)<<" (not recorded)"<Print (ent, theStream); + theStream <<" "<TypeName(ent,Standard_False)<<" (not recorded)"<Number(ent); continue; } + if (mode == 0) { theStream <<" "<Number(ent); continue; } if (mode != 3) { stat = BinderStatus(binder,mess); // 0 Binder Null. 1 void 2 Warning seul 3 Fail seul @@ -1224,22 +1224,22 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP // mode : 0 list num; 1 : num+label + type + result (abrege); 2 : complet if (mode == 1 || mode == 2) { - sout<<"["<Print (ent, sout); - sout<<" "<TypeName(ent,Standard_False); - sout<<" Result:"<Print (ent, theStream); + theStream <<" "<TypeName(ent,Standard_False); + theStream <<" Result:"<Check(); Standard_Integer newi,newnbw = ch->NbWarnings(), newnbf = ch->NbFails(); if (newnbw > 0) { - sout<<" - Warnings : "<CWarning(newi)<CWarning(newi)< 0) { - sout<<" - Fails : "<CFail(newi)<CFail(newi)<PrintList (sout, model, pcm); - else sout<PrintList (theStream, model, pcm); + else theStream < 0) { - sout << "****** Percentages according Transfer Status ******"<Messenger(),"Result ",nbr+nbrw,nl); PrintPercent (TP->Messenger(),"Result + FAIL ",nbrf,nl); PrintPercent (TP->Messenger(),"FAIL, no Result ",nbf,nl); @@ -1297,14 +1297,14 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP chl.SetName("** TRANSFER READ CHECK **"); if (mode == 0) { - chl.Print (sout, model, (what == 5)); + chl.Print (theStream, model, (what == 5)); } else { IFSelect_PrintCount pcm = IFSelect_CountByItem; if (mode == 2) pcm = IFSelect_ListByItem; Handle(IFSelect_CheckCounter) counter = new IFSelect_CheckCounter(Standard_True); counter->Analyse (chl,model,Standard_True,(what == 5)); - counter->PrintList (sout, model, pcm); + counter->PrintList (theStream, model, pcm); } } diff --git a/src/XSControl/XSControl_TransferReader.hxx b/src/XSControl/XSControl_TransferReader.hxx index 9cebdeb5d1..7ce40d541b 100644 --- a/src/XSControl/XSControl_TransferReader.hxx +++ b/src/XSControl/XSControl_TransferReader.hxx @@ -340,11 +340,18 @@ class XSControl_TransferReader : public Standard_Transient //! 2 : ShortByItem (count + 5 first numbers) //! 3 : ListByItem (count + entity numbers) //! 4 : EntitiesByItem (count + entity numbers and labels) - Standard_EXPORT static void PrintStatsProcess (const Handle(Transfer_TransientProcess)& theTP, const Standard_Integer theWhat, const Standard_Integer theMode = 0); + Standard_EXPORT static void PrintStatsProcess (const Handle(Transfer_TransientProcess)& theTP, + Standard_OStream& theStream, + const Standard_Integer theWhat, + const Standard_Integer theMode = 0); //! Works as PrintStatsProcess, but displays data only on the //! entities which are in (filter) - Standard_EXPORT static void PrintStatsOnList (const Handle(Transfer_TransientProcess)& theTP, const Handle(TColStd_HSequenceOfTransient)& theList, const Standard_Integer theWhat, const Standard_Integer theMode = 0); + Standard_EXPORT static void PrintStatsOnList (const Handle(Transfer_TransientProcess)& theTP, + Standard_OStream& theStream, + const Handle(TColStd_HSequenceOfTransient)& theList, + const Standard_Integer theWhat, + const Standard_Integer theMode = 0); DEFINE_STANDARD_RTTIEXT(XSControl_TransferReader,Standard_Transient) diff --git a/src/XSDRAW/XSDRAW.cxx b/src/XSDRAW/XSDRAW.cxx index 0d4c506fae..601c0bb112 100644 --- a/src/XSDRAW/XSDRAW.cxx +++ b/src/XSDRAW/XSDRAW.cxx @@ -17,15 +17,17 @@ #include #include #include +#include void XSDRAW::Factory(Draw_Interpretor& theDI) { - static Standard_Boolean initactor = Standard_False; - if (initactor) + static Standard_Boolean aIsActivated = Standard_False; + if (aIsActivated) { return; } - initactor = Standard_True; + aIsActivated = Standard_True; + XSAlgo::Init(); XSDRAW_Functions::Init(theDI); XSDRAW_FunctionsSession::Init(theDI); XSDRAW_FunctionsShape::Init(theDI); diff --git a/src/XSDRAW/XSDRAW_Functions.cxx b/src/XSDRAW/XSDRAW_Functions.cxx index dd4111e827..e2ad572090 100644 --- a/src/XSDRAW/XSDRAW_Functions.cxx +++ b/src/XSDRAW/XSDRAW_Functions.cxx @@ -70,7 +70,6 @@ static Standard_Integer XSControl_xnorm(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); Handle(XSControl_Controller) control = WS->NormAdaptor(); if (theNbArgs == 1) @@ -131,7 +130,6 @@ static Standard_Integer XSControl_tpclear(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; (void)theNbArgs; const Standard_Boolean modew = (theArgVec[0][2] == 'w'); Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); @@ -163,7 +161,6 @@ static Standard_Integer XSControl_tpstat(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; const Standard_CString arg1 = theArgVec[1]; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Handle(Transfer_TransientProcess)& TP = @@ -241,7 +238,7 @@ static Standard_Integer XSControl_tpstat(Draw_Interpretor& theDI, if (TP->Model() != WS->Model()) aSSC.SStream() << "Model differs from the session"; Handle(TColStd_HSequenceOfTransient) list = WS->GiveList(theArgVec[2]); - XSControl_TransferReader::PrintStatsOnList(TP, list, mod1, mod2); + XSControl_TransferReader::PrintStatsOnList(TP, aSSC.SStream(), list, mod1, mod2); // TP->PrintStats (1,aSSC.SStream()); } else aSSC.SStream() << "TransferRead : not defined"; @@ -257,7 +254,6 @@ static Standard_Integer XSControl_tpent(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; const Standard_CString arg1 = theArgVec[1]; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Handle(Transfer_TransientProcess)& TP = @@ -302,7 +298,6 @@ static Standard_Integer XSControl_tpitem(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; const Standard_CString arg1 = theArgVec[1]; // **** tpitem/tproot/twitem/twroot **** if (theNbArgs < 2) @@ -333,7 +328,6 @@ static Standard_Integer XSControl_trecord(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; const Standard_CString arg1 = theArgVec[1]; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Handle(Transfer_TransientProcess)& TP = WS->TransferReader()->TransientProcess(); @@ -385,7 +379,6 @@ static Standard_Integer XSControl_trstat(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; const Standard_CString arg1 = theArgVec[1]; // **** trstat : TransferReader **** Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); @@ -451,7 +444,6 @@ static Standard_Integer XSControl_trbegin(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; // **** trbegin : TransferReader **** Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); Handle(XSControl_TransferReader) TR = WS->TransferReader(); @@ -483,7 +475,6 @@ static Standard_Integer XSControl_tread(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; //const Standard_CString arg1 = pilot->Arg(1); // **** tread : TransferReader **** Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); @@ -531,7 +522,6 @@ static Standard_Integer XSControl_trtp(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; (void)theNbArgs; (void)theArgVec; // **** TReader -> TProcess **** @@ -553,7 +543,6 @@ static Standard_Integer XSControl_tptr(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; (void)theNbArgs; (void)theArgVec; // **** TProcess -> TReader **** @@ -570,7 +559,6 @@ static Standard_Integer XSControl_twmode(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; const Standard_CString arg1 = theArgVec[1]; // **** twmode **** Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); @@ -605,7 +593,6 @@ static Standard_Integer XSControl_twstat(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; (void)theNbArgs; (void)theArgVec; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); @@ -629,12 +616,12 @@ static Standard_Integer XSControl_twstat(Draw_Interpretor& theDI, //======================================================================= void XSDRAW_Functions::Init(Draw_Interpretor& theDI) { - static Standard_Boolean initactor = Standard_False; - if (initactor) + static Standard_Boolean aIsActivated = Standard_False; + if (aIsActivated) { return; } - initactor = Standard_True; + aIsActivated = Standard_True; Standard_CString aGroup = "DE: General"; theDI.Add("xinit" diff --git a/src/XSDRAW/XSDRAW_FunctionsSession.cxx b/src/XSDRAW/XSDRAW_FunctionsSession.cxx index e968885888..4d0c143945 100644 --- a/src/XSDRAW/XSDRAW_FunctionsSession.cxx +++ b/src/XSDRAW/XSDRAW_FunctionsSession.cxx @@ -105,7 +105,6 @@ static Standard_Integer funstatus(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; (void)theNbArgs; (void)theArgVec; // **** Version & cie **** @@ -126,7 +125,6 @@ static Standard_Integer fun1(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; (void)theNbArgs; (void)theArgVec; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); @@ -147,7 +145,6 @@ static Standard_Integer fun3(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -195,7 +192,6 @@ static Standard_Integer fun4(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -205,7 +201,7 @@ static Standard_Integer fun4(Draw_Interpretor& theDI, aSSC.SStream() << "Write All : give file name !"; return 1; } - return WS->SendAll(arg1) == IFSelect_RetDone; + return (WS->SendAll(arg1) == IFSelect_RetDone ? 0 : 1); } //======================================================================= @@ -217,7 +213,6 @@ static Standard_Integer fun6(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -251,7 +246,7 @@ static Standard_Integer fun6(Draw_Interpretor& theDI, aSSC.SStream() << ko << " bad arguments, abandon"; return 1; } - return WS->SendSelected(arg1, sp) == IFSelect_RetDone; + return (WS->SendSelected(arg1, sp) == IFSelect_RetDone ? 0 : 1); } //======================================================================= @@ -263,7 +258,6 @@ static Standard_Integer fun7(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -299,7 +293,6 @@ static Standard_Integer fun8(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -342,15 +335,27 @@ static Standard_Integer fun9(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theNbArgs; - (void)theArgVec; Handle(IFSelect_WorkSession) WS = XSDRAWBase::Session(); Handle(IFSelect_Signature) signtype = WS->SignType(); if (signtype.IsNull()) signtype = new IFSelect_SignType; - Handle(IFSelect_SignCounter) counter = + Handle(IFSelect_SignCounter) aCounter = new IFSelect_SignCounter(signtype, Standard_False); - counter->AddModel(WS->Model()); - counter->PrintList(aSSC.SStream(), WS->Model(), IFSelect_CountByItem); + if (theNbArgs == 1) + { + aCounter->AddModel(WS->Model()); + } + else + { + // on demande un givelist + Handle(TColStd_HSequenceOfTransient) list = WS->GiveList(theArgVec[1]); + if (list.IsNull()) + { + theDI << "Error: Nothing selected from : " << theArgVec[1] << "\n"; + return 1; + } + aCounter->AddWithGraph(list, WS->Graph()); + } + aCounter->PrintList(aSSC.SStream(), WS->Model(), IFSelect_CountByItem); return 0; } @@ -363,7 +368,6 @@ static Standard_Integer funsigntype(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -417,7 +421,6 @@ static Standard_Integer funsigncase(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; (void)theNbArgs; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -456,7 +459,6 @@ static Standard_Integer fun10(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -491,8 +493,11 @@ static Standard_Integer fun11(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; - (void)theNbArgs; + if (theNbArgs < 2) + { + aSSC.SStream() << "Error: Empty Mode\n"; + return 1; + } Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); // const Standard_CString arg1 = theArgVec[1]; @@ -524,10 +529,10 @@ static Standard_Integer fun11(Draw_Interpretor& theDI, case 'T': niv = 7; break; case 'f': niv = 8; break; case 'F': niv = 10; break; - default: aSSC.SStream() << "Unknown Mode . data tout court pour help"; + default: aSSC.SStream() << "Unknown Mode . tout court pour help"; return 1; } - WS->TraceDumpModel(niv); + WS->DumpModel(niv, aSSC.SStream()); return 0; } @@ -542,7 +547,6 @@ static Standard_Integer fundumpent(Draw_Interpretor& theDI, XSDRAW::StreamContainer aSSC(theDI); Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); Handle(IFSelect_WorkLibrary) WL = WS->WorkLibrary(); - Standard_SStream aStream; Standard_Integer levdef = 0, levmax = 10, level; WL->DumpLevels(levdef, levmax); if (theNbArgs < 2 || (theNbArgs == 2 && levmax < 0)) @@ -556,7 +560,7 @@ static Standard_Integer fundumpent(Draw_Interpretor& theDI, { Standard_CString help = WL->DumpHelp(level); if (help[0] != '\0') - aStream << level << " : " << help; + aSSC.SStream() << level << " : " << help; } return 1; } @@ -572,16 +576,16 @@ static Standard_Integer fundumpent(Draw_Interpretor& theDI, Handle(Standard_Transient) ent = WS->StartingEntity(num); if (ent.IsNull()) { - aStream << "No entity with given id " << arg1 << " (" << num << ") is found in the current model"; + aSSC.SStream() << "No entity with given id " << arg1 << " (" << num << ") is found in the current model"; } else { - aStream << " -- DUMP Entity n0 " << num << " level " << level; - WL->DumpEntity(WS->Model(), WS->Protocol(), ent, aStream, level); + aSSC.SStream() << " -- DUMP Entity n0 " << num << " level " << level; + WL->DumpEntity(WS->Model(), WS->Protocol(), ent, aSSC.SStream(), level); Interface_CheckIterator chl = WS->CheckOne(ent); if (!chl.IsEmpty(Standard_False)) - chl.Print(aStream, WS->Model(), Standard_False); + chl.Print(aSSC.SStream(), WS->Model(), Standard_False); } return 0; } @@ -595,7 +599,6 @@ static Standard_Integer funsign(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -628,7 +631,6 @@ static Standard_Integer funqp(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -658,7 +660,6 @@ static Standard_Integer fun12(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; (void)theNbArgs; (void)theArgVec; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); @@ -676,7 +677,6 @@ static Standard_Integer fun13(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; (void)theNbArgs; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); // **** ListItems **** @@ -693,7 +693,6 @@ static Standard_Integer fun15(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -720,7 +719,6 @@ static Standard_Integer fun17(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -746,7 +744,6 @@ static Standard_Integer fun19(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -769,7 +766,6 @@ static Standard_Integer fun21(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; (void)theNbArgs; (void)theArgVec; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); @@ -783,7 +779,6 @@ static Standard_Integer fun22(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -802,7 +797,7 @@ static Standard_Integer fun22(Draw_Interpretor& theDI, { if (mode < 0) aSSC.SStream() << "Give a suitable mode"; aSSC.SStream() << " Available Modes :\n" - << " a : all data g : graph+check c : check p : selectpointed"; + << " a : all g : graph+check c : check p : selectpointed"; return 1; } WS->ClearData(mode); @@ -818,7 +813,6 @@ static Standard_Integer fun24(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); // **** Item Label **** @@ -859,7 +853,6 @@ static Standard_Integer fun25(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -884,7 +877,6 @@ static Standard_Integer fun26(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -912,7 +904,6 @@ static Standard_Integer fun27(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; Standard_CString arg2 = theArgVec[2]; @@ -1006,7 +997,6 @@ static Standard_Integer fun29(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; (void)theNbArgs; (void)theArgVec; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); @@ -1033,7 +1023,6 @@ static Standard_Integer fun30(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1058,7 +1047,6 @@ static Standard_Integer fun31(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1083,7 +1071,6 @@ static Standard_Integer fun32(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1116,7 +1103,6 @@ static Standard_Integer fun33(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1141,7 +1127,6 @@ static Standard_Integer fun34(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; (void)theNbArgs; (void)theArgVec; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); @@ -1178,7 +1163,6 @@ static Standard_Integer fun35(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; (void)theNbArgs; (void)theArgVec; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); @@ -1196,7 +1180,6 @@ static Standard_Integer fun36(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); // **** Split **** @@ -1233,7 +1216,6 @@ static Standard_Integer fun37(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1267,7 +1249,6 @@ static Standard_Integer fun38(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1313,7 +1294,6 @@ static Standard_Integer fun40(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; (void)theNbArgs; (void)theArgVec; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); @@ -1332,7 +1312,6 @@ static Standard_Integer fun41(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1380,7 +1359,6 @@ static Standard_Integer fun42(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1422,7 +1400,6 @@ static Standard_Integer fun43(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1466,7 +1443,6 @@ static Standard_Integer fun44(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1496,7 +1472,6 @@ static Standard_Integer fun45(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1537,7 +1512,6 @@ static Standard_Integer fun51(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; const Standard_CString arg2 = theArgVec[2]; @@ -1573,7 +1547,6 @@ static Standard_Integer fun56(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1610,7 +1583,6 @@ static Standard_Integer fun57(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1634,7 +1606,6 @@ static Standard_Integer fun58(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1682,7 +1653,6 @@ static Standard_Integer fun59(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1706,7 +1676,6 @@ static Standard_Integer fun60(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; (void)theNbArgs; (void)theArgVec; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); @@ -1727,7 +1696,6 @@ static Standard_Integer fun61(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1768,7 +1736,6 @@ static Standard_Integer fun70(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1798,7 +1765,6 @@ static Standard_Integer fun71(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1833,7 +1799,6 @@ static Standard_Integer fun77(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1861,7 +1826,6 @@ static Standard_Integer fun78(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1888,7 +1852,6 @@ static Standard_Integer fun80(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1916,7 +1879,6 @@ static Standard_Integer fun81(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -1944,7 +1906,6 @@ static Standard_Integer fun91(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; Handle(XSControl_WorkSession) WS = XSDRAWBase::Session(); const Standard_CString arg1 = theArgVec[1]; @@ -2033,7 +1994,6 @@ static Standard_Integer fun_editlist(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; if (theNbArgs < 2) { aSSC.SStream() << "Give the name of an EditForm or an Editor"; @@ -2096,7 +2056,6 @@ static Standard_Integer fun_editclear(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; if (theNbArgs < 2) { aSSC.SStream() << "Give the name of an EditForm [+ name of Value else all]"; @@ -2142,7 +2101,6 @@ static Standard_Integer fun_editapply(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; if (theNbArgs < 2) { aSSC.SStream() << "Give the name of an EditForm [+ option keep to re-apply edited values]"; @@ -2199,7 +2157,6 @@ static Standard_Integer fun_editload(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; if (theNbArgs < 2) { aSSC.SStream() << "Give the name of an EditForm [+ Entity-Ident]"; diff --git a/src/XSDRAW/XSDRAW_FunctionsShape.cxx b/src/XSDRAW/XSDRAW_FunctionsShape.cxx index 506bc80bfb..9a6630f12b 100644 --- a/src/XSDRAW/XSDRAW_FunctionsShape.cxx +++ b/src/XSDRAW/XSDRAW_FunctionsShape.cxx @@ -77,7 +77,6 @@ static Standard_Integer XSControl_tpdraw(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; const Standard_CString arg1 = theArgVec[1]; const Standard_CString arg2 = theArgVec[2]; const Standard_CString arg3 = theArgVec[3]; @@ -301,7 +300,6 @@ static Standard_Integer XSControl_tpcompound(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; const Standard_CString arg1 = theArgVec[1]; const Handle(Transfer_TransientProcess)& TP = XSDRAWBase::Session()->TransferReader()->TransientProcess(); if (TP.IsNull()) @@ -352,7 +350,6 @@ static Standard_Integer XSControl_traccess(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; const Standard_CString arg1 = theArgVec[1]; const Standard_CString arg2 = theArgVec[2]; TCollection_AsciiString aCommand(theArgVec[0]); @@ -460,7 +457,6 @@ static Standard_Integer XSControl_fromshape(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; const Standard_CString arg1 = theArgVec[1]; // **** fromshape (tread) **** if (theNbArgs < 2) @@ -525,14 +521,14 @@ static Standard_Integer XSControl_fromshape(Draw_Interpretor& theDI, TopoDS_Shape sh = TransferBRep::ShapeResult(TP, ent); if (sh.IsNull()) { - ent.Nullify(); continue; } - if (XSControl_IsEqualSubShape(Shape, sh, aLevel)) break; + if (XSControl_IsEqualSubShape(Shape, sh, aLevel)) + break; modrec = -2; sh.Location(L); - if (XSControl_IsEqualSubShape(S0, sh, aLevel)) break; - ent.Nullify(); + if (XSControl_IsEqualSubShape(S0, sh, aLevel)) + break; modrec = 2; } } @@ -643,9 +639,13 @@ static Standard_Integer XSControl_fromshape(Draw_Interpretor& theDI, } } } - if (!yena) aSSC.SStream() << "No transfer (either import or export) recorded" << std::endl; + if (!yena) + { + aSSC.SStream() << "No transfer (either import or export) recorded" << std::endl; + return 1; + } - return 1; + return 0; } //======================================================================= @@ -657,7 +657,6 @@ static Standard_Integer XSControl_trconnexentities(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; const Standard_CString arg1 = theArgVec[1]; // **** connected entities (last transfer) **** const Handle(XSControl_TransferReader)& TR = XSDRAWBase::Session()->TransferReader(); @@ -706,7 +705,6 @@ static Standard_Integer XSControl_twrite(Draw_Interpretor& theDI, const char** theArgVec) { XSDRAW::StreamContainer aSSC(theDI); - (void)theDI; const Standard_CString arg1 = theArgVec[1]; // **** twrite **** Handle(XSControl_TransferWriter) TW = XSDRAWBase::Session()->TransferWriter(); diff --git a/src/XSDRAWBase/XSDRAWBase.cxx b/src/XSDRAWBase/XSDRAWBase.cxx index f3be329dcb..9166c8b828 100644 --- a/src/XSDRAWBase/XSDRAWBase.cxx +++ b/src/XSDRAWBase/XSDRAWBase.cxx @@ -13,6 +13,7 @@ #include +#include #include #include #include @@ -78,7 +79,10 @@ Standard_Real XSDRAWBase::GetLengthUnit(const Handle(TDocStd_Document)& theDoc) return aUnit; } } - XSAlgo::AlgoContainer()->PrepareForTransfer(); + if (Interface_Static::IsPresent("xstep.cascade.unit")) + { + UnitsMethods::SetCasCadeLengthUnit(Interface_Static::IVal("xstep.cascade.unit")); + } return UnitsMethods::GetCasCadeLengthUnit(); } diff --git a/src/XSDRAWDEWrapper/XSDRAWDEWrapper.cxx b/src/XSDRAWDEWrapper/XSDRAWDEWrapper.cxx index 524fe6af26..3f4042ba70 100644 --- a/src/XSDRAWDEWrapper/XSDRAWDEWrapper.cxx +++ b/src/XSDRAWDEWrapper/XSDRAWDEWrapper.cxx @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -375,12 +374,12 @@ static Standard_Integer WriteFile(Draw_Interpretor& theDI, //======================================================================= void XSDRAWDEWrapper::Factory(Draw_Interpretor& theDI) { - static Standard_Boolean initactor = Standard_False; - if (initactor) + static Standard_Boolean aIsActivated = Standard_False; + if (aIsActivated) { return; } - initactor = Standard_True; + aIsActivated = Standard_True; Standard_CString aGroup = "XDE translation commands"; theDI.Add("DumpConfiguration", diff --git a/src/XSDRAWGLTF/XSDRAWGLTF.cxx b/src/XSDRAWGLTF/XSDRAWGLTF.cxx index f7b7c1bb20..0c7a4531d8 100644 --- a/src/XSDRAWGLTF/XSDRAWGLTF.cxx +++ b/src/XSDRAWGLTF/XSDRAWGLTF.cxx @@ -486,12 +486,12 @@ static Standard_Integer WriteGltf(Draw_Interpretor& theDI, //======================================================================= void XSDRAWGLTF::Factory(Draw_Interpretor& theDI) { - static Standard_Boolean initactor = Standard_False; - if (initactor) + static Standard_Boolean aIsActivated = Standard_False; + if (aIsActivated) { return; } - initactor = Standard_True; + aIsActivated = Standard_True; const char* aGroup = "XSTEP-STL/VRML"; // Step transfer file commands theDI.Add("ReadGltf", diff --git a/src/XSDRAWIGES/XSDRAWIGES.cxx b/src/XSDRAWIGES/XSDRAWIGES.cxx index a69ac96898..5c5e244b80 100644 --- a/src/XSDRAWIGES/XSDRAWIGES.cxx +++ b/src/XSDRAWIGES/XSDRAWIGES.cxx @@ -885,14 +885,14 @@ static Standard_Integer WriteIges(Draw_Interpretor& theDI, //======================================================================= void XSDRAWIGES::Factory(Draw_Interpretor& theDI) { - static Standard_Boolean initactor = Standard_False; - if (initactor) + static Standard_Boolean aIsActivated = Standard_False; + if (aIsActivated) { return; } IGESControl_Controller::Init(); - initactor = Standard_True; + aIsActivated = Standard_True; const char* aGroup = "DE: IGES"; theDI.Add("tplosttrim", "number of untrimmed faces during last transfer", __FILE__, XSDRAWIGES_tplosttrim, aGroup); diff --git a/src/XSDRAWOBJ/XSDRAWOBJ.cxx b/src/XSDRAWOBJ/XSDRAWOBJ.cxx index c7b3ec9a33..ad2ed00818 100644 --- a/src/XSDRAWOBJ/XSDRAWOBJ.cxx +++ b/src/XSDRAWOBJ/XSDRAWOBJ.cxx @@ -328,12 +328,12 @@ static Standard_Integer WriteObj(Draw_Interpretor& theDI, //======================================================================= void XSDRAWOBJ::Factory(Draw_Interpretor& theDI) { - static Standard_Boolean initactor = Standard_False; - if (initactor) + static Standard_Boolean aIsActivated = Standard_False; + if (aIsActivated) { return; } - initactor = Standard_True; + aIsActivated = Standard_True; const char* g = "XSTEP-STL/VRML"; // Step transfer file commands theDI.Add("ReadObj", "ReadObj Doc file [-fileCoordSys {Zup|Yup}] [-fileUnit Unit]" diff --git a/src/XSDRAWPLY/XSDRAWPLY.cxx b/src/XSDRAWPLY/XSDRAWPLY.cxx index f32b43685f..6007da172d 100644 --- a/src/XSDRAWPLY/XSDRAWPLY.cxx +++ b/src/XSDRAWPLY/XSDRAWPLY.cxx @@ -327,12 +327,12 @@ static Standard_Integer WritePly(Draw_Interpretor& theDI, //======================================================================= void XSDRAWPLY::Factory(Draw_Interpretor& theDI) { - static Standard_Boolean initactor = Standard_False; - if (initactor) + static Standard_Boolean aIsActivated = Standard_False; + if (aIsActivated) { return; } - initactor = Standard_True; + aIsActivated = Standard_True; const char* g = "XSTEP-STL/VRML"; // Step transfer file commands //XSDRAW::LoadDraw(theCommands); theDI.Add("WritePly", R"( diff --git a/src/XSDRAWSTEP/XSDRAWSTEP.cxx b/src/XSDRAWSTEP/XSDRAWSTEP.cxx index f109b02e04..e1ad60d43e 100644 --- a/src/XSDRAWSTEP/XSDRAWSTEP.cxx +++ b/src/XSDRAWSTEP/XSDRAWSTEP.cxx @@ -899,12 +899,12 @@ static Standard_Integer WriteStep(Draw_Interpretor& theDI, //======================================================================= void XSDRAWSTEP::Factory(Draw_Interpretor& theDI) { - static Standard_Boolean initactor = Standard_False; - if (initactor) + static Standard_Boolean aIsActivated = Standard_False; + if (aIsActivated) { return; } - initactor = Standard_True; + aIsActivated = Standard_True; const char* g = "DE: STEP"; // Step transfer file commands theDI.Add("stepwrite", "stepwrite mode[0-4 afsmw] shape", __FILE__, stepwrite, g); theDI.Add("testwritestep", "testwritestep filename.stp shape [-stream]", diff --git a/src/XSDRAWSTL/XSDRAWSTL.cxx b/src/XSDRAWSTL/XSDRAWSTL.cxx index ec7f474865..b929ca79c7 100644 --- a/src/XSDRAWSTL/XSDRAWSTL.cxx +++ b/src/XSDRAWSTL/XSDRAWSTL.cxx @@ -169,12 +169,12 @@ static Standard_Integer readstl(Draw_Interpretor& theDI, //============================================================================= void XSDRAWSTL::Factory(Draw_Interpretor& theDI) { - static Standard_Boolean initactor = Standard_False; - if (initactor) + static Standard_Boolean aIsActivated = Standard_False; + if (aIsActivated) { return; } - initactor = Standard_True; + aIsActivated = Standard_True; const char* g = "XSTEP-STL/VRML"; // Step transfer file commands theDI.Add("writestl", "shape file [ascii/binary (0/1) : 1 by default] [InParallel (0/1) : 0 by default]", __FILE__, writestl, g); diff --git a/tests/perf/heal/bug24596_1 b/tests/perf/heal/bug24596_1 index aa242c8aa4..bd6b7ccc8b 100644 --- a/tests/perf/heal/bug24596_1 +++ b/tests/perf/heal/bug24596_1 @@ -6,7 +6,7 @@ puts "" ## Slow import of IGES data ############################### -pload QAcommands +pload QAcommands IGES if { [regexp {Debug mode} [dversion]] } { cpulimit 8500 diff --git a/tests/perf/heal/bug24596_2 b/tests/perf/heal/bug24596_2 index aeedf833d1..d925891073 100644 --- a/tests/perf/heal/bug24596_2 +++ b/tests/perf/heal/bug24596_2 @@ -6,7 +6,7 @@ puts "" ## Slow import of IGES data ############################### -pload QAcommands +pload QAcommands IGES if { [regexp {Debug mode} [dversion]] } { cpulimit 8500 diff --git a/tests/perf/moddata/bug25487_1 b/tests/perf/moddata/bug25487_1 index fd62e6caa9..eecb950408 100644 --- a/tests/perf/moddata/bug25487_1 +++ b/tests/perf/moddata/bug25487_1 @@ -6,7 +6,7 @@ puts "" # Extrema_GenExtPS needs to be optimized ########################################## -pload DATAEXCHANGEKERNEL +pload STEP # Restore testing shape and get timing characteristics for operation stepread dchrono perf_h restart diff --git a/tests/perf/moddata/bug25487_2 b/tests/perf/moddata/bug25487_2 index 75880354a3..f6418d39ce 100644 --- a/tests/perf/moddata/bug25487_2 +++ b/tests/perf/moddata/bug25487_2 @@ -8,7 +8,7 @@ puts "" cpulimit 1000 -pload DATAEXCHANGEKERNEL +pload STEP # Restore testing shape and get timing characteristics for operation stepread dchrono perf_h restart diff --git a/tests/perf/moddata/bug27048_2 b/tests/perf/moddata/bug27048_2 index 386b3fd011..b1231429fb 100644 --- a/tests/perf/moddata/bug27048_2 +++ b/tests/perf/moddata/bug27048_2 @@ -6,7 +6,7 @@ puts "" # Recalculation of BSpline cache causes a performance problems ############################################################################ -pload XSDRAW +pload STEP dchrono t restart testreadstep [locate_data_file bug27048.stp] result -- 2.39.5