0027338: Minor corrections in Tcl samples and documentation

In samples:
- Fixed syntax error in DataExchangeDemo.tcl
- MSAA is enabled in some tests to provide better presentation
- Option to build isolines on triangulation is used in some samples to avoid artifacts in selection highlight
- Colors are corrected in cpu.tcl

In documentation:
- Reference to automake tools is removed
- Standard_OVERRIDE is expanded to "override"

diff --git a/dox/overview/overview.md b/dox/overview/overview.md
index 8a647b935e04191dd5426e34d35afe2c1d5eb5f6..2d5c3ff2abb65362f9f4e595f391546fde174d07 100644 (file)
--- a/dox/overview/overview.md
+++ b/dox/overview/overview.md
@@ -83,12 +83,6 @@ the copyright allows you to use, modify, and redistribute Tcl/Tk for any purpose
 explicit license agreement and without paying any license fees or royalties. 
 To use Tcl/Tk, please refer to the Licensing Terms (http://www.tcl.tk/software/tcltk/license.html).
 
-**Robert Boehne** has developed **GNU Autoconf**, **Automake** and **Libtool** scripts and makefiles 
-for the Open CASCADE project http://sourceforge.net/projects/autoopencas/, 
-which became an initial groundwork for the build scripts based on respective GNU tools 
-(autoconf, automake and libtool) in Open CASCADE Technology version 4.0. 
-These scripts are now maintained by the OPEN CASCADE company.
-
 **GL2PS** is developed by Christophe Geuzaine and others. It is optionally used by OCCT to
 export content of OpenGL scene to vector graphics formats (PS, PDF, EMF, SVG). 
 The library is licensed under GL2PS LICENSE http://www.geuz.org/gl2ps/COPYING.GL2PS Version 2, November 2003.

diff --git a/dox/resources/occt_rm.doxyfile b/dox/resources/occt_rm.doxyfile
index e8126b81abaf786ff4a28758d5749d9c9723c5cf..6f774779ccce05dc26f482c7a2cf9b77ee18df44 100644 (file)
--- a/dox/resources/occt_rm.doxyfile
+++ b/dox/resources/occt_rm.doxyfile
@@ -23,7 +23,7 @@ WARNINGS               = NO
 ENABLE_PREPROCESSING   = YES
 MACRO_EXPANSION        = YES
 EXPAND_ONLY_PREDEF     = YES
-PREDEFINED             = Standard_EXPORT __Standard_API __Draw_API Handle(a):=Handle<a> DEFINE_STANDARD_ALLOC DEFINE_NCOLLECTION_ALLOC
+PREDEFINED             = Standard_EXPORT Standard_OVERRIDE:=override __Standard_API __Draw_API Handle(a):=Handle<a> DEFINE_STANDARD_ALLOC DEFINE_NCOLLECTION_ALLOC
 GENERATE_HTML          = YES
 GENERATE_LATEX         = NO
 SEARCH_INCLUDES        = YES

diff --git a/samples/tcl/DataExchangeDemo.tcl b/samples/tcl/DataExchangeDemo.tcl
index 57d2268e85a06e60d34d4ac2e07e0211bed1c0b5..b37cd83c0fa8adba493f790d1059e05fe0745947 100644 (file)
--- a/samples/tcl/DataExchangeDemo.tcl
+++ b/samples/tcl/DataExchangeDemo.tcl
@@ -44,7 +44,7 @@ if { [winfo exists .h ] } {
 set ddir .
 if { [info exists env(CSF_OCCTDataPath)] } {
     set ddir [file join $env(CSF_OCCTDataPath) occ]
-} else if { [info exists env(CASROOT)] } {
+} elseif { [info exists env(CASROOT)] } {
     set ddir [file join $env(CASROOT) data occ]
 }
 

diff --git a/samples/tcl/bottle.tcl b/samples/tcl/bottle.tcl
index 8c8d7b08526763f4968245b587619e45be6a189f..d16e206220a8b872905640964c4859d9a22c8436 100755 (executable)
--- a/samples/tcl/bottle.tcl
+++ b/samples/tcl/bottle.tcl
@@ -112,3 +112,4 @@ puts "Showing result..."
 vdisplay bottle
 vfit
 vsetdispmode 1
+vaspects -isoontriangulation 1

diff --git a/samples/tcl/cad.tcl b/samples/tcl/cad.tcl
index 076906a97dd0fba2af8d308c550b2a2c825c9576..fadd61119f627f7a011bed73940bf8febfa91df1 100644 (file)
--- a/samples/tcl/cad.tcl
+++ b/samples/tcl/cad.tcl
@@ -61,4 +61,5 @@ vinit
 vdisplay res
 vsetdispmode 1
 vshowfaceboundary res 1 255 255 255
+vaspects -isoontriangulation 1
 vfit

diff --git a/samples/tcl/cpu.tcl b/samples/tcl/cpu.tcl
index 3db0c24b8712ab57a756de249ad4881fbbfd0d6f..c756de84784bd6c54a6f90d055f399f3799aaa81 100644 (file)
--- a/samples/tcl/cpu.tcl
+++ b/samples/tcl/cpu.tcl
@@ -248,6 +248,7 @@ if [info exists i7_show_3dview] {
   vinit Driver1/Viewer1/View1
   vclear 
   vsetdispmode 1
+  vrenderparams -msaa 8
 
   vlight clear
   vlight add amb
@@ -265,7 +266,7 @@ if [info exists i7_show_3dview] {
   vsetcolor board_4 0 0.6 0.55
   vsetcolor board_5 0 0.6 0.55
   vsetcolor board_12 0 0.3 0.33
-  vsetcolor board_15 0 0.3 0.33
+  vsetcolor board_14 0 0.3 0.33
 
   vdisplay rpads
   vsetcolor rpads 0.7 0.6 0.4
@@ -290,7 +291,7 @@ foreach f [explode board f] { XSetColor D $f 0.7 0.5 0.3 }
 XSetColor D board_4 0 0.6 0.55
 XSetColor D board_5 0 0.6 0.55
 XSetColor D board_12 0 0.3 0.33
-XSetColor D board_15 0 0.3 0.33
+XSetColor D board_14 0 0.3 0.33
 
 SetName D [XAddShape D case 0] "Case"
 XSetColor D case 0.7 0.7 0.7
@@ -322,10 +323,11 @@ vlight clear
 vlight add amb
 vlight add directional direction 1 -1 -2 head 1
 vsetdispmode 1
+vrenderparams -msaa 8
 vfit
 
 # save to STEP if variable i7_save_xde is defined (specifies file name)
 if [info exists i7_save_xde] {
   param write.surfacecurve.mode 0
   WriteStep D $i7_save_xde
-}
\ No newline at end of file
+}

diff --git a/samples/tcl/cutter.tcl b/samples/tcl/cutter.tcl
index 40e51aef06d8b32d20cf14b4942aa8351f45ca7c..322a77f717432824a0468fe53f3f90b1b1bec2c6 100644 (file)
--- a/samples/tcl/cutter.tcl
+++ b/samples/tcl/cutter.tcl
@@ -85,5 +85,6 @@ checkshape cutter
 incmesh cutter 0.01
 vdisplay cutter
 vsetdispmode cutter 1
+vrenderparams -msaa 8
 incmesh profile_1 0.01; vdisplay profile_1
 vfit

diff --git a/samples/tcl/dimensions.tcl b/samples/tcl/dimensions.tcl
index f80a4b34b0f07233bc1694523705fdcc26c2856e..56ec899addf7bf07d8f5782b2069efec7fc5a025 100644 (file)
--- a/samples/tcl/dimensions.tcl
+++ b/samples/tcl/dimensions.tcl
@@ -96,5 +96,6 @@ vbottom
 vrotate -0.3 -0.3 0
 vfit
 vzoom 1.2
+vrenderparams -msaa 8
 
 puts "Done."
\ No newline at end of file

diff --git a/samples/tcl/drill.tcl b/samples/tcl/drill.tcl
index baef045a61a09abf8e6019ee593331df3fe8b416..35082d7f5187b076be022539862509ed66b2573c 100644 (file)
--- a/samples/tcl/drill.tcl
+++ b/samples/tcl/drill.tcl
@@ -140,6 +140,7 @@ puts "Displaying result..."
 incmesh drill 0.01
 vdisplay drill
 vsetdispmode drill 1
+vrenderparams -msaa 8
 vfit
 
 # show section and sweep path

diff --git a/samples/tcl/materials.tcl b/samples/tcl/materials.tcl
index 4683cbf3595b279c545a0d37e6c71d6e3abdbcb6..ba40779800bcc4dd22d1b3ac60977b43d6a0ec98 100644 (file)
--- a/samples/tcl/materials.tcl
+++ b/samples/tcl/materials.tcl
@@ -72,6 +72,7 @@ vglinfo
 vsetgradientbg 180 200 255 180 180 180 2
 vlight change 0 pos -1 1 1
 vsetdispmode 1
+vrenderparams -msaa 8
 
 # adjust scene bounding box
 box bnd 0 0 0 180 210 1

diff --git a/samples/tcl/pencil.tcl b/samples/tcl/pencil.tcl
index e56969c19727d8cbfd68bfc03e77103dd88ebe7a..6bc635bea86ccbe4b2d99ea6ab08269d06e417c5 100644 (file)
--- a/samples/tcl/pencil.tcl
+++ b/samples/tcl/pencil.tcl
@@ -58,6 +58,7 @@ XShow D
 
 vfit
 vsetdispmode 1
+vrenderparams -msaa 8
 vsetcolorbg 255 255 255
 
 #param write.iges.brep.mode 1

diff --git a/samples/tcl/snowflake.tcl b/samples/tcl/snowflake.tcl
index abef25e3bbd14643fdcc704c08c3cf91f7312fe9..d749e5edbcf2633f9f048ecf02f1a1f42b64b753 100644 (file)
--- a/samples/tcl/snowflake.tcl
+++ b/samples/tcl/snowflake.tcl
@@ -127,6 +127,7 @@ compound snowflake lines text drawing
 # display in 3d view
 vinit Driver1/Viewer1/View1 w=1024 h=768
 vdisplay snowflake lines text
+vrenderparams -msaa 8
 vsetcolor snowflake 0 0 0 
 vsetcolor lines 0 0 0 
 vsetcolor text 0 0 0