]> OCCT Git - occt.git/commitdiff
// rework XDE modules structure
authordpasukhi <dpasukhi@opencascade.com>
Sat, 21 Jan 2023 14:58:23 +0000 (14:58 +0000)
committerdpasukhi <dpasukhi@opencascade.com>
Thu, 9 Mar 2023 17:37:54 +0000 (17:37 +0000)
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

94 files changed:
adm/MODULES
src/DRAWEXE/EXTERNLIB_STATIC
src/TKIGES/CMakeLists.txt [deleted file]
src/TKIGES/EXTERNLIB [deleted file]
src/TKIGES/FILES [deleted file]
src/TKIGES/PACKAGES [deleted file]
src/TKQADraw/EXTERNLIB
src/TKSTEP/CMakeLists.txt [deleted file]
src/TKSTEP/EXTERNLIB [deleted file]
src/TKSTEP/FILES [deleted file]
src/TKSTEP/PACKAGES [deleted file]
src/TKSTEP209/CMakeLists.txt [deleted file]
src/TKSTEP209/EXTERNLIB [deleted file]
src/TKSTEP209/FILES [deleted file]
src/TKSTEP209/PACKAGES [deleted file]
src/TKSTEPAttr/CMakeLists.txt [deleted file]
src/TKSTEPAttr/EXTERNLIB [deleted file]
src/TKSTEPAttr/FILES [deleted file]
src/TKSTEPAttr/PACKAGES [deleted file]
src/TKSTEPBase/CMakeLists.txt [deleted file]
src/TKSTEPBase/EXTERNLIB [deleted file]
src/TKSTEPBase/FILES [deleted file]
src/TKSTEPBase/PACKAGES [deleted file]
src/TKSTL/CMakeLists.txt [deleted file]
src/TKSTL/EXTERNLIB [deleted file]
src/TKSTL/FILES [deleted file]
src/TKSTL/PACKAGES [deleted file]
src/TKVRML/CMakeLists.txt [deleted file]
src/TKVRML/EXTERNLIB [deleted file]
src/TKVRML/FILES [deleted file]
src/TKVRML/PACKAGES [deleted file]
src/TKXDEDRAW/EXTERNLIB
src/TKXDEGLTF/CMakeLists.txt [new file with mode: 0644]
src/TKXDEGLTF/EXTERNLIB [new file with mode: 0644]
src/TKXDEGLTF/FILES [new file with mode: 0644]
src/TKXDEGLTF/PACKAGES [new file with mode: 0644]
src/TKXDEIGES/EXTERNLIB
src/TKXDEIGES/PACKAGES
src/TKXDEOBJ/CMakeLists.txt [new file with mode: 0644]
src/TKXDEOBJ/EXTERNLIB [new file with mode: 0644]
src/TKXDEOBJ/FILES [new file with mode: 0644]
src/TKXDEOBJ/PACKAGES [new file with mode: 0644]
src/TKXDEPLY/CMakeLists.txt [new file with mode: 0644]
src/TKXDEPLY/EXTERNLIB [new file with mode: 0644]
src/TKXDEPLY/FILES [new file with mode: 0644]
src/TKXDEPLY/PACKAGES [new file with mode: 0644]
src/TKXDESTEP/EXTERNLIB
src/TKXDESTEP/PACKAGES
src/TKXDESTL/CMakeLists.txt [new file with mode: 0644]
src/TKXDESTL/EXTERNLIB [new file with mode: 0644]
src/TKXDESTL/FILES [new file with mode: 0644]
src/TKXDESTL/PACKAGES [new file with mode: 0644]
src/TKXDEVRML/CMakeLists.txt [new file with mode: 0644]
src/TKXDEVRML/EXTERNLIB [new file with mode: 0644]
src/TKXDEVRML/FILES [new file with mode: 0644]
src/TKXDEVRML/PACKAGES [new file with mode: 0644]
src/TKXSBase/PACKAGES
src/TKXSDRAW/EXTERNLIB
src/TKXSDRAWBase/EXTERNLIB
src/TKXSDRAWDEWrapper/EXTERNLIB
src/TKXSDRAWGLTF/EXTERNLIB
src/TKXSDRAWIGES/EXTERNLIB
src/TKXSDRAWOBJ/EXTERNLIB
src/TKXSDRAWPLY/EXTERNLIB
src/TKXSDRAWSTEP/EXTERNLIB
src/TKXSDRAWSTL/EXTERNLIB
src/TKXSDRAWVRML/EXTERNLIB
src/XDEDRAW/XDEDRAW.cxx
src/XDEDRAW/XDEDRAW_Colors.cxx
src/XDEDRAW/XDEDRAW_Common.cxx
src/XDEDRAW/XDEDRAW_GDTs.cxx
src/XDEDRAW/XDEDRAW_Layers.cxx
src/XDEDRAW/XDEDRAW_Props.cxx
src/XDEDRAW/XDEDRAW_Shapes.cxx
src/XDEDRAW/XDEDRAW_Views.cxx
src/XSControl/XSControl_TransferReader.cxx
src/XSControl/XSControl_TransferReader.hxx
src/XSDRAW/XSDRAW.cxx
src/XSDRAW/XSDRAW_Functions.cxx
src/XSDRAW/XSDRAW_FunctionsSession.cxx
src/XSDRAW/XSDRAW_FunctionsShape.cxx
src/XSDRAWBase/XSDRAWBase.cxx
src/XSDRAWDEWrapper/XSDRAWDEWrapper.cxx
src/XSDRAWGLTF/XSDRAWGLTF.cxx
src/XSDRAWIGES/XSDRAWIGES.cxx
src/XSDRAWOBJ/XSDRAWOBJ.cxx
src/XSDRAWPLY/XSDRAWPLY.cxx
src/XSDRAWSTEP/XSDRAWSTEP.cxx
src/XSDRAWSTL/XSDRAWSTL.cxx
tests/perf/heal/bug24596_1
tests/perf/heal/bug24596_2
tests/perf/moddata/bug25487_1
tests/perf/moddata/bug25487_2
tests/perf/moddata/bug27048_2

