ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-11 13:37:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

DCQ : New architecture

Browse Source
This commit is contained in:
dcq 2003-10-06 11:58:02 +00:00
parent 9f66a04c1c
commit 531fd06639
32 changed files with 1160 additions and 1295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

232
resources/GEOM_en.xml
View File

@ -41,28 +41,28 @@
<!-- ************************* New Entity (menubar) ******************************* --> <!-- ************************* New Entity (menubar) ******************************* -->
<menu-item label-id="New Entity" item-id="70" pos-id="3"> <menu-item label-id="New Entity" item-id="40" pos-id="3">
<submenu label-id="Basic" item-id="301" pos-id="1"> <submenu label-id="Basic" item-id="401" pos-id="1">
<popup-item item-id="3011" pos-id="" label-id="Point" icon-id="point2.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4011" pos-id="" label-id="Point" icon-id="point2.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="3012" pos-id="" label-id="Line" icon-id="line.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4012" pos-id="" label-id="Line" icon-id="line.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="3013" pos-id="" label-id="Circle" icon-id="circle.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4013" pos-id="" label-id="Circle" icon-id="circle.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="3014" pos-id="" label-id="Ellipse" icon-id="ellipse.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4014" pos-id="" label-id="Ellipse" icon-id="ellipse.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="3015" pos-id="" label-id="Arc" icon-id="arc.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4015" pos-id="" label-id="Arc" icon-id="arc.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<separator pos-id="6"/> <separator pos-id="6"/>
<popup-item item-id="3016" pos-id="" label-id="Vector" icon-id="vector.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4016" pos-id="" label-id="Vector" icon-id="vector.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="3017" pos-id="" label-id="Plane" icon-id="plane.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4017" pos-id="" label-id="Plane" icon-id="plane.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="3018" pos-id="" label-id="Working Plane" icon-id="planeWorking.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4018" pos-id="" label-id="Working Plane" icon-id="planeWorking.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
</submenu> </submenu>
<endsubmenu /> <endsubmenu />
<submenu label-id="Primitives" item-id="302" pos-id="2"> <submenu label-id="Primitives" item-id="402" pos-id="2">
<popup-item item-id="3021" pos-id="" label-id="Box" icon-id="box.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4021" pos-id="" label-id="Box" icon-id="box.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="3022" pos-id="" label-id="Cylinder" icon-id="cylinder.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4022" pos-id="" label-id="Cylinder" icon-id="cylinder.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="3023" pos-id="" label-id="Sphere" icon-id="sphere.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4023" pos-id="" label-id="Sphere" icon-id="sphere.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="3024" pos-id="" label-id="Torus" icon-id="torus.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4024" pos-id="" label-id="Torus" icon-id="torus.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="3025" pos-id="" label-id="Cone" icon-id="cone.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4025" pos-id="" label-id="Cone" icon-id="cone.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
</submenu> </submenu>
<endsubmenu /> <endsubmenu />
<submenu label-id="Generation" item-id="310" pos-id="3"> <submenu label-id="Generation" item-id="403" pos-id="3">
<popup-item item-id="4031" pos-id="" label-id="Extrusion" icon-id="prism.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4031" pos-id="" label-id="Extrusion" icon-id="prism.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="4032" pos-id="" label-id="Revolution" icon-id="revol.png"tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4032" pos-id="" label-id="Revolution" icon-id="revol.png"tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="4033" pos-id="" label-id="Filling" icon-id="filling.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4033" pos-id="" label-id="Filling" icon-id="filling.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
@ -70,106 +70,106 @@
</submenu> </submenu>
<endsubmenu /> <endsubmenu />
<separator pos-id=""/> <separator pos-id=""/>
<popup-item item-id="312" pos-id="" label-id="Sketch" icon-id="sketch.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="404" pos-id="" label-id="Sketch" icon-id="sketch.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<submenu label-id="Sketch Constraints" item-id="313" pos-id=""> <submenu label-id="Sketch Constraints" item-id="405" pos-id="">
<popup-item item-id="3131" pos-id="" label-id="Set Plane" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4051" pos-id="" label-id="Set Plane" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<separator pos-id=""/> <separator pos-id=""/>
<popup-item item-id="3133" pos-id="" label-id="Tangent" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4052" pos-id="" label-id="Tangent" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="3134" pos-id="" label-id="Perpendicular" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4053" pos-id="" label-id="Perpendicular" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
</submenu> </submenu>
<endsubmenu /> <endsubmenu />
<submenu label-id="Sketch Options" item-id="10009" pos-id=""> <submenu label-id="Sketch Options" item-id="406" pos-id="">
<popup-item item-id="10010" pos-id="" label-id="Length Dimension" icon-id="" tooltip-id="" accel-id="" toggle-id="true" execute-action=""/> <popup-item item-id="4061" pos-id="" label-id="Length Dimension" icon-id="" tooltip-id="" accel-id="" toggle-id="true" execute-action=""/>
<popup-item item-id="10011" pos-id="" label-id="Angle Dimension" icon-id="" tooltip-id="" accel-id="" toggle-id="true" execute-action=""/> <popup-item item-id="4062" pos-id="" label-id="Angle Dimension" icon-id="" tooltip-id="" accel-id="" toggle-id="true" execute-action=""/>
<popup-item item-id="10012" pos-id="" label-id="Radius Dimension" icon-id="" tooltip-id="" accel-id="" toggle-id="true" execute-action=""/> <popup-item item-id="4063" pos-id="" label-id="Radius Dimension" icon-id="" tooltip-id="" accel-id="" toggle-id="true" execute-action=""/>
<popup-item item-id="10013" pos-id="" label-id="X Dimension" icon-id="" tooltip-id="" accel-id="" toggle-id="false" execute-action=""/> <popup-item item-id="4064" pos-id="" label-id="X Dimension" icon-id="" tooltip-id="" accel-id="" toggle-id="false" execute-action=""/>
<popup-item item-id="10014" pos-id="" label-id="Y Dimension" icon-id="" tooltip-id="" accel-id="" toggle-id="false" execute-action=""/> <popup-item item-id="4065" pos-id="" label-id="Y Dimension" icon-id="" tooltip-id="" accel-id="" toggle-id="false" execute-action=""/>
</submenu> </submenu>
<endsubmenu /> <endsubmenu />
<separator pos-id=""/> <separator pos-id=""/>
<popup-item item-id="303" pos-id="" label-id="Explode" icon-id="subshape.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="407" pos-id="" label-id="Explode" icon-id="subshape.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="309" pos-id="" label-id="Suppress faces" icon-id="supressface.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <submenu label-id="Build" item-id="408" pos-id="">
<popup-item item-id="314" pos-id="" label-id="Suppress hole" icon-id="supresshole.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4081" pos-id="" label-id="Edge" icon-id="build_edge.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<submenu label-id="Build" item-id="311" pos-id=""> <popup-item item-id="4082" pos-id="" label-id="Wire" icon-id="build_wire.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="304" pos-id="" label-id="Edge" icon-id="build_edge.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4083" pos-id="" label-id="Face" icon-id="build_face.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="305" pos-id="" label-id="Wire" icon-id="build_wire.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4084" pos-id="" label-id="Shell" icon-id="build_shell.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="306" pos-id="" label-id="Face" icon-id="build_face.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4085" pos-id="" label-id="Solid" icon-id="build_solid.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="315" pos-id="" label-id="Shell" icon-id="build_shell.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4086" pos-id="" label-id="Compound" icon-id="build_compound.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="316" pos-id="" label-id="Solid" icon-id="build_solid.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="308" pos-id="" label-id="Compound" icon-id="build_compound.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
</submenu> </submenu>
<endsubmenu /> <endsubmenu />
</menu-item> </menu-item>
<!-- ************************ Operations (menubar) *********************************** --> <!-- ************************ Operations (menubar) *********************************** -->
<menu-item label-id="Operations" item-id="40" pos-id="4"> <menu-item label-id="Operations" item-id="50" pos-id="4">
<submenu label-id="Boolean" item-id="401" pos-id="1"> <submenu label-id="Boolean" item-id="501" pos-id="1">
<popup-item item-id="4011" pos-id="" label-id="Fuse" icon-id="fuse.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="5011" pos-id="" label-id="Fuse" icon-id="fuse.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="4012" pos-id="" label-id="Common" icon-id="common.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="5012" pos-id="" label-id="Common" icon-id="common.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="4013" pos-id="" label-id="Cut" icon-id="cut.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="5013" pos-id="" label-id="Cut" icon-id="cut.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="4014" pos-id="" label-id="Section" icon-id="section.png"tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="5014" pos-id="" label-id="Section" icon-id="section.png"tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
</submenu> </submenu>
<endsubmenu /> <endsubmenu />
<submenu label-id="Transformation" item-id="402" pos-id="2"> <submenu label-id="Transformation" item-id="502" pos-id="2">
<popup-item item-id="4021" pos-id="" label-id="Translation" icon-id="translation.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="5021" pos-id="" label-id="Translation" icon-id="translation.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="4022" pos-id="" label-id="Rotation" icon-id="rotate.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="5022" pos-id="" label-id="Rotation" icon-id="rotate.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="4023" pos-id="" label-id="Mirror by plane" icon-id="mirrorPlane.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="5023" pos-id="" label-id="Mirror by plane" icon-id="mirrorPlane.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="4024" pos-id="" label-id="Scale transform" icon-id="scale.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="5024" pos-id="" label-id="Scale transform" icon-id="scale.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<separator pos-id=""/> <separator pos-id=""/>
<popup-item item-id="4030" pos-id="" label-id="Multi-Translation" icon-id="multitranslation.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="5025" pos-id="" label-id="Multi-Translation" icon-id="multitranslation.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="4040" pos-id="" label-id="Multi-Rotation" icon-id="multirotation.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="5026" pos-id="" label-id="Multi-Rotation" icon-id="multirotation.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
</submenu> </submenu>
<endsubmenu /> <endsubmenu />
<popup-item item-id="4025" pos-id="" label-id="Partition" icon-id="partition.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="503" pos-id="" label-id="Partition" icon-id="partition.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="4026" pos-id="" label-id="Archimede" icon-id="archimede.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="504" pos-id="" label-id="Archimede" icon-id="archimede.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<separator pos-id=""/> <separator pos-id=""/>
<popup-item item-id="4027" pos-id="" label-id="Fillet" icon-id="fillet.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="505" pos-id="" label-id="Fillet" icon-id="fillet.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="4028" pos-id="" label-id="Chamfer" icon-id="chamfer.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="506" pos-id="" label-id="Chamfer" icon-id="chamfer.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
</menu-item> </menu-item>
<!-- ************************** Advanced (menubar) ************************************** --> <!-- ************************** Advanced (menubar) ************************************** -->
<menu-item label-id="Repair" item-id="50" pos-id="5"> <menu-item label-id="Repair" item-id="60" pos-id="5">
<popup-item item-id="501" pos-id="" label-id="Sewing" icon-id="sewing.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="601" pos-id="" label-id="Sewing" icon-id="sewing.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="502" pos-id="" label-id="Orientation" icon-id="orientation.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="602" pos-id="" label-id="Orientation" icon-id="orientation.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="603" pos-id="" label-id="Suppress faces" icon-id="supressface.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="604" pos-id="" label-id="Suppress hole" icon-id="supresshole.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
</menu-item> </menu-item>
<!-- ************************** Mesures (menubar) ************************************ --> <!-- ************************** Mesures (menubar) ************************************ -->
<menu-item label-id="Measures" item-id="60" pos-id="6"> <menu-item label-id="Measures" item-id="70" pos-id="6">
<popup-item item-id="601" pos-id="" label-id="Basic properties" icon-id="basicproperties.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="701" pos-id="" label-id="Basic properties" icon-id="basicproperties.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<separator pos-id="4"/> <separator pos-id="4"/>
<popup-item item-id="604" pos-id="" label-id="Center of gravity" icon-id="centergravity.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="702" pos-id="" label-id="Center of gravity" icon-id="centergravity.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="605" pos-id="" label-id="Axis of inertia" icon-id="axisinertia.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="703" pos-id="" label-id="Axis of inertia" icon-id="axisinertia.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<separator pos-id="7"/> <separator pos-id="7"/>
<submenu label-id="Dimensions" item-id="606" pos-id="8"> <submenu label-id="Dimensions" item-id="704" pos-id="8">
<popup-item item-id="6060" pos-id="" label-id="Bounding Box" icon-id="bounding.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="7041" pos-id="" label-id="Bounding Box" icon-id="bounding.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="6061" pos-id="" label-id="Min distance" icon-id="mindist.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="7042" pos-id="" label-id="Min distance" icon-id="mindist.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
</submenu> </submenu>
<endsubmenu /> <endsubmenu />
<separator pos-id="9"/> <separator pos-id="9"/>
<popup-item item-id="607" pos-id="" label-id="Tolerance" icon-id="tolerance.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="705" pos-id="" label-id="Tolerance" icon-id="tolerance.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<separator pos-id=""/> <separator pos-id=""/>
<popup-item item-id="608" pos-id="" label-id="Whatis" icon-id="whatis.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="706" pos-id="" label-id="Whatis" icon-id="whatis.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="609" pos-id="" label-id="Check" icon-id="check.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="707" pos-id="" label-id="Check" icon-id="check.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
</menu-item> </menu-item>
<!-- ********************************* Tools (menubar) ************************************ --> <!-- ********************************* Tools (menubar) ************************************ -->
<menu-item label-id="Tools" item-id="5" pos-id=""> <menu-item label-id="Tools" item-id="5" pos-id="">
<separator pos-id=""/> <separator pos-id=""/>
<popup-item item-id="5001" pos-id="" label-id="Check Geometry" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="5103" pos-id="" label-id="Check Geometry" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
</menu-item> </menu-item>
<!-- ********************************* Settings (menubar) ********************************* --> <!-- ********************************* Settings (menubar) ********************************* -->
<menu-item label-id="Preferences" item-id="4" pos-id=""> <menu-item label-id="Preferences" item-id="4" pos-id="">
<submenu label-id="Geometry" item-id="40" pos-id="-1"> <submenu label-id="Geometry" item-id="41" pos-id="-1">
<popup-item item-id="701" pos-id="" label-id="Automatic copy" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="411" pos-id="" label-id="Automatic copy" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="702" pos-id="" label-id="Name/Store automatic" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="412" pos-id="" label-id="Name/Store automatic" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<separator pos-id=""/> <separator pos-id=""/>
<popup-item item-id="703" pos-id="" label-id="Shading Color" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="413" pos-id="" label-id="Shading Color" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="704" pos-id="" label-id="Isos" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="414" pos-id="" label-id="Isos" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="705" pos-id="" label-id="Step value" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="415" pos-id="" label-id="Step value" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
</submenu> </submenu>
<endsubmenu /> <endsubmenu />
<separator pos-id="-1"/> <separator pos-id="-1"/>
@ -178,12 +178,12 @@
<!-- ***************************** View (menubar) ************************************ --> <!-- ***************************** View (menubar) ************************************ -->
<menu-item label-id="View" item-id="2" pos-id=""> <menu-item label-id="View" item-id="2" pos-id="">
<submenu label-id="Display mode" item-id="21" pos-id="5"> <submenu label-id="Display mode" item-id="21" pos-id="5">
<popup-item item-id="6021" pos-id="" label-id="Shading" icon-id="shading.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="211" pos-id="" label-id="Shading" icon-id="shading.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<separator pos-id=""/> <separator pos-id=""/>
<popup-item item-id="6022" pos-id="" label-id="Display all" icon-id="displayall.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="212" pos-id="" label-id="Display all" icon-id="displayall.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="6023" pos-id="" label-id="Display only" icon-id="display.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="213" pos-id="" label-id="Display only" icon-id="display.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="6024" pos-id="" label-id="Erase all" icon-id="eraseall.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="214" pos-id="" label-id="Erase all" icon-id="eraseall.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="6025" pos-id="" label-id="Erase only" icon-id="erase.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="215" pos-id="" label-id="Erase only" icon-id="erase.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
</submenu> </submenu>
<endsubmenu /> <endsubmenu />
</menu-item> </menu-item>
@ -194,29 +194,29 @@
<!-- ///////////////////////////////////// TOOLBARS ////////////////////////////////////// --> <!-- ///////////////////////////////////// TOOLBARS ////////////////////////////////////// -->
<toolbar label-id="Basic"> <toolbar label-id="Basic">
<toolbutton-item item-id="3011" pos-id="" label-id="Point" icon-id="point2.png" tooltip-id="Point" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="4011" pos-id="" label-id="Point" icon-id="point2.png" tooltip-id="Point" accel-id="" toggle-id="" execute-action=""/>
<toolbutton-item item-id="3012" pos-id="" label-id="Line" icon-id="line.png" tooltip-id="Line" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="4012" pos-id="" label-id="Line" icon-id="line.png" tooltip-id="Line" accel-id="" toggle-id="" execute-action=""/>
<toolbutton-item item-id="3013" pos-id="" label-id="Circle" icon-id="circle.png" tooltip-id="Circle" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="4013" pos-id="" label-id="Circle" icon-id="circle.png" tooltip-id="Circle" accel-id="" toggle-id="" execute-action=""/>
<toolbutton-item item-id="3014" pos-id="" label-id="Ellipse" icon-id="ellipse.png" tooltip-id="Ellipse" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="4014" pos-id="" label-id="Ellipse" icon-id="ellipse.png" tooltip-id="Ellipse" accel-id="" toggle-id="" execute-action=""/>
<toolbutton-item item-id="3015" pos-id="" label-id="Arc" icon-id="arc.png" tooltip-id="Arc" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="4015" pos-id="" label-id="Arc" icon-id="arc.png" tooltip-id="Arc" accel-id="" toggle-id="" execute-action=""/>
<toolbutton-item item-id="3016" pos-id="" label-id="Vector" icon-id="vector.png" tooltip-id="Vector" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="4016" pos-id="" label-id="Vector" icon-id="vector.png" tooltip-id="Vector" accel-id="" toggle-id="" execute-action=""/>
<toolbutton-item item-id="3017" pos-id="" label-id="Plane" icon-id="plane.png" tooltip-id="Plane" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="4017" pos-id="" label-id="Plane" icon-id="plane.png" tooltip-id="Plane" accel-id="" toggle-id="" execute-action=""/>
<toolbutton-item item-id="3018" pos-id="" label-id="Working Plane" icon-id="planeWorking.png" tooltip-id="Working Plane" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="4018" pos-id="" label-id="Working Plane" icon-id="planeWorking.png" tooltip-id="Working Plane" accel-id="" toggle-id="" execute-action=""/>
</toolbar> </toolbar>
<toolbar label-id="Primitives"> <toolbar label-id="Primitives">
<toolbutton-item item-id="3021" label-id="Box" icon-id="box.png" tooltip-id="Box" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="4021" label-id="Box" icon-id="box.png" tooltip-id="Box" accel-id="" toggle-id="" execute-action=""/>
<toolbutton-item item-id="3022" label-id="Cylinder" icon-id="cylinder.png" tooltip-id="Cylinder" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="4022" label-id="Cylinder" icon-id="cylinder.png" tooltip-id="Cylinder" accel-id="" toggle-id="" execute-action=""/>
<toolbutton-item item-id="3023" label-id="Sphere" icon-id="sphere.png" tooltip-id="Sphere" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="4023" label-id="Sphere" icon-id="sphere.png" tooltip-id="Sphere" accel-id="" toggle-id="" execute-action=""/>
<toolbutton-item item-id="3024" label-id="Torus" icon-id="torus.png" tooltip-id="Torus" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="4024" label-id="Torus" icon-id="torus.png" tooltip-id="Torus" accel-id="" toggle-id="" execute-action=""/>
<toolbutton-item item-id="3025" label-id="Cone" icon-id="cone.png" tooltip-id="Cone" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="4025" label-id="Cone" icon-id="cone.png" tooltip-id="Cone" accel-id="" toggle-id="" execute-action=""/>
</toolbar> </toolbar>
<toolbar label-id="Ope. Boolean"> <toolbar label-id="Ope. Boolean">
<toolbutton-item item-id="4011" label-id="Fuse" icon-id="fuse.png" tooltip-id="Fuse two shapes" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="5011" label-id="Fuse" icon-id="fuse.png" tooltip-id="Fuse two shapes" accel-id="" toggle-id="" execute-action=""/>
<toolbutton-item item-id="4012" label-id="Common" icon-id="common.png" tooltip-id="Common of two shapes" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="5012" label-id="Common" icon-id="common.png" tooltip-id="Common of two shapes" accel-id="" toggle-id="" execute-action=""/>
<toolbutton-item item-id="4013" label-id="Cut" icon-id="cut.png" tooltip-id="Cut first shape with second" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="5013" label-id="Cut" icon-id="cut.png" tooltip-id="Cut first shape with second" accel-id="" toggle-id="" execute-action=""/>
<toolbutton-item item-id="4014" label-id="Section" icon-id="section.png" tooltip-id="Section lines of intersection (2 shapes)" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="5014" label-id="Section" icon-id="section.png" tooltip-id="Section lines of intersection (2 shapes)" accel-id="" toggle-id="" execute-action=""/>
</toolbar> </toolbar>
<toolbar label-id="Generation"> <toolbar label-id="Generation">
@ -227,28 +227,28 @@
</toolbar> </toolbar>
<toolbar label-id="Transformation"> <toolbar label-id="Transformation">
<toolbutton-item item-id="4021" label-id="Translation" icon-id="translation.png" tooltip-id="Translate a shape"accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="5021" label-id="Translation" icon-id="translation.png" tooltip-id="Translate a shape"accel-id="" toggle-id="" execute-action=""/>
<toolbutton-item item-id="4022" label-id="Rotation" icon-id="rotate.png" tooltip-id="Rotate a shape" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="5022" label-id="Rotation" icon-id="rotate.png" tooltip-id="Rotate a shape" accel-id="" toggle-id="" execute-action=""/>
<toolbutton-item item-id="4023" label-id="Mirror by plane" icon-id="mirrorPlane.png" tooltip-id="Mirror a shape" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="5023" label-id="Mirror by plane" icon-id="mirrorPlane.png" tooltip-id="Mirror a shape" accel-id="" toggle-id="" execute-action=""/>
<toolbutton-item item-id="4024" label-id="Scale transform" icon-id="scale.png" tooltip-id="Scale a shape" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="5024" label-id="Scale transform" icon-id="scale.png" tooltip-id="Scale a shape" accel-id="" toggle-id="" execute-action=""/>
<separatorTB/> <separatorTB/>
<toolbutton-item item-id="4030" label-id="Multi-Translation" icon-id="multitranslation.png" tooltip-id="Multi-translate a shape" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="5025" label-id="Multi-Translation" icon-id="multitranslation.png" tooltip-id="Multi-translate a shape" accel-id="" toggle-id="" execute-action=""/>
<toolbutton-item item-id="4040" label-id="Multi-Rotation" icon-id="multirotation.png" tooltip-id="Multi-rotate a shape" accel-id="" toggle-id="" execute-action=""/> <toolbutton-item item-id="5026" label-id="Multi-Rotation" icon-id="multirotation.png" tooltip-id="Multi-rotate a shape" accel-id="" toggle-id="" execute-action=""/>
</toolbar> </toolbar>
<!-- ################################# POPUP MENU ################################# --> <!-- ################################# POPUP MENU ################################# -->
<popupmenu label-id="Popup for Viewer" context-id="" parent-id="Viewer" object-id=""> <popupmenu label-id="Popup for Viewer" context-id="" parent-id="Viewer" object-id="">
<submenu label-id="Properties" item-id="803" pos-id="6"> <submenu label-id="Properties" item-id="803" pos-id="6">
<popup-item item-id="8021" pos-id="" label-id="Wireframe - Shading" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="8031" pos-id="" label-id="Wireframe - Shading" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<separator pos-id=""/> <separator pos-id=""/>
<popup-item item-id="8031" pos-id="" label-id="Color" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="8032" pos-id="" label-id="Color" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="8032" pos-id="" label-id="Transparency" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="8033" pos-id="" label-id="Transparency" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="8033" pos-id="" label-id="Isos" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="8034" pos-id="" label-id="Isos" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
</submenu> </submenu>
<endsubmenu /> <endsubmenu />
<separator pos-id=""/> <separator pos-id=""/>
<popup-item item-id="801" pos-id="" label-id="Add in study" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="804" pos-id="" label-id="Add in study" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
</popupmenu> </popupmenu>
<popupmenu label-id="Popup for ObjectBrowser" context-id="" parent-id="ObjectBrowser" object-id=""> <popupmenu label-id="Popup for ObjectBrowser" context-id="" parent-id="ObjectBrowser" object-id="">
@ -258,17 +258,17 @@
</popupmenu> </popupmenu>
<popupmenu label-id="Sketch" context-id="Sketch" parent-id="Viewer" object-id=""> <popupmenu label-id="Sketch" context-id="Sketch" parent-id="Viewer" object-id="">
<popup-item item-id="10000" pos-id="" label-id="Segment" icon-id="" tooltip-id="" accel-id="" toggle-id="true" execute-action=""/> <popup-item item-id="4041" pos-id="" label-id="Segment" icon-id="" tooltip-id="" accel-id="" toggle-id="true" execute-action=""/>
<popup-item item-id="10001" pos-id="" label-id="Arc" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4042" pos-id="" label-id="Arc" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<separator pos-id=""/> <separator pos-id=""/>
<popup-item item-id="10002" pos-id="" label-id="Set Angle" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4043" pos-id="" label-id="Set Angle" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="10003" pos-id="" label-id="Set X" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4044" pos-id="" label-id="Set X" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="10004" pos-id="" label-id="Set Y" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4045" pos-id="" label-id="Set Y" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<separator pos-id=""/> <separator pos-id=""/>
<popup-item item-id="10006" pos-id="" label-id="Undo" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4046" pos-id="" label-id="Undo" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<separator pos-id=""/> <separator pos-id=""/>
<popup-item item-id="10007" pos-id="" label-id="End" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4047" pos-id="" label-id="End" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
<popup-item item-id="10008" pos-id="" label-id="Close" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/> <popup-item item-id="4048" pos-id="" label-id="Close" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
</popupmenu> </popupmenu>
</desktop> <!-- DESKTOP END --> </desktop> <!-- DESKTOP END -->

