ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-04 17:48:27 +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

@ -121,6 +121,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())) ;

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;

48
src/DlgRef/DlgRef_SpinBox.cxx
View File

@ -28,32 +28,18 @@
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()
// purpose : constructor of specific widget accepting floats in double precision. // purpose : constructor of specific widget accepting floats in double precision.
//================================================================================= //=================================================================================
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 : SetStep() [SLOT]
// purpose :
//=================================================================================
void DlgRef_SpinBox::SetStep( double newStep )
{
setLineStep( newStep );
}
//================================================================================= //=================================================================================
// function : ~DlgRef_SpinBox() // function : ~DlgRef_SpinBox()
// purpose : destructor // purpose : destructor
@ -62,40 +48,54 @@ DlgRef_SpinBox::~DlgRef_SpinBox()
{ {
} }
//=================================================================================
// function : SetStep() [SLOT]
// purpose :
//=================================================================================
void DlgRef_SpinBox::SetStep(double newStep)
{
setLineStep(newStep);
}
//================================================================================= //=================================================================================
// function : SetValue() // function : SetValue()
// purpose : // purpose :
//================================================================================= //=================================================================================
void DlgRef_SpinBox::SetValue( double v ) void DlgRef_SpinBox::SetValue(double v)
{ {
setValue( v ); setValue(v);
} }
//================================================================================= //=================================================================================
// function : GetValue() // function : GetValue()
// purpose : returns a double // purpose : returns a double
//================================================================================= //=================================================================================
double DlgRef_SpinBox::GetValue( ) double DlgRef_SpinBox::GetValue()
{ {
return value(); return value();
} }
//================================================================================= //=================================================================================
// function : GetString() // function : GetString()
// purpose : returns a QString // purpose : returns a QString
//================================================================================= //=================================================================================
QString DlgRef_SpinBox::GetString( ) QString DlgRef_SpinBox::GetString()
{ {
return cleanText(); return cleanText();
} }
//================================================================================= //=================================================================================
// function : RangeStepAndValidator() // function : RangeStepAndValidator()
// purpose : // purpose :
//================================================================================= //=================================================================================
void DlgRef_SpinBox::RangeStepAndValidator( double min, double max, double step, unsigned short decimals ) void DlgRef_SpinBox::RangeStepAndValidator(double min, double max, double step, unsigned short decimals)
{ {
setRange( min, max ); setRange(min, max);
setLineStep( step ); setLineStep(step);
( ( QDoubleValidator* )validator() )->setRange( min, max, decimals ) ; ((QDoubleValidator*)validator())->setRange(min, max, decimals);
} }