index e769ea6b35a2a8b4960adce5a6c0993a3ae54077..13441614796539ccbeb6937bed9c2edffb7e0b28 100644 (file)
@@ -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
index ca4c8fa4ee854c9fd3eba6073144e94fc495f672..c6c1a6a8c7baf6f62c5d924a0614ff91a7118f9a 100644 (file)
@@ -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/CMakeLists.txt b/src/TKIGES/CMakeLists.txt
deleted file mode 100644 (file)
index 383e62f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-project(TKIGES)
-
-OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKIGES/EXTERNLIB b/src/TKIGES/EXTERNLIB
deleted file mode 100755 (executable)
index 56ddcca..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-TKBRep
-TKernel
-TKMath
-TKTopAlgo
-TKShHealing
-TKG2d
-TKG3d
-TKGeomBase
-TKGeomAlgo
-TKPrim
-TKBool
-TKXSBase
diff --git a/src/TKIGES/FILES b/src/TKIGES/FILES
deleted file mode 100755 (executable)
index ca4f0e5..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTERNLIB
-PACKAGES
diff --git a/src/TKIGES/PACKAGES b/src/TKIGES/PACKAGES
deleted file mode 100755 (executable)
index b121c19..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-IGESData
-IGESFile
-IGESBasic
-IGESGraph
-IGESGeom
-IGESDimen
-IGESDraw
-IGESSolid
-IGESDefs
-IGESAppli
-IGESConvGeom
-IGESSelect
-IGESToBRep
-GeomToIGES
-Geom2dToIGES
-BRepToIGES
-BRepToIGESBRep
-IGESControl
index 32d736b68b067f5c05293b0ed9ce0bd217739850..a342fefdc3e6834a9af3997ce42a02b124b3856f 100755 (executable)
@@ -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/CMakeLists.txt b/src/TKSTEP/CMakeLists.txt
deleted file mode 100644 (file)
index 2885f9b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-project(TKSTEP)
-
-OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKSTEP/EXTERNLIB b/src/TKSTEP/EXTERNLIB
deleted file mode 100755 (executable)
index 9423bb5..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-TKernel
-TKSTEPAttr
-TKSTEP209
-TKSTEPBase
-TKBRep
-TKMath
-TKG2d
-TKShHealing
-TKTopAlgo
-TKG3d
-TKGeomBase
-TKGeomAlgo
-TKXSBase
diff --git a/src/TKSTEP/FILES b/src/TKSTEP/FILES
deleted file mode 100755 (executable)
index ca4f0e5..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTERNLIB
-PACKAGES
diff --git a/src/TKSTEP/PACKAGES b/src/TKSTEP/PACKAGES
deleted file mode 100755 (executable)
index 7087915..0000000
+++ /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/CMakeLists.txt b/src/TKSTEP209/CMakeLists.txt
deleted file mode 100644 (file)
index 78e09c5..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-project(TKSTEP209)
-
-OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKSTEP209/EXTERNLIB b/src/TKSTEP209/EXTERNLIB
deleted file mode 100644 (file)
index 28cfbb0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-TKernel
-TKXSBase
-TKSTEPBase
diff --git a/src/TKSTEP209/FILES b/src/TKSTEP209/FILES
deleted file mode 100755 (executable)
index ca4f0e5..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTERNLIB
-PACKAGES
diff --git a/src/TKSTEP209/PACKAGES b/src/TKSTEP209/PACKAGES
deleted file mode 100755 (executable)
index 0b68453..0000000
+++ /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 (file)
index 59e2527..0000000
+++ /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 (file)
index 28cfbb0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-TKernel
-TKXSBase
-TKSTEPBase
diff --git a/src/TKSTEPAttr/FILES b/src/TKSTEPAttr/FILES
deleted file mode 100755 (executable)
index ca4f0e5..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTERNLIB
-PACKAGES
diff --git a/src/TKSTEPAttr/PACKAGES b/src/TKSTEPAttr/PACKAGES
deleted file mode 100755 (executable)
index b6bf50c..0000000
+++ /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 (file)
index fda0c46..0000000
+++ /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 (file)
index fb75d58..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-TKernel
-TKXSBase
-TKMath
diff --git a/src/TKSTEPBase/FILES b/src/TKSTEPBase/FILES
deleted file mode 100755 (executable)
index ca4f0e5..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTERNLIB
-PACKAGES
diff --git a/src/TKSTEPBase/PACKAGES b/src/TKSTEPBase/PACKAGES
deleted file mode 100755 (executable)
index 87033cf..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-StepBasic
-RWStepBasic
-StepRepr
-RWStepRepr
-StepGeom
-RWStepGeom
-StepShape
-RWStepShape
diff --git a/src/TKSTL/CMakeLists.txt b/src/TKSTL/CMakeLists.txt
deleted file mode 100644 (file)
index 2fe1c17..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-project(TKSTL)
-
-OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKSTL/EXTERNLIB b/src/TKSTL/EXTERNLIB
deleted file mode 100755 (executable)
index 8a5b1c2..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-TKXDE
-TKernel
-TKMath
-TKBRep
-TKG2d
-TKG3d
-TKTopAlgo
-TKLCAF
-TKXCAF
diff --git a/src/TKSTL/FILES b/src/TKSTL/FILES
deleted file mode 100755 (executable)
index ca4f0e5..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTERNLIB
-PACKAGES
diff --git a/src/TKSTL/PACKAGES b/src/TKSTL/PACKAGES
deleted file mode 100755 (executable)
index ba06cc7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-StlAPI
-RWStl
diff --git a/src/TKVRML/CMakeLists.txt b/src/TKVRML/CMakeLists.txt
deleted file mode 100644 (file)
index 959447f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-project(TKVRML)
-
-OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKVRML/EXTERNLIB b/src/TKVRML/EXTERNLIB
deleted file mode 100755 (executable)
index a996dc4..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-TKBRep
-TKXDE
-TKTopAlgo
-TKMath
-TKGeomBase
-TKernel
-TKPrim
-TKG2d
-TKG3d
-TKMesh
-TKHLR
-TKRWMesh
-TKService
-TKGeomAlgo
-TKV3d
-TKLCAF
-TKXCAF
-TKXSBase
diff --git a/src/TKVRML/FILES b/src/TKVRML/FILES
deleted file mode 100755 (executable)
index ca4f0e5..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTERNLIB
-PACKAGES
diff --git a/src/TKVRML/PACKAGES b/src/TKVRML/PACKAGES
deleted file mode 100755 (executable)
index 05ba201..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-VrmlConverter
-VrmlAPI
-Vrml
-VrmlData
index 8ee679cab23440ccf9754803180bd485f82ec8d6..89bfa51a34055aec498273f88c6608263fe99bd4 100755 (executable)
@@ -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/TKXDEGLTF/CMakeLists.txt b/src/TKXDEGLTF/CMakeLists.txt
new file mode 100644 (file)
index 0000000..53cfe33
--- /dev/null
@@ -0,0 +1,3 @@
+project(TKXDEGLTF)
+
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKXDEGLTF/EXTERNLIB b/src/TKXDEGLTF/EXTERNLIB
new file mode 100644 (file)
index 0000000..ecd8acc
--- /dev/null
@@ -0,0 +1,13 @@
+TKernel
+TKMath
+TKMesh
+TKXCAF
+TKLCAF
+TKV3d
+TKBRep
+TKG3d
+TKXDE
+TKService
+TKRWMesh
+CSF_RapidJSON
+CSF_Draco
diff --git a/src/TKXDEGLTF/FILES b/src/TKXDEGLTF/FILES
new file mode 100644 (file)
index 0000000..ca4f0e5
--- /dev/null
@@ -0,0 +1,2 @@
+EXTERNLIB
+PACKAGES
diff --git a/src/TKXDEGLTF/PACKAGES b/src/TKXDEGLTF/PACKAGES
new file mode 100644 (file)
index 0000000..7758e9e
--- /dev/null
@@ -0,0 +1 @@
+RWGltf
index d40184c29d9c22fa185ebd41283ac83286781be2..9aeae3420ef1701bb476b33f54b59176540d2d16 100755 (executable)
@@ -2,10 +2,15 @@ TKBRep
 TKXDE
 TKernel
 TKMath