16
src/BasicGUI/BasicGUI.cxx
View File

@ -75,7 +75,7 @@ bool BasicGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
switch (theCommandID) switch (theCommandID)
{ {
case 3011: // POINT case 4011: // POINT
{ {
Handle(AIS_InteractiveContext) ic; Handle(AIS_InteractiveContext) ic;
if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) { if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) {
@ -85,37 +85,37 @@ bool BasicGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
BasicGUI_PointDlg *aDlg = new BasicGUI_PointDlg(parent, "", this, Sel, ic); BasicGUI_PointDlg *aDlg = new BasicGUI_PointDlg(parent, "", this, Sel, ic);
break; break;
} }
case 3012: // LINE case 4012: // LINE
{ {
BasicGUI_LineDlg *aDlg = new BasicGUI_LineDlg(parent, "", this, Sel); BasicGUI_LineDlg *aDlg = new BasicGUI_LineDlg(parent, "", this, Sel);
break; break;
} }
case 3013: // CIRCLE case 4013: // CIRCLE
{ {
BasicGUI_CircleDlg *aDlg = new BasicGUI_CircleDlg(parent, "", this, Sel); BasicGUI_CircleDlg *aDlg = new BasicGUI_CircleDlg(parent, "", this, Sel);
break; break;
} }
case 3014: // ELLIPSE case 4014: // ELLIPSE
{ {
BasicGUI_EllipseDlg *aDlg = new BasicGUI_EllipseDlg(parent, "", this, Sel); BasicGUI_EllipseDlg *aDlg = new BasicGUI_EllipseDlg(parent, "", this, Sel);
break; break;
} }
case 3015: // ARC case 4015: // ARC
{ {
BasicGUI_ArcDlg *aDlg = new BasicGUI_ArcDlg(parent, "", this, Sel); BasicGUI_ArcDlg *aDlg = new BasicGUI_ArcDlg(parent, "", this, Sel);
break ; break ;
} }
case 3016: // VECTOR case 4016: // VECTOR
{ {
BasicGUI_VectorDlg *aDlg = new BasicGUI_VectorDlg(parent, "", this, Sel); BasicGUI_VectorDlg *aDlg = new BasicGUI_VectorDlg(parent, "", this, Sel);
break; break;
} }
case 3017: // PLANE case 4017: // PLANE
{ {
BasicGUI_PlaneDlg *aDlg = new BasicGUI_PlaneDlg(parent, "", this, Sel); BasicGUI_PlaneDlg *aDlg = new BasicGUI_PlaneDlg(parent, "", this, Sel);
break; break;
} }
case 3018: // WORKING PLANE case 4018: // WORKING PLANE
{ {
BasicGUI_WorkingPlaneDlg *aDlg = new BasicGUI_WorkingPlaneDlg(parent, "", this, Sel); BasicGUI_WorkingPlaneDlg *aDlg = new BasicGUI_WorkingPlaneDlg(parent, "", this, Sel);
break; break;

1
src/BasicGUI/BasicGUI_CircleDlg.cxx
View File

@ -115,6 +115,7 @@ void BasicGUI_CircleDlg::Init()
connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed())); connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double)));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;

3
src/BasicGUI/BasicGUI_EllipseDlg.cxx
View File

@ -122,6 +122,9 @@ void BasicGUI_EllipseDlg::Init()
connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(GroupPoints->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupPoints->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DY, SLOT(SetStep(double)));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
/* displays Dialog */ /* displays Dialog */

7
src/BasicGUI/BasicGUI_PlaneDlg.cxx
View File

@ -166,6 +166,13 @@ void BasicGUI_PlaneDlg::Init()
connect(GroupPointDirection->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupPointDirection->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(GroupFace->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupFace->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPointPlusCoordinates->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPointPlusCoordinates->SpinBox_DY, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPointPlusCoordinates->SpinBox_DZ, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPointPlusCoordinates->SpinBox_S, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPointDirection->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupFace->SpinBox_DX, SLOT(SetStep(double)));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
/* Displays Dialog */ /* Displays Dialog */

5
src/BasicGUI/BasicGUI_PointDlg.cxx
View File

@ -156,6 +156,11 @@ void BasicGUI_PointDlg::Init(const Handle(AIS_InteractiveContext)& ic)
connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(GroupDimensions->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupDimensions->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DZ, SLOT(SetStep(double)));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
/* displays Dialog */ /* displays Dialog */

10
src/BasicGUI/BasicGUI_VectorDlg.cxx
View File

@ -53,15 +53,15 @@ BasicGUI_VectorDlg::BasicGUI_VectorDlg(QWidget* parent, const char* name, BasicG
/***************************************************************/ /***************************************************************/
GroupConstructors->setTitle(tr("GEOM_VECTOR")); GroupConstructors->setTitle(tr("GEOM_VECTOR"));
RadioButton1->setPixmap(image0); RadioButton1->setPixmap(image0);
RadioButton2->close(TRUE); RadioButton2->setPixmap(image1);
RadioButton3->close(TRUE); RadioButton3->close(TRUE);
GroupPoints = new DlgRef_2Sel_QTD(this, "GroupPoints"); GroupPoints = new DlgRef_2Sel_QTD(this, "GroupPoints");
GroupPoints->GroupBox1->setTitle(tr("GEOM_POINTS")); GroupPoints->GroupBox1->setTitle(tr("GEOM_POINTS"));
GroupPoints->TextLabel1->setText(tr("GEOM_POINT_I").arg("1")); GroupPoints->TextLabel1->setText(tr("GEOM_POINT_I").arg("1"));
GroupPoints->TextLabel2->setText(tr("GEOM_POINT_I").arg("2")); GroupPoints->TextLabel2->setText(tr("GEOM_POINT_I").arg("2"));
GroupPoints->PushButton1->setPixmap(image1); GroupPoints->PushButton1->setPixmap(image2);
GroupPoints->PushButton2->setPixmap(image1); GroupPoints->PushButton2->setPixmap(image2);
GroupDimensions = new DlgRef_3Spin1Check(this, "GroupDimensions"); GroupDimensions = new DlgRef_3Spin1Check(this, "GroupDimensions");
GroupDimensions->GroupBox1->setTitle(tr("GEOM_COORDINATES")); GroupDimensions->GroupBox1->setTitle(tr("GEOM_COORDINATES"));
@ -141,6 +141,10 @@ void BasicGUI_VectorDlg::Init()
connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(GroupDimensions->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupDimensions->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DZ, SLOT(SetStep(double)));
connect(GroupDimensions->CheckBox1, SIGNAL(stateChanged(int)), this, SLOT(ReverseVector(int))); connect(GroupDimensions->CheckBox1, SIGNAL(stateChanged(int)), this, SLOT(ReverseVector(int)));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));

8
src/BooleanGUI/BooleanGUI.cxx
View File

@ -70,22 +70,22 @@ bool BooleanGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
switch (theCommandID) switch (theCommandID)
{ {
case 4011: // FUSE case 5011: // FUSE
{ {
BooleanGUI_FuseDlg *aDlg = new BooleanGUI_FuseDlg(parent, "", this, Sel); BooleanGUI_FuseDlg *aDlg = new BooleanGUI_FuseDlg(parent, "", this, Sel);
break; break;
} }
case 4012: // COMMON case 5012: // COMMON
{ {
BooleanGUI_CommonDlg *aDlg = new BooleanGUI_CommonDlg(parent, "", this, Sel); BooleanGUI_CommonDlg *aDlg = new BooleanGUI_CommonDlg(parent, "", this, Sel);
break; break;
} }
case 4013: // CUT case 5013: // CUT
{ {
BooleanGUI_CutDlg *aDlg = new BooleanGUI_CutDlg(parent, "", this, Sel); BooleanGUI_CutDlg *aDlg = new BooleanGUI_CutDlg(parent, "", this, Sel);
break; break;
} }
case 4014: // SECTION case 5014: // SECTION
{ {
BooleanGUI_SectionDlg *aDlg = new BooleanGUI_SectionDlg(parent, "", this, Sel); BooleanGUI_SectionDlg *aDlg = new BooleanGUI_SectionDlg(parent, "", this, Sel);
break; break;

14
src/BuildGUI/BuildGUI.cxx
View File

@ -80,39 +80,39 @@ bool BuildGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
switch (theCommandID) switch (theCommandID)
{ {
case 303: // EXPLODE : use ic case 407: // EXPLODE : use ic
{ {
OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer(); OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer();
Handle (AIS_InteractiveContext) ic = v3d->getAISContext(); Handle (AIS_InteractiveContext) ic = v3d->getAISContext();
BuildGUI_SubShapeDlg *aDlg = new BuildGUI_SubShapeDlg(parent, "", this, Sel, ic); BuildGUI_SubShapeDlg *aDlg = new BuildGUI_SubShapeDlg(parent, "", this, Sel, ic);
break ; break ;
} }
case 304: // GEOM::EDGE case 4081: // GEOM::EDGE
{ {
BuildGUI_EdgeDlg *aDlg = new BuildGUI_EdgeDlg(parent, "", this, Sel); BuildGUI_EdgeDlg *aDlg = new BuildGUI_EdgeDlg(parent, "", this, Sel);
break; break;
} }
case 305: // GEOM::WIRE case 4082: // GEOM::WIRE
{ {
BuildGUI_WireDlg *aDlg = new BuildGUI_WireDlg(parent, "", this, Sel); BuildGUI_WireDlg *aDlg = new BuildGUI_WireDlg(parent, "", this, Sel);
break; break;
} }
case 306: // GEOM::FACE case 4083: // GEOM::FACE
{ {
BuildGUI_FaceDlg *aDlg = new BuildGUI_FaceDlg(parent, "", this, Sel); BuildGUI_FaceDlg *aDlg = new BuildGUI_FaceDlg(parent, "", this, Sel);
break; break;
} }
case 315: // GEOM::SHELL case 4084: // GEOM::SHELL
{ {
BuildGUI_ShellDlg *aDlg = new BuildGUI_ShellDlg(parent, "", this, Sel); BuildGUI_ShellDlg *aDlg = new BuildGUI_ShellDlg(parent, "", this, Sel);
break; break;
} }
case 316: // GEOM::SOLID case 4085: // GEOM::SOLID
{ {
BuildGUI_SolidDlg *aDlg = new BuildGUI_SolidDlg(parent, "", this, Sel); BuildGUI_SolidDlg *aDlg = new BuildGUI_SolidDlg(parent, "", this, Sel);
break; break;
} }
case 308: // GEOM::COMPOUND case 4086: // GEOM::COMPOUND
{ {
BuildGUI_CompoundDlg *aDlg = new BuildGUI_CompoundDlg(parent, "", this, Sel); BuildGUI_CompoundDlg *aDlg = new BuildGUI_CompoundDlg(parent, "", this, Sel);
break; break;

24
src/DlgRef/DlgRef_SpinBox.cxx
View File

@ -28,10 +28,7 @@
using namespace std; using namespace std;
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
//#include "DlgRef.h"
#include <qvalidator.h> #include <qvalidator.h>
//#include <qpushbutton.h>
//#include "utilities.h"
//================================================================================= //=================================================================================
// class : DlgRef_SpinBox() // class : DlgRef_SpinBox()
@ -40,8 +37,15 @@ using namespace std;
DlgRef_SpinBox::DlgRef_SpinBox(QWidget* parent, const char* name) DlgRef_SpinBox::DlgRef_SpinBox(QWidget* parent, const char* name)
: QAD_SpinBoxDbl(parent, name) : QAD_SpinBoxDbl(parent, name)
{ {
/* when step value is changed in myGeomGUI */ }
//connect( DlgRef::GetDlgRef(), SIGNAL( SignalDefaultStepValueChanged( double )), this, SLOT( SetStep( double ) ) );
//=================================================================================
// function : ~DlgRef_SpinBox()
// purpose : destructor
//=================================================================================
DlgRef_SpinBox::~DlgRef_SpinBox()
{
} }
@ -54,13 +58,6 @@ void DlgRef_SpinBox::SetStep( double newStep )
setLineStep(newStep); setLineStep(newStep);
} }
//=================================================================================
// function : ~DlgRef_SpinBox()
// purpose : destructor
//=================================================================================
DlgRef_SpinBox::~DlgRef_SpinBox()
{
}
//================================================================================= //=================================================================================
// function : SetValue() // function : SetValue()
@ -71,6 +68,7 @@ void DlgRef_SpinBox::SetValue( double v )
setValue(v); setValue(v);
} }
//================================================================================= //=================================================================================
// function : GetValue() // function : GetValue()
// purpose : returns a double // purpose : returns a double
@ -80,6 +78,7 @@ double DlgRef_SpinBox::GetValue( )
return value(); return value();
} }
//================================================================================= //=================================================================================
// function : GetString() // function : GetString()
// purpose : returns a QString // purpose : returns a QString
@ -89,6 +88,7 @@ QString DlgRef_SpinBox::GetString( )
return cleanText(); return cleanText();
} }
//================================================================================= //=================================================================================
// function : RangeStepAndValidator() // function : RangeStepAndValidator()
// purpose : // purpose :

94
src/GEOMBase/GEOMBase_Context.cxx
View File

