From ad45bbceaf13d07652322432b7957ba09778e4db Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 9 Nov 2009 12:52:44 +0000 Subject: [PATCH] 0020012: EDF 831 GEOM : API for points representation in 3D viewer --- .../gui/GEOM/images/custom_point_marker.png | Bin 0 -> 1058 bytes doc/salome/gui/GEOM/images/dialog.png | Bin 13630 -> 7626 bytes .../gui/GEOM/images/point_marker_dlg1.png | Bin 0 -> 8927 bytes .../gui/GEOM/images/point_marker_dlg2.png | Bin 0 -> 8742 bytes .../gui/GEOM/images/std_point_marker.png | Bin 0 -> 1546 bytes doc/salome/gui/GEOM/input/point_marker.doc | 58 ++++++++++++++++++ .../gui/GEOM/input/tui_viewing_geom_objs.doc | 19 +++++- .../gui/GEOM/input/viewing_geom_obj.doc | 2 + src/GEOM/GEOM_Engine.cxx | 4 +- src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx | 2 +- src/GEOM_SWIG/GEOM_example7.py | 53 ++++++++++++++++ src/GEOM_SWIG/Makefile.am | 1 + 12 files changed, 135 insertions(+), 4 deletions(-) create mode 100755 doc/salome/gui/GEOM/images/custom_point_marker.png create mode 100755 doc/salome/gui/GEOM/images/point_marker_dlg1.png create mode 100755 doc/salome/gui/GEOM/images/point_marker_dlg2.png create mode 100755 doc/salome/gui/GEOM/images/std_point_marker.png create mode 100644 doc/salome/gui/GEOM/input/point_marker.doc create mode 100644 src/GEOM_SWIG/GEOM_example7.py diff --git a/doc/salome/gui/GEOM/images/custom_point_marker.png b/doc/salome/gui/GEOM/images/custom_point_marker.png new file mode 100755 index 0000000000000000000000000000000000000000..a71625ecd6a0f27da1a7ea4a061f83eac683ac8f GIT binary patch literal 1058 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 literal 0 HcmV?d00001 diff --git a/doc/salome/gui/GEOM/images/std_point_marker.png b/doc/salome/gui/GEOM/images/std_point_marker.png new file mode 100755 index 0000000000000000000000000000000000000000..ccf478b0c2301433e5507c5198211aa6bc2bed6d GIT binary patch literal 1546 zcmeAS@N?(olHy`uVBq!ia0y~yV9W=y|8Xz@$tq!CK?Vlai=HlyAr*7p-r49U?a6Tb zp`z3EyHWO;X2|;&Urq(idtN1+=Hc7Gqb;l845UmMjjphq z2oN61oJRIv--_NS`b zSAF-&lC*yRh1uWFd|03K(Z9}7q~wWbR?z0H&inKA{~GG(%-(cf-^Kmg616ke?YQMR z@6DfOkZmnyw@l@{>B(7p-jqC4Ic&DtSJUcK(Bw5IlbUvY^x5=l&Q^C>nK$3ooE4F? zw%R-Em44pORrZ#?r8OJ)|355UzrP(U<{PPRf7?b|K+LXs)~kId-_>+*-KKWxr!iMQW<^=coIA-#NuU zTU%j8^DGtJ;7i->y)8ALK0bWg^Zq{(uwHG=%Kbi`m;dhOIdy}%#qoxD=g#|jmeHOk z^L@*U|G%izwDvF%ccd2RK+Kb!K;d+(Gk zv@zJS`10!48;=L{w@Yu_Z+`c_w&PCir~8BIrhM8vC4cFiTTM%io~c#(eqT7{{n9^| zx7SZ8DzE=N73gMzZw!e7S(C1mh%deK?d|o{fUvy%L6^42`}(YyG}Z6kx9=}&w3m8t zZY}y66?Zu{XJ^5`Z58~6UxOw)>P&k0*>{GhspNzj1MRZJ#=%im{9`vhI_E_5vb$S= PWjuqYtDnm{r-UW|L3e+N literal 0 HcmV?d00001 diff --git a/doc/salome/gui/GEOM/input/point_marker.doc b/doc/salome/gui/GEOM/input/point_marker.doc new file mode 100644 index 000000000..9fdca7c2c --- /dev/null +++ b/doc/salome/gui/GEOM/input/point_marker.doc @@ -0,0 +1,58 @@ +/*! + +\page point_marker_page Point Marker + +\n You can change the representation of the geometrical vertex +(vertices) in 3D viewer either by selecting one of the predefined +shapes or by loading the custom texture from an external file. + +- Standard point marker + +Geometry module provides a set of predefined point marker shapes which +can be used to display vertices in 3D viewer. +Each standard point marker has two attributes: type (defines shape +form) and scale factor (defines shape size). + +\image html point_marker_dlg1.png + +For the Python script a TUI Command: go.SetMarkerStd(Type, Size) +can be used. + +\image html std_point_marker.png + +- Custom point marker + +The user can also load the point marker shape from an external file. +This file should provide a description of the point texture as a set +of lines; each line is represented as sequence of "0" and "1" symbols, +where "1" symbol means an opaque pixel and "0" symbol means a +transparent pixel. The width of the texture correspond to the length +of the longest line in the file, expanded to the nearest byte-aligned +value. The height of the texture is equal to the number of non-empty +lines in the file. Note, that missing symbols are replaced by "0". + +Here is an example of such texture file: + +
+00111100
+00111100
+11111111
+11111111
+11111111
+11111111
+00111100
+00111100
+
+ +\image html point_marker_dlg2.png + +For the Python script a TUI Command: go.SetMarkerTexture(ID) +can be used. + +\image html custom_point_marker.png + +Our TUI Scripts provide you with useful examples of +\ref tui_point_marker "Setting Point Marker". + +*/ + diff --git a/doc/salome/gui/GEOM/input/tui_viewing_geom_objs.doc b/doc/salome/gui/GEOM/input/tui_viewing_geom_objs.doc index 743205b57..2573c0fa5 100644 --- a/doc/salome/gui/GEOM/input/tui_viewing_geom_objs.doc +++ b/doc/salome/gui/GEOM/input/tui_viewing_geom_objs.doc @@ -61,4 +61,21 @@ gg.setColor(fuse_id,218,165,31) gg.setTransparency(fuse_id,0.5) \endcode -*/ \ No newline at end of file +\anchor tui_point_marker +

Set Point Marker

+ +\code +import salome +import geompy + +texture = geompy.LoadTexture("/users/user/mytexture.dat") + +v1 = geompy.MakeVertex(0, 0, 0) +v2 = geompy.MakeVertex(100, 0, 0) +v3 = geompy.MakeVertex(0, 100, 0) + +v1.SetMarkerStd(GEOM.MT_O_PLUS, GEOM.MS_25) +v2.SetMarkerStd(GEOM.MT_BALL, GEOM.MS_40) +v3.SetMarkerTexture(texture) +\endcode +*/ diff --git a/doc/salome/gui/GEOM/input/viewing_geom_obj.doc b/doc/salome/gui/GEOM/input/viewing_geom_obj.doc index 1c2a518d4..8012d2092 100644 --- a/doc/salome/gui/GEOM/input/viewing_geom_obj.doc +++ b/doc/salome/gui/GEOM/input/viewing_geom_obj.doc @@ -27,6 +27,8 @@ the standard Select Color menu. transparency of geometrical objects.
  • \subpage isolines_page "Isos" - allows to change the number of isolines displayed within a shape.
  • +
  • \subpage point_marker_page "Point Marker" - allows to change the +representation of geometrical vertex (vertices).
  • Auto color / Disable auto color - activates the auto color mode. When the auto color mode is enabled, the groups created on the sub-shapes of the selected geometrical object are automatically diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx index 6911bf932..d4426ee6b 100644 --- a/src/GEOM/GEOM_Engine.cxx +++ b/src/GEOM/GEOM_Engine.cxx @@ -1384,7 +1384,7 @@ void AddObjectColors (int theDocID, case 13: aCommand += "GEOM.MS_70"; break; default: aCommand += "GEOM.MS_NONE"; break; } - aCommand += ");"; + aCommand += ")"; theScript += aCommand.ToCString(); } else if (aMarkerType == Aspect_TOM_USERDEFINED) { @@ -1393,7 +1393,7 @@ void AddObjectColors (int theDocID, TCollection_AsciiString aCommand( "\n\t" ); aCommand += aName + ".SetMarkerTexture(texture_map["; aCommand += aMarkerTextureID; - aCommand += "]);"; + aCommand += "])"; theScript += aCommand.ToCString(); } } diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx index e15d307f5..719fd0a8e 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx @@ -358,6 +358,6 @@ void GEOMToolsGUI_MarkerDlg::help() { if ( getStudy() ) { SalomeApp_Application* app = qobject_cast( getStudy()->application() ); - app->onHelpContextModule( "GEOM", "point_marker.html" ); + app->onHelpContextModule( "GEOM", "point_marker_page.html" ); } } diff --git a/src/GEOM_SWIG/GEOM_example7.py b/src/GEOM_SWIG/GEOM_example7.py new file mode 100644 index 000000000..6cce391ef --- /dev/null +++ b/src/GEOM_SWIG/GEOM_example7.py @@ -0,0 +1,53 @@ +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# --- +# +# File : GEOM_example7.py +# Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +# +# --- + +import salome +import geompy +import os +import GEOM + +data_dir = os.getenv('DATA_DIR') +if data_dir: + texture_1 = geompy.LoadTexture(os.path.join(data_dir, "Textures", "texture1.dat")) + texture_2 = geompy.LoadTexture(os.path.join(data_dir, "Textures", "texture2.dat")) + texture_3 = geompy.LoadTexture(os.path.join(data_dir, "Textures", "texture3.dat")) + + Vertex_1 = geompy.MakeVertex(0, 0, 0) + Vertex_2 = geompy.MakeVertex(100, 0, 0) + Vertex_3 = geompy.MakeVertex(0, 100, 0) + Vertex_4 = geompy.MakeVertex(0, 0, 100) + Vertex_5 = geompy.MakeVertex(100, 0, 100) + Vertex_1.SetMarkerTexture(texture_1); + Vertex_2.SetMarkerTexture(texture_2); + Vertex_3.SetMarkerTexture(texture_3); + Vertex_4.SetMarkerStd(GEOM.MT_O_PLUS, GEOM.MS_25); + Vertex_5.SetMarkerStd(GEOM.MT_BALL, GEOM.MS_40); + geompy.addToStudy( Vertex_1, "Vertex_1" ) + geompy.addToStudy( Vertex_2, "Vertex_2" ) + geompy.addToStudy( Vertex_3, "Vertex_3" ) + geompy.addToStudy( Vertex_4, "Vertex_4" ) + geompy.addToStudy( Vertex_5, "Vertex_5" ) + pass diff --git a/src/GEOM_SWIG/Makefile.am b/src/GEOM_SWIG/Makefile.am index 3b7c921fb..11862eb9a 100644 --- a/src/GEOM_SWIG/Makefile.am +++ b/src/GEOM_SWIG/Makefile.am @@ -48,6 +48,7 @@ dist_salomescript_DATA = \ GEOM_example4.py \ GEOM_example5.py \ GEOM_example6.py \ + GEOM_example7.py \ GEOM_moteur.py \ GEOM_TestAll.py \ GEOM_TestOthers.py \ -- 2.30.2