+TKTopAlgo
+TKShHealing
 TKXSBase
+TKGeomBase
+TKGeomAlgo
+TKBool
+TKPrim
 TKCDF
 TKLCAF
 TKG2d
 TKG3d
 TKXCAF
-TKIGES
index 1c6cd9565fc07bb94644dd49510883c132e515bc..d697b0bc3b9c753ef5f366188477e20531d90437 100755 (executable)
@@ -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/TKXDEOBJ/CMakeLists.txt b/src/TKXDEOBJ/CMakeLists.txt
new file mode 100644 (file)
index 0000000..6e22a4f
--- /dev/null
@@ -0,0 +1,3 @@
+project(TKXDEOBJ)
+
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKXDEOBJ/EXTERNLIB b/src/TKXDEOBJ/EXTERNLIB
new file mode 100644 (file)
index 0000000..9095593
--- /dev/null
@@ -0,0 +1,12 @@
+TKernel
+TKMath
+TKMesh
+TKXCAF
+TKLCAF
+TKV3d
+TKBRep
+TKG3d
+TKXDE
+TKService
+TKRWMesh
+CSF_RapidJSON
diff --git a/src/TKXDEOBJ/FILES b/src/TKXDEOBJ/FILES
new file mode 100644 (file)
index 0000000..ca4f0e5
--- /dev/null
@@ -0,0 +1,2 @@
+EXTERNLIB
+PACKAGES
diff --git a/src/TKXDEOBJ/PACKAGES b/src/TKXDEOBJ/PACKAGES
new file mode 100644 (file)
index 0000000..d7824f2
--- /dev/null
@@ -0,0 +1 @@
+RWObj
diff --git a/src/TKXDEPLY/CMakeLists.txt b/src/TKXDEPLY/CMakeLists.txt
new file mode 100644 (file)
index 0000000..dcc4fc5
--- /dev/null
@@ -0,0 +1,3 @@
+project(TKXDEPLY)
+
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKXDEPLY/EXTERNLIB b/src/TKXDEPLY/EXTERNLIB
new file mode 100644 (file)
index 0000000..9095593
--- /dev/null
@@ -0,0 +1,12 @@
+TKernel
+TKMath
+TKMesh
+TKXCAF
+TKLCAF
+TKV3d
+TKBRep
+TKG3d
+TKXDE
+TKService
+TKRWMesh
+CSF_RapidJSON
diff --git a/src/TKXDEPLY/FILES b/src/TKXDEPLY/FILES
new file mode 100644 (file)
index 0000000..ca4f0e5
--- /dev/null
@@ -0,0 +1,2 @@
+EXTERNLIB
+PACKAGES
diff --git a/src/TKXDEPLY/PACKAGES b/src/TKXDEPLY/PACKAGES
new file mode 100644 (file)
index 0000000..228128a
--- /dev/null
@@ -0,0 +1 @@
+RWPly
index 547cb01bb237152d3e4361b9a46e7e01fc292d89..4630b58437fc7fe1810247eea25b899a179e96aa 100755 (executable)
@@ -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
index 508b92a242ad2acb611f01be37c3ce9edc84022b..58b4ee81ab75b1e717afe84bac780ca4e9c6b448 100755 (executable)
@@ -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/TKXDESTL/CMakeLists.txt b/src/TKXDESTL/CMakeLists.txt
new file mode 100644 (file)
index 0000000..916ffee
--- /dev/null
@@ -0,0 +1,3 @@
+project(TKXDESTL)
+
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKXDESTL/EXTERNLIB b/src/TKXDESTL/EXTERNLIB
new file mode 100644 (file)
index 0000000..8a5b1c2
--- /dev/null
@@ -0,0 +1,9 @@
+TKXDE
+TKernel
+TKMath
+TKBRep
+TKG2d
+TKG3d
+TKTopAlgo
+TKLCAF
+TKXCAF
diff --git a/src/TKXDESTL/FILES b/src/TKXDESTL/FILES
new file mode 100644 (file)
index 0000000..ca4f0e5
--- /dev/null
@@ -0,0 +1,2 @@
+EXTERNLIB
+PACKAGES
diff --git a/src/TKXDESTL/PACKAGES b/src/TKXDESTL/PACKAGES
new file mode 100644 (file)
index 0000000..ba06cc7
--- /dev/null
@@ -0,0 +1,2 @@
+StlAPI
+RWStl
diff --git a/src/TKXDEVRML/CMakeLists.txt b/src/TKXDEVRML/CMakeLists.txt
new file mode 100644 (file)
index 0000000..dafb694
--- /dev/null
@@ -0,0 +1,3 @@
+project(TKXDEVRML)
+
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKXDEVRML/EXTERNLIB b/src/TKXDEVRML/EXTERNLIB
new file mode 100644 (file)
index 0000000..a996dc4
--- /dev/null
@@ -0,0 +1,18 @@
+TKBRep
+TKXDE
+TKTopAlgo
+TKMath
+TKGeomBase
+TKernel
+TKPrim
+TKG2d
+TKG3d
+TKMesh
+TKHLR
+TKRWMesh
+TKService
+TKGeomAlgo
+TKV3d
+TKLCAF
+TKXCAF
+TKXSBase
diff --git a/src/TKXDEVRML/FILES b/src/TKXDEVRML/FILES
new file mode 100644 (file)
index 0000000..ca4f0e5
--- /dev/null
@@ -0,0 +1,2 @@
+EXTERNLIB
+PACKAGES
diff --git a/src/TKXDEVRML/PACKAGES b/src/TKXDEVRML/PACKAGES
new file mode 100644 (file)
index 0000000..05ba201
--- /dev/null
@@ -0,0 +1,4 @@
+VrmlConverter
+VrmlAPI
+Vrml
+VrmlData
index f384afd8f1d3446343e01731a01329c67a6ea895..5e726225c176e96991f35059335ccaa7121bc871 100755 (executable)
@@ -4,12 +4,6 @@ IFGraph
 IFSelect
 TransferBRep
 XSControl