@ -276,7 +276,6 @@ bool GEOMBase_Context::GetTopoFromSelection(SALOME_Selection *Sel, TopoDS_Shape&
} }
//===================================================================================== //=====================================================================================
// function : PrepareSubShapeSelection() // function : PrepareSubShapeSelection()
// purpose : (localContextId of the method is opened and defined here) // purpose : (localContextId of the method is opened and defined here)
@ -992,7 +991,6 @@ void GEOMBase_Context::DisplaySimulationShape(const TopoDS_Shape& S)
} }
//================================================================================== //==================================================================================
// function : EraseSimulationShape() // function : EraseSimulationShape()
// purpose : Clears the display of 'mySimulationShape' a pure graphical shape // purpose : Clears the display of 'mySimulationShape' a pure graphical shape
@ -1007,11 +1005,8 @@ void GEOMBase_Context::EraseSimulationShape()
ic->Erase(this->mySimulationShape, Standard_True, Standard_False); ic->Erase(this->mySimulationShape, Standard_True, Standard_False);
ic->ClearPrs(this->mySimulationShape); ic->ClearPrs(this->mySimulationShape);
ic->UpdateCurrentViewer(); ic->UpdateCurrentViewer();
} else if (myActiveStudy->getStudyFrame(i)->getTypeView() == VIEW_VTK ) { // VTK
} }
} }
// MESSAGE ( " GEOMBase_Context::EraseSimulationShape done. " )
} }
@ -1027,15 +1022,11 @@ bool GEOMBase_Context::Display(GEOM::GEOM_Shape_ptr aShape, Standard_CString nam
Sel->ClearIObjects(); Sel->ClearIObjects();
if(aShape->_is_nil()) { if(aShape->_is_nil()) {
QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), QAD_MessageBox::warn1 (QAD_Application::getDesktop(), tr("GEOM_WRN_WARNING"), tr("GEOM_PRP_ABORT"), tr("GEOM_BUT_OK"));
tr ("GEOM_WRN_WARNING"),
tr ("GEOM_PRP_ABORT"),
tr ("GEOM_BUT_OK") );
return false; return false;
} }
TopoDS_Shape shape = myShapeReader.GetShape(myComponentGeom, aShape); TopoDS_Shape shape = myShapeReader.GetShape(myComponentGeom, aShape);
if(shape.IsNull()) if(shape.IsNull())
return false; return false;
@ -1051,20 +1042,20 @@ bool GEOMBase_Context::Display(GEOM::GEOM_Shape_ptr aShape, Standard_CString nam
QAD_Operation* op = new SALOMEGUI_ImportOperation(myActiveStudy); QAD_Operation* op = new SALOMEGUI_ImportOperation(myActiveStudy);
op->start(); op->start();
aLocked = aStudy->GetProperties()->IsLocked(); aLocked = aStudy->GetProperties()->IsLocked();
if (aLocked) aStudy->GetProperties()->SetLocked(false); if(aLocked)
aStudy->GetProperties()->SetLocked(false);
father = aStudyBuilder->NewComponent("GEOM"); father = aStudyBuilder->NewComponent("GEOM");
anAttr = aStudyBuilder->FindOrCreateAttribute(father, "AttributeName"); anAttr = aStudyBuilder->FindOrCreateAttribute(father, "AttributeName");
aName = SALOMEDS::AttributeName::_narrow(anAttr); aName = SALOMEDS::AttributeName::_narrow(anAttr);
// aName->SetValue( tr("GEOM_MEN_COMPONENT") );
aName->SetValue(QAD_Application::getDesktop()->getComponentUserName("GEOM")); aName->SetValue(QAD_Application::getDesktop()->getComponentUserName("GEOM"));
anAttr = aStudyBuilder->FindOrCreateAttribute(father, "AttributePixMap"); anAttr = aStudyBuilder->FindOrCreateAttribute(father, "AttributePixMap");
aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr); aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr);
aPixmap->SetPixMap("ICON_OBJBROWSER_Geometry"); aPixmap->SetPixMap("ICON_OBJBROWSER_Geometry");
myActiveStudy->updateObjBrowser(); myActiveStudy->updateObjBrowser();
if (aLocked) aStudy->GetProperties()->SetLocked(true); if(aLocked)
aStudy->GetProperties()->SetLocked(true);
op->finish(); op->finish();
} }
// if (aLocked) return false;
aStudyBuilder->DefineComponentInstance(father, myComponentGeom); aStudyBuilder->DefineComponentInstance(father, myComponentGeom);
father->ComponentIOR(myFatherior); father->ComponentIOR(myFatherior);
@ -1076,12 +1067,12 @@ bool GEOMBase_Context::Display(GEOM::GEOM_Shape_ptr aShape, Standard_CString nam
Standard_CString type; Standard_CString type;
GetShapeTypeString(shape,type); GetShapeTypeString(shape,type);
aShape->NameType(type); aShape->NameType(type);
nameG += TCollection_AsciiString( type ) + TCollection_AsciiString("_") + nameG += TCollection_AsciiString(type) + TCollection_AsciiString("_") + TCollection_AsciiString(myNbGeom++) + TCollection_AsciiString("\0");
TCollection_AsciiString( myNbGeom++ ) + TCollection_AsciiString("\0"); }
} else else
nameG += TCollection_AsciiString( aShape->NameType()) + TCollection_AsciiString("_") + nameG += TCollection_AsciiString(aShape->NameType()) + TCollection_AsciiString("_") + TCollection_AsciiString(myNbGeom++) + TCollection_AsciiString("\0");
TCollection_AsciiString( myNbGeom++ ) + TCollection_AsciiString("\0"); }
} else else
nameG = TCollection_AsciiString(name); nameG = TCollection_AsciiString(name);
// VTK // VTK
@ -1091,14 +1082,11 @@ bool GEOMBase_Context::Display(GEOM::GEOM_Shape_ptr aShape, Standard_CString nam
vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer(); vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
int themode = myRenderInter->GetDisplayMode(); int themode = myRenderInter->GetDisplayMode();
vtkActorCollection* theActors = vtkActorCollection* theActors = GEOM_AssemblyBuilder::BuildActors(shape, 0, themode, Standard_True);
GEOM_AssemblyBuilder::BuildActors(shape,0,themode,Standard_True);
theActors->InitTraversal(); theActors->InitTraversal();
vtkActor* anActor = (vtkActor*)theActors->GetNextActor(); vtkActor* anActor = (vtkActor*)theActors->GetNextActor();
IO = new GEOM_InteractiveObject(aShape->Name(), IO = new GEOM_InteractiveObject(aShape->Name(), myFatherior, "GEOM");
myFatherior,
"GEOM");
while(!(anActor==NULL)) { while(!(anActor==NULL)) {
GEOM_Actor* GActor = GEOM_Actor::SafeDownCast(anActor); GEOM_Actor* GActor = GEOM_Actor::SafeDownCast(anActor);
GActor->setIO(IO); GActor->setIO(IO);
@ -1114,19 +1102,13 @@ bool GEOMBase_Context::Display(GEOM::GEOM_Shape_ptr aShape, Standard_CString nam
Handle(AIS_InteractiveContext) ic = v3d->getAISContext(); Handle(AIS_InteractiveContext) ic = v3d->getAISContext();
Handle(GEOM_AISShape) theResult = new GEOM_AISShape(shape, nameG.ToCString()); Handle(GEOM_AISShape) theResult = new GEOM_AISShape(shape, nameG.ToCString());
theResult->SetShadingColor(myShadingColor); theResult->SetShadingColor(myShadingColor);
IO = new GEOM_InteractiveObject(aShape->Name(), IO = new GEOM_InteractiveObject(aShape->Name(), myFatherior, "GEOM");
myFatherior,
"GEOM");
theResult->setIO(IO); theResult->setIO(IO);
theResult->setName(nameG.ToCString()); theResult->setName(nameG.ToCString());
/* Precaution : close any local context to permit the display */ /* Precaution : close any local context to permit the display */
if ( ic->HasOpenedContext() ) { if(ic->HasOpenedContext())
ic->CloseAllContexts(); ic->CloseAllContexts();
}
// if(isInfinite)
// theResult->SetInfiniteState() ;
ic->Display(theResult); ic->Display(theResult);
} }
@ -1165,19 +1147,19 @@ bool GEOMBase_Context::AddInStudy(bool selection, const Handle(SALOME_Interactiv
QAD_Operation* op = new SALOMEGUI_ImportOperation(myActiveStudy); QAD_Operation* op = new SALOMEGUI_ImportOperation(myActiveStudy);
op->start(); op->start();
aLocked = aStudy->GetProperties()->IsLocked(); aLocked = aStudy->GetProperties()->IsLocked();
if (aLocked) aStudy->GetProperties()->SetLocked(false); if(aLocked)
aStudy->GetProperties()->SetLocked(false);
father = aStudyBuilder->NewComponent("GEOM"); father = aStudyBuilder->NewComponent("GEOM");
anAttr = aStudyBuilder->FindOrCreateAttribute(father, "AttributeName"); anAttr = aStudyBuilder->FindOrCreateAttribute(father, "AttributeName");
aName = SALOMEDS::AttributeName::_narrow(anAttr); aName = SALOMEDS::AttributeName::_narrow(anAttr);
// aName->SetValue( tr("GEOM_MEN_COMPONENT") );
aName->SetValue( QAD_Application::getDesktop()->getComponentUserName("GEOM")); aName->SetValue( QAD_Application::getDesktop()->getComponentUserName("GEOM"));
anAttr = aStudyBuilder->FindOrCreateAttribute(father, "AttributePixMap"); anAttr = aStudyBuilder->FindOrCreateAttribute(father, "AttributePixMap");
aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr); aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr);
aPixmap->SetPixMap("ICON_OBJBROWSER_Geometry"); aPixmap->SetPixMap("ICON_OBJBROWSER_Geometry");
if (aLocked) aStudy->GetProperties()->SetLocked(true); if (aLocked)
aStudy->GetProperties()->SetLocked(true);
op->finish(); op->finish();
} }
// if (aLocked) return false;
aStudyBuilder->DefineComponentInstance(father, myComponentGeom); aStudyBuilder->DefineComponentInstance(father, myComponentGeom);
father->ComponentIOR(myFatherior); father->ComponentIOR(myFatherior);
@ -1251,17 +1233,15 @@ bool GEOMBase_Context::AddInStudy(bool selection, const Handle(SALOME_Interactiv
QString Name = SALOMEGUI_NameDlg::getName(QAD_Application::getDesktop(), anIO->getName()); QString Name = SALOMEGUI_NameDlg::getName(QAD_Application::getDesktop(), anIO->getName());
if(!Name.isEmpty()) { if(!Name.isEmpty()) {
// VTK // VTK
if ( myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { if(myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK)
GActor->setName(strdup(Name.latin1())); GActor->setName(strdup(Name.latin1()));
}
// OCC // OCC
else if ( myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_OCC ) { else if(myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_OCC)
GAISShape->setName(strdup(Name.latin1())); GAISShape->setName(strdup(Name.latin1()));
} }
} else { else
return false; return false;
} }
}
// open transaction // open transaction
QAD_Operation* op = new SALOMEGUI_ImportOperation(myActiveStudy); QAD_Operation* op = new SALOMEGUI_ImportOperation(myActiveStudy);
@ -1286,23 +1266,22 @@ bool GEOMBase_Context::AddInStudy(bool selection, const Handle(SALOME_Interactiv
anAttr = aStudyBuilder->FindOrCreateAttribute(newObj, "AttributePixMap"); anAttr = aStudyBuilder->FindOrCreateAttribute(newObj, "AttributePixMap");
aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr); aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr);
if ( aShape->ShapeType() == GEOM::COMPOUND ) { if(aShape->ShapeType() == GEOM::COMPOUND)
aPixmap->SetPixMap("ICON_OBJBROWSER_COMPOUND"); aPixmap->SetPixMap("ICON_OBJBROWSER_COMPOUND");
} else if ( aShape->ShapeType() == GEOM::COMPSOLID ) { else if(aShape->ShapeType() == GEOM::COMPSOLID)
aPixmap->SetPixMap("ICON_OBJBROWSER_COMPSOLID"); aPixmap->SetPixMap("ICON_OBJBROWSER_COMPSOLID");
} else if ( aShape->ShapeType() == GEOM::SOLID ) { else if(aShape->ShapeType() == GEOM::SOLID)
aPixmap->SetPixMap("ICON_OBJBROWSER_SOLID"); aPixmap->SetPixMap("ICON_OBJBROWSER_SOLID");
} else if ( aShape->ShapeType() == GEOM::SHELL ) { else if(aShape->ShapeType() == GEOM::SHELL)
aPixmap->SetPixMap("ICON_OBJBROWSER_SHELL"); aPixmap->SetPixMap("ICON_OBJBROWSER_SHELL");
} else if ( aShape->ShapeType() == GEOM::FACE ) { else if(aShape->ShapeType() == GEOM::FACE)
aPixmap->SetPixMap("ICON_OBJBROWSER_FACE"); aPixmap->SetPixMap("ICON_OBJBROWSER_FACE");
} else if ( aShape->ShapeType() == GEOM::WIRE ) { else if(aShape->ShapeType() == GEOM::WIRE)
aPixmap->SetPixMap("ICON_OBJBROWSER_WIRE"); aPixmap->SetPixMap("ICON_OBJBROWSER_WIRE");
} else if ( aShape->ShapeType() == GEOM::EDGE ) { else if(aShape->ShapeType() == GEOM::EDGE)
aPixmap->SetPixMap("ICON_OBJBROWSER_EDGE"); aPixmap->SetPixMap("ICON_OBJBROWSER_EDGE");
} else if ( aShape->ShapeType() == GEOM::VERTEX ) { else if(aShape->ShapeType() == GEOM::VERTEX)
aPixmap->SetPixMap("ICON_OBJBROWSER_VERTEX"); aPixmap->SetPixMap("ICON_OBJBROWSER_VERTEX");
}
// VTK // VTK
if(myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { if(myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
@ -1344,20 +1323,15 @@ bool GEOMBase_Context::AddInStudy(bool selection, const Handle(SALOME_Interactiv
if(!ObjectReferenced) if(!ObjectReferenced)
aStudyBuilder->RemoveObject(Arguments); aStudyBuilder->RemoveObject(Arguments);
} }
op->finish(); op->finish();
if(!mySettings_AddInStudy || selection)
if ( !mySettings_AddInStudy || selection ) {
myActiveStudy->updateObjBrowser(); myActiveStudy->updateObjBrowser();
} else { else {
myActiveStudy->updateObjBrowser(false); myActiveStudy->updateObjBrowser(false);
Sel->AddIObject(GIO); Sel->AddIObject(GIO);
} }
// MESSAGE ( " highlihght done" )
return true; return true;
} }
@ -1376,14 +1350,12 @@ TopoDS_Shape GEOMBase_Context::GetShapeFromIOR( QString IOR )
if(CORBA::is_nil(obj)) if(CORBA::is_nil(obj))
return result; return result;
GEOM::GEOM_Shape_var aShape = myComponentGeom->GetIORFromString(IOR); GEOM::GEOM_Shape_var aShape = myComponentGeom->GetIORFromString(IOR);
if (!aShape->_is_nil()) { if(!aShape->_is_nil())
result = myShapeReader.GetShape(myComponentGeom, aShape); result = myShapeReader.GetShape(myComponentGeom, aShape);
}
return result; return result;
} }
//======================================================================= //=======================================================================
// function : Parameter() // function : Parameter()
// purpose : return a parameter (float) from a dialog box // purpose : return a parameter (float) from a dialog box

14
src/GEOMBase/GEOMBase_Display.cxx
View File