322
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)
@ -907,7 +906,7 @@ bool GEOMBase_Context::DefineDlgPosition(QWidget* aDlg, int& x, int& y)
{ {
/* Here the position is on the bottom right corner - 10 */ /* Here the position is on the bottom right corner - 10 */
QAD_Desktop* PP = QAD_Application::getDesktop(); QAD_Desktop* PP = QAD_Application::getDesktop();
x = abs(PP->x() + PP->size().width() - aDlg->size().width() - 10); x = abs(PP->x() + PP->size().width() - aDlg->size().width() - 10);
y = abs(PP->y() + PP->size().height() - aDlg->size().height() - 10); y = abs(PP->y() + PP->size().height() - aDlg->size().height() - 10);
return true; return true;
} }
@ -963,36 +962,35 @@ void GEOMBase_Context::SetDisplayedObjectList()
//===================================================================================== //=====================================================================================
void GEOMBase_Context::DisplaySimulationShape(const TopoDS_Shape& S) void GEOMBase_Context::DisplaySimulationShape(const TopoDS_Shape& S)
{ {
if( S.IsNull() ) if(S.IsNull())
return ; return;
//NRI DEBUG : 14/02/2002 //NRI DEBUG : 14/02/2002
if ( myActiveStudy->getActiveStudyFrame()->getTypeView() > VIEW_OCC ) if(myActiveStudy->getActiveStudyFrame()->getTypeView() > VIEW_OCC)
return ; return;
OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer(); OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer();
Handle (AIS_InteractiveContext) ic = v3d->getAISContext(); Handle(AIS_InteractiveContext) ic = v3d->getAISContext();
try { try {
/* erase any previous */ /* erase any previous */
ic->Erase( this->mySimulationShape, Standard_True, Standard_False ); ic->Erase(this->mySimulationShape, Standard_True, Standard_False);
ic->ClearPrs( this->mySimulationShape ); ic->ClearPrs(this->mySimulationShape);
this->mySimulationShape = new AIS_Shape( TopoDS_Shape() ) ; this->mySimulationShape = new AIS_Shape(TopoDS_Shape());
this->mySimulationShape->Set( S ) ; this->mySimulationShape->Set(S);
this->mySimulationShape->SetColor(Quantity_NOC_VIOLET) ; this->mySimulationShape->SetColor(Quantity_NOC_VIOLET);
ic->Deactivate( this->mySimulationShape ); ic->Deactivate(this->mySimulationShape);
ic->Display( this->mySimulationShape, Standard_False ); ic->Display(this->mySimulationShape, Standard_False);
ic->UpdateCurrentViewer(); ic->UpdateCurrentViewer();
} }
catch(Standard_Failure) { catch(Standard_Failure) {
MESSAGE( "Exception catched in GEOMBase_Context::DisplaySimulationShape " ) ; MESSAGE("Exception catched in GEOMBase_Context::DisplaySimulationShape ");
} }
this->mySimulationShape->UnsetColor() ; this->mySimulationShape->UnsetColor();
return ; return;
} }
//================================================================================== //==================================================================================
// function : EraseSimulationShape() // function : EraseSimulationShape()
// purpose : Clears the display of 'mySimulationShape' a pure graphical shape // purpose : Clears the display of 'mySimulationShape' a pure graphical shape
@ -1000,18 +998,15 @@ void GEOMBase_Context::DisplaySimulationShape(const TopoDS_Shape& S)
void GEOMBase_Context::EraseSimulationShape() void GEOMBase_Context::EraseSimulationShape()
{ {
int count = myActiveStudy->getStudyFramesCount(); int count = myActiveStudy->getStudyFramesCount();
for ( int i = 0; i < count; i++ ) { for(int i = 0; i < count; i++) {
if (myActiveStudy->getStudyFrame(i)->getTypeView() == VIEW_OCC ) { if(myActiveStudy->getStudyFrame(i)->getTypeView() == VIEW_OCC) {
OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)myActiveStudy->getStudyFrame(i)->getRightFrame()->getViewFrame())->getViewer(); OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)myActiveStudy->getStudyFrame(i)->getRightFrame()->getViewFrame())->getViewer();
Handle (AIS_InteractiveContext) ic = v3d->getAISContext(); Handle(AIS_InteractiveContext) ic = v3d->getAISContext();
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,115 +1022,102 @@ 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"), return false;
tr ("GEOM_PRP_ABORT"),
tr ("GEOM_BUT_OK") );
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;
SALOMEDS::Study_var aStudy = myActiveStudy->getStudyDocument(); SALOMEDS::Study_var aStudy = myActiveStudy->getStudyDocument();
SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
SALOMEDS::GenericAttribute_var anAttr; SALOMEDS::GenericAttribute_var anAttr;
SALOMEDS::AttributeName_var aName; SALOMEDS::AttributeName_var aName;
SALOMEDS::AttributePixMap_var aPixmap; SALOMEDS::AttributePixMap_var aPixmap;
SALOMEDS::SComponent_var father = aStudy->FindComponent("GEOM"); SALOMEDS::SComponent_var father = aStudy->FindComponent("GEOM");
int aLocked = false; int aLocked = false;
if (father->_is_nil()) { if(father->_is_nil()) {
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);
TCollection_AsciiString nameG(""); TCollection_AsciiString nameG("");
Standard_CString Type; Standard_CString Type;
if ( TCollection_AsciiString(name).IsEqual(Standard_CString("")) ) { if(TCollection_AsciiString(name).IsEqual(Standard_CString(""))) {
if ( TCollection_AsciiString(aShape->NameType()).IsEqual(Standard_CString("")) ) { if(TCollection_AsciiString(aShape->NameType()).IsEqual(Standard_CString(""))) {
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
if ( myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { if(myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
VTKViewer_RenderWindowInteractor* myRenderInter = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRWInteractor(); VTKViewer_RenderWindowInteractor* myRenderInter = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRWInteractor();
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);
GActor->setName( nameG.ToCString() ); GActor->setName(nameG.ToCString());
theRenderer->AddActor(GActor); theRenderer->AddActor(GActor);
anActor = (vtkActor*)theActors->GetNextActor(); anActor = (vtkActor*)theActors->GetNextActor();
} }
} }
// OCC // OCC
else if ( myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_OCC ) { else if(myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_OCC) {
OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer(); OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer();
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, theResult->setIO(IO);
"GEOM"); theResult->setName(nameG.ToCString());
theResult->setIO( IO );
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);
} }
Sel->AddIObject( IO, false ); Sel->AddIObject(IO, false);
myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame()->Repaint(); myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame()->Repaint();
if ( mySettings_AddInStudy ) if(mySettings_AddInStudy)
AddInStudy( false, IO ); AddInStudy(false, IO);
return true; return true;
} }
@ -1146,41 +1128,41 @@ bool GEOMBase_Context::Display(GEOM::GEOM_Shape_ptr aShape, Standard_CString nam
//===================================================================================== //=====================================================================================
bool GEOMBase_Context::AddInStudy(bool selection, const Handle(SALOME_InteractiveObject)& anIO) bool GEOMBase_Context::AddInStudy(bool selection, const Handle(SALOME_InteractiveObject)& anIO)
{ {
SALOME_Selection* Sel = SALOME_Selection::Selection( myActiveStudy->getSelection() ); SALOME_Selection* Sel = SALOME_Selection::Selection(myActiveStudy->getSelection());
if ( !( !mySettings_AddInStudy || selection ) ) { if (!(!mySettings_AddInStudy || selection)) {
Sel->ClearIObjects(); Sel->ClearIObjects();
} }
SALOMEDS::Study_var aStudy = myActiveStudy->getStudyDocument(); SALOMEDS::Study_var aStudy = myActiveStudy->getStudyDocument();
SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
SALOMEDS::GenericAttribute_var anAttr; SALOMEDS::GenericAttribute_var anAttr;
SALOMEDS::AttributeName_var aName; SALOMEDS::AttributeName_var aName;
SALOMEDS::AttributePixMap_var aPixmap; SALOMEDS::AttributePixMap_var aPixmap;
SALOMEDS::AttributeIOR_var anIOR; SALOMEDS::AttributeIOR_var anIOR;
SALOMEDS::AttributeSelectable_var aSelAttr; SALOMEDS::AttributeSelectable_var aSelAttr;
SALOMEDS::SComponent_var father = aStudy->FindComponent("GEOM"); SALOMEDS::SComponent_var father = aStudy->FindComponent("GEOM");
int aLocked = false; int aLocked = false;
if (father->_is_nil()) { if(father->_is_nil()) {
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);
SALOMEDS::SObject_var fatherSF = aStudy->FindObjectID(myActiveStudy->getActiveStudyFrame()->entry()); SALOMEDS::SObject_var fatherSF = aStudy->FindObjectID(myActiveStudy->getActiveStudyFrame()->entry());
@ -1190,20 +1172,20 @@ bool GEOMBase_Context::AddInStudy(bool selection, const Handle(SALOME_Interactiv
bool found = false; bool found = false;
// VTK // VTK
if ( myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
vtkRenderer *Renderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer(); vtkRenderer *Renderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
vtkActorCollection* theActors = Renderer->GetActors(); vtkActorCollection* theActors = Renderer->GetActors();
theActors->InitTraversal(); theActors->InitTraversal();
vtkActor *ac = theActors->GetNextActor(); vtkActor *ac = theActors->GetNextActor();
while(!(ac==NULL)) { while(!(ac==NULL)) {
if ( ac->IsA("GEOM_Actor") ) { if(ac->IsA("GEOM_Actor")) {
GEOM_Actor* anActor = GEOM_Actor::SafeDownCast( ac ); GEOM_Actor* anActor = GEOM_Actor::SafeDownCast(ac);
if ( anActor->hasIO() ) { if(anActor->hasIO()) {
Handle(SALOME_InteractiveObject) IO = anActor->getIO(); Handle(SALOME_InteractiveObject) IO = anActor->getIO();
if ( IO->IsKind(STANDARD_TYPE(GEOM_InteractiveObject)) ) { if(IO->IsKind(STANDARD_TYPE(GEOM_InteractiveObject))) {
GIO = Handle(GEOM_InteractiveObject)::DownCast( IO ); GIO = Handle(GEOM_InteractiveObject)::DownCast(IO);
if ( anIO->isSame( GIO ) ) { if(anIO->isSame(GIO)) {
found = true; found = true;
GActor = anActor; GActor = anActor;
break; break;
@ -1214,25 +1196,25 @@ bool GEOMBase_Context::AddInStudy(bool selection, const Handle(SALOME_Interactiv
ac = theActors->GetNextActor(); ac = theActors->GetNextActor();
} }
if ( !found ) if(!found)
return false; return false;
} }
// OCC // OCC
else if ( myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_OCC ) { else if(myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_OCC) {
OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer(); OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer();
Handle (AIS_InteractiveContext) ic = v3d->getAISContext(); Handle (AIS_InteractiveContext) ic = v3d->getAISContext();
AIS_ListOfInteractive List; AIS_ListOfInteractive List;
ic->DisplayedObjects(List); ic->DisplayedObjects(List);
AIS_ListIteratorOfListOfInteractive ite(List); AIS_ListIteratorOfListOfInteractive ite(List);
while (ite.More()) { while(ite.More()) {
if (ite.Value()->IsInstance(STANDARD_TYPE(GEOM_AISShape))) { if(ite.Value()->IsInstance(STANDARD_TYPE(GEOM_AISShape))) {
Handle(GEOM_AISShape) aSh = Handle(GEOM_AISShape)::DownCast(ite.Value()); Handle(GEOM_AISShape) aSh = Handle(GEOM_AISShape)::DownCast(ite.Value());
if ( aSh->hasIO() ) { if(aSh->hasIO()) {
Handle(SALOME_InteractiveObject) IO = aSh->getIO(); Handle(SALOME_InteractiveObject) IO = aSh->getIO();
if ( IO->IsKind(STANDARD_TYPE(GEOM_InteractiveObject)) ) { if ( IO->IsKind(STANDARD_TYPE(GEOM_InteractiveObject))) {
GIO = Handle(GEOM_InteractiveObject)::DownCast( IO ); GIO = Handle(GEOM_InteractiveObject)::DownCast(IO);
if ( anIO->isSame( GIO ) ) { if(anIO->isSame(GIO)) {
found = true; found = true;
GAISShape = aSh; GAISShape = aSh;
break; break;
@ -1243,37 +1225,35 @@ bool GEOMBase_Context::AddInStudy(bool selection, const Handle(SALOME_Interactiv
ite.Next(); ite.Next();
} }
if ( !found ) if(!found)
return false; return false;
} }
if ( !mySettings_AddInStudy || selection ) { if(!mySettings_AddInStudy || selection) {
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);
op->start(); op->start();
SALOMEDS::SObject_var newObj = aStudyBuilder->NewObject(father); SALOMEDS::SObject_var newObj = aStudyBuilder->NewObject(father);
GEOM::GEOM_Shape_var aShape = myComponentGeom->GetIORFromString( GIO->getIOR() ); GEOM::GEOM_Shape_var aShape = myComponentGeom->GetIORFromString(GIO->getIOR());
/* For the shape inserted into the study we set its field 'studyshapeid' */ /* For the shape inserted into the study we set its field 'studyshapeid' */
/* so the shape will contain its corresponding entry in the study Ocaf doc. */ /* so the shape will contain its corresponding entry in the study Ocaf doc. */
aShape->StudyShapeId(newObj->GetID()) ; aShape->StudyShapeId(newObj->GetID());
GIO->setEntry(newObj->GetID()); GIO->setEntry(newObj->GetID());
@ -1286,32 +1266,31 @@ 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) {
GActor->setIO( GIO ); GActor->setIO(GIO);
aName->SetValue(GActor->getName()); aName->SetValue(GActor->getName());
} }
// OCC // OCC
else if ( myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_OCC ) { else if(myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_OCC) {
GAISShape->setIO( GIO ); GAISShape->setIO(GIO);
aName->SetValue(GAISShape->getName()); aName->SetValue(GAISShape->getName());
} }
@ -1321,7 +1300,7 @@ bool GEOMBase_Context::AddInStudy(bool selection, const Handle(SALOME_Interactiv
GEOM::GEOM_Gen::ListOfIOR_var listIOR = new GEOM::GEOM_Gen::ListOfIOR; GEOM::GEOM_Gen::ListOfIOR_var listIOR = new GEOM::GEOM_Gen::ListOfIOR;
listIOR = myComponentGeom->GetReferencedObjects(aShape); listIOR = myComponentGeom->GetReferencedObjects(aShape);
if (listIOR->length()>0) { if(listIOR->length()>0) {
SALOMEDS::SObject_var Arguments = aStudyBuilder->NewObject(newObj); SALOMEDS::SObject_var Arguments = aStudyBuilder->NewObject(newObj);
anAttr = aStudyBuilder->FindOrCreateAttribute(Arguments, "AttributeName"); anAttr = aStudyBuilder->FindOrCreateAttribute(Arguments, "AttributeName");
aName = SALOMEDS::AttributeName::_narrow(anAttr); aName = SALOMEDS::AttributeName::_narrow(anAttr);
@ -1334,30 +1313,25 @@ bool GEOMBase_Context::AddInStudy(bool selection, const Handle(SALOME_Interactiv
for (unsigned int ind = 0; ind < listIOR->length();ind++) { for (unsigned int ind = 0; ind < listIOR->length();ind++) {
SALOMEDS::SObject_var theObj = aStudy->FindObjectIOR(listIOR[ind]); SALOMEDS::SObject_var theObj = aStudy->FindObjectIOR(listIOR[ind]);
if ( !theObj->_is_nil() ) { if(!theObj->_is_nil()) {
SALOMEDS::SObject_var RefObject = aStudyBuilder->NewObject(Arguments); SALOMEDS::SObject_var RefObject = aStudyBuilder->NewObject(Arguments);
aStudyBuilder->Addreference(RefObject, theObj); aStudyBuilder->Addreference(RefObject, theObj);
ObjectReferenced = true; ObjectReferenced = true;
} }
} }
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;
} }
@ -1365,25 +1339,23 @@ bool GEOMBase_Context::AddInStudy(bool selection, const Handle(SALOME_Interactiv
// function : GetShapeFromIOR() // function : GetShapeFromIOR()
// purpose : exist also as static method ! // purpose : exist also as static method !
//===================================================================================== //=====================================================================================
TopoDS_Shape GEOMBase_Context::GetShapeFromIOR( QString IOR ) TopoDS_Shape GEOMBase_Context::GetShapeFromIOR(QString IOR)
{ {
TopoDS_Shape result; TopoDS_Shape result;
if( IOR.stripWhiteSpace().isEmpty() ) if(IOR.stripWhiteSpace().isEmpty())
return result; return result;
ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ; ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance();
CORBA::ORB_var& _orb = init.orb() ; CORBA::ORB_var& _orb = init.orb() ;
CORBA::Object_var obj = _orb->string_to_object( (char*)(IOR.latin1()) ); CORBA::Object_var obj = _orb->string_to_object((char*)(IOR.latin1()));
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

18
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();
@ -276,7 +276,7 @@ void GEOMBase_Display::OnDisplayAll(bool onlyPreviousDisplayedObject)
//===================================================================================== //=====================================================================================
void GEOMBase_Display::OnVTKDisplayOnly() void GEOMBase_Display::OnVTKDisplayOnly()
{ {
QApplication::setOverrideCursor( Qt::waitCursor ); QApplication::setOverrideCursor(Qt::waitCursor);
// Erase all not selected actors // Erase all not selected actors
vtkRenderer* aren = ((VTKViewer_ViewFrame*)myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer(); vtkRenderer* aren = ((VTKViewer_ViewFrame*)myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
@ -307,7 +307,7 @@ void GEOMBase_Display::OnVTKDisplayOnly()
Handle(SALOME_InteractiveObject) IObject = It.Value(); Handle(SALOME_InteractiveObject) IObject = It.Value();
SALOMEDS::SObject_var obj = aStudy->FindObjectID( IObject->getEntry() ); SALOMEDS::SObject_var obj = aStudy->FindObjectID( IObject->getEntry() );
VTKViewer_RenderWindowInteractor* myRenderInter= ((VTKViewer_ViewFrame*)myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRWInteractor(); VTKViewer_RenderWindowInteractor* myRenderInter = ((VTKViewer_ViewFrame*)myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRWInteractor();
if(myRenderInter->isInViewer(IObject)) { if(myRenderInter->isInViewer(IObject)) {
myRenderInter->Display(IObject); myRenderInter->Display(IObject);

31
src/GEOMBase/GEOMBase_NbIsosDlg.cxx
View File

@ -44,16 +44,16 @@ using namespace std;
// The dialog will by default be modeless, unless you set 'modal' to // The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog. // TRUE to construct a modal dialog.
//================================================================================= //=================================================================================
GEOMBase_NbIsosDlg::GEOMBase_NbIsosDlg( QWidget* parent, const char* name, bool modal, WFlags fl ) GEOMBase_NbIsosDlg::GEOMBase_NbIsosDlg(QWidget* parent, const char* name, 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 )
setName( "GEOMBase_NbIsosDlg" ); setName("GEOMBase_NbIsosDlg");
setCaption( name ); setCaption(name);
setSizeGripEnabled( TRUE ); setSizeGripEnabled(TRUE);
QGridLayout* MyDialogLayout = new QGridLayout( this ); QGridLayout* MyDialogLayout = new QGridLayout(this);
MyDialogLayout->setSpacing( 6 ); MyDialogLayout->setSpacing(6);
MyDialogLayout->setMargin( 11 ); MyDialogLayout->setMargin(11);
/***************************************************************/ /***************************************************************/
QGroupBox* GroupC1 = new QGroupBox( this, "GroupC1" ); QGroupBox* GroupC1 = new QGroupBox( this, "GroupC1" );
@ -109,18 +109,18 @@ GEOMBase_NbIsosDlg::GEOMBase_NbIsosDlg( QWidget* parent, const char* name, bool
GroupButtonsLayout->addWidget( buttonCancel, 0, 2 ); GroupButtonsLayout->addWidget( buttonCancel, 0, 2 );
/***************************************************************/ /***************************************************************/
MyDialogLayout->addWidget( GroupC1, 0, 0 ); MyDialogLayout->addWidget(GroupC1, 0, 0);
MyDialogLayout->addWidget( GroupButtons, 1, 0 ); MyDialogLayout->addWidget(GroupButtons, 1, 0);
/* Retrieve GeomGUI */ /* Retrieve GeomGUI */
myGeomGUI = GEOMBase_Context::GetGeomGUI() ; myGeomGUI = GEOMBase_Context::GetGeomGUI();
// signals and slots connections // signals and slots connections
connect( buttonOk, SIGNAL( clicked() ), this, SLOT( accept() ) ); connect(buttonOk, SIGNAL(clicked()), this, SLOT(accept()));
connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) ); connect(buttonCancel, SIGNAL(clicked()), this, SLOT(reject()));
/* Move widget on the botton right corner of main widget */ /* Move widget on the botton right corner of main widget */
QAD_Tools::centerWidget( this, parent ); QAD_Tools::centerWidget(this, parent);
} }
@ -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
} }

17
src/GEOMBase/GEOMBase_NbIsosDlg.h
View File

@ -45,17 +45,18 @@ class GEOMBase_NbIsosDlg : public QDialog
Q_OBJECT Q_OBJECT
public: public:
GEOMBase_NbIsosDlg( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); GEOMBase_NbIsosDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
~GEOMBase_NbIsosDlg(); ~GEOMBase_NbIsosDlg();
GEOMBase_Context* myGeomGUI ; /* Current GeomGUI object */ GEOMBase_Context* myGeomGUI; /* Current GeomGUI object */
QPushButton* buttonOk;
QPushButton* buttonCancel;
QLabel* TextLabel1;
QLabel* TextLabel2;
QSpinBox* SpinBoxU;
QSpinBox* SpinBoxV;
QPushButton* buttonOk;
QPushButton* buttonCancel;
QLabel* TextLabel1 ;
QLabel* TextLabel2 ;
QSpinBox* SpinBoxU ;
QSpinBox* SpinBoxV ;
}; };
#endif // GEOMETRYGUI_NBISOSDLG_H #endif // GEOMETRYGUI_NBISOSDLG_H

242
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

@ -53,12 +53,6 @@ public :
void OnSketchDelete(); void OnSketchDelete();
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;

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;

119
src/GEOMBase/GEOMBase_TransparencyDlg.cxx
View File

@ -54,22 +54,17 @@ 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, :QDialog(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
SALOME_Selection* Sel,
const Handle(AIS_InteractiveContext)& ic,
bool modal,
WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
if ( !name ) if(!name)
setName( "GEOMBase_TransparencyDlg" ); setName("GEOMBase_TransparencyDlg");
resize( 152, 107 ); resize(152, 107);
setCaption( tr( "GEOM_TRANSPARENCY_TITLE" ) ); setCaption(tr("GEOM_TRANSPARENCY_TITLE"));
setSizeGripEnabled( TRUE ); setSizeGripEnabled(TRUE);
GEOMBase_TransparencyDlgLayout = new QGridLayout( this ); GEOMBase_TransparencyDlgLayout = new QGridLayout(this);
GEOMBase_TransparencyDlgLayout->setSpacing( 6 ); GEOMBase_TransparencyDlgLayout->setSpacing(6);
GEOMBase_TransparencyDlgLayout->setMargin( 11 ); GEOMBase_TransparencyDlgLayout->setMargin(11);
/*************************************************************************/ /*************************************************************************/
QGroupBox* GroupButtons = new QGroupBox( this, "GroupButtons" ); QGroupBox* GroupButtons = new QGroupBox( this, "GroupButtons" );
@ -116,35 +111,33 @@ GEOMBase_TransparencyDlg::GEOMBase_TransparencyDlg( QWidget* parent,
GroupC1Layout->addMultiCellWidget( Slider1, 1, 1, 0, 2 ); GroupC1Layout->addMultiCellWidget( Slider1, 1, 1, 0, 2 );
/*************************************************************************/ /*************************************************************************/
GEOMBase_TransparencyDlgLayout->addWidget( GroupC1, 0, 0 ); GEOMBase_TransparencyDlgLayout->addWidget(GroupC1, 0, 0);
GEOMBase_TransparencyDlgLayout->addWidget( GroupButtons, 1, 0 ); GEOMBase_TransparencyDlgLayout->addWidget(GroupButtons, 1, 0);
/* Initialisations */ /* Initialisations */
this->myGeomGUI = GEOMBase_Context::GetGeomGUI() ; this->myGeomGUI = GEOMBase_Context::GetGeomGUI();
this->myIc = ic ; this->myIc = ic;
this->mySel = Sel ; this->mySel = Sel;
/* First call valueChanged() method for initialisation */ /* First call valueChanged() method for initialisation */
/* The default value of transparency will change with the selection */ /* The default value of transparency will change with the selection */
this->myFirstInit = true ; this->myFirstInit = true;
// Slider1->setMaxValue( 10 ); // Slider1->setMaxValue( 10 );
// Slider1->setValue( 5 ) ; // Slider1->setValue( 5 ) ;
this->ValueHasChanged( Slider1->value() ) ; this->ValueHasChanged(Slider1->value());
// signals and slots connections : after ValueHasChanged() // signals and slots connections : after ValueHasChanged()
connect( buttonOk, SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) ); connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
connect( Slider1, SIGNAL( valueChanged(int) ), this, SLOT( ValueHasChanged(int) ) ); connect(Slider1, SIGNAL(valueChanged(int)), this, SLOT(ValueHasChanged(int)));
/* Move widget on the botton right corner of main widget */ /* Move widget on the botton right corner of main widget */
int x, y ; int x, y ;
myGeomGUI->DefineDlgPosition( this, x, y ) ; myGeomGUI->DefineDlgPosition(this, x, y);
this->move( x, y ) ; this->move(x, y) ;
this->show() ; /* Displays this Dialog */ this->show() ; /* Displays this Dialog */
} }
//================================================================================= //=================================================================================
// function : ~GEOMBase_TransparencyDlg() // function : ~GEOMBase_TransparencyDlg()
// purpose : // purpose :
@ -161,8 +154,8 @@ GEOMBase_TransparencyDlg::~GEOMBase_TransparencyDlg()
//======================================================================= //=======================================================================
void GEOMBase_TransparencyDlg::ClickOnOk() void GEOMBase_TransparencyDlg::ClickOnOk()
{ {
accept() ; accept();
return ; return;
} }
@ -172,8 +165,8 @@ void GEOMBase_TransparencyDlg::ClickOnOk()
//======================================================================= //=======================================================================
void GEOMBase_TransparencyDlg::ClickOnClose() void GEOMBase_TransparencyDlg::ClickOnClose()
{ {
accept() ; accept();
return ; return;
} }
@ -182,68 +175,64 @@ void GEOMBase_TransparencyDlg::ClickOnClose()
// purpose : Called when value of slider change // purpose : Called when value of slider change
// : or the first time as initilisation // : or the first time as initilisation
//================================================================================= //=================================================================================
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;
float transp = ( myRenderInter->GetTransparency(FirstIOS))*10.0 ; float transp = (myRenderInter->GetTransparency(FirstIOS))*10.0;
this->Slider1->setValue( int(transp) ) ; this->Slider1->setValue(int(transp));
} }
} }
QApplication::setOverrideCursor( Qt::waitCursor ); QApplication::setOverrideCursor(Qt::waitCursor);
for( ;It.More(); It.Next() ) { for(;It.More(); It.Next()) {
Handle(SALOME_InteractiveObject) IOS = It.Value(); Handle(SALOME_InteractiveObject) IOS = It.Value();
myRenderInter->SetTransparency( IOS, newValue/10.0 ); myRenderInter->SetTransparency(IOS, newValue/10.0);
} }
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
} }
else if ( myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC ) { else if(myGeomGUI->GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) {
// OCC // OCC
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;
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 ;
} }
} }
QApplication::setOverrideCursor( Qt::waitCursor ); QApplication::setOverrideCursor(Qt::waitCursor);
for( ;It.More(); It.Next() ) { for(;It.More(); It.Next()) {
Handle(SALOME_InteractiveObject) IObject = It.Value(); Handle(SALOME_InteractiveObject) IObject = It.Value();
Standard_Boolean found; Standard_Boolean found;
Handle(GEOM_AISShape) Shape = myGeomGUI->ConvertIOinGEOMAISShape(IObject, found); Handle(GEOM_AISShape) Shape = myGeomGUI->ConvertIOinGEOMAISShape(IObject, found);
if( !found ) { if(!found) {
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
return ; return;
} }
this->myIc->SetTransparency( Shape, newValue / 10.0, false ); this->myIc->SetTransparency(Shape, newValue / 10.0, false);
myIc->Redisplay( Shape, Standard_False, Standard_True ); myIc->Redisplay(Shape, Standard_False, Standard_True);
} }
myIc->UpdateCurrentViewer(); myIc->UpdateCurrentViewer();
} }
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
return ; return;
} }

116
src/GEOMBase/GEOMBase_aParameterDlg.cxx
View File

@ -58,80 +58,72 @@ 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, :QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
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 )
{ {
if ( !name ) if(!name)
setName( "MyParameterDialog" ); setName( "MyParameterDialog" );
resize( 288, 81 ); resize(288, 81);
setCaption( name ); /* appears on the title bar */ setCaption(name); /* appears on the title bar */
setSizeGripEnabled( TRUE ); setSizeGripEnabled(TRUE);
QGridLayout* topLayout = new QGridLayout( this );
topLayout->setSpacing( 6 );
topLayout->setMargin( 11 );
QGroupBox* mainGrp = new QGroupBox( this, "mainGrp" ); QGridLayout* topLayout = new QGridLayout(this);
mainGrp->setColumnLayout(0, Qt::Vertical ); topLayout->setSpacing(6);
mainGrp->layout()->setSpacing( 0 ); topLayout->setMargin(11);
mainGrp->layout()->setMargin( 0 );
QGridLayout* mainGrpLayout = new QGridLayout( mainGrp->layout() ); QGroupBox* mainGrp = new QGroupBox(this, "mainGrp");
mainGrpLayout->setAlignment( Qt::AlignTop ); mainGrp->setColumnLayout(0, Qt::Vertical);
mainGrpLayout ->setSpacing( 6 ); mainGrp->layout()->setSpacing(0);
mainGrpLayout->setMargin( 11 ); mainGrp->layout()->setMargin(0);
topLayout->addWidget( mainGrp, 0, 0 ); QGridLayout* mainGrpLayout = new QGridLayout(mainGrp->layout());
mainGrpLayout->setAlignment(Qt::AlignTop);
mainGrpLayout ->setSpacing(6);
mainGrpLayout->setMargin(11);
topLayout->addWidget(mainGrp, 0, 0);
/* aTitle1 : text prompt on left of edit line */ /* aTitle1 : text prompt on left of edit line */
QLabel* TextLabel1 = new QLabel( mainGrp, "TextLabel1" ); QLabel* TextLabel1 = new QLabel(mainGrp, "TextLabel1");
TextLabel1->setText( tr( aTitle1 ) ); TextLabel1->setText(tr(aTitle1));
mainGrpLayout->addWidget( TextLabel1, 0, 0 ); mainGrpLayout->addWidget(TextLabel1, 0, 0);
mySpinBox = new QAD_SpinBoxDbl( mainGrp, "mySpinBox" ); mySpinBox = new QAD_SpinBoxDbl(mainGrp, "mySpinBox");
mySpinBox->setPrecision( 12); mySpinBox->setPrecision(12);
mySpinBox->setRange( bottom, top ); mySpinBox->setRange(bottom, top);
(( QDoubleValidator* )(mySpinBox->validator()))->setRange(bottom, top, decimals); ((QDoubleValidator*)(mySpinBox->validator()))->setRange(bottom, top, decimals);
mySpinBox->setValue(QString(aValue1).toDouble()); mySpinBox->setValue(QString(aValue1).toDouble());
mainGrpLayout->addWidget( mySpinBox, 0, 1 ); mainGrpLayout->addWidget(mySpinBox, 0, 1);
QGroupBox* btnGrp = new QGroupBox( this, "btnGrp" ); QGroupBox* btnGrp = new QGroupBox(this, "btnGrp");
btnGrp->setColumnLayout(0, Qt::Vertical ); btnGrp->setColumnLayout(0, Qt::Vertical);
btnGrp->layout()->setSpacing( 0 ); btnGrp->layout()->setSpacing(0);
btnGrp->layout()->setMargin( 0 ); btnGrp->layout()->setMargin(0);
QGridLayout* btnGrpLayout = new QGridLayout( btnGrp->layout() ); QGridLayout* btnGrpLayout = new QGridLayout(btnGrp->layout());
btnGrpLayout->setAlignment( Qt::AlignTop ); btnGrpLayout->setAlignment(Qt::AlignTop);
btnGrpLayout->setSpacing( 6 ); btnGrpLayout->setSpacing(6);
btnGrpLayout->setMargin( 11 ); btnGrpLayout->setMargin(11);
topLayout->addWidget( btnGrp, 1, 0 ); topLayout->addWidget(btnGrp, 1, 0);
/* Ok button */ /* Ok button */
myButtonOk = new QPushButton( btnGrp, "buttonOk" ); myButtonOk = new QPushButton(btnGrp, "buttonOk");
myButtonOk->setText( tr("GEOM_BUT_OK") ); myButtonOk->setText(tr("GEOM_BUT_OK"));
myButtonOk->setAutoDefault( TRUE ); myButtonOk->setAutoDefault(TRUE);
myButtonOk->setDefault( TRUE ); myButtonOk->setDefault(TRUE);
btnGrpLayout->addWidget( myButtonOk, 0, 0 ); btnGrpLayout->addWidget(myButtonOk, 0, 0);
btnGrpLayout->addItem( new QSpacerItem(5, 5, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 1 ); btnGrpLayout->addItem(new QSpacerItem(5, 5, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 1);
/* Cancel button */ /* Cancel button */
myButtonCancel = new QPushButton( btnGrp, "buttonCancel" ); myButtonCancel = new QPushButton(btnGrp, "buttonCancel");
myButtonCancel->setText( tr("GEOM_BUT_CANCEL") ); myButtonCancel->setText(tr("GEOM_BUT_CANCEL"));
myButtonCancel->setAutoDefault( TRUE ); myButtonCancel->setAutoDefault(TRUE);
btnGrpLayout->addWidget( myButtonCancel, 0, 2 ); btnGrpLayout->addWidget(myButtonCancel, 0, 2);
/* signals and slots connections */ /* signals and slots connections */
connect( myButtonOk, SIGNAL( clicked() ), this, SLOT( accept() ) ); connect(myButtonOk, SIGNAL(clicked()), this, SLOT(accept()));
connect( myButtonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) ); connect(myButtonCancel, SIGNAL(clicked()), this, SLOT(reject()));
/* Retrieve GeomGUI */ /* Retrieve GeomGUI */
myGeomGUI = GEOMBase_Context::GetGeomGUI() ; myGeomGUI = GEOMBase_Context::GetGeomGUI();
/* Move widget on the botton right corner of main widget */ /* Move widget on the botton right corner of main widget */
QAD_Tools::centerWidget(this, parent); QAD_Tools::centerWidget(this, parent);
@ -143,18 +135,21 @@ 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
//====================================================================================== //======================================================================================
void GEOMBase_aParameterDlg::setValue( double val ) 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();
} }

21
src/GEOMBase/GEOMBase_aParameterDlg.h
View File

@ -45,28 +45,19 @@ 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);
double getValue(); double getValue();
private: private:
GEOMBase_Context* myGeomGUI ; /* Current GeomGUI object */ GEOMBase_Context* myGeomGUI; /* Current GeomGUI object */
QPushButton* myButtonOk; QPushButton* myButtonOk;
QPushButton* myButtonCancel; QPushButton* myButtonCancel;
QAD_SpinBoxDbl* mySpinBox; QAD_SpinBoxDbl* mySpinBox;
}; };
#endif // GEOMBase_aParameterDlg.h #endif // GEOMBase_aParameterDlg.h

1060
src/GEOMGUI/GeometryGUI.cxx
View File

File diff suppressed because it is too large Load Diff

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);
@ -148,6 +148,13 @@ void PrimitiveGUI_ConeDlg::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(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())) ;

5
src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
View File

@ -141,6 +141,11 @@ void PrimitiveGUI_CylinderDlg::Init()
connect(GroupPoints->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupPoints->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
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())) ;

4
src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx
View File

@ -118,8 +118,12 @@ 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()));

5
src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
View File

@ -137,6 +137,11 @@ void PrimitiveGUI_TorusDlg::Init()
connect(GroupPoints->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupPoints->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
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())) ;

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;