-StepData
-StepFile
-HeaderSection
-RWHeaderSection
-APIHeaderSection
-StepSelect
 XSAlgo
 LibCtl
 MoniTool
index 5b7039675caa457f29b6bd47a67ee417ba3a0075..9d080a7a12ad2c2be5c2c4c255abdb7c0e82a405 100755 (executable)
@@ -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
index 1947db4b4f00ebfea9003fc7461c6df988113710..b55793ee84611ac816883079670d9ab7f605955b 100644 (file)
@@ -8,16 +8,11 @@ TKMeshVS
 TKG3d
 TKViewerTest
 TKG2d
-TKSTEPBase
 TKTopAlgo
 TKGeomBase
 TKGeomAlgo
 TKMesh
 TKDraw
-TKSTEP
-TKIGES
-TKSTL
-TKVRML
 TKLCAF
 TKDCAF
 TKXCAF
index fd5b972224aca40e2baf50d8dd2510d232329de6..cdbfa490bf52ca4b2d3334382279baefc9aa0475 100644 (file)
@@ -8,16 +8,11 @@ TKMeshVS
 TKG3d
 TKViewerTest
 TKG2d
-TKSTEPBase
 TKTopAlgo
 TKGeomBase
 TKGeomAlgo
 TKMesh
 TKDraw