@ -69,7 +69,7 @@ bool GEOMBase_Display::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
{ {
switch (theCommandID) switch (theCommandID)
{ {
case 6021: // SHADING/WIREFRAME - MENU case 211: // SHADING/WIREFRAME - MENU
{ {
if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
QApplication::setOverrideCursor(waitCursor); QApplication::setOverrideCursor(waitCursor);
@ -79,11 +79,11 @@ bool GEOMBase_Display::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
int themode = myRenderInter->GetDisplayMode(); int themode = myRenderInter->GetDisplayMode();
if(themode==0) { if(themode==0) {
myRenderInter->SetDisplayMode(1); myRenderInter->SetDisplayMode(1);
myGeomGUI->GetDesktop()->menuBar()->changeItem(6021, tr("GEOM_MEN_WIREFRAME")); myGeomGUI->GetDesktop()->menuBar()->changeItem(211, tr("GEOM_MEN_WIREFRAME"));
} }
else { else {
myRenderInter->SetDisplayMode(0); myRenderInter->SetDisplayMode(0);
myGeomGUI->GetDesktop()->menuBar()->changeItem(6021, tr("GEOM_MEN_SHADING")); myGeomGUI->GetDesktop()->menuBar()->changeItem(211, tr("GEOM_MEN_SHADING"));
} }
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
@ -113,15 +113,15 @@ bool GEOMBase_Display::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
ic->SetDisplayMode(newmode, Standard_False); ic->SetDisplayMode(newmode, Standard_False);
if(newmode == 1) if(newmode == 1)
myGeomGUI->GetDesktop()->menuBar()->changeItem(6021, tr("GEOM_MEN_WIREFRAME")); myGeomGUI->GetDesktop()->menuBar()->changeItem(211, tr("GEOM_MEN_WIREFRAME"));
else else
myGeomGUI->GetDesktop()->menuBar()->changeItem(6021, tr("GEOM_MEN_SHADING")); myGeomGUI->GetDesktop()->menuBar()->changeItem(211, tr("GEOM_MEN_SHADING"));
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
} }
break; break;
} }
case 6022: // DISPLAY ALL - MENU case 212: // DISPLAY ALL - MENU
{ {
if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK) if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK)
((VTKViewer_ViewFrame*)myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRWInteractor()->DisplayAll(); ((VTKViewer_ViewFrame*)myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRWInteractor()->DisplayAll();
@ -129,7 +129,7 @@ bool GEOMBase_Display::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
this->OnDisplayAll(); this->OnDisplayAll();
break; break;
} }
case 6024: // ERASE ALL - MENU case 214: // ERASE ALL - MENU
{ {
if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK) if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK)
((VTKViewer_ViewFrame*)myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRWInteractor()->EraseAll(); ((VTKViewer_ViewFrame*)myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRWInteractor()->EraseAll();

1
src/GEOMBase/GEOMBase_NbIsosDlg.cxx
View File

@ -132,4 +132,3 @@ GEOMBase_NbIsosDlg::~GEOMBase_NbIsosDlg()
{ {
// no need to delete child widgets, Qt does it all for us // no need to delete child widgets, Qt does it all for us
} }

1
src/GEOMBase/GEOMBase_NbIsosDlg.h
View File

@ -56,6 +56,7 @@ public:
QLabel* TextLabel2; QLabel* TextLabel2;
QSpinBox* SpinBoxU; QSpinBox* SpinBoxU;
QSpinBox* SpinBoxV; QSpinBox* SpinBoxV;
}; };
#endif // GEOMETRYGUI_NBISOSDLG_H #endif // GEOMETRYGUI_NBISOSDLG_H

240
src/GEOMBase/GEOMBase_Sketcher.cxx
View File

@ -78,7 +78,7 @@ bool GEOMBase_Sketcher::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
switch (theCommandID) switch (theCommandID)
{ {
case 312: // SKETCHER case 404: // SKETCHER
{ {
((OCCViewer_ViewFrame*)myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->onViewTop(); // DCQ : 28/02/2002 ((OCCViewer_ViewFrame*)myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->onViewTop(); // DCQ : 28/02/2002
@ -87,111 +87,126 @@ bool GEOMBase_Sketcher::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
mySketcher = Sketch(v3d->getViewer3d()); mySketcher = Sketch(v3d->getViewer3d());
myGeomGUI->SetState(CURRENT_SKETCH); myGeomGUI->SetState(CURRENT_SKETCH);
QMenuItem* item = Mb->findItem(10010, &pp); QMenuItem* item = Mb->findItem(4061, &pp);
mySketcher.SetParameterVisibility(LENGTH_PARAMETER, pp->isItemChecked(10010)); mySketcher.SetParameterVisibility(LENGTH_PARAMETER, pp->isItemChecked(4061));
item = Mb->findItem(10011, &pp); item = Mb->findItem(4062, &pp);
mySketcher.SetParameterVisibility(ANGLE_PARAMETER, pp->isItemChecked(10011)); mySketcher.SetParameterVisibility(ANGLE_PARAMETER, pp->isItemChecked(4062));
item = Mb->findItem(10012, &pp); item = Mb->findItem(4063, &pp);
mySketcher.SetParameterVisibility(RADIUS_PARAMETER, pp->isItemChecked(10012)); mySketcher.SetParameterVisibility(RADIUS_PARAMETER, pp->isItemChecked(4063));
item = Mb->findItem(10013, &pp); item = Mb->findItem(4064, &pp);
mySketcher.SetParameterVisibility(XVALUE_PARAMETER, pp->isItemChecked(10013)); mySketcher.SetParameterVisibility(XVALUE_PARAMETER, pp->isItemChecked(4064));
item = Mb->findItem(10014, &pp); item = Mb->findItem(4065, &pp);
mySketcher.SetParameterVisibility(YVALUE_PARAMETER, pp->isItemChecked(10014)); mySketcher.SetParameterVisibility(YVALUE_PARAMETER, pp->isItemChecked(4065));
mySketcher.SetTransitionStatus(NOCONSTRAINT); mySketcher.SetTransitionStatus(NOCONSTRAINT);
item = Mb->findItem(3133, &pp); item = Mb->findItem(4052, &pp);
pp->setItemChecked(3133, false); pp->setItemChecked(4052, false);
item = Mb->findItem(3134, &pp); item = Mb->findItem(4053, &pp);
pp->setItemChecked(3134, false); pp->setItemChecked(4053, false);
break; break;
} }
case 3133: // sketcher case 4041: // SKETCH Segment
{
QMenuItem* item = Mb->findItem(3133, &pp);
pp->setItemChecked(3133, !pp->isItemChecked(3133));
if (pp->isItemChecked(3133) == true)
mySketcher.SetTransitionStatus(TANGENT);
else
mySketcher.SetTransitionStatus(NOCONSTRAINT);
pp->setItemChecked(3134, false);
break;
}
case 3134: // sketcher
{
QMenuItem* item = Mb->findItem(3134, &pp);
pp->setItemChecked(3134,!pp->isItemChecked(3134));
if (pp->isItemChecked(3134) == true)
mySketcher.SetTransitionStatus(PERPENDICULAR);
else
mySketcher.SetTransitionStatus(NOCONSTRAINT);
pp->setItemChecked(3133, false);
break;
}
case 10000 : // SKETCH Segment
{ {
mySketcher.ChangeMode(SEGMENT); mySketcher.ChangeMode(SEGMENT);
break; break;
} }
case 10001 : // SKETCH Arc case 4042: // SKETCH Arc
{ {
mySketcher.ChangeMode(ARC_CHORD); mySketcher.ChangeMode(ARC_CHORD);
break; break;
} }
case 10002 : // SKETCH Set Angle case 4043: // SKETCH Set Angle
{ {
OnSketchSetAngle(); OnSketchSetAngle();
break; break;
} }
case 10003 : // SKETCH Set X case 4044: // SKETCH Set X
{ {
OnSketchSetx(); OnSketchSetx();
break; break;
} }
case 10004 : // SKETCH Set Y case 4045: // SKETCH Set Y
{ {
OnSketchSety(); OnSketchSety();
break; break;
} }
case 10006 : // SKETCH Delete case 4046: // SKETCH Delete
{ {
OnSketchDelete(); OnSketchDelete();
break; break;
} }
case 10007 : // SKETCH End case 4047: // SKETCH End
{ {
OnSketchEnd(); OnSketchEnd();
break; break;
} }
case 10008 : // SKETCH Close case 4048: // SKETCH Close
{ {
OnSketchClose(); OnSketchClose();
break; break;
} }
case 10010 : // SKETCH OptionsOnofflengthdimension case 4051: // sketcher Set Plane
{ {
OnSketchOptionsOnofflengthdimension(); //TO DO
break; break;
} }
case 10011 : // SKETCH OptionsOnoffangledimension case 4052: // sketcher TANGENT
{ {
OnSketchOptionsOnoffangledimension(); QMenuItem* item = Mb->findItem(theCommandID, &pp);
pp->setItemChecked(theCommandID, !pp->isItemChecked(theCommandID));
if(pp->isItemChecked(theCommandID) == true)
mySketcher.SetTransitionStatus(TANGENT);
else
mySketcher.SetTransitionStatus(NOCONSTRAINT);
pp->setItemChecked(4053, false);
break; break;
} }
case 10012 : // SKETCH OptionsOnoffradiusdimension case 4053: // sketcher PERPENDICULAR
{ {
OnSketchOptionsOnoffradiusdimension(); QMenuItem* item = Mb->findItem(theCommandID, &pp);
pp->setItemChecked(theCommandID,!pp->isItemChecked(theCommandID));
if(pp->isItemChecked(theCommandID) == true)
mySketcher.SetTransitionStatus(PERPENDICULAR);
else
mySketcher.SetTransitionStatus(NOCONSTRAINT);
pp->setItemChecked(4052, false);
break; break;
} }
case 10013 : // SKETCH OptionsOnoffxdimension case 4061: // SKETCH OptionsOnofflengthdimension
{ {
OnSketchOptionsOnoffxdimension(); QMenuItem* item = Mb->findItem(theCommandID, &pp);
pp->setItemChecked(theCommandID, !pp->isItemChecked(theCommandID));
mySketcher.SetParameterVisibility(LENGTH_PARAMETER, pp->isItemChecked(theCommandID));
break; break;
} }
case 10014 : // SKETCH OptionsOnoffydimension case 4062: // SKETCH OptionsOnoffangledimension
{ {
OnSketchOptionsOnoffydimension(); QMenuItem* item = Mb->findItem(theCommandID, &pp);
pp->setItemChecked(theCommandID, !pp->isItemChecked(theCommandID));
mySketcher.SetParameterVisibility(ANGLE_PARAMETER, pp->isItemChecked(theCommandID));
break;
}
case 4063: // SKETCH OptionsOnoffradiusdimension
{
QMenuItem* item = Mb->findItem(theCommandID, &pp);
pp->setItemChecked(theCommandID, !pp->isItemChecked(theCommandID));
mySketcher.SetParameterVisibility(RADIUS_PARAMETER, pp->isItemChecked(theCommandID));
break;
}
case 4064: // SKETCH OptionsOnoffxdimension
{
QMenuItem* item = Mb->findItem(theCommandID, &pp);
pp->setItemChecked(theCommandID, !pp->isItemChecked(theCommandID));
mySketcher.SetParameterVisibility(XVALUE_PARAMETER, pp->isItemChecked(theCommandID));
break;
}
case 4065: // SKETCH OptionsOnoffydimension
{
QMenuItem* item = Mb->findItem(theCommandID, &pp);
pp->setItemChecked(theCommandID, !pp->isItemChecked(theCommandID));
mySketcher.SetParameterVisibility(YVALUE_PARAMETER, pp->isItemChecked(theCommandID));
break; break;
} }
default: default:
@ -221,10 +236,10 @@ void GEOMBase_Sketcher::OnSketchSetAngle()
mySketcher.SetSegmentAngle(anAngle); mySketcher.SetSegmentAngle(anAngle);
QMenuBar* Mb = myGeomGUI->GetDesktop()->getMainMenuBar(); QMenuBar* Mb = myGeomGUI->GetDesktop()->getMainMenuBar();
QMenuData* pp; QMenuData* pp;
QMenuItem* item = Mb->findItem(3133, &pp); QMenuItem* item = Mb->findItem(4052, &pp);
pp->setItemChecked(3133, false); pp->setItemChecked(4052, false);
item = Mb->findItem(3134, &pp); item = Mb->findItem(4053, &pp);
pp->setItemChecked(3134, false); pp->setItemChecked(4053, false);
} }
return; return;
} }
@ -243,10 +258,10 @@ void GEOMBase_Sketcher::OnSketchSetx()
mySketcher.SetXDimension(X); mySketcher.SetXDimension(X);
QMenuBar* Mb = myGeomGUI->GetDesktop()->getMainMenuBar(); QMenuBar* Mb = myGeomGUI->GetDesktop()->getMainMenuBar();
QMenuData* pp; QMenuData* pp;
QMenuItem* item = Mb->findItem(3133, &pp); QMenuItem* item = Mb->findItem(4052, &pp);
pp->setItemChecked(3133, false); pp->setItemChecked(4052, false);
item = Mb->findItem(3134, &pp); item = Mb->findItem(4053, &pp);
pp->setItemChecked(3134, false); pp->setItemChecked(4053, false);
return; return;
} }
@ -264,10 +279,10 @@ void GEOMBase_Sketcher::OnSketchSety()
mySketcher.SetYDimension(Y); mySketcher.SetYDimension(Y);
QMenuBar* Mb = myGeomGUI->GetDesktop()->getMainMenuBar(); QMenuBar* Mb = myGeomGUI->GetDesktop()->getMainMenuBar();
QMenuData* pp; QMenuData* pp;
QMenuItem* item = Mb->findItem(3133, &pp); QMenuItem* item = Mb->findItem(4052, &pp);
pp->setItemChecked(3133, false); pp->setItemChecked(4052, false);
item = Mb->findItem(3134, &pp); item = Mb->findItem(4053, &pp);
pp->setItemChecked(3134, false); pp->setItemChecked(4053, false);
return; return;
} }
@ -281,8 +296,8 @@ void GEOMBase_Sketcher::OnSketchDelete()
if(mySketcher.GetmyEdgesNumber() == 1) { if(mySketcher.GetmyEdgesNumber() == 1) {
QMenuBar* Mb = myGeomGUI->GetDesktop()->getMainMenuBar(); QMenuBar* Mb = myGeomGUI->GetDesktop()->getMainMenuBar();
QMenuData* pp; QMenuData* pp;
QMenuItem* item = Mb->findItem(313, &pp); QMenuItem* item = Mb->findItem(406, &pp);
pp->setItemEnabled(313, false); // SKETCH CONTRAINTS pp->setItemEnabled(406, false); // SKETCH CONTRAINTS
mySketcher.SetTransitionStatus(NOCONSTRAINT); mySketcher.SetTransitionStatus(NOCONSTRAINT);
} }
@ -375,8 +390,8 @@ void GEOMBase_Sketcher::OnSketchClose()
myGeomGUI->ResetState(); myGeomGUI->ResetState();
QMenuBar* Mb = myGeomGUI->GetDesktop()->getMainMenuBar(); QMenuBar* Mb = myGeomGUI->GetDesktop()->getMainMenuBar();
QMenuData* pp; QMenuData* pp;
QMenuItem* item = Mb->findItem(313, &pp); QMenuItem* item = Mb->findItem(406, &pp);
pp->setItemEnabled(313, false); // SKETCH CONTRAINTS pp->setItemEnabled(406, false); // SKETCH CONTRAINTS
mySketcher.SetTransitionStatus(NOCONSTRAINT); mySketcher.SetTransitionStatus(NOCONSTRAINT);
return; return;
} }
@ -465,83 +480,8 @@ void GEOMBase_Sketcher::OnSketchEnd()
myGeomGUI->ResetState(); myGeomGUI->ResetState();
QMenuBar* Mb = myGeomGUI->GetDesktop()->getMainMenuBar(); QMenuBar* Mb = myGeomGUI->GetDesktop()->getMainMenuBar();
QMenuData* pp; QMenuData* pp;
QMenuItem* item = Mb->findItem(313, &pp); QMenuItem* item = Mb->findItem(406, &pp);
pp->setItemEnabled(313, false); // SKETCH CONTRAINTS pp->setItemEnabled(406, false); // SKETCH CONTRAINTS
mySketcher.SetTransitionStatus(NOCONSTRAINT); mySketcher.SetTransitionStatus(NOCONSTRAINT);
return; return;
} }
//=======================================================================
// function : OnSketchOptionsOnoffangledimension()
// purpose :
//=======================================================================
void GEOMBase_Sketcher::OnSketchOptionsOnoffangledimension()
{
QMenuBar* Mb = myGeomGUI->GetDesktop()->getMainMenuBar();
QMenuData* pp;
QMenuItem* item = Mb->findItem(10011, &pp);
pp->setItemChecked(10011, !pp->isItemChecked(10011));
mySketcher.SetParameterVisibility(ANGLE_PARAMETER, pp->isItemChecked(10011));
return;
}
//=======================================================================
// function : OnSketchOptionsOnofflengthdimension()
// purpose :
//=======================================================================
void GEOMBase_Sketcher::OnSketchOptionsOnofflengthdimension()
{
QMenuBar* Mb = myGeomGUI->GetDesktop()->getMainMenuBar();
QMenuData* pp;
QMenuItem* item = Mb->findItem(10010, &pp);
pp->setItemChecked(10010, !pp->isItemChecked(10010));
mySketcher.SetParameterVisibility(LENGTH_PARAMETER, pp->isItemChecked(10010));
return;
}
//=======================================================================
// function : OnSketchOptionsOnoffradiusdimension()
// purpose :
//=======================================================================
void GEOMBase_Sketcher::OnSketchOptionsOnoffradiusdimension()
{
QMenuBar* Mb = myGeomGUI->GetDesktop()->getMainMenuBar();
QMenuData* pp;
QMenuItem* item = Mb->findItem(10012, &pp);
pp->setItemChecked(10012, !pp->isItemChecked(10012));
mySketcher.SetParameterVisibility(RADIUS_PARAMETER, pp->isItemChecked(10012));
return;
}
//=======================================================================
// function : OnSketchOptionsOnoffxdimension()
// purpose :
//=======================================================================
void GEOMBase_Sketcher::OnSketchOptionsOnoffxdimension()
{
QMenuBar* Mb = myGeomGUI->GetDesktop()->getMainMenuBar();
QMenuData* pp;
QMenuItem* item = Mb->findItem(10013, &pp);
pp->setItemChecked(10013, !pp->isItemChecked(10013));
mySketcher.SetParameterVisibility(XVALUE_PARAMETER, pp->isItemChecked(10013));
return;
}
//=======================================================================
// function : OnSketchOptionsOnoffydimension()
// purpose :
//=======================================================================
void GEOMBase_Sketcher::OnSketchOptionsOnoffydimension()
{
QMenuBar* Mb = myGeomGUI->GetDesktop()->getMainMenuBar();
QMenuData* pp;
QMenuItem* item = Mb->findItem(10014, &pp);
pp->setItemChecked(10014, !pp->isItemChecked(10014));
mySketcher.SetParameterVisibility(YVALUE_PARAMETER, pp->isItemChecked(10014));
return;
}

6
src/GEOMBase/GEOMBase_Sketcher.h
View File

@ -54,12 +54,6 @@ public :
void OnSketchClose(); void OnSketchClose();
void OnSketchEnd(); void OnSketchEnd();
void OnSketchOptionsOnoffangledimension();
void OnSketchOptionsOnofflengthdimension();
void OnSketchOptionsOnoffradiusdimension();
void OnSketchOptionsOnoffxdimension();
void OnSketchOptionsOnoffydimension();
private: private:
GEOMBase_Context* myGeomGUI; GEOMBase_Context* myGeomGUI;
GEOM::GEOM_Gen_var myGeom; /* Current Geom Component */ GEOM::GEOM_Gen_var myGeom; /* Current Geom Component */

42
src/GEOMBase/GEOMBase_Tools.cxx
View File

@ -84,9 +84,6 @@ bool GEOMBase_Tools::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
myGeomGUI->EmitSignalDeactivateDialog(); myGeomGUI->EmitSignalDeactivateDialog();
SALOME_Selection* Sel = SALOME_Selection::Selection(myGeomGUI->GetActiveStudy()->getSelection()); SALOME_Selection* Sel = SALOME_Selection::Selection(myGeomGUI->GetActiveStudy()->getSelection());
QMenuBar* Mb = myGeomGUI->GetDesktop()->getMainMenuBar();
QMenuData* pp;
SALOMEDS::Study_var aStudy = myGeomGUI->GetActiveStudy()->getStudyDocument(); SALOMEDS::Study_var aStudy = myGeomGUI->GetActiveStudy()->getStudyDocument();
SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
@ -147,25 +144,29 @@ bool GEOMBase_Tools::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
myGeomGUI->ResetState(); myGeomGUI->ResetState();
break; break;
} }
case 701: // SETTINGS - COPY case 411: // SETTINGS - COPY
{ {
QMenuItem* item = parent->menuBar()->findItem(701, &pp); QMenuBar* Mb = myGeomGUI->GetDesktop()->getMainMenuBar();
bool check = !pp->isItemChecked(701); QMenuData* pp;
pp->setItemChecked(701, check); QMenuItem* item = parent->menuBar()->findItem(411, &pp);
bool check = !pp->isItemChecked(411);
pp->setItemChecked(411, check);
myGeomGUI->GetSettings_Copy() = check; myGeomGUI->GetSettings_Copy() = check;
QAD_CONFIG->addSetting("Geometry:SettingsCopy", myGeomGUI->GetSettings_Copy()); QAD_CONFIG->addSetting("Geometry:SettingsCopy", myGeomGUI->GetSettings_Copy());
break; break;
} }
case 702: // SETTINGS - ADD IN STUDY case 412: // SETTINGS - ADD IN STUDY
{ {
QMenuItem* item = parent->menuBar()->findItem(702, &pp); QMenuBar* Mb = myGeomGUI->GetDesktop()->getMainMenuBar();
bool check = !pp->isItemChecked(702); QMenuData* pp;
pp->setItemChecked(702,check); QMenuItem* item = parent->menuBar()->findItem(412, &pp);
bool check = !pp->isItemChecked(412);
pp->setItemChecked(412,check);
myGeomGUI->GetSettings_AddInStudy() = check; myGeomGUI->GetSettings_AddInStudy() = check;
QAD_CONFIG->addSetting("Geometry:SettingsAddInStudy", myGeomGUI->GetSettings_AddInStudy()); QAD_CONFIG->addSetting("Geometry:SettingsAddInStudy", myGeomGUI->GetSettings_AddInStudy());
break; break;
} }
case 703: // SETTINGS - SHADING COLOR case 413: // SETTINGS - SHADING COLOR
{ {
if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() > VIEW_OCC) if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() > VIEW_OCC)
break; break;
@ -212,7 +213,7 @@ bool GEOMBase_Tools::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
} }
break; break;
} }
case 704: // SETTINGS - ISOS case 414: // SETTINGS - ISOS
{ {
if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() > VIEW_OCC) if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() > VIEW_OCC)
break; break;
@ -228,8 +229,7 @@ bool GEOMBase_Tools::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
else else
IsoV = "1"; IsoV = "1";
GEOMBase_NbIsosDlg* NbIsosDlg = new GEOMBase_NbIsosDlg(myGeomGUI->GetDesktop(), GEOMBase_NbIsosDlg* NbIsosDlg = new GEOMBase_NbIsosDlg(myGeomGUI->GetDesktop(), tr("GEOM_MEN_ISOS"), TRUE);
tr("GEOM_MEN_ISOS"), TRUE);
int UIso = IsoU.toInt(); int UIso = IsoU.toInt();
int VIso = IsoV.toInt(); int VIso = IsoV.toInt();
@ -270,7 +270,7 @@ bool GEOMBase_Tools::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
ic->UpdateCurrentViewer(); ic->UpdateCurrentViewer();
break; break;
} }
case 705: // SETTINGS : STEP VALUE FOR SPIN BOXES case 415: // SETTINGS : STEP VALUE FOR SPIN BOXES
{ {
QString step = QAD_CONFIG->getSetting("Geometry:SettingsGeomStep"); QString step = QAD_CONFIG->getSetting("Geometry:SettingsGeomStep");
if(step.isEmpty()) if(step.isEmpty())
@ -288,7 +288,7 @@ bool GEOMBase_Tools::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
parent->putInfo(tr("GEOM_PRP_ABORT")); parent->putInfo(tr("GEOM_PRP_ABORT"));
break; break;
} }
case 801: // ADD IN STUDY - POPUP VIEWER case 804: // ADD IN STUDY - POPUP VIEWER
{ {
const SALOME_ListIO& ListSelected = Sel->StoredIObjects(); const SALOME_ListIO& ListSelected = Sel->StoredIObjects();
SALOME_ListIteratorOfListIO It(ListSelected); SALOME_ListIteratorOfListIO It(ListSelected);
@ -558,7 +558,7 @@ bool GEOMBase_Tools::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
} }
break; break;
} }
case 5001: // CHECK GEOMETRY case 5103: // CHECK GEOMETRY
{ {
QAD_PyEditor* PyEditor = myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getPyEditor(); QAD_PyEditor* PyEditor = myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getPyEditor();
PyEditor->setText("from GEOM_usinggeom import *\n"); PyEditor->setText("from GEOM_usinggeom import *\n");
@ -566,7 +566,7 @@ bool GEOMBase_Tools::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
PyEditor->handleReturn(); PyEditor->handleReturn();
break; break;
} }
case 8031: // COLOR - POPUP VIEWER case 8032: // COLOR - POPUP VIEWER
{ {
if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
// VTK // VTK
@ -621,12 +621,12 @@ bool GEOMBase_Tools::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
break; break;
} }
case 8032: // TRANSPARENCY - POPUP VIEWER case 8033: // TRANSPARENCY - POPUP VIEWER
{ {
GEOMBase_TransparencyDlg *aDlg = new GEOMBase_TransparencyDlg(parent, "", Sel, ic); GEOMBase_TransparencyDlg *aDlg = new GEOMBase_TransparencyDlg(parent, "", Sel, ic);
break; break;
} }
case 8033: // ISOS - POPUP VIEWER case 8034: // ISOS - POPUP VIEWER
{ {
if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() > VIEW_OCC) if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() > VIEW_OCC)
break; break;

