From 63fad07eb4751d73f16e572f749c862d4695c733 Mon Sep 17 00:00:00 2001 From: abv Date: Sat, 2 Apr 2016 16:38:09 +0300 Subject: [PATCH] 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" --- dox/overview/overview.md | 6 ------ dox/resources/occt_rm.doxyfile | 2 +- samples/tcl/DataExchangeDemo.tcl | 2 +- samples/tcl/bottle.tcl | 1 + samples/tcl/cad.tcl | 1 + samples/tcl/cpu.tcl | 8 +++++--- samples/tcl/cutter.tcl | 1 + samples/tcl/dimensions.tcl | 1 + samples/tcl/drill.tcl | 1 + samples/tcl/materials.tcl | 1 + samples/tcl/pencil.tcl | 1 + samples/tcl/snowflake.tcl | 1 + 12 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dox/overview/overview.md b/dox/overview/overview.md index 8a647b935e..2d5c3ff2ab 100644 --- 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 e8126b81ab..6f774779cc 100644 --- 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 DEFINE_STANDARD_ALLOC DEFINE_NCOLLECTION_ALLOC +PREDEFINED = Standard_EXPORT Standard_OVERRIDE:=override __Standard_API __Draw_API Handle(a):=Handle 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 57d2268e85..b37cd83c0f 100644 --- 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 8c8d7b0852..d16e206220 100755 --- 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 076906a97d..fadd61119f 100644 --- 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 3db0c24b87..c756de8478 100644 --- 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 40e51aef06..322a77f717 100644 --- 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 f80a4b34b0..56ec899add 100644 --- 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 baef045a61..35082d7f51 100644 --- 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 4683cbf359..ba40779800 100644 --- 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 e56969c197..6bc635bea8 100644 --- 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 abef25e3bb..d749e5edbc 100644 --- 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