-TKSTEP
-TKIGES
-TKSTL
-TKVRML
 TKLCAF
 TKDCAF
 TKXCAF
index 5b7039675caa457f29b6bd47a67ee417ba3a0075..c9547e57cf555ad54a69048f93e2ab730f9a1c8b 100644 (file)
@@ -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
index 98b7ff99354bdd3bf7aebb7da81500c2d81a7f51..3c4c3962a39110fb211563faed6217ea451d0e65 100644 (file)
@@ -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
index 5b7039675caa457f29b6bd47a67ee417ba3a0075..22fb5400c0d091fd4670d2e18d61bb9899f6d4ea 100644 (file)
@@ -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
index 5b7039675caa457f29b6bd47a67ee417ba3a0075..15bdeac30b871ee1b973113d44953ee1a8b8800a 100644 (file)
@@ -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
index 769c251788364f588f0e2292f297346948fe7de1..9d544fdc28b848960385df0ce728ef2c69a3e85a 100644 (file)
@@ -8,16 +8,11 @@ TKMeshVS
 TKG3d
 TKViewerTest
 TKG2d
-TKSTEPBase
 TKTopAlgo
 TKGeomBase
 TKGeomAlgo
 TKMesh
 TKDraw
-TKSTEP
-TKIGES
-TKSTL
-TKVRML
 TKLCAF
 TKDCAF
 TKXCAF