15
src/GEOMBase/GEOMBase_TransparencyDlg.cxx
View File

@ -54,12 +54,7 @@ using namespace std;
// : WARNING : this dialog is modal ! // : WARNING : this dialog is modal !
// //
//================================================================================= //=================================================================================
GEOMBase_TransparencyDlg::GEOMBase_TransparencyDlg( QWidget* parent, GEOMBase_TransparencyDlg::GEOMBase_TransparencyDlg(QWidget* parent, const char* name, SALOME_Selection* Sel, const Handle(AIS_InteractiveContext)& ic, bool modal, WFlags fl)
const char* name,
SALOME_Selection* Sel,
const Handle(AIS_InteractiveContext)& ic,
bool modal,
WFlags fl )
:QDialog(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) :QDialog(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
{ {
if(!name) if(!name)
@ -143,8 +138,6 @@ GEOMBase_TransparencyDlg::GEOMBase_TransparencyDlg( QWidget* parent,
} }
//================================================================================= //=================================================================================
// function : ~GEOMBase_TransparencyDlg() // function : ~GEOMBase_TransparencyDlg()
// purpose : // purpose :
@ -184,16 +177,13 @@ void GEOMBase_TransparencyDlg::ClickOnClose()
//================================================================================= //=================================================================================
void GEOMBase_TransparencyDlg::ValueHasChanged(int newValue) void GEOMBase_TransparencyDlg::ValueHasChanged(int newValue)
{ {
if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
// VTK // VTK
// vtkQGLRenderWindowInteractor* myRenderInter= myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getVTKView()->getRWInteractor();
VTKViewer_RenderWindowInteractor* myRenderInter= ((VTKViewer_ViewFrame*)myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRWInteractor(); VTKViewer_RenderWindowInteractor* myRenderInter= ((VTKViewer_ViewFrame*)myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRWInteractor();
SALOME_ListIteratorOfListIO It(this->mySel->StoredIObjects()); SALOME_ListIteratorOfListIO It(this->mySel->StoredIObjects());
Handle(SALOME_InteractiveObject) FirstIOS = mySel->firstIObject(); Handle(SALOME_InteractiveObject) FirstIOS = mySel->firstIObject();
if(!FirstIOS.IsNull()) { if(!FirstIOS.IsNull()) {
/* The first time as initialisation */ /* The first time as initialisation */
if(this->myFirstInit) { if(this->myFirstInit) {
this->myFirstInit = false; this->myFirstInit = false;
@ -221,9 +211,8 @@ void GEOMBase_TransparencyDlg::ValueHasChanged( int newValue )
this->myFirstInit = false; this->myFirstInit = false;
Standard_Boolean found; Standard_Boolean found;
Handle(GEOM_AISShape) Shape = myGeomGUI->ConvertIOinGEOMAISShape(FirstIOS, found); Handle(GEOM_AISShape) Shape = myGeomGUI->ConvertIOinGEOMAISShape(FirstIOS, found);
if( !found ) { if(!found)
return; return;
}
float transp = (int(Shape->Transparency() * 10.0 + 0.001)); float transp = (int(Shape->Transparency() * 10.0 + 0.001));
this->Slider1->setValue(int(transp)); this->Slider1->setValue(int(transp));
return; return;

16
src/GEOMBase/GEOMBase_aParameterDlg.cxx
View File

@ -58,15 +58,7 @@ using namespace std;
// TRUE to construct a modal dialog. // TRUE to construct a modal dialog.
// //
//====================================================================================== //======================================================================================
GEOMBase_aParameterDlg::GEOMBase_aParameterDlg( const char *aValue1, GEOMBase_aParameterDlg::GEOMBase_aParameterDlg(const char *aValue1, const char *aTitle1, QWidget* parent, const char* name, bool modal, WFlags fl, const double bottom, const double top, const int decimals)
const char *aTitle1,
QWidget* parent,
const char* name,
bool modal,
WFlags fl,
const double bottom,
const double top,
const int decimals )
:QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) :QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
{ {
if(!name) if(!name)
@ -143,9 +135,11 @@ GEOMBase_aParameterDlg::GEOMBase_aParameterDlg( const char *aValue1,
// purpose : Destroys the object and frees any allocated resources // purpose : Destroys the object and frees any allocated resources
//====================================================================================== //======================================================================================
GEOMBase_aParameterDlg::~GEOMBase_aParameterDlg() GEOMBase_aParameterDlg::~GEOMBase_aParameterDlg()
{ // no need to delete child widgets, Qt does it all for us {
// no need to delete child widgets, Qt does it all for us
} }
//====================================================================================== //======================================================================================
// function : GEOMBase_aParameterDlg::setValue // function : GEOMBase_aParameterDlg::setValue
// purpose : sets value // purpose : sets value
@ -155,6 +149,7 @@ void GEOMBase_aParameterDlg::setValue( double val )
mySpinBox->setValue(val); mySpinBox->setValue(val);
} }
//====================================================================================== //======================================================================================
// function : GEOMBase_aParameterDlg::getValue // function : GEOMBase_aParameterDlg::getValue
// purpose : gets value // purpose : gets value
@ -163,4 +158,3 @@ double GEOMBase_aParameterDlg::getValue()
{ {
return mySpinBox->value(); return mySpinBox->value();
} }

11
src/GEOMBase/GEOMBase_aParameterDlg.h
View File

@ -45,16 +45,7 @@ class GEOMBase_aParameterDlg : public QDialog
Q_OBJECT Q_OBJECT
public: public:
GEOMBase_aParameterDlg( const char* aValue1 = "25", GEOMBase_aParameterDlg(const char* aValue1 = "25", const char* aTitle1 = "Value :", QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0, const double bottom = -1E6, const double top = +1E6, const int decimals = 6);
const char* aTitle1 = "Value :",
QWidget* parent = 0,
const char* name = 0,
bool modal = FALSE,
WFlags fl = 0,
const double bottom = -1E6,
const double top = +1E6,
const int decimals = 6 ) ;
~GEOMBase_aParameterDlg(); ~GEOMBase_aParameterDlg();
void setValue(double val); void setValue(double val);

512
src/GEOMGUI/GeometryGUI.cxx
View File

@ -113,16 +113,6 @@ GeometryGUI::~GeometryGUI()
} }
// //=======================================================================
// // function : GetGEOMBase_Context() static
// // purpose : Returns current 'GeomGUI' a static pointer
// //=======================================================================
// GEOMBase_Context* GeometryGUI::GetGeomGUI()
// {
// return GeomGUI;
// }
//======================================================================= //=======================================================================
// function : GetOrCreateGEOMBase() // function : GetOrCreateGEOMBase()
// purpose : Gets or create an object 'GEOMBase' with initialisations // purpose : Gets or create an object 'GEOMBase' with initialisations
@ -149,18 +139,21 @@ bool GeometryGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
if(GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) if(GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC)
ViewOCC = true; ViewOCC = true;
else if(GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK) else if(GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK)
ViewOCC = true; ViewOCC = false;
else else
return false; return false;
Mb->setItemEnabled( 312, ViewOCC);//Sketch Mb->setItemEnabled(404, ViewOCC);//Sketch
Mb->setItemEnabled( 309, ViewOCC);//SuppressFace Mb->setItemEnabled(405, ViewOCC);//Sketch
Mb->setItemEnabled( 314, ViewOCC);//SuppressHole Mb->setItemEnabled(406, ViewOCC);//Sketch
Mb->setItemEnabled( 703, ViewOCC);// ShadingColor Settings Mb->setItemEnabled(603, ViewOCC);//SuppressFace
Mb->setItemEnabled( 704, ViewOCC);// Isos Settings Mb->setItemEnabled(604, ViewOCC);//SuppressHole
if (GeomGUI->GetState() == CURRENT_SKETCH && theCommandID != 10000 && theCommandID != 10001 && theCommandID != 10002 && theCommandID != 10003 && theCommandID != 10004 && theCommandID != 10006 && theCommandID != 10007 && theCommandID != 10008 && theCommandID != 10010 && theCommandID != 10011 && theCommandID != 10012 && theCommandID != 10013 && theCommandID != 10014 && theCommandID != 3133 && theCommandID != 3134) Mb->setItemEnabled(413, ViewOCC);// ShadingColor Settings
Mb->setItemEnabled(414, ViewOCC);// Isos Settings
if (GeomGUI->GetState() == CURRENT_SKETCH && theCommandID != 404 && theCommandID != 4041 && theCommandID != 4042 && theCommandID != 4043 && theCommandID != 4044 && theCommandID != 4045 && theCommandID != 4046 && theCommandID != 4047 && theCommandID != 4048 && theCommandID != 4051 && theCommandID != 4052 && theCommandID != 4053 && theCommandID != 4061 && theCommandID != 4062 && theCommandID != 4063 && theCommandID != 4064 && theCommandID != 4065)
return false; return false;
@ -169,42 +162,41 @@ bool GeometryGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
// int theCommandID_Group = theCommandID_str.toInt(); // int theCommandID_Group = theCommandID_str.toInt();
if(theCommandID == 31 || theCommandID == 33 || theCommandID == 111 || if(theCommandID == 31 || theCommandID == 33 || theCommandID == 111 ||
theCommandID == 112 || theCommandID == 113 || theCommandID == 121 || theCommandID == 112 || theCommandID == 113 || theCommandID == 121 ||
theCommandID == 122 || theCommandID == 123 || theCommandID == 701 || theCommandID == 122 || theCommandID == 123 || theCommandID == 411 ||
theCommandID == 702 || theCommandID == 703 || theCommandID == 704 || theCommandID == 412 || theCommandID == 413 || theCommandID == 414 ||
theCommandID == 705 || theCommandID == 801 || theCommandID == 901 || theCommandID == 415 || theCommandID == 804 || theCommandID == 901 ||
theCommandID == 903 || theCommandID == 5001 || theCommandID == 8031 || theCommandID == 903 || theCommandID == 5103 || theCommandID == 8032 ||
theCommandID == 8032 || theCommandID == 8033 || theCommandID == 9024) { theCommandID == 8033 || theCommandID == 8034 || theCommandID == 9024) {
GEOMBase_Tools* myToolsGUI = new GEOMBase_Tools(); GEOMBase_Tools* myToolsGUI = new GEOMBase_Tools();
myToolsGUI->OnGUIEvent(theCommandID, parent); myToolsGUI->OnGUIEvent(theCommandID, parent);
return true; return true;
} }
if(theCommandID == 312 || theCommandID == 3133 || theCommandID == 3134 || if(theCommandID == 404 || theCommandID == 4041 || theCommandID == 4042 ||
theCommandID == 10000 || theCommandID == 10001 || theCommandID == 10002 || theCommandID == 4043 || theCommandID == 4044 || theCommandID == 4045 ||
theCommandID == 10003 || theCommandID == 10004 || theCommandID == 10006 || theCommandID == 4046 || theCommandID == 4047 || theCommandID == 4048 ||
theCommandID == 10007 || theCommandID == 10008 || theCommandID == 10010 || theCommandID == 4051 || theCommandID == 4052 || theCommandID == 4053 ||
theCommandID == 10011 || theCommandID == 10012 || theCommandID == 10013 || theCommandID == 4061 || theCommandID == 4062 || theCommandID == 4063 ||
theCommandID == 10014) { theCommandID == 4064 || theCommandID == 4065) {
GEOMBase_Sketcher* mySketcherGUI = new GEOMBase_Sketcher(); GEOMBase_Sketcher* mySketcherGUI = new GEOMBase_Sketcher();
mySketcherGUI->OnGUIEvent(theCommandID, parent); mySketcherGUI->OnGUIEvent(theCommandID, parent);
return true; return true;
} }
if(theCommandID == 6021 || theCommandID == 6022 || theCommandID == 6024 || if(theCommandID == 211 || theCommandID == 212 || theCommandID == 214 ||
theCommandID == 8021 || theCommandID == 8022 || theCommandID == 8023 || theCommandID == 8021 || theCommandID == 8022 || theCommandID == 8023 ||
theCommandID == 9022 || theCommandID == 9023) { theCommandID == 9022 || theCommandID == 9023) {
GEOMBase_Display* myDisplayGUI = new GEOMBase_Display(); GEOMBase_Display* myDisplayGUI = new GEOMBase_Display();
myDisplayGUI->OnGUIEvent(theCommandID, parent); myDisplayGUI->OnGUIEvent(theCommandID, parent);
return true; return true;
} }
if(theCommandID == 3011 || theCommandID == 3012 || if(theCommandID == 4011 || theCommandID == 4012 || theCommandID == 4013 ||
theCommandID == 3013 || theCommandID == 3014 || theCommandID == 4014 || theCommandID == 4015 || theCommandID == 4016 ||
theCommandID == 3015 || theCommandID == 3016 || theCommandID == 4017 || theCommandID == 4018) {
theCommandID == 3017 || theCommandID == 3018) {
BasicGUI* myBasicGUI = new BasicGUI(); BasicGUI* myBasicGUI = new BasicGUI();
myBasicGUI->OnGUIEvent(theCommandID, parent); myBasicGUI->OnGUIEvent(theCommandID, parent);
return true; return true;
} }
if(theCommandID == 3021 || theCommandID == 3022 || theCommandID == 3023 || if(theCommandID == 4021 || theCommandID == 4022 || theCommandID == 4023 ||
theCommandID == 3024 || theCommandID == 3025) { theCommandID == 4024 || theCommandID == 4025) {
PrimitiveGUI* myPrimitiveGUI = new PrimitiveGUI(); PrimitiveGUI* myPrimitiveGUI = new PrimitiveGUI();
myPrimitiveGUI->OnGUIEvent(theCommandID, parent); myPrimitiveGUI->OnGUIEvent(theCommandID, parent);
return true; return true;
@ -215,39 +207,40 @@ bool GeometryGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
myGenerationGUI->OnGUIEvent(theCommandID, parent); myGenerationGUI->OnGUIEvent(theCommandID, parent);
return true; return true;
} }
if(theCommandID == 303 || theCommandID == 304 || theCommandID == 305 || if(theCommandID == 407 || theCommandID == 4081 || theCommandID == 4082 ||
theCommandID == 306 || theCommandID == 308 || theCommandID == 315 || theCommandID == 4083 || theCommandID == 4084 || theCommandID == 4085 ||
theCommandID == 316) { theCommandID == 4086) {
BuildGUI* myBuildGUI = new BuildGUI(); BuildGUI* myBuildGUI = new BuildGUI();
myBuildGUI->OnGUIEvent(theCommandID, parent); myBuildGUI->OnGUIEvent(theCommandID, parent);
return true; return true;
} }
if(theCommandID == 4011 || theCommandID == 4012 || if(theCommandID == 5011 || theCommandID == 5012 ||
theCommandID == 4013 || theCommandID == 4014) { theCommandID == 5013 || theCommandID == 5014) {
BooleanGUI* myBooleanGUI = new BooleanGUI(); BooleanGUI* myBooleanGUI = new BooleanGUI();
myBooleanGUI->OnGUIEvent(theCommandID, parent); myBooleanGUI->OnGUIEvent(theCommandID, parent);
return true; return true;
} }
if(theCommandID == 4021 || theCommandID == 4022 || theCommandID == 4023 || if(theCommandID == 5021 || theCommandID == 5022 || theCommandID == 5023 ||
theCommandID == 4024 || theCommandID == 4030 || theCommandID == 4040) { theCommandID == 5024 || theCommandID == 5025 || theCommandID == 5026) {
TransformationGUI* myTransformationGUI = new TransformationGUI(); TransformationGUI* myTransformationGUI = new TransformationGUI();
myTransformationGUI->OnGUIEvent(theCommandID, parent); myTransformationGUI->OnGUIEvent(theCommandID, parent);
return true; return true;
} }
if(theCommandID == 501 || theCommandID == 502) { if(theCommandID == 503 || theCommandID == 504 ||
theCommandID == 505 || theCommandID == 506) {
OperationGUI* myOperationGUI = new OperationGUI(); OperationGUI* myOperationGUI = new OperationGUI();
myOperationGUI->OnGUIEvent(theCommandID, parent); myOperationGUI->OnGUIEvent(theCommandID, parent);
return true; return true;
} }
if(theCommandID == 501 || theCommandID == 502 || if(theCommandID == 601 || theCommandID == 602 ||
theCommandID == 309 || theCommandID == 314) { theCommandID == 603 || theCommandID == 604) {
RepairGUI* myRepairGUI = new RepairGUI(); RepairGUI* myRepairGUI = new RepairGUI();
myRepairGUI->OnGUIEvent(theCommandID, parent); myRepairGUI->OnGUIEvent(theCommandID, parent);
return true; return true;
} }
if(theCommandID == 601 || theCommandID == 604 || theCommandID == 605 || if(theCommandID == 701 || theCommandID == 702 || theCommandID == 703 ||
theCommandID == 6060 || theCommandID == 6061 || theCommandID == 7041 || theCommandID == 7042 ||
theCommandID == 607 || theCommandID == 608 || theCommandID == 609) { theCommandID == 705 || theCommandID == 706 || theCommandID == 707) {
MeasureGUI* myMeasureGUI = new MeasureGUI(); MeasureGUI* myMeasureGUI = new MeasureGUI();
myMeasureGUI->OnGUIEvent(theCommandID, parent); myMeasureGUI->OnGUIEvent(theCommandID, parent);
return true; return true;
@ -293,11 +286,11 @@ bool GeometryGUI::OnMousePress(QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFr
if(GeomGUI->GetSketcher().GetmyEdgesNumber() == 1) { if(GeomGUI->GetSketcher().GetmyEdgesNumber() == 1) {
QMenuBar* Mb = GeomGUI->GetDesktop()->getMainMenuBar(); QMenuBar* Mb = GeomGUI->GetDesktop()->getMainMenuBar();
QMenuData* pp; QMenuData* pp;
QMenuItem* item = Mb->findItem(313,&pp); QMenuItem* item = Mb->findItem(405, &pp);
pp->setItemEnabled( 313, true); // SKETCH CONTRAINTS pp->setItemEnabled(405, true); // SKETCH CONTRAINTS
} }
} else if( GeomGUI->GetState() == POINT_METHOD ) { }
else if(GeomGUI->GetState() == POINT_METHOD) {
GeomGUI->EraseSimulationShape(); GeomGUI->EraseSimulationShape();
BasicGUI_PointDlg *DialogPt = (BasicGUI_PointDlg*)(GeomGUI->GetActiveDialogBox()); BasicGUI_PointDlg *DialogPt = (BasicGUI_PointDlg*)(GeomGUI->GetActiveDialogBox());
@ -308,24 +301,19 @@ bool GeometryGUI::OnMousePress(QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFr
else else
v3d->getAISSelector()->select(); /* New selection */ v3d->getAISSelector()->select(); /* New selection */
if ( ic->MoreSelected() ) { if(ic->MoreSelected())
thePoint = BRep_Tool::Pnt( TopoDS::Vertex(ic->SelectedShape())); thePoint = BRep_Tool::Pnt( TopoDS::Vertex(ic->SelectedShape()));
}
else else
thePoint = GeomGUI->ConvertClickToPoint(pe->x(), pe->y(), ((OCCViewer_ViewPort3d*)vp)->getView()); thePoint = GeomGUI->ConvertClickToPoint(pe->x(), pe->y(), ((OCCViewer_ViewPort3d*)vp)->getView());
} }
else else
thePoint = GeomGUI->ConvertClickToPoint(pe->x(), pe->y(), ((OCCViewer_ViewPort3d*)vp)->getView()); thePoint = GeomGUI->ConvertClickToPoint(pe->x(), pe->y(), ((OCCViewer_ViewPort3d*)vp)->getView());
if( DialogPt != 0 ) { if(DialogPt != 0)
DialogPt->PointIntoCoordinates(thePoint, true); /* display point */ DialogPt->PointIntoCoordinates(thePoint, true); /* display point */
} else
else {
// MESSAGE ("On Mouse Press : myActiveDialogBox is null" << endl) ;
GeomGUI->GetDesktop()->putInfo(tr("GEOM_PRP_ABORT")); GeomGUI->GetDesktop()->putInfo(tr("GEOM_PRP_ABORT"));
} }
}
return false; return false;
} }
@ -360,11 +348,7 @@ bool GeometryGUI::SetSettings( QAD_Desktop* parent )
{ {
GeometryGUI::GetOrCreateGeometryGUI(parent); GeometryGUI::GetOrCreateGeometryGUI(parent);
//DCQ parent->menuBar()->setItemEnabled( 504, false); // CORRECTING parent->menuBar()->setItemEnabled( 405, false); // SKETCH CONTRAINTS
//DCQ parent->menuBar()->setItemEnabled( 6062, false); // RADIUS
//VSR parent->menuBar()->setItemEnabled( 701, false); // AUTOMATIC COPY
parent->menuBar()->setItemEnabled( 313, false); // SKETCH CONTRAINTS
parent->menuBar()->setItemEnabled( 3131, false); // SKETCH SET PLAN
/* Shading Color */ /* Shading Color */
QString SCr = QAD_CONFIG->getSetting("Geometry:SettingsShadingColorRed"); QString SCr = QAD_CONFIG->getSetting("Geometry:SettingsShadingColorRed");
@ -379,27 +363,20 @@ bool GeometryGUI::SetSettings( QAD_Desktop* parent )
OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)parent->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer(); OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)parent->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer();
Handle(AIS_InteractiveContext) ic = v3d->getAISContext(); Handle(AIS_InteractiveContext) ic = v3d->getAISContext();
DisplayMode = ic->DisplayMode(); DisplayMode = ic->DisplayMode();
} else if ( parent->getActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { }
else if(parent->getActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
VTKViewer_RenderWindowInteractor* myRenderInter = ((VTKViewer_ViewFrame*)parent->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRWInteractor(); VTKViewer_RenderWindowInteractor* myRenderInter = ((VTKViewer_ViewFrame*)parent->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRWInteractor();
DisplayMode = myRenderInter->GetDisplayMode(); DisplayMode = myRenderInter->GetDisplayMode();
} }
if(DisplayMode == 1) if(DisplayMode == 1)
parent->menuBar()->changeItem(6021, tr("GEOM_MEN_WIREFRAME") ); parent->menuBar()->changeItem(211, tr("GEOM_MEN_WIREFRAME"));
else else
parent->menuBar()->changeItem(6021, tr("GEOM_MEN_SHADING") ); parent->menuBar()->changeItem(211, tr("GEOM_MEN_SHADING"));
/* Copy */
// QString Copy = QAD_CONFIG->getSetting("Geometry:SettingsCopy");
// if ( !Copy.isEmpty() ) {
// GeomGUI->GetSettings_Copy() = Copy.toInt();
// QMenuData* pp;
// parent->menuBar()->findItem(701,&pp);
// pp->setItemChecked(701, GeomGUI->GetSettings_Copy());
// }
QMenuData* pp; QMenuData* pp;
if ( parent->menuBar()->findItem(701,&pp) ) if(parent->menuBar()->findItem(411, &pp))
pp->removeItem(701); pp->removeItem(411);
/* Add in Study */ /* Add in Study */
QString AddInStudy = QAD_CONFIG->getSetting("Geometry:SettingsAddInStudy"); QString AddInStudy = QAD_CONFIG->getSetting("Geometry:SettingsAddInStudy");
@ -407,8 +384,8 @@ bool GeometryGUI::SetSettings( QAD_Desktop* parent )
GeomGUI->GetSettings_AddInStudy() = AddInStudy.toInt(); GeomGUI->GetSettings_AddInStudy() = AddInStudy.toInt();
else else
GeomGUI->GetSettings_AddInStudy() = 1; GeomGUI->GetSettings_AddInStudy() = 1;
parent->menuBar()->findItem(702,&pp); parent->menuBar()->findItem(412, &pp);
pp->setItemChecked(702, GeomGUI->GetSettings_AddInStudy()); pp->setItemChecked(412, GeomGUI->GetSettings_AddInStudy());
/* step value */ /* step value */
QString S = QAD_CONFIG->getSetting("Geometry:SettingsGeomStep"); QString S = QAD_CONFIG->getSetting("Geometry:SettingsGeomStep");
@ -438,12 +415,15 @@ bool GeometryGUI::SetSettings( QAD_Desktop* parent )
QMenuBar* Mb = GeomGUI->GetDesktop()->getMainMenuBar(); QMenuBar* Mb = GeomGUI->GetDesktop()->getMainMenuBar();
Mb->setItemEnabled( 312, ViewOCC); //Sketch Mb->setItemEnabled(404, ViewOCC);//Sketch
Mb->setItemEnabled( 309, ViewOCC); //SuppressFace Mb->setItemEnabled(405, ViewOCC);//Sketch
Mb->setItemEnabled( 314, ViewOCC); //SuppressHole Mb->setItemEnabled(406, ViewOCC);//Sketch
Mb->setItemEnabled( 703, ViewOCC);// ShadingColor Settings Mb->setItemEnabled(603, ViewOCC);//SuppressFace
Mb->setItemEnabled( 704, ViewOCC);// Isos Settings Mb->setItemEnabled(604, ViewOCC);//SuppressHole
Mb->setItemEnabled(413, ViewOCC);// ShadingColor Settings
Mb->setItemEnabled(414, ViewOCC);// Isos Settings
return true; return true;
} }
@ -486,8 +466,11 @@ void GeometryGUI::DefinePopup(QString & theContext, QString & theParent, QString
} }
else else
theContext = ""; theContext = "";
return;
} }
//===================================================================================== //=====================================================================================
// function : CustomPopup() // function : CustomPopup()
// purpose : [static] // purpose : [static]
@ -509,62 +492,48 @@ bool GeometryGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QStr
if((nbSel == 0) && (theContext.compare("Sketch")!=0)) if((nbSel == 0) && (theContext.compare("Sketch")!=0))
return false; return false;
if(GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) {
if (GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer();
{
OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)GeomGUI->GetActiveStudy()->getActiveStudyFrame()->
getRightFrame()->getViewFrame())->getViewer();
Handle(AIS_InteractiveContext) ic = v3d->getAISContext(); Handle(AIS_InteractiveContext) ic = v3d->getAISContext();
if ( theParent.compare("Viewer")==0 ) if(theParent.compare("Viewer")==0) {
{ if(theContext.compare("Sketch")==0) {
if ( theContext.compare("Sketch")==0 )
{
SketchStatus myCS = GeomGUI->GetSketcher().GetCurrentStatus(); SketchStatus myCS = GeomGUI->GetSketcher().GetCurrentStatus();
popup->setCheckable(TRUE); popup->setCheckable(TRUE);
if (myCS==SEGMENT) if(myCS == SEGMENT) {
{ popup->setItemChecked(4041,true); //Sketch Segment Menu
popup->setItemChecked(10000,true); popup->setItemChecked(4042,false); //Sketch Arc Menu
popup->setItemChecked(10001,false);
} }
else if (myCS==ARC_CHORD) else if(myCS == ARC_CHORD) {
{ popup->setItemChecked(4041,false); //Sketch Segment Menu
popup->setItemChecked(10000,false); popup->setItemChecked(4042,true); //Sketch Arc Menu
popup->setItemChecked(10001,true);
} }
return true; return true;
} }
else else if(theObject.compare("Component") == 0) {
if (theObject.compare("Component") == 0)
{
popup->removeItem(QAD_DisplayOnly_Popup_ID); popup->removeItem(QAD_DisplayOnly_Popup_ID);
return true; return true;
} }
else else {
{
QFont f = QApplication::font(); QFont f = QApplication::font();
f.setBold( TRUE ); f.setBold( TRUE );
if (nbSel==1) if(nbSel==1) {
{
Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject(); Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
popup->removeItem(QAD_TopLabel_Popup_ID); popup->removeItem(QAD_TopLabel_Popup_ID);
popup->insertItem(new CustomItem (QString(IObject->getName()), f), QAD_TopLabel_Popup_ID, 0); popup->insertItem(new CustomItem (QString(IObject->getName()), f), QAD_TopLabel_Popup_ID, 0);
if(IObject->hasEntry()) if(IObject->hasEntry())
popup->setItemEnabled( 801, false ); popup->setItemEnabled(804, false); //Add in Study Menu
else else
popup->setItemEnabled( 801, true ); popup->setItemEnabled(804, true); //Add in Study Menu
if (IObject->IsKind(STANDARD_TYPE(GEOM_InteractiveObject))) if(IObject->IsKind(STANDARD_TYPE(GEOM_InteractiveObject))) {
{
Standard_Boolean found; Standard_Boolean found;
Handle(GEOM_AISShape) Result = GeomGUI->ConvertIOinGEOMAISShape(IObject, found, true); Handle(GEOM_AISShape) Result = GeomGUI->ConvertIOinGEOMAISShape(IObject, found, true);
if ( found ) if(found) {
{
if(Result->DisplayMode() == 1) if(Result->DisplayMode() == 1)
popup->changeItem(8021, tr("GEOM_MEN_WIREFRAME") ); popup->changeItem(8031, tr("GEOM_MEN_WIREFRAME")); //Shading/Wireframe Menu
else else
popup->changeItem(8021, tr("GEOM_MEN_SHADING") ); popup->changeItem(8031, tr("GEOM_MEN_SHADING")); //Shading/Wireframe Menu
} }
} }
@ -572,25 +541,21 @@ bool GeometryGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QStr
popup->removeItem(QAD_Erase_Popup_ID); popup->removeItem(QAD_Erase_Popup_ID);
else else
popup->removeItem(QAD_Display_Popup_ID); popup->removeItem(QAD_Display_Popup_ID);
} }
else else {
{
popup->removeItem(QAD_DisplayOnly_Popup_ID); popup->removeItem(QAD_DisplayOnly_Popup_ID);
popup->removeItem(QAD_TopLabel_Popup_ID); popup->removeItem(QAD_TopLabel_Popup_ID);
popup->insertItem( new CustomItem ( tr("GEOM_MEN_POPUP_NAME").arg(nbSel), f ), popup->insertItem(new CustomItem (tr("GEOM_MEN_POPUP_NAME").arg(nbSel), f), QAD_TopLabel_Popup_ID, 0);
QAD_TopLabel_Popup_ID, 0 ); popup->setItemEnabled(804, false); //Add in Study Menu
popup->setItemEnabled( 801, false );
} }
} }
return true; return true;
} }
else else if(theParent.compare("ObjectBrowser")==0) {
if ( theParent.compare("ObjectBrowser")==0 )
{
popup->removeItem(QAD_TopLabel_Popup_ID); popup->removeItem(QAD_TopLabel_Popup_ID);
int id = popup->idAt(0); // separator int id = popup->idAt(0); // separator
if (id < 0) popup->removeItem(id); if(id < 0)
popup->removeItem(id);
// checking for GEOM label in the selected list // checking for GEOM label in the selected list
SALOME_ListIteratorOfListIO It(Sel->StoredIObjects()); SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
@ -601,8 +566,7 @@ bool GeometryGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QStr
bool needDisplay = false; bool needDisplay = false;
bool needErase = false; bool needErase = false;
SALOMEDS::GenericAttribute_var aTmpAttr; SALOMEDS::GenericAttribute_var aTmpAttr;
for(;It.More();It.Next()) for(;It.More();It.Next()) {
{
anIObject = It.Value(); anIObject = It.Value();
if(!anIObject->hasEntry()) if(!anIObject->hasEntry())
continue; continue;
@ -611,35 +575,27 @@ bool GeometryGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QStr
needErase = true; needErase = true;
else else
needDisplay = true; needDisplay = true;
SALOMEDS::SObject_var obj = SALOMEDS::SObject_var obj = GeomGUI->GetActiveStudy()->getStudyDocument()->FindObjectID(anIObject->getEntry());
GeomGUI->GetActiveStudy()->getStudyDocument()->FindObjectID( anIObject->getEntry() ); if(!obj->_is_nil()) {
if (!obj->_is_nil())
{
GEOM::GEOM_Shape_var aShape; GEOM::GEOM_Shape_var aShape;
if(obj->FindAttribute(aTmpAttr, "AttributeIOR")) { if(obj->FindAttribute(aTmpAttr, "AttributeIOR")) {
char *str = SALOMEDS::AttributeIOR::_narrow(aTmpAttr)->Value(); char *str = SALOMEDS::AttributeIOR::_narrow(aTmpAttr)->Value();
if(str && strlen(str)) if(str && strlen(str))
aShape = myComponentGeom->GetIORFromString(str); aShape = myComponentGeom->GetIORFromString(str);
} }
else else if(obj->FindAttribute(aTmpAttr, "AttributePersistentRef"))
if (obj->FindAttribute(aTmpAttr, "AttributePersistentRef"))
needOpen = true; needOpen = true;
if (aShape->_is_nil())
{ if(aShape->_is_nil()) {
SALOMEDS::ChildIterator_var anIter = GeomGUI->GetActiveStudy()-> SALOMEDS::ChildIterator_var anIter = GeomGUI->GetActiveStudy()->getStudyDocument()->NewChildIterator(obj);
getStudyDocument()->NewChildIterator(obj); while(anIter->More()) {
while (anIter->More())
{
SALOMEDS::SObject_var subobj = anIter->Value(); SALOMEDS::SObject_var subobj = anIter->Value();
if (subobj->FindAttribute(aTmpAttr, "AttributeIOR")) if(subobj->FindAttribute(aTmpAttr, "AttributeIOR")) {
{
useSubItems = true; useSubItems = true;
needErase = true; needErase = true;
needDisplay = true; needDisplay = true;
} }
else else if(subobj->FindAttribute(aTmpAttr, "AttributePersistentRef")) {
if (subobj->FindAttribute(aTmpAttr, "AttributePersistentRef"))
{
needOpen = true; needOpen = true;
useSubItems = true; useSubItems = true;
} }
@ -649,47 +605,43 @@ bool GeometryGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QStr
} }
} }
// remove useless popup items // remove useless popup items
if (nbSel != 1) popup->removeItem(901); // rename if(nbSel != 1)
if (useSubItems) popup->removeItem(QAD_DisplayOnly_Popup_ID); // display only popup->removeItem(901); // rename
if (!needOpen) if(useSubItems)
{ popup->removeItem(QAD_DisplayOnly_Popup_ID); // display only
int index = popup->indexOf(9024);
popup->removeItem(9024); // open if(!needOpen) {
int index = popup->indexOf(9024); // open
popup->removeItem(9024);
popup->removeItemAt(index); // separator under Open popup->removeItemAt(index); // separator under Open
if (!needDisplay) popup->removeItem(QAD_Display_Popup_ID); if (!needDisplay)
if (!needErase) popup->removeItem(QAD_Erase_Popup_ID); popup->removeItem(QAD_Display_Popup_ID);
if (!needDisplay && !needErase) if (!needErase)
{ popup->removeItem(QAD_Erase_Popup_ID);
if(!needDisplay && !needErase) {
int id = popup->idAt(popup->count()-1); // last item int id = popup->idAt(popup->count()-1); // last item
popup->removeItem(id); // separator popup->removeItem(id); // separator
} }
} }
else else {
{
popup->removeItem(QAD_DisplayOnly_Popup_ID); // display only popup->removeItem(QAD_DisplayOnly_Popup_ID); // display only
popup->removeItem(QAD_Display_Popup_ID); popup->removeItem(QAD_Display_Popup_ID);
popup->removeItem(QAD_Erase_Popup_ID); popup->removeItem(QAD_Erase_Popup_ID);
if (nbSel!=1) if (nbSel!=1) {
{
int id = popup->idAt(popup->count()-1); // last item int id = popup->idAt(popup->count()-1); // last item
popup->removeItem(id); // separator popup->removeItem(id); // separator
} }
} }
return true; return true;
} }
// MESSAGE ( " CUSTOM POPUP VIEWER OCC done. ")
} }
else else if(GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
if (GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK)
{
// MESSAGE ( " CUSTOM POPUP VIEWER VTK ") // MESSAGE ( " CUSTOM POPUP VIEWER VTK ")
if ( ( theParent.compare("Viewer")==0 ) ) if((theParent.compare("Viewer")==0)) {
{ popup->setItemEnabled(8034, false); //Isos Menu
if(theObject.compare("Component") == 0) {
popup->setItemEnabled( 8033, false );
if (theObject.compare("Component") == 0)
{
popup->removeItem(QAD_DisplayOnly_Popup_ID); popup->removeItem(QAD_DisplayOnly_Popup_ID);
return true; return true;
} }
@ -698,31 +650,26 @@ bool GeometryGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QStr
QFont f = QApplication::font(); QFont f = QApplication::font();
f.setBold( TRUE ); f.setBold( TRUE );
if (nbSel==1) if(nbSel==1) {
{
Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject(); Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
popup->removeItem(QAD_TopLabel_Popup_ID); popup->removeItem(QAD_TopLabel_Popup_ID);
popup->insertItem(new CustomItem (QString(IObject->getName()), f), QAD_TopLabel_Popup_ID, 0); popup->insertItem(new CustomItem (QString(IObject->getName()), f), QAD_TopLabel_Popup_ID, 0);
if ( IObject->hasEntry() ) if(IObject->hasEntry()) {
{ popup->setItemEnabled(804, false); //Add in Study Menu
popup->setItemEnabled( 801, false );
SALOMEDS::Study_var aStudy = GeomGUI->GetActiveStudy()->getStudyDocument(); SALOMEDS::Study_var aStudy = GeomGUI->GetActiveStudy()->getStudyDocument();
SALOMEDS::SObject_var SO = aStudy->FindObjectID(IObject->getEntry()); SALOMEDS::SObject_var SO = aStudy->FindObjectID(IObject->getEntry());
SALOMEDS::GenericAttribute_var anAttr; SALOMEDS::GenericAttribute_var anAttr;
SALOMEDS::AttributeIOR_var anIOR; SALOMEDS::AttributeIOR_var anIOR;
if ( !SO->_is_nil() ) if(!SO->_is_nil()) {
{ if(SO->FindAttribute(anAttr, "AttributeIOR")) {
if (SO->FindAttribute(anAttr, "AttributeIOR") )
{
anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr); anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
Standard_Boolean found; Standard_Boolean found;
GEOM_Actor* Result = GeomGUI->ConvertIORinGEOMActor(anIOR->Value(), found, true); GEOM_Actor* Result = GeomGUI->ConvertIORinGEOMActor(anIOR->Value(), found, true);
if ( found ) if(found) {
{
if(Result->getDisplayMode() == 1) if(Result->getDisplayMode() == 1)
popup->changeItem(8021, "Wireframe" ); popup->changeItem(8031, tr("GEOM_MEN_WIREFRAME")); //Shading/Wireframe Menu
else else
popup->changeItem(8021, "Shading" ); popup->changeItem(8031, tr("GEOM_MEN_SHADING")); //Shading/Wireframe Menu
if(!Result->GetVisibility()) if(!Result->GetVisibility())
popup->removeItem(QAD_Erase_Popup_ID); popup->removeItem(QAD_Erase_Popup_ID);
@ -735,23 +682,21 @@ bool GeometryGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QStr
} }
} }
else else
popup->setItemEnabled( 801, true ); popup->setItemEnabled(804, true); //Add in Study Menu
} }
else else {
{
popup->removeItem(QAD_DisplayOnly_Popup_ID); popup->removeItem(QAD_DisplayOnly_Popup_ID);
popup->removeItem(QAD_TopLabel_Popup_ID); popup->removeItem(QAD_TopLabel_Popup_ID);
popup->insertItem( new CustomItem (tr("GEOM_MEN_POPUP_NAME").arg(nbSel), f), QAD_TopLabel_Popup_ID, 0); popup->insertItem( new CustomItem (tr("GEOM_MEN_POPUP_NAME").arg(nbSel), f), QAD_TopLabel_Popup_ID, 0);
popup->setItemEnabled( 801, false ); popup->setItemEnabled(804, false); //Add in Study Menu
} }
return true; return true;
} }
else else if(theParent.compare("ObjectBrowser")==0) {
if ( theParent.compare("ObjectBrowser")==0 )
{
popup->removeItem(QAD_TopLabel_Popup_ID); popup->removeItem(QAD_TopLabel_Popup_ID);
int id = popup->idAt(0); // separator int id = popup->idAt(0); // separator
if (id < 0) popup->removeItem(id); if(id < 0)
popup->removeItem(id);
// checking for GEOM label in the selected list // checking for GEOM label in the selected list
SALOME_ListIteratorOfListIO It(Sel->StoredIObjects()); SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
@ -762,10 +707,8 @@ bool GeometryGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QStr
bool needDisplay = false; bool needDisplay = false;
bool needErase = false; bool needErase = false;
SALOMEDS::GenericAttribute_var aTmpAttr; SALOMEDS::GenericAttribute_var aTmpAttr;
VTKViewer_RenderWindowInteractor* myRenderInter= ((VTKViewer_ViewFrame*)GeomGUI->GetActiveStudy()-> VTKViewer_RenderWindowInteractor* myRenderInter= ((VTKViewer_ViewFrame*)GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRWInteractor();
getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRWInteractor(); for(;It.More();It.Next()) {
for(;It.More();It.Next())
{
anIObject = It.Value(); anIObject = It.Value();
if(!anIObject->hasEntry()) if(!anIObject->hasEntry())
continue; continue;
@ -775,8 +718,7 @@ bool GeometryGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QStr
else else
needDisplay = true; needDisplay = true;
SALOMEDS::SObject_var obj = GeomGUI->GetActiveStudy()->getStudyDocument() SALOMEDS::SObject_var obj = GeomGUI->GetActiveStudy()->getStudyDocument()->FindObjectID( anIObject->getEntry());
->FindObjectID( anIObject->getEntry() );
if(!obj->_is_nil()) { if(!obj->_is_nil()) {
GEOM::GEOM_Shape_var aShape; GEOM::GEOM_Shape_var aShape;
if(obj->FindAttribute(aTmpAttr, "AttributeIOR")) { if(obj->FindAttribute(aTmpAttr, "AttributeIOR")) {
@ -784,25 +726,19 @@ bool GeometryGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QStr
if(str && strlen(str)) if(str && strlen(str))
aShape = myComponentGeom->GetIORFromString(str); aShape = myComponentGeom->GetIORFromString(str);
} }
else else if(obj->FindAttribute(aTmpAttr, "AttributePersistentRef"))
if (obj->FindAttribute(aTmpAttr, "AttributePersistentRef"))
needOpen = true; needOpen = true;
if (aShape->_is_nil())
{ if(aShape->_is_nil()) {
SALOMEDS::ChildIterator_var anIter = SALOMEDS::ChildIterator_var anIter = GeomGUI->GetActiveStudy()->getStudyDocument()->NewChildIterator(obj);
GeomGUI->GetActiveStudy()->getStudyDocument()->NewChildIterator(obj); while(anIter->More()) {
while (anIter->More())
{
SALOMEDS::SObject_var subobj = anIter->Value(); SALOMEDS::SObject_var subobj = anIter->Value();
if (subobj->FindAttribute(aTmpAttr, "AttributeIOR")) if(subobj->FindAttribute(aTmpAttr, "AttributeIOR")) {
{
useSubItems = true; useSubItems = true;
needDisplay = true; needDisplay = true;
needErase = true; needErase = true;
} }
else else if(subobj->FindAttribute(aTmpAttr, "AttributePersistentRef")) {
if (subobj->FindAttribute(aTmpAttr, "AttributePersistentRef"))
{
needOpen = true; needOpen = true;
useSubItems = true; useSubItems = true;
} }
@ -812,40 +748,39 @@ bool GeometryGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QStr
} }
} }
// remove useless popup items // remove useless popup items
if (nbSel != 1) popup->removeItem(901); // rename if(nbSel != 1)
if (useSubItems) popup->removeItem(QAD_DisplayOnly_Popup_ID); // display only popup->removeItem(901); // rename
if (!needOpen) if(useSubItems)
{ popup->removeItem(QAD_DisplayOnly_Popup_ID); // display only
int index = popup->indexOf(9024);
popup->removeItem(9024); // open if(!needOpen) {
int index = popup->indexOf(9024); // open
popup->removeItem(9024);
popup->removeItemAt(index); // separator under Open popup->removeItemAt(index); // separator under Open
if (!needDisplay) popup->removeItem(QAD_Display_Popup_ID); if(!needDisplay)
if (!needErase) popup->removeItem(QAD_Erase_Popup_ID); popup->removeItem(QAD_Display_Popup_ID);
if (!needDisplay && !needErase) if(!needErase)
{ popup->removeItem(QAD_Erase_Popup_ID);
if(!needDisplay && !needErase) {
int id = popup->idAt(popup->count()-1); // last item int id = popup->idAt(popup->count()-1); // last item
popup->removeItem(id); // separator popup->removeItem(id); // separator
} }
} }
else else {
{
popup->removeItem(QAD_DisplayOnly_Popup_ID); // display only popup->removeItem(QAD_DisplayOnly_Popup_ID); // display only
popup->removeItem(QAD_Display_Popup_ID); popup->removeItem(QAD_Display_Popup_ID);
popup->removeItem(QAD_Erase_Popup_ID); popup->removeItem(QAD_Erase_Popup_ID);
if (nbSel!=1) if(nbSel!=1) {
{
int id = popup->idAt(popup->count()-1); // last item int id = popup->idAt(popup->count()-1); // last item
popup->removeItem(id); // separator popup->removeItem(id); // separator
} }
} }
return true; return true;
// MESSAGE ( " CUSTOM POPUP VIEWER VTK done.")
} }
} else }
{ // other viewer types not supported. else { // other viewer types not supported.
while (1) while(1) {
{
int id = popup->idAt(0); int id = popup->idAt(0);
if(id <= QAD_TopLabel_Popup_ID && id != -1) if(id <= QAD_TopLabel_Popup_ID && id != -1)
popup->removeItemAt(0); popup->removeItemAt(0);
@ -856,7 +791,8 @@ bool GeometryGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QStr
popup->removeItem(QAD_Display_Popup_ID); popup->removeItem(QAD_Display_Popup_ID);
popup->removeItem(QAD_Erase_Popup_ID); popup->removeItem(QAD_Erase_Popup_ID);
int id = popup->idAt(popup->count()-1); // last item int id = popup->idAt(popup->count()-1); // last item
if (id < 0 && id != -1) popup->removeItem(id); // separator if(id < 0 && id != -1)
popup->removeItem(id); // separator
return false; return false;
} }
return false; return false;
@ -882,12 +818,15 @@ void GeometryGUI::activeStudyChanged(QAD_Desktop* parent)
if(GeomGUI->GetDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) if(GeomGUI->GetDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC)
ViewOCC = true; ViewOCC = true;
Mb->setItemEnabled(312, ViewOCC); //Sketch Mb->setItemEnabled(404, ViewOCC);//Sketch
Mb->setItemEnabled(309, ViewOCC); //SuppressFace Mb->setItemEnabled(405, ViewOCC);//Sketch
Mb->setItemEnabled(314, ViewOCC); //SuppressHole Mb->setItemEnabled(406, ViewOCC);//Sketch
Mb->setItemEnabled(703, ViewOCC);// ShadingColor Settings Mb->setItemEnabled(603, ViewOCC);//SuppressFace
Mb->setItemEnabled(704, ViewOCC);// Isos Settings Mb->setItemEnabled(604, ViewOCC);//SuppressHole
Mb->setItemEnabled(413, ViewOCC);// ShadingColor Settings
Mb->setItemEnabled(414, ViewOCC);// Isos Settings
GeomGUI->EraseSimulationShape(); GeomGUI->EraseSimulationShape();
GeomGUI->EmitSignalCloseAllDialogs(); GeomGUI->EmitSignalCloseAllDialogs();
@ -918,9 +857,11 @@ void GeometryGUI::BuildPresentation(const Handle(SALOME_InteractiveObject)& theI
if(GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) { if(GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) {
v3d = ((OCCViewer_ViewFrame*)GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer(); v3d = ((OCCViewer_ViewFrame*)GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer();
ic = v3d->getAISContext(); ic = v3d->getAISContext();
} else if ( GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { }
else if(GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
Renderer = ((VTKViewer_ViewFrame*)GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer(); Renderer = ((VTKViewer_ViewFrame*)GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
} else }
else
return; return;
if(theIO.IsNull()) if(theIO.IsNull())
@ -929,8 +870,7 @@ void GeometryGUI::BuildPresentation(const Handle(SALOME_InteractiveObject)& theI
if(GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { if(GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
// VTK // VTK
SALOMEDS::SObject_var fatherSF = SALOMEDS::SObject_var fatherSF = aStudy->FindObjectID(GeomGUI->GetActiveStudy()->getActiveStudyFrame()->entry());
aStudy->FindObjectID(GeomGUI->GetActiveStudy()->getActiveStudyFrame()->entry());
SALOMEDS::SObject_var obj = aStudy->FindObjectID(theIO->getEntry()); SALOMEDS::SObject_var obj = aStudy->FindObjectID(theIO->getEntry());
@ -960,8 +900,12 @@ void GeometryGUI::BuildPresentation(const Handle(SALOME_InteractiveObject)& theI
anAttr = aTmpAttr; anAttr = aTmpAttr;
obj = subobj; obj = subobj;
useSubItems = true; useSubItems = true;
} else anIter->Next(); }
} else anIter->Next(); else
anIter->Next();
}
else
anIter->Next();
} }
} }
@ -1033,9 +977,13 @@ void GeometryGUI::BuildPresentation(const Handle(SALOME_InteractiveObject)& theI
if (subobject->FindAttribute(aTmpAttribute, "AttributeIOR")) { if (subobject->FindAttribute(aTmpAttribute, "AttributeIOR")) {
anAttr = aTmpAttribute; anAttr = aTmpAttribute;
obj = subobject; obj = subobject;
} else anIter->Next();
} }
} else anAttr = SALOMEDS::GenericAttribute::_nil(); else
anIter->Next();
}
}
else
anAttr = SALOMEDS::GenericAttribute::_nil();
} }
} }
} }
@ -1043,9 +991,9 @@ void GeometryGUI::BuildPresentation(const Handle(SALOME_InteractiveObject)& theI
// No viewer update should be done here! // No viewer update should be done here!
//myRenderInter->Render(); //myRenderInter->Render();
//GeomGUI->GetActiveStudy()->updateObjBrowser( true ); //GeomGUI->GetActiveStudy()->updateObjBrowser( true );
} else if (GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC ) { }
SALOMEDS::SObject_var fatherSF = else if(GeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) {
aStudy->FindObjectID( GeomGUI->GetActiveStudy()->getActiveStudyFrame()->entry()); SALOMEDS::SObject_var fatherSF = aStudy->FindObjectID(GeomGUI->GetActiveStudy()->getActiveStudyFrame()->entry());
SALOMEDS::GenericAttribute_var anAttr; SALOMEDS::GenericAttribute_var anAttr;
SALOMEDS::AttributeName_var aName; SALOMEDS::AttributeName_var aName;
SALOMEDS::AttributeIOR_var anIOR; SALOMEDS::AttributeIOR_var anIOR;
@ -1058,7 +1006,8 @@ void GeometryGUI::BuildPresentation(const Handle(SALOME_InteractiveObject)& theI
ic->AddOrRemoveCurrentObject(aSh, false); ic->AddOrRemoveCurrentObject(aSh, false);
} }
} else { }
else {
SALOMEDS::SObject_var obj = aStudy->FindObjectID(theIO->getEntry()); SALOMEDS::SObject_var obj = aStudy->FindObjectID(theIO->getEntry());
if(!obj->_is_nil()) { if(!obj->_is_nil()) {
MESSAGE("BuildPresentation(): SObject not null") MESSAGE("BuildPresentation(): SObject not null")
@ -1077,8 +1026,12 @@ void GeometryGUI::BuildPresentation(const Handle(SALOME_InteractiveObject)& theI
anAttr = aTmpAttr; anAttr = aTmpAttr;
obj = subobj; obj = subobj;
useSubItems = true; useSubItems = true;
} else anIter->Next(); }
} else anIter->Next(); else
anIter->Next();
}
else
anIter->Next();
} }
} }
@ -1099,13 +1052,16 @@ void GeometryGUI::BuildPresentation(const Handle(SALOME_InteractiveObject)& theI
for(;anIObjects.More();anIObjects.Next()) { for(;anIObjects.More();anIObjects.Next()) {
anAISShape = Handle(AIS_Shape)::DownCast(anIObjects.Value()); anAISShape = Handle(AIS_Shape)::DownCast(anIObjects.Value());
if(!anAISShape.IsNull()) { if(!anAISShape.IsNull()) {
if (anAISShape->Shape().IsSame(Shape)) break; if(anAISShape->Shape().IsSame(Shape))
break;
anAISShape.Nullify(); anAISShape.Nullify();
} }
} }
if(!anAISShape.IsNull()) { if(!anAISShape.IsNull()) {
if (!ic->IsDisplayed(anAISShape)) ic->Display(anAISShape, false); if(!ic->IsDisplayed(anAISShape))
} else { ic->Display(anAISShape, false);
}
else {
if(!useSubItems) { if(!useSubItems) {
// open transaction // open transaction
QAD_Operation* op = new SALOMEGUI_ImportOperation( GeomGUI->GetActiveStudy() ); QAD_Operation* op = new SALOMEGUI_ImportOperation( GeomGUI->GetActiveStudy() );
@ -1119,14 +1075,13 @@ void GeometryGUI::BuildPresentation(const Handle(SALOME_InteractiveObject)& theI
} }
Handle(GEOM_AISShape) aSh = new GEOM_AISShape(Shape, aName->Value()); Handle(GEOM_AISShape) aSh = new GEOM_AISShape(Shape, aName->Value());
aSh->SetShadingColor(GeomGUI->GetShadingColor()); aSh->SetShadingColor(GeomGUI->GetShadingColor());
Handle(GEOM_InteractiveObject) IO = new GEOM_InteractiveObject(anIOR->Value(), Handle(GEOM_InteractiveObject) IO = new GEOM_InteractiveObject(anIOR->Value(), GeomGUI->GetFatherior(), "GEOM");
GeomGUI->GetFatherior(),
"GEOM");
IO->setEntry(obj->GetID()); IO->setEntry(obj->GetID());
aSh->setIO(IO); aSh->setIO(IO);
aSh->setName(aName->Value()); aSh->setName(aName->Value());
ic->Display(aSh, false); ic->Display(aSh, false);
if (!useSubItems) ic->AddOrRemoveCurrentObject(aSh, false); if(!useSubItems)
ic->AddOrRemoveCurrentObject(aSh, false);
} }
} }
// next item iteration // next item iteration
@ -1139,9 +1094,12 @@ void GeometryGUI::BuildPresentation(const Handle(SALOME_InteractiveObject)& theI
if(subobject->FindAttribute(aTmpAttribute, "AttributeIOR")) { if(subobject->FindAttribute(aTmpAttribute, "AttributeIOR")) {
anAttr = aTmpAttribute; anAttr = aTmpAttribute;
obj = subobject; obj = subobject;
} else anIter->Next();
} }
} else else
anIter->Next();
}
}
else
anAttr = SALOMEDS::GenericAttribute::_nil(); anAttr = SALOMEDS::GenericAttribute::_nil();
} }
} }
@ -1160,50 +1118,32 @@ void GeometryGUI::BuildPresentation(const Handle(SALOME_InteractiveObject)& theI
extern "C" extern "C"
{ {
bool OnGUIEvent(int theCommandID, QAD_Desktop* parent) bool OnGUIEvent(int theCommandID, QAD_Desktop* parent)
{ {return GeometryGUI::OnGUIEvent(theCommandID, parent);}
return GeometryGUI::OnGUIEvent(theCommandID, parent);
}
bool OnKeyPress (QKeyEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame) bool OnKeyPress (QKeyEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame)
{ {return GeometryGUI::OnKeyPress(pe, parent, studyFrame);}
return GeometryGUI::OnKeyPress(pe, parent, studyFrame);
}
bool OnMousePress (QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame) bool OnMousePress (QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame)
{ {return GeometryGUI::OnMousePress(pe, parent, studyFrame);}
return GeometryGUI::OnMousePress(pe, parent, studyFrame);
}
bool OnMouseMove(QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame) bool OnMouseMove(QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame)
{ {return GeometryGUI::OnMouseMove(pe, parent, studyFrame);}
return GeometryGUI::OnMouseMove(pe, parent, studyFrame);
}
bool SetSettings(QAD_Desktop* parent) bool SetSettings(QAD_Desktop* parent)
{ {return GeometryGUI::SetSettings(parent);}
return GeometryGUI::SetSettings(parent);
}
bool customPopup(QAD_Desktop* parent, QPopupMenu* popup, const QString & theContext, bool customPopup(QAD_Desktop* parent, QPopupMenu* popup, const QString & theContext,
const QString & theParent, const QString & theObject) const QString & theParent, const QString & theObject)
{ {return GeometryGUI::CustomPopup(parent, popup, theContext, theParent, theObject);}
return GeometryGUI::CustomPopup(parent, popup, theContext, theParent, theObject);
}
void definePopup(QString & theContext, QString & parent, QString & theObject) void definePopup(QString & theContext, QString & parent, QString & theObject)
{ {GeometryGUI::DefinePopup(theContext, parent, theObject);}
GeometryGUI::DefinePopup(theContext, parent, theObject);
}
bool activeStudyChanged(QAD_Desktop* parent) bool activeStudyChanged(QAD_Desktop* parent)
{ {GeometryGUI::activeStudyChanged(parent);}
GeometryGUI::activeStudyChanged(parent);
}
void buildPresentation(const Handle(SALOME_InteractiveObject)& theIO) void buildPresentation(const Handle(SALOME_InteractiveObject)& theIO)
{ {GeometryGUI::BuildPresentation(theIO);}
GeometryGUI::BuildPresentation(theIO);
}
void supportedViewType(int* buffer, int bufferSize) void supportedViewType(int* buffer, int bufferSize)
{ {

34
src/GenerationGUI/GenerationGUI_FillingDlg.cxx
View File

@ -56,10 +56,10 @@ GenerationGUI_FillingDlg::GenerationGUI_FillingDlg(QWidget* parent, const char*
GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS")); GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
GroupPoints->TextLabel1->setText(tr("GEOM_FILLING_COMPOUND")); GroupPoints->TextLabel1->setText(tr("GEOM_FILLING_COMPOUND"));
GroupPoints->TextLabel2->setText(tr("GEOM_FILLING_MIN_DEG")); GroupPoints->TextLabel2->setText(tr("GEOM_FILLING_MIN_DEG"));
GroupPoints->TextLabel3->setText(tr("GEOM_FILLING_MAX_DEG")); GroupPoints->TextLabel3->setText(tr("GEOM_FILLING_TOL_2D"));
GroupPoints->TextLabel4->setText(tr("GEOM_FILLING_TOL_3D")); GroupPoints->TextLabel4->setText(tr("GEOM_FILLING_NB_ITER"));
GroupPoints->TextLabel5->setText(tr("GEOM_FILLING_TOL_2D")); GroupPoints->TextLabel5->setText(tr("GEOM_FILLING_MAX_DEG"));
GroupPoints->TextLabel6->setText(tr("GEOM_FILLING_NB_ITER")); GroupPoints->TextLabel6->setText(tr("GEOM_FILLING_TOL_3D"));
GroupPoints->PushButton1->setPixmap(image1); GroupPoints->PushButton1->setPixmap(image1);
Layout1->addWidget(GroupPoints, 1, 0); Layout1->addWidget(GroupPoints, 1, 0);
@ -102,20 +102,20 @@ void GenerationGUI_FillingDlg::Init()
/* Get setting of step value from file configuration */ /* Get setting of step value from file configuration */
QString St = QAD_CONFIG->getSetting("Geometry:SettingsGeomStep"); QString St = QAD_CONFIG->getSetting("Geometry:SettingsGeomStep");
step = St.toDouble(); step = St.toInt();
/* min, max, step and decimals for spin boxes & initial values */ /* min, max, step and decimals for spin boxes & initial values */
GroupPoints->SpinBox_1->RangeStepAndValidator(0.001, 999.999, step, 3); GroupPoints->SpinBox_1->RangeStepAndValidator(0.001, 999.999, step, 3);
GroupPoints->SpinBox_2->RangeStepAndValidator(0.001, 999.999, step, 3); GroupPoints->SpinBox_2->RangeStepAndValidator(0.00001, 10000.0, 3, 10);
GroupPoints->SpinBox_3->RangeStepAndValidator(0.00001, 10000.0, 3, 10); GroupPoints->SpinBox_3->RangeStepAndValidator(0.001, 999.999, step, 3);
GroupPoints->SpinBox_4->RangeStepAndValidator(0.00001, 10000.0, 3, 10); GroupPoints->SpinBox_4->RangeStepAndValidator(0.001, 999.999, step, 3);
GroupPoints->SpinBox_5->RangeStepAndValidator(0.001, 999.999, step, 3); GroupPoints->SpinBox_5->RangeStepAndValidator(0.00001, 10000.0, 3, 10);
GroupPoints->SpinBox_1->SetValue(myMinDeg); GroupPoints->SpinBox_1->SetValue(myMinDeg);
GroupPoints->SpinBox_2->SetValue(myMaxDeg); GroupPoints->SpinBox_2->SetValue(myTol2D);
GroupPoints->SpinBox_3->SetValue(myTol3D); GroupPoints->SpinBox_3->SetValue(myNbIter);
GroupPoints->SpinBox_4->SetValue(myTol2D); GroupPoints->SpinBox_4->SetValue(myMaxDeg);
GroupPoints->SpinBox_5->SetValue(myNbIter); GroupPoints->SpinBox_5->SetValue(myTol3D);
/* signals and slots connections */ /* signals and slots connections */
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
@ -155,10 +155,10 @@ void GenerationGUI_FillingDlg::ClickOnApply()
myGeomGUI->GetDesktop()->putInfo(tr("")); myGeomGUI->GetDesktop()->putInfo(tr(""));
myMinDeg = GroupPoints->SpinBox_1->value(); myMinDeg = GroupPoints->SpinBox_1->value();
myMaxDeg = GroupPoints->SpinBox_2->value(); myTol2D = GroupPoints->SpinBox_2->value();
myTol3D = GroupPoints->SpinBox_3->value(); myNbIter = GroupPoints->SpinBox_3->value();
myTol2D = GroupPoints->SpinBox_4->value(); myMaxDeg = GroupPoints->SpinBox_4->value();
myNbIter = GroupPoints->SpinBox_5->value(); myTol3D = GroupPoints->SpinBox_5->value();
if(myOkSectionShape) if(myOkSectionShape)
myGenerationGUI->MakeFillingAndDisplay(myGeomShape, myMinDeg, myMaxDeg, myTol3D, myTol2D, myNbIter); myGenerationGUI->MakeFillingAndDisplay(myGeomShape, myMinDeg, myMaxDeg, myTol3D, myTol2D, myNbIter);

16
src/MeasureGUI/MeasureGUI.cxx
View File

@ -71,42 +71,42 @@ bool MeasureGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
switch (theCommandID) switch (theCommandID)
{ {
case 601: // PROPERTIES (Length, surface, volume) case 701: // PROPERTIES (Length, surface, volume)
{ {
MeasureGUI_PropertiesDlg *aDlg = new MeasureGUI_PropertiesDlg(parent, "", Sel); MeasureGUI_PropertiesDlg *aDlg = new MeasureGUI_PropertiesDlg(parent, "", Sel);
break; break;
} }
case 604: // CDG : Center of mass case 702: // CDG : Center of mass
{ {
MeasureGUI_CenterMassDlg *aDlg = new MeasureGUI_CenterMassDlg(parent, "", this, Sel); MeasureGUI_CenterMassDlg *aDlg = new MeasureGUI_CenterMassDlg(parent, "", this, Sel);
break; break;
} }
case 605: // INERTIA case 703: // INERTIA
{ {
MeasureGUI_InertiaDlg *aDlg = new MeasureGUI_InertiaDlg(parent, "", Sel); MeasureGUI_InertiaDlg *aDlg = new MeasureGUI_InertiaDlg(parent, "", Sel);
break; break;
} }
case 6060: // BOUNDING BOX case 7041: // BOUNDING BOX
{ {
MeasureGUI_BndBoxDlg *aDlg = new MeasureGUI_BndBoxDlg(parent, "", Sel); MeasureGUI_BndBoxDlg *aDlg = new MeasureGUI_BndBoxDlg(parent, "", Sel);
break; break;
} }
case 6061: // MIN DISTANCE case 7042: // MIN DISTANCE
{ {
MeasureGUI_DistanceDlg *aDlg = new MeasureGUI_DistanceDlg(parent, "", Sel); MeasureGUI_DistanceDlg *aDlg = new MeasureGUI_DistanceDlg(parent, "", Sel);
break; break;
} }
case 607: // MAXTOLERANCE case 705: // MAXTOLERANCE
{ {
MeasureGUI_MaxToleranceDlg *aDlg = new MeasureGUI_MaxToleranceDlg(parent, "", Sel); MeasureGUI_MaxToleranceDlg *aDlg = new MeasureGUI_MaxToleranceDlg(parent, "", Sel);
break; break;
} }
case 608: // WHATIS case 706: // WHATIS
{ {
MeasureGUI_WhatisDlg *aDlg = new MeasureGUI_WhatisDlg(parent, "", Sel); MeasureGUI_WhatisDlg *aDlg = new MeasureGUI_WhatisDlg(parent, "", Sel);
break; break;
} }
case 609: // CHECKSHAPE case 707: // CHECKSHAPE
{ {
MeasureGUI_CheckShape *aDlg = new MeasureGUI_CheckShape(parent, "", Sel); MeasureGUI_CheckShape *aDlg = new MeasureGUI_CheckShape(parent, "", Sel);
break; break;

8
src/OperationGUI/OperationGUI.cxx
View File

@ -73,17 +73,17 @@ bool OperationGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
switch (theCommandID) switch (theCommandID)
{ {
case 4025: // PARTITION case 503: // PARTITION
{ {
OperationGUI_PartitionDlg *aDlg = new OperationGUI_PartitionDlg(parent, "", this, Sel); OperationGUI_PartitionDlg *aDlg = new OperationGUI_PartitionDlg(parent, "", this, Sel);
break; break;
} }
case 4026: // ARCHIMEDE case 504: // ARCHIMEDE
{ {
OperationGUI_ArchimedeDlg *aDlg = new OperationGUI_ArchimedeDlg(parent, "", this, Sel); OperationGUI_ArchimedeDlg *aDlg = new OperationGUI_ArchimedeDlg(parent, "", this, Sel);
break; break;
} }
case 4027: // FILLET case 505: // FILLET
{ {
Handle(AIS_InteractiveContext) ic; Handle(AIS_InteractiveContext) ic;
if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) { if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) {
@ -93,7 +93,7 @@ bool OperationGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
OperationGUI_FilletDlg *aDlg = new OperationGUI_FilletDlg(parent, "", this, Sel, ic); OperationGUI_FilletDlg *aDlg = new OperationGUI_FilletDlg(parent, "", this, Sel, ic);
break; break;
} }
case 4028: // CHAMFER case 506: // CHAMFER
{ {
Handle(AIS_InteractiveContext) ic; Handle(AIS_InteractiveContext) ic;
if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) { if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) {

10
src/PrimitiveGUI/PrimitiveGUI.cxx
View File

@ -68,27 +68,27 @@ bool PrimitiveGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
switch (theCommandID) switch (theCommandID)
{ {
case 3021: // BOX case 4021: // BOX
{ {
PrimitiveGUI_BoxDlg *aDlg = new PrimitiveGUI_BoxDlg(parent, "", this, Sel); PrimitiveGUI_BoxDlg *aDlg = new PrimitiveGUI_BoxDlg(parent, "", this, Sel);
break; break;
} }
case 3022: // CYLINDER case 4022: // CYLINDER
{ {
PrimitiveGUI_CylinderDlg *aDlg = new PrimitiveGUI_CylinderDlg(parent, "", this, Sel); PrimitiveGUI_CylinderDlg *aDlg = new PrimitiveGUI_CylinderDlg(parent, "", this, Sel);
break; break;
} }
case 3023: // SPHERE case 4023: // SPHERE
{ {
PrimitiveGUI_SphereDlg *aDlg = new PrimitiveGUI_SphereDlg(parent, "", this, Sel); PrimitiveGUI_SphereDlg *aDlg = new PrimitiveGUI_SphereDlg(parent, "", this, Sel);
break; break;
} }
case 3024: // TORUS case 4024: // TORUS
{ {
PrimitiveGUI_TorusDlg *aDlg = new PrimitiveGUI_TorusDlg(parent, "", this, Sel); PrimitiveGUI_TorusDlg *aDlg = new PrimitiveGUI_TorusDlg(parent, "", this, Sel);
break; break;
} }
case 3025: // CONE case 4025: // CONE
{ {
PrimitiveGUI_ConeDlg *aDlg = new PrimitiveGUI_ConeDlg(parent, "", this, Sel); PrimitiveGUI_ConeDlg *aDlg = new PrimitiveGUI_ConeDlg(parent, "", this, Sel);
break; break;

4
src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
View File

@ -133,6 +133,10 @@ void PrimitiveGUI_BoxDlg::Init()
connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(GroupDimensions->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupDimensions->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DZ, SLOT(SetStep(double)));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
/* displays Dialog */ /* displays Dialog */

11
src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx
View File

@ -119,10 +119,10 @@ void PrimitiveGUI_ConeDlg::Init()
/* min, max, step and decimals for spin boxes & initial values */ /* min, max, step and decimals for spin boxes & initial values */
GroupPoints->SpinBox_DX->RangeStepAndValidator(0.001, 999.999, step, 3); GroupPoints->SpinBox_DX->RangeStepAndValidator(0.001, 999.999, step, 3);
GroupPoints->SpinBox_DY->RangeStepAndValidator(0.001, 999.999, step, 3); GroupPoints->SpinBox_DY->RangeStepAndValidator(0.001, 999.999, step, 3);
GroupPoints->SpinBox_DY->RangeStepAndValidator(-999.999, 999.999, step, 3); GroupPoints->SpinBox_DZ->RangeStepAndValidator(-999.999, 999.999, step, 3);
GroupDimensions->SpinBox_DX->RangeStepAndValidator(0.001, 999.999, step, 3); GroupDimensions->SpinBox_DX->RangeStepAndValidator(0.001, 999.999, step, 3);
GroupDimensions->SpinBox_DY->RangeStepAndValidator(0.001, 999.999, step, 3); GroupDimensions->SpinBox_DY->RangeStepAndValidator(0.001, 999.999, step, 3);
GroupDimensions->SpinBox_DY->RangeStepAndValidator(-999.999, 999.999, step, 3); GroupDimensions->SpinBox_DZ->RangeStepAndValidator(-999.999, 999.999, step, 3);
GroupPoints->SpinBox_DX->SetValue(myRadius1); GroupPoints->SpinBox_DX->SetValue(myRadius1);
GroupPoints->SpinBox_DY->SetValue(myRadius2); GroupPoints->SpinBox_DY->SetValue(myRadius2);
@ -149,6 +149,13 @@ void PrimitiveGUI_ConeDlg::Init()
connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(GroupDimensions->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupDimensions->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DY, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DZ, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DZ, SLOT(SetStep(double)));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
/* displays Dialog */ /* displays Dialog */

5
src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
View File

@ -142,6 +142,11 @@ void PrimitiveGUI_CylinderDlg::Init()
connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DY, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY, SLOT(SetStep(double)));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
/* displays Dialog */ /* displays Dialog */

4
src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx
View File

@ -118,9 +118,13 @@ void PrimitiveGUI_SphereDlg::Init()
connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed())); connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double)));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
/* displays Dialog */ /* displays Dialog */

5
src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
View File

@ -138,6 +138,11 @@ void PrimitiveGUI_TorusDlg::Init()
connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DY, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY, SLOT(SetStep(double)));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
/* displays Dialog */ /* displays Dialog */

8
src/RepairGUI/RepairGUI.cxx
View File

@ -70,17 +70,17 @@ bool RepairGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
switch (theCommandID) switch (theCommandID)
{ {
case 501: // SEWING case 601: // SEWING
{ {
RepairGUI_SewingDlg *aDlg = new RepairGUI_SewingDlg(parent, "", this, Sel); RepairGUI_SewingDlg *aDlg = new RepairGUI_SewingDlg(parent, "", this, Sel);
break; break;
} }
case 502: // ORIENTATION case 602: // ORIENTATION
{ {
RepairGUI_OrientationDlg *aDlg = new RepairGUI_OrientationDlg(parent, "", this, Sel); RepairGUI_OrientationDlg *aDlg = new RepairGUI_OrientationDlg(parent, "", this, Sel);
break; break;
} }
case 309: // SUPPRESS FACES : use ic case 603: // SUPPRESS FACES : use ic
{ {
Handle(AIS_InteractiveContext) ic; Handle(AIS_InteractiveContext) ic;
if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) { if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) {
@ -90,7 +90,7 @@ bool RepairGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
RepairGUI_SuppressFacesDlg *aDlg = new RepairGUI_SuppressFacesDlg(parent, "", this, Sel, ic); RepairGUI_SuppressFacesDlg *aDlg = new RepairGUI_SuppressFacesDlg(parent, "", this, Sel, ic);
break; break;
} }
case 314: // SUPPRESS HOLES : use ic case 604: // SUPPRESS HOLES : use ic
{ {
Handle(AIS_InteractiveContext) ic; Handle(AIS_InteractiveContext) ic;
if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) { if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) {

12
src/TransformationGUI/TransformationGUI.cxx
View File

@ -69,32 +69,32 @@ bool TransformationGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
switch (theCommandID) switch (theCommandID)
{ {
case 4021: // TRANSLATION case 5021: // TRANSLATION
{ {
TransformationGUI_TranslationDlg *aDlg = new TransformationGUI_TranslationDlg(parent, "", this, Sel); TransformationGUI_TranslationDlg *aDlg = new TransformationGUI_TranslationDlg(parent, "", this, Sel);
break; break;
} }
case 4022: // ROTATION case 5022: // ROTATION
{ {
TransformationGUI_RotationDlg *aDlg = new TransformationGUI_RotationDlg(parent, "", this, Sel); TransformationGUI_RotationDlg *aDlg = new TransformationGUI_RotationDlg(parent, "", this, Sel);
break; break;
} }
case 4023: // MIRROR case 5023: // MIRROR
{ {
TransformationGUI_MirrorDlg *aDlg = new TransformationGUI_MirrorDlg(parent, "", this, Sel); TransformationGUI_MirrorDlg *aDlg = new TransformationGUI_MirrorDlg(parent, "", this, Sel);
break; break;
} }
case 4024: // SCALE case 5024: // SCALE
{ {
TransformationGUI_ScaleDlg *aDlg = new TransformationGUI_ScaleDlg(parent, "", this, Sel ); TransformationGUI_ScaleDlg *aDlg = new TransformationGUI_ScaleDlg(parent, "", this, Sel );
break; break;
} }
case 4030: // MULTI TRANSLATION case 5025: // MULTI TRANSLATION
{ {
TransformationGUI_MultiTranslationDlg *aDlg = new TransformationGUI_MultiTranslationDlg(parent, "", this, Sel); TransformationGUI_MultiTranslationDlg *aDlg = new TransformationGUI_MultiTranslationDlg(parent, "", this, Sel);
break; break;
} }
case 4040: // MULTI ROTATION case 5026: // MULTI ROTATION
{ {
TransformationGUI_MultiRotationDlg *aDlg = new TransformationGUI_MultiRotationDlg(parent, "", this, Sel); TransformationGUI_MultiRotationDlg *aDlg = new TransformationGUI_MultiRotationDlg(parent, "", this, Sel);
break; break;