index 5b7039675caa457f29b6bd47a67ee417ba3a0075..078fe4c11fed69c79426c26a4da457c873365a65 100644 (file)
@@ -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
index 5b7039675caa457f29b6bd47a67ee417ba3a0075..c6055e0f2ff56dfc5e18d42b0e2739406b78c59a 100644 (file)
@@ -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
index 859ca585d3039bde0cbb5f9ae4f9f1d4a884ebb0..d88ea63aaece2718920bc60e9bddbaaad65a09f9 100644 (file)
@@ -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();
index d4a6404fba6f0781eb6ae0c05a603c9814774ca0..0c2858ae11762e01398ecfebd6b32080fcca6b02 100644 (file)
@@ -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
index c8cc360bfa736298e2f4396d23196579e9e88c68..e97f43d6ea5a1b8e5c37ffdf7885831cd0d7afae 100644 (file)
@@ -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";
 
index c68504d0c597083b55a4c8c047010cb766275e02..b46863d48379282e4517577073c130e707a5a38d 100644 (file)
@@ -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";
 
index c5f65a180898ce6fcf2efbd72720aa506b05967a..59a61bfdf370fb464a6816fc386fbd583c88cd75 100644 (file)
@@ -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
index 03806766dca0b3f545d4f8a4df1ce62a8803e280..0e4b367696bdfeadca2eb3ac435c8a69341cefaa 100644 (file)
@@ -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";
   
index 8936f719541aa826edbe44a1d99a831cea47b552..0902cead9aa008a512d7301352d2ad63df803f90 100644 (file)
@@ -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
index 1c812747c6d03a1c88adda4bdc86d9f1fb0c8719..40c3b1b24020722520a37363c39bf8cef2ee6ba6 100644 (file)
@@ -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";
 
index d1f73102bba31ea8d363f7b5fc1f4377b8cca8b5..576dda6fd301c58e8bb1cfd78c8a709a1d90c5a3 100644 (file)
@@ -974,7 +974,7 @@ void XSControl_TransferReader::PrintStats (Standard_OStream& sout,
   if (what > 10)  {  sout<<" ***  Not yet implemented"<<std::endl;  return;  }
   if (what < 10)  {
     sout << "******        Data recorded on Last Transfer                 ******"<<std::endl;
-    PrintStatsProcess (myTP,what,mode);
+    PrintStatsProcess (myTP, sout, what,mode);
   }
   //  reste  what = 10 : on liste les racines des final results
   sout << "******        Final Results                                  ******"<<std::endl;
@@ -1127,11 +1127,12 @@ static void PrintPercent(const Handle(Message_Messenger)& sout, const Standard_C
 //=======================================================================
 
 void XSControl_TransferReader::PrintStatsProcess(const Handle(Transfer_TransientProcess)& TP,
+                                                 Standard_OStream& theStream,
                                                  const Standard_Integer what,
                                                  const Standard_Integer mode)
 {
   Handle(TColStd_HSequenceOfTransient) list;  // null
-  XSControl_TransferReader::PrintStatsOnList (TP,list,what,mode);
+  XSControl_TransferReader::PrintStatsOnList (TP, theStream,list,what,mode);
 }
 
 
@@ -1141,33 +1142,32 @@ void XSControl_TransferReader::PrintStatsProcess(const Handle(Transfer_Transient
 //=======================================================================
 
 void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientProcess)& TP,
+                                                Standard_OStream& theStream,
                                                 const Handle(TColStd_HSequenceOfTransient)& list,
                                                 const Standard_Integer what,
                                                 const Standard_Integer mode)
 {
-  Message_Messenger::StreamBuffer sout = TP->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)          ******"<<std::endl;
-  if (what == 1) sout << "******        Individual Transfers  (Roots)                  ******\n";
-  if (what == 2) sout << "******        All recorded data about Transfer               ******\n";
-  if (what == 3) sout << "******        Abnormal records                               ******\n";
+  theStream <<"\n*******************************************************************\n";
+  theStream << "******        Statistics on Transfer Process (Read)          ******"<<std::endl;
+  if (what == 1) theStream << "******        Individual Transfers  (Roots)                  ******\n";
+  if (what == 2) theStream << "******        All recorded data about Transfer               ******\n";
+  if (what == 3) theStream << "******        Abnormal records                               ******\n";
   if (what == 1 || what == 2 || what == 3) {
-    if (mode == 0) sout<<"******        (n0s of recorded entities)                     ******\n";
-    if (mode == 1) sout<<"******        (per entity : type + result)                   ******\n";
-    if (mode == 2) sout<<"******        (per entity : type + result/status)            ******\n";
-    if (mode == 3) sout<<"******        (count per type of entity)                     ******\n";
-    if (mode == 4) sout<<"******        (count per type of result)                     ******\n";
-    if (mode == 5) sout<<"******   (count per couple entity-type / result-type/status) ******\n";
-    if (mode == 6) sout<<"******   (list per couple entity-type / result-type/status)  ******\n";
+    if (mode == 0) theStream<<"******        (n0s of recorded entities)                     ******\n";
+    if (mode == 1) theStream<<"******        (per entity : type + result)                   ******\n";
+    if (mode == 2) theStream<<"******        (per entity : type + result/status)            ******\n";
+    if (mode == 3) theStream<<"******        (count per type of entity)                     ******\n";
+    if (mode == 4) theStream<<"******        (count per type of result)                     ******\n";
+    if (mode == 5) theStream<<"******   (count per couple entity-type / result-type/status) ******\n";
+    if (mode == 6) theStream<<"******   (list per couple entity-type / result-type/status)  ******\n";
   }
-  if (what == 4) sout << "******        Check messages                                 ******\n";
-  if (what == 5) sout << "******        Fail  messages                                 ******\n";
-  sout<<"*******************************************************************\n";
+  if (what == 4) theStream << "******        Check messages                                 ******\n";
+  if (what == 5) theStream << "******        Fail  messages                                 ******\n";
+  theStream <<"*******************************************************************\n";
 
   //  Cas what = 1,2,3 : contenu du TP (binders)
 
@@ -1190,10 +1190,10 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP
     IFSelect_PrintCount pcm = IFSelect_CountByItem;
     if (mode == 6) pcm = IFSelect_ListByItem;
 
-    sout  <<"****        Entities in Model   : "<<model->NbEntities()<<std::endl;
-    sout  <<"****        Nb Items (Transfer) : "<<nb<<std::endl;
+    theStream <<"****        Entities in Model   : "<<model->NbEntities()<<std::endl;
+    theStream <<"****        Nb Items (Transfer) : "<<nb<<std::endl;
     if (!nolist)
-      sout<<"****        Nb Items (Listed)   : "<<nl<<std::endl;
+      theStream <<"****        Nb Items (Listed)   : "<<nl<<std::endl;
 
     for (itrp.Start(); itrp.More(); itrp.Next()) {
       nbi ++;
@@ -1203,13 +1203,13 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP
        nbnr ++;
        if (notrec) counter->Add(ent,"(not recorded)");
        else if (mode == 1 || mode == 2) {
-         sout<<"["<<Interface_MSG::Blanks (nbi,4)<<nbi<<" ]:";
-         model->Print (ent, sout);
-         sout<<"   "<<model->TypeName(ent,Standard_False)<<"  (not recorded)"<<std::endl;
+    theStream <<"["<<Interface_MSG::Blanks (nbi,4)<<nbi<<" ]:";
+         model->Print (ent, theStream);
+    theStream <<"   "<<model->TypeName(ent,Standard_False)<<"  (not recorded)"<<std::endl;
          continue;
        }
       }
-      if (mode == 0)  {  sout<<"  "<<model->Number(ent); continue;  }
+      if (mode == 0)  { theStream <<"  "<<model->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<<"["<<Interface_MSG::Blanks (i,4)<<i<<" ]:";
-       model->Print (ent, sout);
-       sout<<"   "<<model->TypeName(ent,Standard_False);
-       sout<<" Result:"<<mess<<std::endl;
+        theStream <<"["<<Interface_MSG::Blanks (i,4)<<i<<" ]:";
+       model->Print (ent, theStream);
+  theStream <<"   "<<model->TypeName(ent,Standard_False);
+  theStream <<"        Result:"<<mess<<std::endl;
        if (mode == 1) continue;
 
        const Handle(Interface_Check)& ch = binder->Check();
        Standard_Integer newi,newnbw = ch->NbWarnings(), newnbf = ch->NbFails();
 
        if (newnbw > 0) {
-         sout<<" - Warnings : "<<newnbw<<":\n";
-         for (newi = 1; newi <= newnbw; newi ++) sout<<ch->CWarning(newi)<<std::endl;
+    theStream <<" - Warnings : "<<newnbw<<":\n";
+         for (newi = 1; newi <= newnbw; newi ++) theStream <<ch->CWarning(newi)<<std::endl;
        }
        if (newnbf > 0) {
-         sout<<" - Fails : "<<newnbf<<":\n";
-         for (newi = 1; newi <= newnbf; newi ++) sout<<ch->CFail(newi)<<std::endl;
+    theStream <<" - Fails : "<<newnbf<<":\n";
+         for (newi = 1; newi <= newnbf; newi ++) theStream <<ch->CFail(newi)<<std::endl;
        }
        continue;
       }
@@ -1265,11 +1265,11 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP
 
       //    Fin de l iteration
     }
-    if (!counter.IsNull()) counter->PrintList (sout, model, pcm);
-    else sout<<std::endl;
+    if (!counter.IsNull()) counter->PrintList (theStream, model, pcm);
+    else theStream <<std::endl;
     //    Pourcentages
     if (mode != 3 && nbi > 0) {
-      sout << "******        Percentages according Transfer Status          ******"<<std::endl;
+      theStream << "******        Percentages according Transfer Status          ******"<<std::endl;
       PrintPercent (TP->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);
     }
   }
 
index 9cebdeb5d10b53974580376c593b312eab66dee8..7ce40d541b98db792baacfa449d6822374255bed 100644 (file)
@@ -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 <list> (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)
 
index 0d4c506faed9d5bf0a4372d61ba4525f8d2e25b8..601c0bb112c98a1963b6ba7f942b9e65e7e52bc6 100644 (file)
 #include <XSDRAW_Functions.hxx>
 #include <XSDRAW_FunctionsSession.hxx>
 #include <XSDRAW_FunctionsShape.hxx>
+#include <XSAlgo.hxx>
 
 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);
index dd4111e82779961d96d58a3de2252bc6aaf58e41..e2ad57209092d4447e5015af1568dbaa2c6c347d 100644 (file)
@@ -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"
index e9688858883a79ac20b52a45846751e632bbc0c6..4d0c143945df3abde88a099b1d745d0fba521c38 100644 (file)
@@ -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]";
index 506bc80bfb5c938666a901d3ba6df8f5fc6f21e8..9a6630f12b9268487cf3721360a12b56d5fdefdb 100644 (file)
@@ -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();
index f3be329dcb3f26ce067cac8359a6545cf9519fb6..9166c8b8285c5454cc6610f77f5b0d1f6152e771 100644 (file)
@@ -13,6 +13,7 @@
 
 #include <XSDRAWBase.hxx>
 
+#include <Interface_Static.hxx>
 #include <XCAFDoc_DocumentTool.hxx>
 #include <XSAlgo.hxx>
 #include <XSAlgo_AlgoContainer.hxx>
@@ -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();
 }
 
index 524fe6af26192e16658f24cd6242f3d848dcc4a4..3f4042ba70e6e2a5c0d96bb5c384c488cf608bb7 100644 (file)
@@ -20,7 +20,6 @@
 #include <Draw_PluginMacro.hxx>
 #include <Draw_Interpretor.hxx>
 #include <Draw_ProgressIndicator.hxx>
-#include <De_ConfigurationNode.hxx>
 #include <DE_ConfigurationContext.hxx>
 #include <DE_Provider.hxx>
 #include <DE_Wrapper.hxx>
@@ -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",
index f7b7c1bb20117ba9f8d44708df4192f29e037e8e..0c7a4531d87e8f187e012da5793fa0b34d75fb96 100644 (file)
@@ -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",
index a69ac96898e47a85486a9f53bc2fd4a12535975d..5c5e244b809dbc33bca01641287f25c3e5eac0f4 100644 (file)
@@ -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);
index c7b3ec9a3336f9930e4356e55eed4f203ed515cd..ad2ed00818b816ef278f9531105310ca8a8bf1a1 100644 (file)
@@ -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]"
index f32b43685fe010e4f6659577fd9e99ccbbf60690..6007da172d1d62e9bc80399c57d2a916c1fb0f97 100644 (file)
@@ -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"(
index f109b02e04320987a90f2d673ca975a5c87f5af1..e1ad60d43e91d0ac205bf8e60d43a40257946ccd 100644 (file)
@@ -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]",
index ec7f474865904344d5f8c9da25addcc7980f1f94..b929ca79c75654cf0337e6593093f237c2e67e17 100644 (file)
@@ -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);
index aa242c8aa4b418f35df324f18bf75e6e5bfe807f..bd6b7ccc8bba84b5bf0184cee75fafc9fd65c8fe 100644 (file)
@@ -6,7 +6,7 @@ puts ""
 ## Slow import of IGES data
 ###############################
 
-pload QAcommands
+pload QAcommands IGES
 
 if { [regexp {Debug mode} [dversion]] } {
   cpulimit 8500
index aeedf833d1334f48223c016d20de4c8cc074e750..d92589107336e29520921eade473edfd9125a021 100644 (file)
@@ -6,7 +6,7 @@ puts ""
 ## Slow import of IGES data
 ###############################
 
-pload QAcommands
+pload QAcommands IGES
 
 if { [regexp {Debug mode} [dversion]] } {
   cpulimit 8500
index fd62e6caa9ccfe5fe6ab48578410885017c24bee..eecb9504081e0ff0416e54bed804996f5da5d1d6 100644 (file)
@@ -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
index 75880354a323cd81979aa4c5a1ed9c6697cf0600..f6418d39cee1cf117e1fa9755b926d50655c0495 100644 (file)
@@ -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
index 386b3fd011b900a2c2aa1d2db227f08d9745c84a..b1231429fbf12325324a6b1af0d450041ec31db8 100644 (file)
@@ -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