ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-11 16:19:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

SMH: Merged GEOM (NEWGUI, HEAD, POLYWORK)

Browse Source
This commit is contained in:
smh 2005-06-02 07:17:09 +00:00
parent 0213ec6649
commit 7322118087
299 changed files with 8528 additions and 6067 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
INSTALL
View File

@ -1,3 +1,3 @@
This is the version 2.2.0 of GEOM
This is the version 3.0.0 of GEOM
Compatible with :
- KERNEL 2.2.0
- KERNEL 3.0.0 only!

7
adm_local/unix/make_commence.in
View File

@ -10,7 +10,7 @@ HAVE_SSTREAM=@HAVE_SSTREAM@
LIBS=@LIBS@
LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib/salome
LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome
# add libstdc++ to link c++ library with libtool !
LDFLAGS+= -lstdc++
@ -34,6 +34,10 @@ CXX = @CXX@
CXXFLAGS = @CXXFLAGS@
CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
# BOOST Library
BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
# JAVA
JAVA_INCLUDES = @JAVA_INCLUDES@
@ -60,6 +64,7 @@ QT_MT_LIBS = @QT_MT_LIBS@
MOC = @MOC@
UIC = @UIC@
MSG2QM = @MSG2QM@
#QWT

2
bin/VERSION
View File

@ -1 +1 @@
THIS IS SALOME - GEOM VERSION: 2.2.0
THIS IS SALOME - GEOM VERSION: 2.2.2

18
configure.in.base
View File

@ -210,6 +210,14 @@ echo
CHECK_QT
echo
echo ---------------------------------------------
echo testing MSG2QM
echo ---------------------------------------------
echo
CHECK_MSG2QM
echo
echo ---------------------------------------------
echo testing VTK
@ -234,6 +242,14 @@ echo
CHECK_MED2
echo
echo ---------------------------------------------
echo BOOST Library
echo ---------------------------------------------
echo
CHECK_BOOST
echo
echo ---------------------------------------------
echo Testing OpenCascade
@ -265,7 +281,7 @@ echo ---------------------------------------------
echo
echo Configure
variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
for var in $variables
do

18
doc/salome/gui/GEOM/changing_displaying_parameters.htm
View File

@ -15,20 +15,20 @@ if (navigator.appName !="Netscape")
<style type="text/css">
<!--
p.whs1 { font-family:'Times New Roman' , serif; font-size:12pt; font-weight:normal; }
img_whs2 { border-style:none; border:none; float:none; width:30px; height:30px; }
img_whs2 { border:none; float:none; width:30px; height:30px; border-style:none; }
p.whs3 { font-family:'Times New Roman' , serif; font-size:12pt; }
p.whs4 { margin-left:40px; }
p.whs5 { font-family:'Times New Roman' , serif; font-size:14pt; }
img_whs6 { border-style:none; width:20px; height:20px; }
img_whs6 { width:20px; height:20px; border-style:none; }
p.whs7 { font-size:12pt; margin-left:40px; }
img_whs8 { border-style:none; border:none; width:150px; height:121px; }
img_whs8 { border:none; width:150px; height:121px; border-style:none; }
p.whs9 { font-size:12pt; font-family:'Times New Roman' , serif; }
p.whs10 { font-size:12pt; }
p.whs11 { font-size:14pt; }
img_whs12 { border-style:none; border:none; width:200px; height:100px; }
img_whs12 { border:none; width:200px; height:100px; border-style:none; }
p.whs13 { margin-left:40px; font-size:12pt; }
img_whs14 { border-style:none; border:none; width:150px; height:126px; }
img_whs15 { border-style:none; border:none; width:200px; height:111px; }
img_whs14 { border:none; width:150px; height:126px; border-style:none; }
img_whs15 { border:none; width:200px; height:111px; border-style:none; }
-->
</style><script type="text/javascript" language="JavaScript" title="WebHelpInlineScript">
<!--
@ -95,7 +95,7 @@ else
<ul>
<li class=kadov-p><p class="whs3"><a
href="#W/S">Wireframe/Shading</a></p></li>
href="#W_S">Wireframe/Shading</a></p></li>
<li class=kadov-p><p class="whs3"><a
href="#Color">Color</a></p></li>
@ -120,8 +120,8 @@ else
<p>&nbsp;</p>
<p class="whs5"><b style="font-weight: bold;"><a NAME="W_S"><span style="font-size: 14pt;"><font size=4 style="font-size:14pt;"><img src="files/salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image51.gif" width="20px" height="20px" border="0" class="img_whs6"> Wireframe/Shading</a></b>
</font></span></p>
<p class="whs5"><b><a
NAME=W_S><img src="files/salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image51.gif" width="20px" height="20px" border="0" class="img_whs6">Wireframe/Shading</a></b> </p>
<p class="whs3">&nbsp;</p>

8
doc/salome/gui/GEOM/ehlpdhtm.js
View File

@ -1,6 +1,6 @@
// eHelp® Corporation Dynamic HTML JavaScript
// Copyright© 1998-2003 eHelp® Corporation.All rights reserved.
// Version=4.81
// Version=4.82
// Warning:Do not modify this file.It is generated by RoboHELP® and changes will be overwritten.
@ -2018,11 +2018,15 @@ function kadovAdjustObjectTag(strRawHTML, nStartPos)
// does the commented object tag contain a items parameters
var strRTItemsOpen = '<param name="Items" value="';
var strRTItemsClose = '$$**$$">';
var strRTItemsClose = '$$**$$" >';
var strRTItemsClose2 = '$$**$$">';
var nRTItemsOpen = strRawHTML.indexOf(strRTItemsOpen, nDTCTagOpen);
if( nRTItemsOpen < nDTCTagOpen )
return strRawHTML;
var nRTItemsClose = strRawHTML.indexOf(strRTItemsClose, nRTItemsOpen);
if (nRTItemsClose == -1)
nRTItemsClose = strRawHTML.indexOf(strRTItemsClose2, nRTItemsOpen);
if( nRTItemsClose < nRTItemsOpen )
return strRawHTML;

27
doc/salome/gui/GEOM/files/salome2_sp3_geomtoolsgui_functions.htm
View File

@ -15,10 +15,11 @@ if (navigator.appName !="Netscape")
<style type="text/css">
<!--
p.whs1 { font-size:12pt; }
img_whs2 { border-style:none; border:none; float:none; width:30px; height:30px; }
img_whs2 { border:none; float:none; width:30px; height:30px; border-style:none; }
p.whs3 { margin-left:40px; }
img_whs4 { border-style:none; border:none; width:250px; height:136px; }
p.whs5 { font-size:12pt; font-family:'Times New Roman' , serif; }
img_whs4 { border:none; width:517px; height:342px; border-style:none; }
img_whs5 { border:none; width:519px; height:339px; }
p.whs6 { font-size:12pt; font-family:'Times New Roman' , serif; }
-->
</style><script type="text/javascript" language="JavaScript" title="WebHelpInlineScript">
<!--
@ -94,7 +95,7 @@ else
<p class="whs3">&nbsp;</p>
<p class="whs3"><img src="../image134.jpg" width="250px" height="136px" border="0" class="img_whs4"></p>
<p class="whs3"><img src="../image1.gif" width="517px" height="342px" border="0" class="img_whs4"></p>
<p class="whs3">&nbsp;</p>
@ -116,15 +117,15 @@ else
<p class=TODO>&nbsp;</p>
<p class="whs3">From the <span style="font-weight: bold;"><B>File
</B></span>menu choose <span style="font-weight: bold;"><B>Export </B></span>and
select the required format of the file for exportation. Then you will
see a standard dialog box allowing to enter the name and select the location
for the file which will be exported:</p>
<p class="whs3">Select the object you wish to export, then
from the <span style="font-weight: bold;"><B>File </B></span>menu choose <span
style="font-weight: bold;"><B>Export </B></span>and select the required format
of the file for exportation. You will see a standard dialog box allowing
to enter the name and select the location for the file which will be exported:</p>
<p class="whs3">&nbsp;</p>
<p class="whs3"><img src="../image134.jpg" width="250px" height="136px" border="0" class="img_whs4"></p>
<p class="whs3"><img src="../image2.jpg" width="519px" height="339px" border="0" class="img_whs5"></p>
<p class="whs3">&nbsp;</p>
@ -139,11 +140,11 @@ else
which the shape is exported, FormatName is a string which describes the
file format.</p>
<p class="whs5">&nbsp;</p>
<p class="whs6">&nbsp;</p>
<li class=kadov-p><p class="whs5">&nbsp;</p></li>
<li class=kadov-p><p class="whs6">&nbsp;</p></li>
<p class="whs5">&nbsp;</p>
<p class="whs6">&nbsp;</p>
<script type="text/javascript" language="javascript1.2">
<!--

118
doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions.htm
View File

@ -20,28 +20,43 @@ A:link { color:#0000ff; }
</style><style type="text/css">
<!--
p.whs1 { font-size:12pt; }
img_whs2 { border-style:none; border:none; float:none; width:30px; height:30px; }
img_whs2 { border:none; float:none; width:30px; height:30px; border-style:none; }
p.whs3 { margin-left:40px; }
img_whs4 { border-style:none; border:none; width:21px; height:19px; }
img_whs4 { border:none; width:21px; height:19px; border-style:none; }
p.whs5 { font-size:12pt; margin-left:40px; font-weight:bold; }
img_whs6 { border:none; width:216px; height:250px; }
img_whs6 { border:none; width:216px; height:250px; border-style:none; }
p.whs7 { font-family:'Times New Roman' , serif; font-size:14pt; }
img_whs8 { border-style:none; width:20px; height:20px; }
img_whs8 { width:20px; height:20px; border-style:none; }
p.whs9 { font-family:'Times New Roman' , serif; font-size:12pt; }
img_whs10 { border:none; width:283px; height:250px; }
img_whs10 { border:none; width:283px; height:250px; border-style:none; }
p.whs11 { font-size:12pt; margin-left:40px; }
img_whs12 { border:none; width:199px; height:250px; }
img_whs12 { border:none; width:199px; height:250px; border-style:none; }
p.whs13 { font-size:12pt; margin-left:400px; }
img_whs14 { border:none; width:256px; height:250px; }
img_whs14 { border:none; width:256px; height:250px; border-style:none; }
p.whs15 { font-size:12pt; font-weight:bold; }
img_whs16 { border:none; width:263px; height:250px; }
img_whs16 { border:none; width:263px; height:250px; border-style:none; }
p.whs17 { font-size:12pt; font-weight:normal; }
img_whs18 { border:none; width:310px; height:250px; }
img_whs19 { border:none; width:262px; height:250px; }
img_whs20 { border:none; width:268px; height:250px; }
img_whs21 { border:none; width:266px; height:250px; }
img_whs18 { border:none; width:310px; height:250px; border-style:none; }
img_whs19 { border:none; width:262px; height:250px; border-style:none; }
img_whs20 { border:none; width:268px; height:250px; border-style:none; }
img_whs21 { border:none; width:266px; height:250px; border-style:none; }
p.whs22 { font-size:12pt; margin-left:40px; text-indent:-40px; }
img_whs23 { border:none; width:25px; height:23px; border-style:none; }
ul.whs24 { list-style:disc; }
img_whs25 { border:none; width:300px; height:374px; border-style:none; }
-->
</style><script type="text/javascript" language="JavaScript" title="WebHelpInlineScript">
</style><script type="text/javascript" language="JavaScript">
<!--
if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) == 4))
{
var strNSS = "<style type='text/css'>";
strNSS += "p.whs22 {text-indent:1pt; }";
strNSS +="</style>";
document.write(strNSS);
}
//-->
</script>
<script type="text/javascript" language="JavaScript" title="WebHelpInlineScript">
<!--
function reDo() {
if (innerWidth != origWidth || innerHeight != origHeight)
@ -126,6 +141,9 @@ else
<li class=kadov-p><p class="whs1"><a href="#Whatis">WhatIs</a></p></li>
<li class=kadov-p><p class="whs1"><a href="#check">Check</a></p></li>
<li class=kadov-p><p class="whs1"><a href="#Check_comp_blocks">Check
compound of blocks</a></p></li>
</ul>
<p class="whs1">&nbsp;</p>
@ -462,7 +480,7 @@ else
<p class="whs7">&nbsp;</p>
<p class="whs1"><b style="font-weight: bold;">Description:</b>
Return True if this geometrical object is valid.</p>
Returns True if this geometrical object is valid.</p>
<p class="whs1">&nbsp;</p>
@ -489,6 +507,78 @@ else
<p class="whs11">&nbsp;</p>
<p class="whs22">&nbsp;</p>
<p class="whs22">&nbsp;</p>
<p class="whs22"><a name=Check_comp_blocks><img src="../image27.gif" width="25px" height="23px" border="0" class="img_whs23"> <span style="font-size: 14pt; font-weight: bold;"><font size=4 style="font-size:14pt;"><B>Check compound
of blocks</B></font></span></a></p>
<p class="whs22">&nbsp;</p>
<p class="whs1"><b style="font-weight: bold;">Description:</b>
Checks whether a shape is a compound of glued blocks. To be considered
as a compound of blocks, the given shape must satisfy the following conditions:</p>
<ul type="disc" class="whs24">
<li class=kadov-p><p class="whs1">&nbsp;Each
element of the compound should be a Block (6 faces and 12 edges);</p></li>
<li class=kadov-p><p class="whs1">&nbsp;A
connection between two Blocks should be an entire quadrangle face or an
entire edge;</p></li>
<li class=kadov-p><p class="whs1">&nbsp;The
compound should be connected;</p></li>
<li class=kadov-p><p class="whs1">&nbsp;Two
quadrangle faces should be glued. </p></li>
</ul>
<p class="whs1">&nbsp;</p>
<p class="whs1">Informs of the following possible errors:</p>
<ul type="disc" class="whs24">
<li class=kadov-p><p class="whs1">not a block,</p></li>
<li class=kadov-p><p class="whs1">not glued,</p></li>
<li class=kadov-p><p class="whs1">not connected,</p></li>
<li class=kadov-p><p class="whs1"><span style="font-size: 12pt;"><font size=3 style="font-size:12pt;">extra
or degenerated edge.</font></span></p></li>
</ul>
<p class="whs1">&nbsp;</p>
<p class="whs1"><b style="font-weight: bold;">Result:</b> Boolean;
highlight in the viewer.</p>
<p class="whs1">&nbsp;</p>
<p class="whs1"><b>TUI Command:</b><i> </i><span style="font-style: italic;"><I>geompy.CheckCompoundOfBlocks(Compound)</I></span>,
where the Compound is a shape, investigated in order to see, if it is
a valid compound of blocks. Validity flag is returned, encountered errors
are printed in the python console.</p>
<p class="whs1">&nbsp;</p>
<p class="whs1"><b style="font-weight: bold;">Arguments:</b>
1 shape.</p>
<p class="whs1">&nbsp;</p>
<p class="whs1"><b style="font-weight: bold;">Dialog Box:</b></p>
<p class="whs11">&nbsp;</p>
<p class="whs11"><img src="../image13.jpg" width="300px" height="374px" border="0" class="img_whs25"></p>
<p class="whs11">&nbsp;</p>
<script type="text/javascript" language="javascript1.2">
<!--
if (window.writeIntopicBar)

146
doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions.htm
View File

@ -31,36 +31,46 @@ img_whs10 { border:none; width:153px; height:250px; border-style:none; }
img_whs11 { border:none; width:154px; height:250px; border-style:none; }
img_whs12 { border:none; width:202px; height:250px; border-style:none; }
img_whs13 { border:none; width:150px; height:135px; border-style:none; }
img_whs14 { border:none; width:199px; height:250px; }
img_whs14 { border:none; width:199px; height:250px; border-style:none; }
img_whs15 { border:none; width:150px; height:131px; border-style:none; }
img_whs16 { border:none; width:215px; height:250px; }
img_whs17 { border:none; width:213px; height:250px; }
img_whs18 { border:none; width:214px; height:250px; }
img_whs16 { border:none; width:215px; height:250px; border-style:none; }
img_whs17 { border:none; width:213px; height:250px; border-style:none; }
img_whs18 { border:none; width:214px; height:250px; border-style:none; }
img_whs19 { border:none; width:150px; height:99px; border-style:none; }
img_whs20 { border:none; width:208px; height:250px; }
img_whs21 { border:none; width:206px; height:250px; }
img_whs22 { border:none; width:212px; height:250px; }
img_whs20 { border:none; width:208px; height:250px; float:none; border-style:none; }
img_whs21 { border:none; width:206px; height:250px; border-style:none; }
img_whs22 { border:none; width:212px; height:250px; border-style:none; }
img_whs23 { border:none; width:150px; height:104px; border-style:none; }
img_whs24 { border:none; width:24px; height:22px; border-style:none; }
p.whs25 { font-size:12pt; font-weight:bold; }
ul.whs26 { list-style:circle; }
p.whs27 { font-size:12pt; font-weight:normal; }
table.whs28 { x-cell-content-align:top; border-spacing:0px; width:37.774%; }
table.whs28 { x-cell-content-align:top; width:37.774%; border-spacing:0px; }
col.whs29 { width:48.722%; }
col.whs30 { width:51.278%; }
tr.whs31 { x-cell-content-align:top; }
td.whs32 { padding-right:10px; padding-left:10px; border-right-style:none; border-left-style:none; border-top-style:none; border-bottom-style:none; }
img_whs33 { border:none; width:150px; height:250px; }
td.whs34 { padding-right:10px; padding-left:10px; border-top-style:none; border-bottom-style:none; border-right-style:none; }
img_whs35 { border:none; width:149px; height:250px; }
td.whs32 { width:48.722%; padding-right:10px; padding-left:10px; border-right-style:none; border-left-style:none; border-top-style:none; border-bottom-style:none; }
img_whs33 { border:none; width:150px; height:250px; border-style:none; }
td.whs34 { width:51.278%; padding-right:10px; padding-left:10px; border-top-style:none; border-bottom-style:none; border-right-style:none; }
img_whs35 { border:none; width:149px; height:250px; border-style:none; }
p.whs36 { font-weight:bold; }
img_whs37 { border:none; width:250px; height:284px; float:none; border-style:none; }
img_whs38 { border:none; width:271px; height:284px; border-style:none; }
img_whs39 { border:none; width:23px; height:22px; border-style:none; }
img_whs40 { border:none; width:178px; height:250px; }
img_whs40 { border:none; width:178px; height:250px; border-style:none; }
p.whs41 { font-size:12pt; margin-left:0px; }
p.whs42 { font-size:12pt; margin-left:0px; font-weight:bold; }
img_whs43 { border:none; width:300px; height:311px; border-style:none; }
p.whs43 { margin-left:40px; font-size:12pt; }
img_whs44 { border:none; width:300px; height:311px; border-style:none; }
p.whs45 { font-size:12pt; margin-left:36px; text-indent:-36px; }
p.whs46 { font-size:12pt; text-indent:-36px; margin-left:40px; }
img_whs47 { border:none; width:23px; height:21px; border-style:none; }
img_whs48 { border:none; width:200px; height:139px; border-style:none; }
p.whs49 { font-size:12pt; margin-left:40px; text-indent:-40px; }
p.whs50 { font-size:12pt; margin-left:40px; text-indent:-40px; font-weight:bold; }
p.whs51 { font-size:12pt; text-indent:-40px; font-weight:bold; margin-left:80px; }
img_whs52 { border:none; width:250px; height:236px; border-style:none; }
img_whs53 { border:none; width:250px; height:233px; border-style:none; }
-->
</style><script type="text/javascript" language="JavaScript">
<!--
@ -69,6 +79,11 @@ if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) == 4))
var strNSS = "<style type='text/css'>";
strNSS += "p.whs41 {margin-left:1pt; }";
strNSS += "p.whs42 {margin-left:1pt; }";
strNSS += "p.whs45 {text-indent:1pt; }";
strNSS += "p.whs46 {text-indent:1pt; }";
strNSS += "p.whs49 {text-indent:1pt; }";
strNSS += "p.whs50 {text-indent:1pt; }";
strNSS += "p.whs51 {text-indent:1pt; }";
strNSS +="</style>";
document.write(strNSS);
}
@ -158,8 +173,10 @@ else
href="#Multi-transformation">Multi-transformation</a></p></li>
<li class=kadov-p><p class="whs3"><a
href="#ExplodeOnBlocks">Explode on blocks</a><span style="font-family: 'Times New Roman', serif; font-size: 12pt;"><font size=3 style="font-size:12pt;"><a
HREF="#_Toc57113146">&#9;</a></font></span></p></li>
href="#ExplodeOnBlocks">Explode on blocks</a></p></li>
<li class=kadov-p><p class="whs3"><a
href="#Propagate">Propagate</a><a HREF="#_Toc57113146">&#9;</a></p></li>
</ul>
</ul>
@ -205,17 +222,18 @@ else
<p class="whs5">&nbsp;</p>
<p class="whs5"><b>Arguments:</b> Up to 4 shapes + reconstruction
limit.</p>
<p class="whs5"><b style="font-weight: bold;">Arguments:</b>
Up to 4 shapes + reconstruction limit.</p>
<ul type="disc" class="whs4">
<li class=kadov-p><p class="whs5"><b>1st Constructor:</b>
Name + 2 shapes (first shape will be intersected by the second shape)
+ reconstruction limit.</p></li>
<li class=kadov-p><p class="whs5"><b style="font-weight: bold;">1st
Constructor:</b> Name + 2 shapes (first shape will be intersected by the
second shape) + reconstruction limit.</p></li>
<li class=kadov-p><p class="whs5"><b>2nd Constructor:</b>
Name + 1 shape which will be intersected + 1 cutting face.</p></li>
<li class=kadov-p><p class="whs5"><b style="font-weight: bold;">2nd
Constructor:</b> Name + 1 shape which will be intersected + 1 cutting
face.</p></li>
</ul>
<p class="whs5">&nbsp;</p>
@ -318,14 +336,16 @@ else
<ul type="disc" class="whs4">
<li class=kadov-p><p class="whs5"><b>1st Constructor:</b>
Name + 1 shape + 1 value (fillet radius).</p></li>
<li class=kadov-p><p class="whs5"><b style="font-weight: bold;">1st
Constructor:</b> Name + 1 shape + 1 value (fillet radius).</p></li>
<li class=kadov-p><p class="whs5"><b>2nd Constructor:</b>
Name + 1 shape + 1 Selection of edges + 1 value (Fillet radius).</p></li>
<li class=kadov-p><p class="whs5"><b style="font-weight: bold;">2nd
Constructor:</b> Name + 1 shape + 1 Selection of edges + 1 value (Fillet
radius).</p></li>
<li class=kadov-p><p class="whs5"><b>3rd Constructor:</b>
Name + 1 shape + 1 Selection of faces + 1 value (Fillet radius).</p></li>
<li class=kadov-p><p class="whs5"><b style="font-weight: bold;">3rd
Constructor:</b> Name + 1 shape + 1 Selection of faces + 1 value (Fillet
radius).</p></li>
</ul>
<p class="whs5">&nbsp;</p>
@ -389,14 +409,15 @@ else
<ul type="disc" class="whs4">
<li class=kadov-p><p class="whs5"><b>1st Constructor :</b>
Name + 1 SHAPE + 1 value (Chamfer dimension).</p></li>
<li class=kadov-p><p class="whs5"><b style="font-weight: bold;">1st
Constructor :</b> Name + 1 SHAPE + 1 value (Chamfer dimension).</p></li>
<li class=kadov-p><p class="whs5"><b>2nd Constructor :</b>
Name + 1 SHAPE + 2 faces + 2 values (Chamfer dimensions).</p></li>
<li class=kadov-p><p class="whs5"><b style="font-weight: bold;">2nd
Constructor :</b> Name + 1 SHAPE + 2 faces + 2 values (Chamfer dimensions).</p></li>
<li class=kadov-p><p class="whs5"><b>3rd Constructor :</b>
Name + 1 SHAPE + 1 Selection of faces + 2 values (Chamfer dimensions).</p></li>
<li class=kadov-p><p class="whs5"><b style="font-weight: bold;">3rd
Constructor :</b> Name + 1 SHAPE + 1 Selection of faces + 2 values (Chamfer
dimensions).</p></li>
</ul>
<p class="whs5">&nbsp;</p>
@ -405,7 +426,7 @@ else
<p class="whs5">&nbsp;</p>
<p class="whs9"><img src="../image278.jpg" width="208px" height="250px" border="0" class="img_whs20"> &nbsp;<img src="../image279.jpg" width="206px" height="250px" border="0" class="img_whs21"> &nbsp;<img src="../image280.jpg" width="212px" height="250px" border="0" class="img_whs22"></p>
<p class="whs9"><img src="../image278.jpg" x-maintain-ratio="FALSE" width="208px" height="250px" border="0" class="img_whs20"> &nbsp;<img src="../image279.jpg" width="206px" height="250px" border="0" class="img_whs21"> &nbsp;<img src="../image280.jpg" width="212px" height="250px" border="0" class="img_whs22"></p>
<p class="whs5">&nbsp; </p>
@ -492,7 +513,7 @@ else
<p class="whs5"><b style="font-weight: bold;">Dialog Box:</b></p>
<table x-use-null-cells width="37.774%" cellspacing="0" class="whs28">
<table x-use-null-cells cellspacing="0" width="37.774%" class="whs28">
<col class="whs29">
<col class="whs30">
@ -516,7 +537,7 @@ else
<p>&nbsp;</p>
<p><a name=ExplodeOnBlocks><img src="../image53.gif" width="23px" height="22px" border="0" class="img_whs39"> <span style="font-weight: bold; font-size: 14pt;"><font size=4 style="font-size:14pt;"><B>Explode
on blocks</B></font></span></a></p>
on Blocks</B></font></span></a></p>
<p>&nbsp;</p>
@ -561,7 +582,54 @@ else
<p class="whs41">&nbsp;</p>
<p class="whs9"><img src="../image191.jpg" width="300px" height="311px" border="0" class="img_whs43"></p>
<p class="whs43"><img src="../image191.jpg" width="300px" height="311px" border="0" class="img_whs44"></p>
<p class="whs45">&nbsp;</p>
<p class="whs46">&nbsp;</p>
<p class="whs46">&nbsp;</p>
<p><a name=Propagate><img src="../image3.gif" width="23px" height="21px" border="0" class="img_whs47"> <span style="font-weight: bold; font-size: 14pt;"><font size=4 style="font-size:14pt;"><B>Propagate</B></font></span></a></p>
<p>&nbsp;</p>
<p class="whs5"><b style="font-weight: bold;">Description:</b>
Breaks a multitude of edges of a shape into groups (builds all possible
propagation groups).</p>
<p class="whs5">&nbsp;</p>
<p class="whs5"><b style="font-weight: bold;">Result:</b> List
of GEOM_Objects. Each Geom Object will contain a group of edges.</p>
<p class="whs5">&nbsp;</p>
<p class="whs5"><b>TUI Command:</b><i> </i><span style="font-style: italic;"><I>geompy.Propagate(Shape)</I></span>,
where Shape is a shape to build propagation groups on.</p>
<p class="whs5">&nbsp;</p>
<p class="whs5"><b style="font-weight: bold;">Arguments: <span
style="font-weight: normal;">1 Shape.</span></b></p>
<p class="whs5">&nbsp;</p>
<p class="whs5">&nbsp;</p>
<p class="whs5"><b style="font-weight: bold;">Dialog Box: </b></p>
<p class="whs5">&nbsp;</p>
<p class="whs43"><img src="../image4.jpg" width="200px" height="139px" border="0" class="img_whs48"></p>
<p class="whs49">&nbsp;</p>
<p class="whs50">Example:</p>
<p class="whs50">&nbsp;</p>
<p class="whs51"><img src="../image15.jpg" width="250px" height="236px" border="0" class="img_whs52"> &nbsp;&nbsp;<img src="../image16.jpg" width="250px" height="233px" border="0" class="img_whs53"> &nbsp;&nbsp;</p>
<script type="text/javascript" language="javascript1.2">
<!--

84
doc/salome/gui/GEOM/files/salome2_sp3_repairgui_functions.htm
View File

@ -40,24 +40,24 @@ img_whs19 { border:none; width:244px; height:214px; border-style:none; }
p.whs20 { font-family:'Times New Roman' , serif; font-size:14pt; }
img_whs21 { border:none; width:239px; height:214px; border-style:none; }
img_whs22 { width:20px; height:20px; border-style:none; }
img_whs23 { border:none; width:263px; height:250px; }
img_whs23 { border:none; width:263px; height:250px; border-style:none; }
img_whs24 { border:none; width:150px; height:131px; border-style:none; }
p.whs25 { font-size:14pt; font-weight:bold; }
p.whs26 { font-size:12pt; margin-left:40px; font-weight:bold; }
img_whs27 { border:none; width:186px; height:250px; }
img_whs27 { border:none; width:186px; height:250px; border-style:none; }
p.whs28 { font-size:12pt; font-weight:bold; }
img_whs29 { border:none; width:214px; height:250px; }
img_whs29 { border:none; width:214px; height:250px; border-style:none; }
img_whs30 { border:none; width:200px; height:214px; border-style:none; }
img_whs31 { border:none; width:176px; height:214px; border-style:none; }
img_whs32 { border:none; width:348px; height:90px; }
img_whs32 { border:none; width:348px; height:90px; border-style:none; }
img_whs33 { border:none; width:198px; height:250px; border-style:none; }
img_whs34 { border:none; width:150px; height:136px; border-style:none; }
img_whs35 { border:none; width:216px; height:250px; }
img_whs35 { border:none; width:216px; height:250px; border-style:none; }
img_whs36 { border:none; width:150px; height:132px; border-style:none; }
img_whs37 { border:none; width:22px; height:22px; border-style:none; }
p.whs38 { font-size:12pt; font-weight:normal; }
p.whs39 { margin-left:40px; font-size:12pt; font-weight:bold; }
img_whs40 { border:none; width:191px; height:250px; }
img_whs40 { border:none; width:191px; height:250px; border-style:none; }
p.whs41 { font-size:12pt; margin-left:40px; text-indent:-40px; }
p.whs42 { font-size:12pt; margin-left:40px; text-indent:-40px; font-weight:bold; }
p.whs43 { margin-left:80px; font-size:12pt; text-indent:-40px; }
@ -65,7 +65,7 @@ img_whs44 { border:none; width:200px; height:231px; border-style:none; }
img_whs45 { border:none; width:185px; height:231px; border-style:none; }
p.whs46 { font-size:12pt; text-indent:-68px; margin-left:72px; }
p.whs47 { font-size:12pt; text-indent:-68px; margin-left:112px; }
img_whs48 { border:none; width:240px; height:250px; }
img_whs48 { border:none; width:240px; height:250px; border-style:none; }
p.whs49 { font-size:12pt; margin-left:112px; text-indent:-112px; }
p.whs50 { font-size:12pt; text-indent:-112px; margin-left:152px; }
img_whs51 { border:none; width:200px; height:150px; float:none; border-style:none; }
@ -73,11 +73,13 @@ img_whs52 { border:none; width:204px; height:150px; border-style:none; }
p.whs53 { font-size:12pt; text-indent:-40px; margin-left:80px; }
p.whs54 { font-size:12pt; margin-left:80px; text-indent:-80px; }
p.whs55 { font-size:12pt; margin-left:80px; text-indent:-68px; }
img_whs56 { border:none; width:276px; height:192px; }
img_whs56 { border:none; width:276px; height:192px; border-style:none; }
p.whs57 { font-size:12pt; margin-left:0px; }
img_whs58 { border:none; width:209px; height:138px; border-style:none; }
img_whs59 { border:none; width:192px; height:138px; border-style:none; }
img_whs60 { border:none; width:191px; height:138px; border-style:none; }
img_whs61 { border:none; width:23px; height:22px; border-style:none; }
img_whs62 { border:none; width:320px; height:143px; border-style:none; }
-->
</style><script type="text/javascript" language="JavaScript">
<!--
@ -192,7 +194,10 @@ else
point on edge</a></p></li>
<li class=kadov-p><p class="whs1">&nbsp;<a
href="#CheckFreeBound">Check free boundaries</a><a
href="#CheckFreeBound">Check free boundaries</a></p></li>
<li class=kadov-p><p class="whs1">&nbsp;<a
href="#Check_free_faces">Check free faces</a><a
HREF="#_Toc57113183">&#9;</a></p></li>
</ul>
@ -488,8 +493,8 @@ if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) == 4))
<p class="whs4">&nbsp;</p>
<p class="whs4"><b>Arguments: <span style="font-weight: normal;">Name
+ 1 shape + contour</span> <span style="font-weight: normal;">(</span></b>Wire,
<p class="whs4"><b style="font-weight: bold;">Arguments: <span
style="font-weight: normal;">Name + 1 shape + contour</span> <span style="font-weight: normal;">(</span></b>Wire,
or a set of Edges) + mode of closure (by vertex or by edge)</p>
<p class="whs4">&nbsp;</p>
@ -532,7 +537,7 @@ if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) == 4))
<p class="whs4">&nbsp;</p>
<p class="whs4"><b>Arguments:</b></p>
<p class="whs4"><b style="font-weight: bold;">Arguments:</b></p>
<ul type="disc" class="whs3">
@ -600,8 +605,8 @@ if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) == 4))
<p class="whs4">&nbsp;</p>
<p class="whs4"><b>Arguments: </b>Name + 1 shape + Wires which
should be removed.</p>
<p class="whs4"><b style="font-weight: bold;">Arguments: </b>Name
+ 1 shape + Wires which should be removed.</p>
<p class="whs4"><span style="font-weight: bold;"><B>Remove all
holes </B></span>checkbox allows to fill all holes of a definite shape.</p>
@ -657,8 +662,8 @@ if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) == 4))
<p class="whs4">&nbsp;</p>
<p class="whs4"><b>Arguments:</b> Name + 1 or more shapes +
1 value (sew precision).</p>
<p class="whs4"><b style="font-weight: bold;">Arguments:</b>
Name + 1 or more shapes + 1 value (sew precision).</p>
<p class="whs4"><span style="font-size: 12pt;"><font size=3 style="font-size:12pt;"><span style="font-weight: bold;"><B>Detect
</B></span>button allows to display the number of free boundaries in your
@ -770,9 +775,9 @@ if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) == 4))
<p class="whs46"><i><span style="font-style: italic;"><I>&nbsp;</I></span></i></p>
<p class="whs46"><b>Arguments: <span style="font-weight: normal;">Name
+</span> </b>1 <i><span style="font-style: normal;">Compound + Tolerance
value</span></i></p>
<p class="whs46"><b style="font-weight: bold;">Arguments:
<span style="font-weight: normal;">Name +</span> </b>1 <i><span style="font-style: normal;">Compound
+ Tolerance value</span></i></p>
<p class="whs46">&nbsp;</p>
@ -807,7 +812,7 @@ if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) == 4))
<p class="whs4">&nbsp;</p>
<p class="whs4"><b style="font-weight: bold;">Result:</b> GEOM_Object.</p>
<p class="whs4"><b>Result:</b> GEOM_Object. </p>
<p class="whs4">&nbsp;</p>
@ -843,6 +848,45 @@ if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) == 4))
<p class="whs57">&nbsp;</p>
<p class="whs57">&nbsp;</p>
<p class="whs57"><a name=Check_free_faces><img src="../image10.gif" width="23px" height="22px" border="0" class="img_whs61"> <span style="font-size: 14pt; font-weight: bold;"><font size=4 style="font-size:14pt;"><B>Check free
faces</B></font></span></a></p>
<p class="whs57">&nbsp;</p>
<p class="whs4"><b>Description: </b>Retrieves all free faces
from a given shape.<span> A free face is a face not shared between two
shells of the shape. </span></p>
<p class="whs4">&nbsp;</p>
<p class="whs4"><b>Result:</b> GEOM_Object. Returns a list
of IDs of all free faces, contained in the shape.</p>
<p class="whs4">&nbsp;</p>
<p class="whs4"><b>TUI Command :</b><i><span style="font-style: italic;">
<I></i>GetFreeFacesIDs(Shape)</I></span>, where Shape is a shape to be checked.</p>
<p class="whs4">&nbsp;</p>
<p class="whs4"><b style="font-weight: bold;">Arguments:</b>
Shape</p>
<p class="whs4">&nbsp;</p>
<p class="whs38"><b style="font-weight: bold;">Dialog
Box:</b></p>
<p class="whs38">&nbsp;</p>
<p class="whs16"><img src="../image26.gif" width="320px" height="143px" border="0" class="img_whs62"></p>
<p class="whs41">&nbsp;</p>
<p class="whs41">&nbsp;</p>
<script type="text/javascript" language="javascript1.2">
<!--
if (window.writeIntopicBar)

113
doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions.htm
View File

@ -20,46 +20,46 @@ A:link { color:#0000ff; }
</style><style type="text/css">
<!--
p.whs1 { font-size:12pt; }
img_whs2 { border-style:none; border:none; float:none; width:30px; height:30px; }
img_whs2 { border:none; float:none; width:30px; height:30px; border-style:none; }
ul.whs3 { list-style:disc; }
p.whs4 { font-family:'Times New Roman' , serif; font-size:12pt; }
p.whs5 { font-family:'Times New Roman' , serif; font-size:14pt; }
img_whs6 { border-style:none; width:20px; height:20px; }
img_whs6 { width:20px; height:20px; border-style:none; }
p.whs7 { font-size:12pt; margin-left:40px; }
img_whs8 { border:none; width:184px; height:250px; }
img_whs9 { border:none; width:196px; height:250px; }
img_whs10 { border:none; width:197px; height:250px; }
img_whs8 { border:none; width:184px; height:250px; border-style:none; }
img_whs9 { border:none; width:196px; height:250px; border-style:none; }
img_whs10 { border:none; width:197px; height:250px; border-style:none; }
p.whs11 { margin-left:40px; }
img_whs12 { border-style:none; border:none; width:150px; height:163px; }
img_whs13 { border:none; width:218px; height:250px; }
img_whs14 { border-style:none; border:none; width:150px; height:145px; }
img_whs12 { border:none; width:150px; height:163px; border-style:none; }
img_whs13 { border:none; width:218px; height:250px; border-style:none; }
img_whs14 { border:none; width:150px; height:145px; border-style:none; }
p.whs15 { margin-left:48px; text-indent:-48px; }
p.whs16 { margin-left:48px; text-indent:-48px; font-size:14pt; font-weight:bold; }
img_whs17 { border-style:none; border:none; width:25px; height:22px; }
img_whs18 { border-style:none; border:none; width:209px; height:234px; }
img_whs19 { border-style:none; border:none; width:200px; height:234px; }
img_whs17 { border:none; width:25px; height:22px; border-style:none; }
img_whs18 { border:none; width:209px; height:234px; border-style:none; }
img_whs19 { border:none; width:200px; height:234px; border-style:none; }
p.whs20 { font-size:12pt; margin-left:40px; text-indent:-40px; }
p.whs21 { font-size:12pt; text-indent:-40px; margin-left:80px; }
img_whs22 { border-style:none; border:none; width:200px; height:209px; }
img_whs23 { border:none; width:214px; height:250px; }
img_whs24 { border:none; width:215px; height:250px; }
img_whs25 { border:none; width:216px; height:250px; }
img_whs26 { border-style:none; border:none; width:150px; height:127px; }
img_whs27 { border:none; width:205px; height:250px; }
img_whs22 { border:none; width:200px; height:209px; border-style:none; }
img_whs23 { border:none; width:214px; height:250px; border-style:none; }
img_whs24 { border:none; width:215px; height:250px; border-style:none; }
img_whs25 { border:none; width:216px; height:250px; border-style:none; }
img_whs26 { border:none; width:150px; height:127px; border-style:none; }
img_whs27 { border:none; width:205px; height:250px; border-style:none; }
p.whs28 { margin-left:40px; font-size:12pt; }
img_whs29 { border-style:none; border:none; width:150px; height:153px; }
img_whs30 { border-style:none; border:none; width:24px; height:22px; }
img_whs29 { border:none; width:150px; height:153px; border-style:none; }
img_whs30 { border:none; width:24px; height:22px; border-style:none; }
p.whs31 { font-size:12pt; margin-left:40px; font-weight:bold; }
img_whs32 { border:none; width:225px; height:250px; }
img_whs32 { border:none; width:225px; height:250px; border-style:none; }
p.whs33 { font-size:12pt; font-weight:bold; }
img_whs34 { border-style:none; border:none; width:200px; height:191px; }
img_whs35 { border:none; width:140px; height:250px; }
img_whs36 { border:none; width:141px; height:250px; }
img_whs37 { border-style:none; border:none; width:150px; height:123px; }
img_whs38 { border:none; width:159px; height:250px; }
img_whs39 { border:none; width:160px; height:250px; }
img_whs40 { border-style:none; border:none; width:150px; height:128px; }
img_whs41 { border-style:none; border:none; width:150px; height:113px; }
img_whs34 { border:none; width:200px; height:191px; border-style:none; }
img_whs35 { border:none; width:140px; height:250px; border-style:none; }
img_whs36 { border:none; width:141px; height:250px; border-style:none; }
img_whs37 { border:none; width:150px; height:123px; border-style:none; }
img_whs38 { border:none; width:159px; height:250px; border-style:none; }
img_whs39 { border:none; width:160px; height:250px; border-style:none; }
img_whs40 { border:none; width:150px; height:128px; border-style:none; }
img_whs41 { border:none; width:150px; height:113px; border-style:none; }
-->
</style><script type="text/javascript" language="JavaScript">
<!--
@ -168,6 +168,9 @@ else
<p class="whs1">&nbsp;</p>
<p class="whs1">All these operations are accessible in the
main menu, via <span style="font-style: italic;"><I>Operations / Transformation.</I></span></p>
<p class="whs1">&nbsp;</p>
<p class="whs5"><b style="font-weight: bold;"><a
@ -193,18 +196,22 @@ else
<p class="whs1">&nbsp;</p>
<p class="whs1"><b>Arguments:</b> </p>
<p class="whs1"><b style="font-weight: bold;">Arguments:</b>
</p>
<ul type="disc" class="whs3">
<li class=kadov-p><p class="whs1"><b>1st Constructor: <span
style="font-weight: normal;">Name + </span></b>1 shape + 3 values (coordinates).</p></li>
<li class=kadov-p><p class="whs1"><b style="font-weight: bold;">1st
Constructor: <span style="font-weight: normal;">Name + </span></b>1 shape
+ 3 values (coordinates).</p></li>
<li class=kadov-p><p class="whs1"><b>2st Constructor: <span
style="font-weight: normal;">Name + </span></b>1 shape + 2 vertices.</p></li>
<li class=kadov-p><p class="whs1"><b style="font-weight: bold;">2st
Constructor: <span style="font-weight: normal;">Name + </span></b>1 shape
+ 2 vertices.</p></li>
<li class=kadov-p><p class="whs1"><b>3st Constructor: <span
style="font-weight: normal;">Name + </span></b>1 shape + 1 vector.</p></li>
<li class=kadov-p><p class="whs1"><b style="font-weight: bold;">3st
Constructor: <span style="font-weight: normal;">Name + </span></b>1 shape
+ 1 vector.</p></li>
</ul>
<p class="whs1">&nbsp;</p>
@ -254,8 +261,8 @@ else
<p class="whs1">&nbsp;</p>
<p class="whs1"><b>Arguments:</b> 1 shape + 1 vector for direction
of rotation + 1 angle.</p>
<p class="whs1"><b style="font-weight: bold;">Arguments:</b>
1 shape + 1 vector for direction of rotation + 1 angle.</p>
<p class="whs1"><span style="font-weight: bold;"><B>Reverse </B></span>checkbox
allows to specify the direction of rotation.</p>
@ -305,8 +312,8 @@ else
<p class="whs1">&nbsp;</p>
<p class="whs1"><b>Arguments:</b> Name + 1 GEOM_Object + [Starting
Coordinate System] + End Coordinate System.</p>
<p class="whs1"><b style="font-weight: bold;">Arguments:</b>
Name + 1 GEOM_Object + [Starting Coordinate System] + End Coordinate System.</p>
<p class="whs1"><span style="font-weight: bold;"><B>Create a copy
</B></span>checkbox allows to keep the initial object, otherwise it will be
@ -356,18 +363,22 @@ else
<p class="whs1">&nbsp;</p>
<p class="whs1"><b>Arguments:</b> </p>
<p class="whs1"><b style="font-weight: bold;">Arguments:</b>
</p>
<ul type="disc" class="whs3">
<li class=kadov-p><p class="whs1"><b>1st Constructor: <span
style="font-weight: normal;">Name + </span></b>1 shape + 1 vertex.</p></li>
<li class=kadov-p><p class="whs1"><b style="font-weight: bold;">1st
Constructor: <span style="font-weight: normal;">Name + </span></b>1 shape
+ 1 vertex.</p></li>
<li class=kadov-p><p class="whs1"><b>2st Constructor: <span
style="font-weight: normal;">Name + </span></b>1 shape + 1 vector.</p></li>
<li class=kadov-p><p class="whs1"><b style="font-weight: bold;">2st
Constructor: <span style="font-weight: normal;">Name + </span></b>1 shape
+ 1 vector.</p></li>
<li class=kadov-p><p class="whs1"><b>3st Constructor: <span
style="font-weight: normal;">Name + </span></b>1 shape + 1 plane.</p></li>
<li class=kadov-p><p class="whs1"><b style="font-weight: bold;">3st
Constructor: <span style="font-weight: normal;">Name + </span></b>1 shape
+ 1 plane.</p></li>
</ul>
<p class="whs1"><span style="font-weight: bold;"><B>Create a copy
@ -460,7 +471,7 @@ else
<p class="whs1">&nbsp;</p>
<p class="whs1"><b>Arguments:</b></p>
<p class="whs1"><b style="font-weight: bold;">Arguments:</b></p>
<ul type="disc" class="whs3">
@ -615,10 +626,10 @@ else
Constructor <span style="font-weight: normal;">(in one direction):</span></b>
Name + 1 shape + 1 vector for direction + 1 value (repetition).</p></li>
<li class=kadov-p><p class="whs1"><b>2nd Constructor <span
style="font-weight: normal;">(in two directions):</span></b> Name + 1
shape + 1 vector for direction + 1 angle + 1 value (repetition) + 1 step
value + 1 value (repetition); <span style="font-weight: bold;"><B>Reverse
<li class=kadov-p><p class="whs1"><b style="font-weight: bold;">2nd
Constructor <span style="font-weight: normal;">(in two directions):</span></b>
Name + 1 shape + 1 vector for direction + 1 angle + 1 value (repetition)
+ 1 step value + 1 value (repetition); <span style="font-weight: bold;"><B>Reverse
</B></span><span>checkbox allows to set the direction of rotation</span>.</p></li>
</ul>

BIN
doc/salome/gui/GEOM/image13.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 22 KiB

BIN
doc/salome/gui/GEOM/image15.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
doc/salome/gui/GEOM/image16.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

59
doc/salome/gui/GEOM/newentity_blocks.htm
View File

@ -15,9 +15,9 @@ if (navigator.appName !="Netscape")
<style type="text/css">
<!--
p.whs1 { font-size:14pt; font-weight:bold; }
img_whs2 { border-style:none; border:none; float:none; width:30px; height:30px; }
img_whs2 { border:none; float:none; width:30px; height:30px; border-style:none; }
ul.whs3 { list-style:disc; }
img_whs4 { border-style:none; border:none; width:23px; height:22px; }
img_whs4 { border:none; width:23px; height:22px; border-style:none; }
p.whs5 { font-size:12pt; }
p.whs6 { font-size:12pt; font-style:italic; font-weight:normal; }
table.whs7 { x-cell-content-align:top; border-spacing:0px; width:66.515%; }
@ -25,31 +25,33 @@ col.whs8 { width:32.996%; }
col.whs9 { width:33.052%; }
col.whs10 { width:33.952%; }
tr.whs11 { x-cell-content-align:top; }
td.whs12 { padding-right:10px; padding-left:10px; border-right-style:none; border-left-style:none; border-top-style:none; border-bottom-style:none; }
img_whs13 { border:none; width:183px; height:250px; }
td.whs14 { padding-right:10px; padding-left:10px; border-right-style:none; border-top-style:none; border-bottom-style:none; }
td.whs15 { padding-right:10px; padding-left:10px; border-top-style:none; border-bottom-style:none; border-right-style:none; }
img_whs16 { border:none; width:184px; height:250px; }
td.whs12 { width:32.996%; padding-right:10px; padding-left:10px; border-right-style:none; border-left-style:none; border-top-style:none; border-bottom-style:none; }
img_whs13 { border:none; width:183px; height:250px; border-style:none; }
td.whs14 { width:33.052%; padding-right:10px; padding-left:10px; border-right-style:none; border-top-style:none; border-bottom-style:none; }
td.whs15 { width:33.952%; padding-right:10px; padding-left:10px; border-top-style:none; border-bottom-style:none; border-right-style:none; }
img_whs16 { border:none; width:184px; height:250px; border-style:none; }
p.whs17 { font-weight:bold; }
img_whs18 { border-style:none; border:none; width:250px; height:195px; }
img_whs19 { border-style:none; border:none; width:24px; height:22px; }
img_whs18 { border:none; width:250px; height:195px; border-style:none; }
img_whs19 { border:none; width:24px; height:22px; border-style:none; }
table.whs20 { x-cell-content-align:top; border-spacing:0px; width:40.406%; }
col.whs21 { width:49.761%; }
col.whs22 { width:50.239%; }
img_whs23 { border:none; width:162px; height:250px; }
img_whs24 { border:none; width:164px; height:250px; }
p.whs25 { font-size:12pt; font-weight:bold; }
p.whs26 { font-size:12pt; font-weight:bold; margin-left:0px; }
img_whs27 { border-style:none; border:none; width:300px; height:234px; float:none; }
img_whs28 { border-style:none; border:none; width:251px; height:234px; }
p.whs29 { font-size:12pt; margin-left:40px; }
td.whs23 { width:49.761%; padding-right:10px; padding-left:10px; border-right-style:none; border-left-style:none; border-top-style:none; border-bottom-style:none; }
img_whs24 { border:none; width:162px; height:250px; border-style:none; }
td.whs25 { width:50.239%; padding-right:10px; padding-left:10px; border-top-style:none; border-bottom-style:none; border-right-style:none; }
img_whs26 { border:none; width:164px; height:250px; border-style:none; }
p.whs27 { font-size:12pt; font-weight:bold; }
p.whs28 { font-size:12pt; font-weight:bold; margin-left:0px; }
img_whs29 { border:none; width:300px; height:234px; float:none; border-style:none; }
img_whs30 { border:none; width:251px; height:234px; border-style:none; }
p.whs31 { font-size:12pt; margin-left:40px; }
-->
</style><script type="text/javascript" language="JavaScript">
<!--
if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) == 4))
{
var strNSS = "<style type='text/css'>";
strNSS += "p.whs26 {margin-left:1pt; }";
strNSS += "p.whs28 {margin-left:1pt; }";
strNSS +="</style>";
document.write(strNSS);
}
@ -138,7 +140,8 @@ else
<p>&nbsp;</p>
<p>To build a compound the user may take the following steps:</p>
<p>These functionalities are available from the main menu via <span style="font-style: italic;"><I>New
Entity / Blocks.</I></span></p>
<p>&nbsp;</p>
@ -206,7 +209,7 @@ else
<p class="whs5"><b style="font-weight: bold;">Dialog Box:</b></p>
<table x-use-null-cells width="66.515%" cellspacing="0" class="whs7">
<table x-use-null-cells cellspacing="0" width="66.515%" class="whs7">
<col class="whs8">
<col class="whs9">
<col class="whs10">
@ -283,26 +286,26 @@ else
<p class="whs5">&nbsp;</p>
<table x-use-null-cells width="40.406%" cellspacing="0" class="whs20">
<table x-use-null-cells cellspacing="0" width="40.406%" class="whs20">
<col class="whs21">
<col class="whs22">
<tr valign="top" class="whs11">
<td width="49.761%" class="whs12">
<p class="whs5"><b>&nbsp;</b><img src="image242.jpg" width="162px" height="250px" border="0" class="img_whs23"></td>
<td width="50.239%" class="whs15">
<p><img src="image243.jpg" width="164px" height="250px" border="0" class="img_whs24"></td></tr>
<td width="49.761%" class="whs23">
<p class="whs5"><b style="font-weight: bold;">&nbsp;</b><img src="image242.jpg" width="162px" height="250px" border="0" class="img_whs24"></td>
<td width="50.239%" class="whs25">
<p><img src="image243.jpg" width="164px" height="250px" border="0" class="img_whs26"></td></tr>
</table>
<p class="whs5">&nbsp;</p>
<p class="whs25">Example:</p>
<p class="whs27">Example:</p>
<p class="whs25">&nbsp;</p>
<p class="whs27">&nbsp;</p>
<p class="whs26"><img src="image180.jpg" x-maintain-ratio="TRUE" width="300px" height="234px" border="0" class="img_whs27"> &nbsp;&nbsp;&nbsp;<img src="image181.jpg" width="251px" height="234px" border="0" class="img_whs28"> &nbsp;</p>
<p class="whs28"><img src="image180.jpg" x-maintain-ratio="TRUE" width="300px" height="234px" border="0" class="img_whs29"> &nbsp;&nbsp;&nbsp;<img src="image181.jpg" width="251px" height="234px" border="0" class="img_whs30"> &nbsp;</p>
<p class="whs29"><b style="font-weight: bold;">&nbsp;&nbsp;&nbsp;</b>&nbsp;&nbsp;</p>
<p class="whs31"><b style="font-weight: bold;">&nbsp;&nbsp;&nbsp;</b>&nbsp;&nbsp;</p>
<p class="whs1">&nbsp;</p>

18
doc/salome/gui/GEOM/sketcher.htm
View File

@ -18,13 +18,13 @@ img_whs1 { border-style:none; border:none; float:none; width:30px; height:30px;
p.whs2 { font-size:12pt; }
ul.whs3 { list-style:disc; }
p.whs4 { margin-left:40px; font-size:12pt; }
img_whs5 { border:none; width:200px; height:277px; }
img_whs6 { border:none; width:200px; height:276px; }
img_whs5 { border:none; width:200px; height:277px; border-style:none; }
img_whs6 { border:none; width:200px; height:276px; border-style:none; }
p.whs7 { font-size:12pt; margin-left:40px; text-indent:-40px; }
p.whs8 { font-size:12pt; margin-left:40px; text-indent:-40px; font-weight:bold; }
p.whs9 { font-size:12pt; text-indent:-40px; font-weight:bold; margin-left:80px; }
img_whs10 { border:none; width:200px; height:200px; }
img_whs11 { border:none; width:200px; height:195px; }
img_whs10 { border:none; width:200px; height:200px; border-style:none; }
img_whs11 { border:none; width:200px; height:195px; border-style:none; }
-->
</style><script type="text/javascript" language="JavaScript">
<!--
@ -112,6 +112,11 @@ else
<p>&nbsp;</p>
<p>This functionality is available from the main menu via <span style="font-style: italic;"><I>New
Entity / Sketch.</I></span></p>
<p>&nbsp;</p>
<p class="whs2"><span style="font-size: 12pt;"><font size=3 style="font-size:12pt;"><b style="font-weight: bold;">Description:</b>
Creates curves (line segment and arc).</font></span></p>
@ -129,7 +134,8 @@ else
<p class="whs2">&nbsp;</p>
<p class="whs2"><b>Arguments:</b> </p>
<p class="whs2"><b style="font-weight: bold;">Arguments:</b>
</p>
<p class="whs2"><span><font size=3 style="font-size:12pt;">1. Element type (segment or arc).</font></span></p>
@ -172,7 +178,7 @@ else
<p class="whs2">&nbsp;</p>
<p class="whs2"><b>Dialog Box:</b></p>
<p class="whs2"><b style="font-weight: bold;">Dialog Box:</b></p>
<p class="whs2">&nbsp;</p>

BIN
doc/salome/gui/GEOM/webhelp.cab
View File

Binary file not shown.

BIN
doc/salome/gui/GEOM/webhelp.jar
View File

Binary file not shown.

4
doc/salome/gui/GEOM/whdata/whfts.htm
View File

@ -8,9 +8,7 @@
<script language="javascript" src="whfts.js"></script>
<script language="javascript">
<!--
iWM("0","geometry","whfwdata0.htm");
iWM("geompy","radiu","whfwdata1.htm");
iWM("radius","zmin","whfwdata2.htm");
iWM("0","zmin","whfwdata0.htm");
iTM(0,16,"whftdata0.htm");

536
doc/salome/gui/GEOM/whdata/whfwdata0.htm
View File

@ -14,6 +14,7 @@
<!--
aWE("0",1,12);
aWE("1",1,15,3,4,7,5,11,12,13,10,9,16);
aWE("12",9);
aWE("1d",3,10);
aWE("1st",3,11,12,13,10);
aWE("2",14,1,15,3,4,5,11,12,13,10,9);
@ -26,13 +27,14 @@ aWE("3rd",3,10);
aWE("3st",13);
aWE("4",14,15,4,12,10);
aWE("5",15,7,12);
aWE("6",14,12);
aWE("6",14,12,9);
aWE("7",12);
aWE("8",12);
aWE("9",15,12);
aWE("90",15);
aWE("abl",15);
aWE("absolut",15);
aWE("accessibl",13);
aWE("accord",3,12);
aWE("accordanc",12);
aWE("achiev",12);
@ -60,10 +62,11 @@ aWE("around",7);
aWE("associat",6);
aWE("attribut",6);
aWE("automatical",14,3);
aWE("availabl",6,12);
aWE("availabl",14,15,6,12,16);
aWE("ax",3);
aWE("axi",3,7,11,13,9);
aWE("b",3);
aWE("background",16);
aWE("bas",7,11,12,13);
aWE("baseshap",7);
aWE("basi",7);
@ -72,7 +75,7 @@ aWE("basicproperti",9);
aWE("befor",15,12);
aWE("below",14);
aWE("bezi",3,12);
aWE("block",14,0,10);
aWE("block",14,0,10,9);
aWE("boolean",2,4,5,9);
aWE("both",6);
aWE("bound",9);
@ -80,6 +83,7 @@ aWE("boundari",12);
aWE("boundary",12);
aWE("boundingbox",9);
aWE("box",14,1,15,3,4,8,7,5,11,12,13,10,9,16);
aWE("break",10);
aWE("brep",2,8);
aWE("brows",3,6,8);
aWE("bsplin",12);
@ -97,6 +101,7 @@ aWE("chamf",10);
aWE("chang",1);
aWE("check",12,10,9);
aWE("checkbox",12,13);
aWE("checkcompoundofblock",9);
aWE("checkshap",9);
aWE("choos",6,8,10);
aWE("circl",3);
@ -112,20 +117,23 @@ aWE("common",4,12);
aWE("complex",2,4,7,10);
aWE("component",15,3,13);
aWE("compos",14,9);
aWE("compound",14,4,5,12,13,10);
aWE("compound",14,4,5,12,13,10,9);
aWE("compsolid",7);
aWE("comput",10,9);
aWE("con",11);
aWE("concern",9);
aWE("condition",9);
aWE("confirm",8);
aWE("conical",12);
aWE("connect",5,10);
aWE("consider",12);
aWE("connect",5,10,9);
aWE("connection",9);
aWE("consider",12,9);
aWE("consol",9);
aWE("constraint",14);
aWE("construct",14,5,11);
aWE("construction",2,4);
aWE("constructor",3,11,12,13,10);
aWE("contain",15,8,12);
aWE("contain",15,8,12,10);
aWE("content",8);
aWE("continuiti",12);
aWE("continuity",12);
@ -141,7 +149,7 @@ aWE("correspond",3,7,5,11,12,10);
aWE("coupl",15);
aWE("creat",14,15,3,6,7,5,11,12,13,10,9,16);
aWE("creategroup",16);
aWE("creation",2,7,12,10);
aWE("creation",2,7,12,10,16);
aWE("current",15,6);
aWE("curv",15,3,7,12);
aWE("curve2dmod",12);
@ -153,11 +161,12 @@ aWE("cylindrical",12);
aWE("d1",10);
aWE("d2",10);
aWE("data",9);
aWE("default",15);
aWE("default",15,16);
aWE("defin",15,3,11,12,13,10);
aWE("definit",12,9);
aWE("definition",7,12);
aWE("deflection",10);
aWE("degenerat",9);
aWE("degre",15,7,12);
aWE("delet",10);
aWE("density",10);
@ -202,7 +211,8 @@ aWE("e1",14);
aWE("e2",14);
aWE("e3",14);
aWE("e4",14);
aWE("edg",14,3,7,5,12,10);
aWE("easi",16);
aWE("edg",14,3,7,5,12,10,9);
aWE("edgeid",12);
aWE("edit",16);
aWE("egdemaxtol",9);
@ -212,14 +222,16 @@ aWE("element",15,3,4,6,7,5,11,12,9);
aWE("elementary",14);
aWE("ellips",3);
aWE("empty",12);
aWE("encounter",9);
aWE("end",15,3,12,13);
aWE("ent",3,8);
aWE("entity",15,3,7,5,11,16);
aWE("entir",9);
aWE("entity",14,15,3,7,5,11,16);
aWE("equal",15);
aWE("eras",6);
aWE("eraseall",6);
aWE("eraseon",6);
aWE("error",12);
aWE("error",12,9);
aWE("etc",5,12);
aWE("exampl",14,1,15,3,4,7,5,11,12,13,10,16);
aWE("except",12);
@ -227,6 +239,7 @@ aWE("exist",15,16);
aWE("explod",0,5,10);
aWE("export",2,8);
aWE("exportation",8);
aWE("extra",9);
aWE("extract",10);
aWE("extrud",7);
aWE("extrusion",7);
@ -236,7 +249,7 @@ aWE("f3",14);
aWE("f4",14);
aWE("f5",14);
aWE("f6",14);
aWE("fac",14,3,7,5,12,13,10);
aWE("fac",14,3,7,5,12,13,10,9);
aWE("face1",10);
aWE("face2",10);
aWE("facemaxtol",9);
@ -252,12 +265,15 @@ aWE("first",3,4,5,11,13,10);
aWE("fix",12);
aWE("fixfacesiz",12);
aWE("fixshap",12);
aWE("follow",14,4,6,5);
aWE("flag",9);
aWE("follow",4,6,5,9);
aWE("format",2,8);
aWE("formatnam",8);
aWE("four",14);
aWE("fre",12);
aWE("function",2,5);
aWE("functionaliti",14);
aWE("functionality",15,16);
aWE("fus",4);
aWE("gap",12);
aWE("general",14);
@ -268,6 +284,498 @@ aWE("geom_object",14,15,3,4,7,5,11,12,13,10,9,16);
aWE("geometric",14);
aWE("geometrical",1,2,3,4,6,8,7,5,11,12,13,10,9,16);
aWE("geometry",12);
aWE("geompy",14,15,3,4,8,7,5,11,12,13,10,9,16);
aWE("get",4,5,9);
aWE("getfreeboundary",12);
aWE("getfreefacesid",12);
aWE("getobjectid",16);
aWE("getsubshapeid",5);
aWE("gg",1);
aWE("giv",3);
aWE("given",3,5,12,13,10,9);
aWE("glu",12,10,9);
aWE("graphic",6);
aWE("gravity",9);
aWE("group",10,16);
aWE("gui",10);
aWE("half",3);
aWE("handl",16);
aWE("hav",5,12);
aWE("height",7,11);
aWE("hexahedral",14,10);
aWE("hexahedron",14);
aWE("hid",6);
aWE("highlight",12,9);
aWE("hol",12);
aWE("i",6);
aWE("i11",9);
aWE("i12",9);
aWE("i13",9);
aWE("i21",9);
aWE("i22",9);
aWE("i23",9);
aWE("i31",9);
aWE("i32",9);
aWE("i33",9);
aWE("id",1,6,5,12,10,16);
aWE("if",5,12,10,9,16);
aWE("ig",2,8);
aWE("imag",13);
aWE("import",2,6,8,9);
aWE("importation",8);
aWE("in",13);
aWE("increas",12);
aWE("independent",4,6);
aWE("indic",10);
aWE("inertia",9);
aWE("inform",9);
aWE("initial",13);
aWE("inquir",9);
aWE("inretia",9);
aWE("insert",12);
aWE("insid",10);
aWE("integ",10);
aWE("integer",10);
aWE("intend",12);
aWE("interactive",10);
aWE("intermediat",14);
aWE("internal",12);
aWE("intersect",10);
aWE("intersection",10);
aWE("introduction",14,2);
aWE("invalid",12);
aWE("investigat",9);
aWE("isbyparamet",12);
aWE("iscommonvertex",12);
aWE("iso",1);
aWE("isolin",1);
aWE("iteration",7);
aWE("itself",12);
aWE("ix",9);
aWE("iy",9);
aWE("iz",9);
aWE("just",14);
aWE("keep",13);
aWE("last",3,5);
aWE("lc",3);
aWE("least",3);
aWE("length",15,12,9);
aWE("les",12);
aWE("limit",10);
aWE("lin",15,3,10);
aWE("list",15,3,7,5,12,10,16);
aWE("listoffaceid",10);
aWE("listofgeomshap",12);
aWE("listofid",5,12);
aWE("listofkeepinsid",10);
aWE("listofmaterial",10);
aWE("listofremoveinsid",10);
aWE("listofshap",3,5,12,10);
aWE("listofshapeid",10);
aWE("listoftool",10);
aWE("listofwireid",12);
aWE("local",15,3,13);
aWE("locat",3);
aWE("location",3,8,13);
aWE("lwp",15);
aWE("ly",15,12);
aWE("main",14,0,15,3,4,6,7,5,11,12,13,10,9,16);
aWE("mainshap",16);
aWE("major",3,11);
aWE("mak",13,10,16);
aWE("makearc",3);
aWE("makebezi",3);
aWE("makeblockexplod",10);
aWE("makeboolean",4);
aWE("makebox",11);
aWE("makecdg",9);
aWE("makechamferedg",10);
aWE("makechamferfac",10);
aWE("makecircl",3);
aWE("makecompound",5);
aWE("makecon",11);
aWE("makecylind",11);
aWE("makeedg",5);
aWE("makeellips",3);
aWE("makefac",5);
aWE("makefil",7);
aWE("makefillet",10);
aWE("makegluefac",12);
aWE("makehexasolid",14);
aWE("makehexasolidtwofac",14);
aWE("makeinterpol",3);
aWE("makelin",3);
aWE("makemark",3);
aWE("makemirrorbyplan",13);
aWE("makemultirotation1d",13);
aWE("makemultirotation2d",13);
aWE("makemultitransformation1d",10);
aWE("makemultitransformation2d",10);
aWE("makemultitranslation1d",13);
aWE("makemultitranslation2d",13);
aWE("makeoffset",13);
aWE("makepartition",10);
aWE("makepip",7);
aWE("makeplan",3);
aWE("makepolylin",3);
aWE("makeposition",13);
aWE("makeprism",7);
aWE("makequadfac",14);
aWE("makequadfaceedg",14);
aWE("makequadfacevertic",14);
aWE("makerevolution",7);
aWE("makerotation",13);
aWE("makescaletransform",13);
aWE("makesew",12);
aWE("makeshell",5);
aWE("makesketch",15);
aWE("makesolid",5);
aWE("makespher",11);
aWE("maketoru",11);
aWE("maketranslation",13);
aWE("makevector",3);
aWE("makevertex",3);
aWE("makewir",5);
aWE("manual",3);
aWE("mas",9);
aWE("material",10);
aWE("matrix",9);
aWE("max",7,12,10);
aWE("maxdegre",7);
aWE("maximal",7,12,10,9);
aWE("maximum",12,10);
aWE("maxnbfac",10);
aWE("maxtoleranc",12);
aWE("maxtolerance3d",12);
aWE("mean",15,13);
aWE("measur",9);
aWE("measurement",9);
aWE("mention",14);
aWE("menu",14,0,1,15,3,4,6,8,7,5,11,12,13,10,9,16);
aWE("merg",12);
aWE("mesh",14,10);
aWE("meshingdeflection",10);
aWE("method",5);
aWE("middl",3);
aWE("min",7,10,9);
aWE("mindegre",7);
aWE("mindistanc",9);
aWE("minimal",7,10,9);
aWE("minimum",10);
aWE("minnbfac",10);
aWE("minor",3,11);
aWE("mirror",13);
aWE("mod",1,12);
aWE("model",2,10);
aWE("modifi",3,12,13);
aWE("modification",12,13);
aWE("modify",13);
aWE("modul",2,6);
aWE("moment",9);
aWE("mov",13);
aWE("much",16);
aWE("multi",0,13,10);
aWE("multitud",10);
aWE("must",12,13,9);
aWE("nam",14,3,4,8,7,5,11,12,13,10);
aWE("nbit",7);
aWE("nbsplitpoint",12);
aWE("nbtim",13,10);
aWE("nbtimes1",13);
aWE("nbtimes2",13);
aWE("nbtimesu",10);
aWE("nbtimesv",10);
aWE("necessary",15,6,12,9);
aWE("need",12);
aWE("negativ",13);
aWE("neigbour",12);
aWE("new",14,15,3,7,5,11,12,16);
aWE("nod",3);
aWE("noerror",12);
aWE("normal",3,7,13);
aWE("notion",14);
aWE("numb",1,7,12,13,10);
aWE("number",10);
aWE("numeb",10);
aWE("object",1,2,3,4,6,8,7,5,11,12,13,10,9,16);
aWE("occ",1,6,12,16);
aWE("occur",12);
aWE("offer",16);
aWE("offset",13);
aWE("ok",3,8);
aWE("on",15,3,4,6,12,13,10);
aWE("open",12);
aWE("openwir",12);
aWE("operation",14,2,4,6,7,12,13,10,16);
aWE("operator",12);
aWE("opposit",11);
aWE("optimization",2);
aWE("option",0);
aWE("ord",12,9);
aWE("orient",14,3);
aWE("origin",3,11);
aWE("otherwis",12,13);
aWE("outsid",10);
aWE("ox",15,3);
aWE("oy",3);
aWE("oz",15,3);
aWE("paramet",3,5,12);
aWE("parameter",1,15,3,7,12);
aWE("paramt",12);
aWE("part",4,11);
aWE("partition",10);
aWE("pas",3);
aWE("path",7);
aWE("pathshap",7);
aWE("pattern",13);
aWE("perform",10,16);
aWE("perpendicular",15);
aWE("pip",7);
aWE("plan",15,3,13,10);
aWE("planar",15,3,5);
aWE("platform",16);
aWE("plung",10);
aWE("point",14,15,3,11,12,13,9);
aWE("point1",3);
aWE("point2",3);
aWE("point3",3);
aWE("pointcoordinat",9);
aWE("polylin",3);
aWE("pop",1,6);
aWE("position",3,12);
aWE("possibility",12);
aWE("possibl",6,12,10,9);
aWE("precision",12);
aWE("predefin",15);
aWE("preferenc",16);
aWE("pres",3);
aWE("preview",3);
aWE("previou",15);
aWE("primitiv",2,11);
aWE("print",9);
aWE("prism",7);
aWE("problem",12);
aWE("proces",12,10);
aWE("processshap",12);
aWE("project",16);
aWE("propagat",10);
aWE("propagation",10);
aWE("properti",1,9);
aWE("put",10);
aWE("python",9);
aWE("quadrangl",14,3,9);
aWE("radian",12);
aWE("radiu",15,3,11,10);
aWE("radius",3,11);
aWE("radius1",11);
aWE("radius2",11);
aWE("radiusmajor",3,11);
aWE("radiusminor",3,11);
aWE("rang",2,12);
aWE("re",12);
aWE("reasonabl",6);
aWE("reconstruction",10);
aWE("referenc",3);
aWE("regard",3);
aWE("relativ",15);
aWE("remov",12,13,16);
aWE("removeobject",16);
aWE("removeweb",10);
aWE("repair",2,12);
aWE("repetition",13);
aWE("represent",3);
aWE("request",5);
aWE("requir",6,8,12);
aWE("requireddegre",12);
aWE("requirednbsegment",12);
aWE("respect",15,12);
aWE("restriction",12);
aWE("result",14,15,3,4,7,5,11,12,13,10,9,16);
aWE("resultant",12);
aWE("retriev",5,12);
aWE("return",5,12,10,9,16);
aWE("revers",13);
aWE("revolution",7,12);
aWE("right",1,6);
aWE("rotat",7,13);
aWE("rotation",13);
aWE("s",3,5,12,13,10,16);
aWE("salom",2,16);
aWE("sam",15,12);
aWE("sameparamet",12);
aWE("satisfy",9);
aWE("scal",13);
aWE("se",8,9);
aWE("search",8);
aWE("second",4,11,13,10);
aWE("section",4,10);
aWE("segment",15,12);
aWE("select",0,1,15,3,4,6,8,7,5,11,12,10,9,16);
aWE("selection",15,3,10);
aWE("sens",10);
aWE("serv",3,7);
aWE("set",1,3,12,13,10);
aWE("setcolor",1);
aWE("setdisplaymod",1);
aWE("settransparency",1);
aWE("sew",12);
aWE("sg",6);
aWE("shad",1);
aWE("shap",1,2,4,6,8,7,5,12,13,10,9,16);
aWE("shape1",4,9);
aWE("shape2",4,9);
aWE("shapesto",12);
aWE("shapetyp",10,16);
aWE("shar",12);
aWE("shel",5,12,13);
aWE("shell",14,7,5,13);
aWE("short",1);
aWE("should",12,9);
aWE("shown",3);
aWE("sid",3);
aWE("sign",13);
aWE("six",14);
aWE("siz",3,12,10);
aWE("sketch",15);
aWE("small",3,12);
aWE("solid",14,7,5,11,13,10);
aWE("soon",3);
aWE("spac",3,9);
aWE("specifi",3,12,10);
aWE("specific",14);
aWE("specify",12,13);
aWE("spher",11);
aWE("splin",3);
aWE("split",12);
aWE("splitangl",12);
aWE("splitclosedfac",12);
aWE("splitcontinuity",12);
aWE("spot",12);
aWE("stag",14);
aWE("standard",8);
aWE("start",15,3,13);
aWE("step",2,8,13);
aWE("step1",13);
aWE("step2",13);
aWE("str",15,8);
aWE("strip",12);
aWE("study",6);
aWE("sub",5,12,16);
aWE("submenu",0,5,12,9);
aWE("subshap",5,10,16);
aWE("subshapeall",5);
aWE("subshapeid",16);
aWE("suppres",12);
aWE("suppressfac",12);
aWE("suppresshol",12);
aWE("suppressinternalwir",12);
aWE("surfac",12,13,9);
aWE("surfacecontinuity",12);
aWE("surfacemod",12);
aWE("symmetrical",13);
aWE("symmetry",11,13);
aWE("system",3,13);
aWE("tangent",15);
aWE("target",15,10);
aWE("tetrahedral",14);
aWE("theendlc",13);
aWE("them",12);
aWE("theobject",13);
aWE("therefor",15);
aWE("theshap",12);
aWE("thestartlc",13);
aWE("thetoleranc",12);
aWE("tim",13);
aWE("tobezi",12);
aWE("toggl",16);
aWE("tol2d",7);
aWE("tol3d",7);
aWE("toleranc",7,12,9);
aWE("tolerance2d",12);
aWE("tolerance3d",12);
aWE("tool",9);
aWE("toru",11);
aWE("transform",4,13,10);
aWE("transformation",0,2,13,10);
aWE("translat",13);
aWE("translation",13,10);
aWE("transparency",1);
aWE("trihedron",3);
aWE("trimsiz",3);
aWE("tru",12,10,9);
aWE("tui",14,1,15,3,4,6,8,7,5,11,12,13,10,9,16);
aWE("tupl",9);
aWE("two",14,4,11,12,13,10,9);
aWE("typ",15,4,5,11,12,10,9,16);
aWE("typeofshap",5);
aWE("underly",12);
aWE("up",1,6,11,10);
aWE("updat",3);
aWE("us",14,2,15,3,4,6,7,5,12,13,10,9,16);
aWE("useful",16);
aWE("v1",14);
aWE("v2",14);
aWE("v3",14);
aWE("v4",14);
aWE("val",12);
aWE("valid",9);
aWE("validity",9);
aWE("valu",1,15,3,7,11,12,13,10,9);
aWE("variou",12);
aWE("vector",15,3,7,11,13);
aWE("vertex",3,7,5,11,12,13,9);
aWE("vertex1",5);
aWE("vertex2",5);
aWE("vertexmaxtol",9);
aWE("vertexmintol",9);
aWE("vertic",14,3,5,11,12,13);
aWE("via",14,15,13,16);
aWE("view",1,3,6,12,9,16);
aWE("viewer",6);
aWE("visibility",6);
aWE("visualization",1,6);
aWE("volum",9);
aWE("vtk",6);
aWE("vx",15);
aWE("wantplanarfac",5);
aWE("wat",10);
aWE("waterdensity",10);
aWE("weight",10);
aWE("whati",9);
aWE("wheth",9);
aWE("whil",12);
aWE("whos",5,9);
aWE("wid",2);
aWE("will",3,8,12,13,10);
aWE("wir",14,7,5,12);
aWE("wirefram",1);
aWE("wish",8);
aWE("within",1,12);
aWE("work",15,3,6,12,16);
aWE("x",15,3,9);
aWE("x1",11);
aWE("x2",11);
aWE("xdx",3);
aWE("xdy",3);
aWE("xdz",3);
aWE("xmax",9);
aWE("xmin",9);
aWE("xoy",15);
aWE("xyz",3);
aWE("y",15,3,9);
aWE("y1",11);
aWE("y2",11);
aWE("ydx",3);
aWE("ydy",3);
aWE("ydz",3);
aWE("ymax",9);
aWE("ymin",9);
aWE("your",8,12,9,16);
aWE("z",3,10,9);
aWE("z1",11);
aWE("z2",11);
aWE("zmax",9);
aWE("zmin",9);
//-->
</script>

6
doc/salome/gui/GEOM/whgdata/whlstf0.htm
View File

File diff suppressed because one or more lines are too long

8
doc/salome/gui/GEOM/whgdata/whlstf1.htm
View File

File diff suppressed because one or more lines are too long

10
doc/salome/gui/GEOM/whgdata/whlstf2.htm
View File

File diff suppressed because one or more lines are too long

12
doc/salome/gui/GEOM/whgdata/whlstf3.htm
View File

File diff suppressed because one or more lines are too long

8
doc/salome/gui/GEOM/whgdata/whlstf4.htm
View File

File diff suppressed because one or more lines are too long

12
doc/salome/gui/GEOM/whgdata/whlstf5.htm
View File

@ -33,15 +33,17 @@ A:hover {color:Navy; } A:hover {font-family:Tahoma; } A:hover {font-size:8pt; }
<body marginheight="0" marginwidth="0" bgproperties="fixed">
<p class="ftsbody" align="center"><a href="whlstf4.htm" target="_self" title="previous search group"><b>&lt;&lt;</b></a><br><br></p>
<p class="ftsbody" >
<a name="bm_V"></a><a name="subkey_V{"></a><a href="../newentity_blocks.htm"><b>v1</b></a> <br><a href="../newentity_blocks.htm"><b>v2</b></a> <br><a href="../newentity_blocks.htm"><b>v3</b></a> <br><a href="../newentity_blocks.htm"><b>v4</b></a> <br><a name="bms_VA"></a><a name="subkey_VA"></a><a href="../files/salome2_sp3_repairgui_functions.htm"><b>val</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>valid</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>validity</b></a> <br><nobr>value <a href="../sketcher.htm"><b>1</b></a> <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_primitivegui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_operationgui_functions.htm"><b>5</b></a> <a href="../files/salome2_sp3_generationgui_functions.htm"><b>6</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>7</b></a> </nobr><br><nobr>values <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_primitivegui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_operationgui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>5</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>6</b></a> <a href="../changing_displaying_parameters.htm"><b>7</b></a> </nobr><br><a href="../files/salome2_sp3_repairgui_functions.htm"><b>various</b></a> <br><nobr><a name="bms_VE"></a><a name="subkey_VE"></a>vector <a href="../sketcher.htm"><b>1</b></a> <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_primitivegui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_generationgui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>5</b></a> </nobr><br><nobr>vectors <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>2</b></a> </nobr><br><nobr>vertex <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_primitivegui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_generationgui_functions.htm"><b>5</b></a> <a href="../files/salome2_sp3_buildgui_functions.htm"><b>6</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>7</b></a> </nobr><br><a href="../files/salome2_sp3_buildgui_functions.htm"><b>vertex1</b></a> <br><a href="../files/salome2_sp3_buildgui_functions.htm"><b>vertex2</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>vertexmaxtol</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>vertexmintol</b></a> <br><nobr>vertices <a href="../newentity_blocks.htm"><b>1</b></a> <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_primitivegui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_buildgui_functions.htm"><b>5</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>6</b></a> </nobr><br><a name="bms_VI"></a><a name="subkey_VI"></a><a href="../files/salome2_sp3_displaygui_functions.htm"><b>view</b></a> <br><nobr>viewer <a href="../files/salome2_sp3_repairgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_displaygui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>3</b></a> <a href="../changing_displaying_parameters.htm"><b>4</b></a> </nobr><br><a href="../files/salome2_sp3_displaygui_functions.htm"><b>viewers</b></a> <br><a href="../files/salome2_sp3_displaygui_functions.htm"><b>visibility</b></a> <br><nobr>visualization <a href="../files/salome2_sp3_displaygui_functions.htm"><b>1</b></a> <a href="../changing_displaying_parameters.htm"><b>2</b></a> </nobr><br><a name="bms_VO"></a><a name="subkey_VO"></a><a href="../files/salome2_sp3_measuregui_functions.htm"><b>volume</b></a> <br><a name="bms_VT"></a><a name="subkey_VT"></a><a href="../files/salome2_sp3_displaygui_functions.htm"><b>vtk</b></a> <br><a name="bms_VX"></a><a name="subkey_VX"></a><a href="../sketcher.htm"><b>vx</b></a> <br>
<a name="bms_TR"></a><a name="subkey_TR"></a><a href="../files/salome2_sp3_transformationgui_functions.htm"><b>transform</b></a> <br><nobr>transformation <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_operationgui_functions.htm"><b>2</b></a> <a href="../blocks.htm"><b>3</b></a> </nobr><br><nobr>transformations <a href="../files/salome2_sp3_operationgui_functions.htm"><b>1</b></a> <a href="../files/introduction_to_geom.htm"><b>2</b></a> </nobr><br><nobr>transformed <a href="../files/salome2_sp3_operationgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>2</b></a> </nobr><br><a href="../files/salome2_sp3_transformationgui_functions.htm"><b>translated</b></a> <br><a href="../files/salome2_sp3_transformationgui_functions.htm"><b>translation</b></a> <br><nobr>translations <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_operationgui_functions.htm"><b>2</b></a> </nobr><br><a href="../changing_displaying_parameters.htm"><b>transparency</b></a> <br><a href="../files/salome2_sp3_basicgui_functions.htm"><b>trihedron</b></a> <br><a href="../files/salome2_sp3_basicgui_functions.htm"><b>trimsize</b></a> <br><nobr>true <a href="../files/salome2_sp3_repairgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_operationgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>3</b></a> </nobr><br><nobr><a name="bms_TU"></a><a name="subkey_TU"></a>tui <a href="../sketcher.htm"><b>1</b></a> <a href="../newentity_blocks.htm"><b>2</b></a> <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_primitivegui_functions.htm"><b>5</b></a> <a href="../files/salome2_sp3_operationgui_functions.htm"><b>6</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>7</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>8</b></a> <a href="../files/salome2_sp3_generationgui_functions.htm"><b>9</b></a> <a href="../files/salome2_sp3_displaygui_functions.htm"><b>10</b></a> <a href="../files/salome2_sp3_buildgui_functions.htm"><b>11</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>12</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>13</b></a> <a href="../changing_displaying_parameters.htm"><b>14</b></a> <a href="../working_with_groups.htm"><b>15</b></a> </nobr><br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>tuple</b></a> <br><nobr><a name="bms_TW"></a><a name="subkey_TW"></a>two <a href="../newentity_blocks.htm"><b>1</b></a> <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_primitivegui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_operationgui_functions.htm"><b>5</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>6</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>7</b></a> </nobr><br><nobr><a name="bms_TY"></a><a name="subkey_TY"></a>type <a href="../sketcher.htm"><b>1</b></a> <a href="../files/salome2_sp3_operationgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_buildgui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>5</b></a> <a href="../working_with_groups.htm"><b>6</b></a> </nobr><br><a href="../files/salome2_sp3_buildgui_functions.htm"><b>typeofshape</b></a> <br><nobr>types <a href="../sketcher.htm"><b>1</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_primitivegui_functions.htm"><b>3</b></a> </nobr><br>
<br><br>
<a name="bm_W"></a><a name="subkey_WA"></a><a href="../files/salome2_sp3_buildgui_functions.htm"><b>wantplanarface</b></a> <br><a href="../files/salome2_sp3_operationgui_functions.htm"><b>water</b></a> <br><a href="../files/salome2_sp3_operationgui_functions.htm"><b>waterdensity</b></a> <br><a name="bms_WE"></a><a name="subkey_WE"></a><a href="../files/salome2_sp3_operationgui_functions.htm"><b>weight</b></a> <br><a name="bms_WH"></a><a name="subkey_WH"></a><a href="../files/salome2_sp3_measuregui_functions.htm"><b>whatis</b></a> <br><a href="../files/salome2_sp3_repairgui_functions.htm"><b>while</b></a> <br><nobr>whose <a href="../files/salome2_sp3_measuregui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_buildgui_functions.htm"><b>2</b></a> </nobr><br><a name="bms_WI"></a><a name="subkey_WI"></a><a href="../files/introduction_to_geom.htm"><b>wide</b></a> <br><nobr>will <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_operationgui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>5</b></a> </nobr><br><nobr>wire <a href="../files/salome2_sp3_repairgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_generationgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_buildgui_functions.htm"><b>3</b></a> </nobr><br><a href="../changing_displaying_parameters.htm"><b>wireframe</b></a> <br><nobr>wires <a href="../newentity_blocks.htm"><b>1</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_buildgui_functions.htm"><b>3</b></a> </nobr><br><nobr>within <a href="../files/salome2_sp3_repairgui_functions.htm"><b>1</b></a> <a href="../changing_displaying_parameters.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_WO"></a><a name="subkey_WO"></a>work <a href="../files/salome2_sp3_repairgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_displaygui_functions.htm"><b>2</b></a> </nobr><br><nobr>working <a href="../sketcher.htm"><b>1</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>2</b></a> <a href="../working_with_groups.htm"><b>3</b></a> </nobr><br>
<a name="bm_U"></a><a name="subkey_UN"></a><a href="../files/salome2_sp3_repairgui_functions.htm"><b>underlying</b></a> <br><nobr><a name="bms_UP"></a><a name="subkey_UP"></a>up <a href="../files/salome2_sp3_operationgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_displaygui_functions.htm"><b>2</b></a> <a href="../changing_displaying_parameters.htm"><b>3</b></a> </nobr><br><a href="../files/salome2_sp3_basicgui_functions.htm"><b>updated</b></a> <br><a href="../files/salome2_sp3_primitivegui_functions.htm"><b>upper</b></a> <br><nobr><a name="bms_US"></a><a name="subkey_US"></a>used <a href="../sketcher.htm"><b>1</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_generationgui_functions.htm"><b>3</b></a> <a href="../working_with_groups.htm"><b>4</b></a> </nobr><br><a href="../working_with_groups.htm"><b>useful</b></a> <br><nobr>user <a href="../files/salome2_sp3_repairgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_operationgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>3</b></a> </nobr><br><nobr>using <a href="../newentity_blocks.htm"><b>1</b></a> <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_operationgui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>5</b></a> <a href="../files/salome2_sp3_generationgui_functions.htm"><b>6</b></a> <a href="../files/salome2_sp3_displaygui_functions.htm"><b>7</b></a> <a href="../files/salome2_sp3_buildgui_functions.htm"><b>8</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>9</b></a> <a href="../files/introduction_to_geom.htm"><b>10</b></a> </nobr><br>
<br><br>
<a name="bm_V"></a><a name="subkey_V{"></a><a href="../newentity_blocks.htm"><b>v1</b></a> <br><a href="../newentity_blocks.htm"><b>v2</b></a> <br><a href="../newentity_blocks.htm"><b>v3</b></a> <br><a href="../newentity_blocks.htm"><b>v4</b></a> <br><a name="bms_VA"></a><a name="subkey_VA"></a><a href="../files/salome2_sp3_repairgui_functions.htm"><b>val</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>valid</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>validity</b></a> <br><nobr>value <a href="../sketcher.htm"><b>1</b></a> <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_primitivegui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_operationgui_functions.htm"><b>5</b></a> <a href="../files/salome2_sp3_generationgui_functions.htm"><b>6</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>7</b></a> </nobr><br><nobr>values <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_primitivegui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_operationgui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>5</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>6</b></a> <a href="../changing_displaying_parameters.htm"><b>7</b></a> </nobr><br><a href="../files/salome2_sp3_repairgui_functions.htm"><b>various</b></a> <br><nobr><a name="bms_VE"></a><a name="subkey_VE"></a>vector <a href="../sketcher.htm"><b>1</b></a> <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_primitivegui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_generationgui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>5</b></a> </nobr><br><nobr>vectors <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>2</b></a> </nobr><br><nobr>vertex <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_primitivegui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_generationgui_functions.htm"><b>5</b></a> <a href="../files/salome2_sp3_buildgui_functions.htm"><b>6</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>7</b></a> </nobr><br><a href="../files/salome2_sp3_buildgui_functions.htm"><b>vertex1</b></a> <br><a href="../files/salome2_sp3_buildgui_functions.htm"><b>vertex2</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>vertexmaxtol</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>vertexmintol</b></a> <br><nobr>vertices <a href="../newentity_blocks.htm"><b>1</b></a> <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_primitivegui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_buildgui_functions.htm"><b>5</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>6</b></a> </nobr><br><nobr><a name="bms_VI"></a><a name="subkey_VI"></a>via <a href="../sketcher.htm"><b>1</b></a> <a href="../newentity_blocks.htm"><b>2</b></a> <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>3</b></a> <a href="../working_with_groups.htm"><b>4</b></a> </nobr><br><a href="../files/salome2_sp3_displaygui_functions.htm"><b>view</b></a> <br><nobr>viewer <a href="../files/salome2_sp3_repairgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_displaygui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>4</b></a> <a href="../changing_displaying_parameters.htm"><b>5</b></a> <a href="../working_with_groups.htm"><b>6</b></a> </nobr><br><a href="../files/salome2_sp3_displaygui_functions.htm"><b>viewers</b></a> <br><a href="../files/salome2_sp3_displaygui_functions.htm"><b>visibility</b></a> <br><nobr>visualization <a href="../files/salome2_sp3_displaygui_functions.htm"><b>1</b></a> <a href="../changing_displaying_parameters.htm"><b>2</b></a> </nobr><br><a name="bms_VO"></a><a name="subkey_VO"></a><a href="../files/salome2_sp3_measuregui_functions.htm"><b>volume</b></a> <br><a name="bms_VT"></a><a name="subkey_VT"></a><a href="../files/salome2_sp3_displaygui_functions.htm"><b>vtk</b></a> <br><a name="bms_VX"></a><a name="subkey_VX"></a><a href="../sketcher.htm"><b>vx</b></a> <br>
<br><br>
<a name="bm_W"></a><a name="subkey_WA"></a><a href="../files/salome2_sp3_buildgui_functions.htm"><b>wantplanarface</b></a> <br><a href="../files/salome2_sp3_operationgui_functions.htm"><b>water</b></a> <br><a href="../files/salome2_sp3_operationgui_functions.htm"><b>waterdensity</b></a> <br><a name="bms_WE"></a><a name="subkey_WE"></a><a href="../files/salome2_sp3_operationgui_functions.htm"><b>weight</b></a> <br><a name="bms_WH"></a><a name="subkey_WH"></a><a href="../files/salome2_sp3_measuregui_functions.htm"><b>whatis</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>whether</b></a> <br><a href="../files/salome2_sp3_repairgui_functions.htm"><b>while</b></a> <br><nobr>whose <a href="../files/salome2_sp3_measuregui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_buildgui_functions.htm"><b>2</b></a> </nobr><br><a name="bms_WI"></a><a name="subkey_WI"></a><a href="../files/introduction_to_geom.htm"><b>wide</b></a> <br><nobr>will <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_operationgui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>5</b></a> </nobr><br><nobr>wire <a href="../files/salome2_sp3_repairgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_generationgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_buildgui_functions.htm"><b>3</b></a> </nobr><br><a href="../changing_displaying_parameters.htm"><b>wireframe</b></a> <br><nobr>wires <a href="../newentity_blocks.htm"><b>1</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_buildgui_functions.htm"><b>3</b></a> </nobr><br><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>wish</b></a> <br><nobr>within <a href="../files/salome2_sp3_repairgui_functions.htm"><b>1</b></a> <a href="../changing_displaying_parameters.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_WO"></a><a name="subkey_WO"></a>work <a href="../files/salome2_sp3_repairgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_displaygui_functions.htm"><b>2</b></a> </nobr><br><nobr>working <a href="../sketcher.htm"><b>1</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>2</b></a> <a href="../working_with_groups.htm"><b>3</b></a> </nobr><br>
<br><br>
<nobr><a name="bm_X"></a><a name="subkey_X{"></a>x <a href="../sketcher.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>3</b></a> </nobr><br><a href="../files/salome2_sp3_primitivegui_functions.htm"><b>x1</b></a> <br><a href="../files/salome2_sp3_primitivegui_functions.htm"><b>x2</b></a> <br><a name="bms_XD"></a><a name="subkey_XD"></a><a href="../files/salome2_sp3_basicgui_functions.htm"><b>xdx</b></a> <br><a href="../files/salome2_sp3_basicgui_functions.htm"><b>xdy</b></a> <br><a href="../files/salome2_sp3_basicgui_functions.htm"><b>xdz</b></a> <br><a name="bms_XM"></a><a name="subkey_XM"></a><a href="../files/salome2_sp3_measuregui_functions.htm"><b>xmax</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>xmin</b></a> <br><a name="bms_XO"></a><a name="subkey_XO"></a><a href="../sketcher.htm"><b>xoy</b></a> <br><a name="bms_XY"></a><a name="subkey_XY"></a><a href="../files/salome2_sp3_basicgui_functions.htm"><b>xyz</b></a> <br>
<br><br>
<nobr><a name="bm_Y"></a><a name="subkey_Y{"></a>y <a href="../sketcher.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>3</b></a> </nobr><br><a href="../files/salome2_sp3_primitivegui_functions.htm"><b>y1</b></a> <br><a href="../files/salome2_sp3_primitivegui_functions.htm"><b>y2</b></a> <br><a name="bms_YD"></a><a name="subkey_YD"></a><a href="../files/salome2_sp3_basicgui_functions.htm"><b>ydx</b></a> <br><a href="../files/salome2_sp3_basicgui_functions.htm"><b>ydy</b></a> <br><a href="../files/salome2_sp3_basicgui_functions.htm"><b>ydz</b></a> <br><a name="bms_YM"></a><a name="subkey_YM"></a><a href="../files/salome2_sp3_measuregui_functions.htm"><b>ymax</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>ymin</b></a> <br><nobr><a name="bms_YO"></a><a name="subkey_YO"></a>your <a href="../files/salome2_sp3_repairgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>3</b></a> </nobr><br>
<nobr><a name="bm_Y"></a><a name="subkey_Y{"></a>y <a href="../sketcher.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>3</b></a> </nobr><br><a href="../files/salome2_sp3_primitivegui_functions.htm"><b>y1</b></a> <br><a href="../files/salome2_sp3_primitivegui_functions.htm"><b>y2</b></a> <br><a name="bms_YD"></a><a name="subkey_YD"></a><a href="../files/salome2_sp3_basicgui_functions.htm"><b>ydx</b></a> <br><a href="../files/salome2_sp3_basicgui_functions.htm"><b>ydy</b></a> <br><a href="../files/salome2_sp3_basicgui_functions.htm"><b>ydz</b></a> <br><a name="bms_YM"></a><a name="subkey_YM"></a><a href="../files/salome2_sp3_measuregui_functions.htm"><b>ymax</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>ymin</b></a> <br><nobr><a name="bms_YO"></a><a name="subkey_YO"></a>your <a href="../files/salome2_sp3_repairgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>3</b></a> <a href="../working_with_groups.htm"><b>4</b></a> </nobr><br>
<br><br>
<nobr><a name="bm_Z"></a><a name="subkey_Z{"></a>z <a href="../files/salome2_sp3_operationgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>3</b></a> </nobr><br><a href="../files/salome2_sp3_primitivegui_functions.htm"><b>z1</b></a> <br><a href="../files/salome2_sp3_primitivegui_functions.htm"><b>z2</b></a> <br><a name="bms_ZM"></a><a name="subkey_ZM"></a><a href="../files/salome2_sp3_measuregui_functions.htm"><b>zmax</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>zmin</b></a> <br><br><br></p>
</body>

2
doc/salome/gui/GEOM/whgdata/whlstfl15.htm
View File

@ -37,7 +37,7 @@ body {background-color:White; }
</head>
<body marginheight="0" marginwidth="0" bgproperties="fixed">
<p class="ftsheader"><a name="subkey_R"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf3.htm#bm_R" target="ftslist" title="search letter RA"><b>RA</b></a> <a href="whlstf3.htm#bms_RE" target="ftslist" title="search letter RE"><b>RE</b></a> <a href="whlstf4.htm#bms_RI" target="ftslist" title="search letter RI"><b>RI</b></a> <a href="whlstf4.htm#bms_RO" target="ftslist" title="search letter RO"><b>RO</b></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
<p class="ftsheader"><a name="subkey_R"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf3.htm#bm_R" target="ftslist" title="search letter RA"><b>RA</b></a> <a href="whlstf4.htm#bms_RE" target="ftslist" title="search letter RE"><b>RE</b></a> <a href="whlstf4.htm#bms_RI" target="ftslist" title="search letter RI"><b>RI</b></a> <a href="whlstf4.htm#bms_RO" target="ftslist" title="search letter RO"><b>RO</b></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
</body>

2
doc/salome/gui/GEOM/whgdata/whlstfl17.htm
View File

@ -37,7 +37,7 @@ body {background-color:White; }
</head>
<body marginheight="0" marginwidth="0" bgproperties="fixed">
<p class="ftsheader"><a name="subkey_T"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf4.htm#bm_T" target="ftslist" title="search letter TA"><b>TA</b></a> <a href="whlstf4.htm#bms_TE" target="ftslist" title="search letter TE"><b>TE</b></a> <a href="whlstf4.htm#bms_TH" target="ftslist" title="search letter TH"><b>TH</b></a> <a href="whlstf4.htm#bms_TI" target="ftslist" title="search letter TI"><b>TI</b></a> <a href="whlstf4.htm#bms_TO" target="ftslist" title="search letter TO"><b>TO</b></a> <a href="whlstf4.htm#bms_TR" target="ftslist" title="search letter TR"><b>TR</b></a> <a href="whlstf4.htm#bms_TU" target="ftslist" title="search letter TU"><b>TU</b></a> <a href="whlstf4.htm#bms_TW" target="ftslist" title="search letter TW"><b>TW</b></a> <a href="whlstf4.htm#bms_TY" target="ftslist" title="search letter TY"><b>TY</b></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
<p class="ftsheader"><a name="subkey_T"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf4.htm#bm_T" target="ftslist" title="search letter TA"><b>TA</b></a> <a href="whlstf4.htm#bms_TE" target="ftslist" title="search letter TE"><b>TE</b></a> <a href="whlstf4.htm#bms_TH" target="ftslist" title="search letter TH"><b>TH</b></a> <a href="whlstf4.htm#bms_TI" target="ftslist" title="search letter TI"><b>TI</b></a> <a href="whlstf4.htm#bms_TO" target="ftslist" title="search letter TO"><b>TO</b></a> <a href="whlstf5.htm#bms_TR" target="ftslist" title="search letter TR"><b>TR</b></a> <a href="whlstf5.htm#bms_TU" target="ftslist" title="search letter TU"><b>TU</b></a> <a href="whlstf5.htm#bms_TW" target="ftslist" title="search letter TW"><b>TW</b></a> <a href="whlstf5.htm#bms_TY" target="ftslist" title="search letter TY"><b>TY</b></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
</body>

2
doc/salome/gui/GEOM/whgdata/whlstfl18.htm
View File

@ -37,7 +37,7 @@ body {background-color:White; }
</head>
<body marginheight="0" marginwidth="0" bgproperties="fixed">
<p class="ftsheader"><a name="subkey_U"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf4.htm#bm_U" target="ftslist" title="search letter UN"><b>UN</b></a> <a href="whlstf4.htm#bms_UP" target="ftslist" title="search letter UP"><b>UP</b></a> <a href="whlstf4.htm#bms_US" target="ftslist" title="search letter US"><b>US</b></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
<p class="ftsheader"><a name="subkey_U"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf5.htm#bm_U" target="ftslist" title="search letter UN"><b>UN</b></a> <a href="whlstf5.htm#bms_UP" target="ftslist" title="search letter UP"><b>UP</b></a> <a href="whlstf5.htm#bms_US" target="ftslist" title="search letter US"><b>US</b></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
</body>

2
doc/salome/gui/GEOM/whgdata/whlstfl5.htm
View File

@ -37,7 +37,7 @@ body {background-color:White; }
</head>
<body marginheight="0" marginwidth="0" bgproperties="fixed">
<p class="ftsheader"><a name="subkey_E"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf1.htm#bm_E" target="ftslist" title="search letter E "><b>E </b></a> <a href="whlstf1.htm#bms_ED" target="ftslist" title="search letter ED"><b>ED</b></a> <a href="whlstf1.htm#bms_EG" target="ftslist" title="search letter EG"><b>EG</b></a> <a href="whlstf1.htm#bms_EI" target="ftslist" title="search letter EI"><b>EI</b></a> <a href="whlstf1.htm#bms_EL" target="ftslist" title="search letter EL"><b>EL</b></a> <a href="whlstf1.htm#bms_EM" target="ftslist" title="search letter EM"><b>EM</b></a> <a href="whlstf1.htm#bms_EN" target="ftslist" title="search letter EN"><b>EN</b></a> <a href="whlstf1.htm#bms_EQ" target="ftslist" title="search letter EQ"><b>EQ</b></a> <a href="whlstf1.htm#bms_ER" target="ftslist" title="search letter ER"><b>ER</b></a> <a href="whlstf1.htm#bms_ET" target="ftslist" title="search letter ET"><b>ET</b></a> <a href="whlstf1.htm#bms_EX" target="ftslist" title="search letter EX"><b>EX</b></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
<p class="ftsheader"><a name="subkey_E"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf1.htm#bm_E" target="ftslist" title="search letter E "><b>E </b></a> <a href="whlstf1.htm#bms_EA" target="ftslist" title="search letter EA"><b>EA</b></a> <a href="whlstf1.htm#bms_ED" target="ftslist" title="search letter ED"><b>ED</b></a> <a href="whlstf1.htm#bms_EG" target="ftslist" title="search letter EG"><b>EG</b></a> <a href="whlstf1.htm#bms_EI" target="ftslist" title="search letter EI"><b>EI</b></a> <a href="whlstf1.htm#bms_EL" target="ftslist" title="search letter EL"><b>EL</b></a> <a href="whlstf1.htm#bms_EM" target="ftslist" title="search letter EM"><b>EM</b></a> <a href="whlstf1.htm#bms_EN" target="ftslist" title="search letter EN"><b>EN</b></a> <a href="whlstf1.htm#bms_EQ" target="ftslist" title="search letter EQ"><b>EQ</b></a> <a href="whlstf1.htm#bms_ER" target="ftslist" title="search letter ER"><b>ER</b></a> <a href="whlstf1.htm#bms_ET" target="ftslist" title="search letter ET"><b>ET</b></a> <a href="whlstf1.htm#bms_EX" target="ftslist" title="search letter EX"><b>EX</b></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
</body>

2
doc/salome/gui/GEOM/whgdata/whlstfl6.htm
View File

@ -37,7 +37,7 @@ body {background-color:White; }
</head>
<body marginheight="0" marginwidth="0" bgproperties="fixed">
<p class="ftsheader"><a name="subkey_F"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf1.htm#bm_F" target="ftslist" title="search letter F "><b>F </b></a> <a href="whlstf1.htm#bms_FA" target="ftslist" title="search letter FA"><b>FA</b></a> <a href="whlstf1.htm#bms_FI" target="ftslist" title="search letter FI"><b>FI</b></a> <a href="whlstf2.htm#bms_FO" target="ftslist" title="search letter FO"><b>FO</b></a> <a href="whlstf2.htm#bms_FR" target="ftslist" title="search letter FR"><b>FR</b></a> <a href="whlstf2.htm#bms_FU" target="ftslist" title="search letter FU"><b>FU</b></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
<p class="ftsheader"><a name="subkey_F"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf1.htm#bm_F" target="ftslist" title="search letter F "><b>F </b></a> <a href="whlstf1.htm#bms_FA" target="ftslist" title="search letter FA"><b>FA</b></a> <a href="whlstf2.htm#bms_FI" target="ftslist" title="search letter FI"><b>FI</b></a> <a href="whlstf2.htm#bms_FL" target="ftslist" title="search letter FL"><b>FL</b></a> <a href="whlstf2.htm#bms_FO" target="ftslist" title="search letter FO"><b>FO</b></a> <a href="whlstf2.htm#bms_FR" target="ftslist" title="search letter FR"><b>FR</b></a> <a href="whlstf2.htm#bms_FU" target="ftslist" title="search letter FU"><b>FU</b></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
</body>

2
doc/salome/gui/GEOM/whgdata/whlsti0.htm
View File

@ -32,8 +32,6 @@ A:hover {color:Navy; } A:hover {font-family:Tahoma; } A:hover {font-size:8pt; }
</style>
</head>
<body marginheight="0" marginwidth="0" bgproperties="fixed">
<p class="ndxbody">
<br><br></p>
</body>

29
doc/salome/gui/GEOM/whgdata/whnvl31.htm
View File

@ -37,35 +37,6 @@ body {background-color:White; }
</style>
</head>
<body marginheight="0" marginwidth="0" bgproperties="fixed">
<p class="ndxheader">
<font class="inactive">#</font>
<font class="inactive">A</font>
<font class="inactive">B</font>
<font class="inactive">C</font>
<font class="inactive">D</font>
<font class="inactive">E</font>
<font class="inactive">F</font>
<font class="inactive">G</font>
<font class="inactive">H</font>
<font class="inactive">I</font>
<font class="inactive">J</font>
<font class="inactive">K</font>
<font class="inactive">L</font>
<font class="inactive">M</font>
<font class="inactive">N</font>
<font class="inactive">O</font>
<font class="inactive">P</font>
<font class="inactive">Q</font>
<font class="inactive">R</font>
<font class="inactive">S</font>
<font class="inactive">T</font>
<font class="inactive">U</font>
<font class="inactive">V</font>
<font class="inactive">W</font>
<font class="inactive">X</font>
<font class="inactive">Y</font>
<font class="inactive">Z</font>
</p>
<body>
</html>

2
doc/salome/gui/GEOM/whgdata/whnvt30.htm
View File

@ -37,7 +37,7 @@ img {vertial-align:middle;}
<table class="tabs" width="100%">
<tr>
<td class="tabs">
<nobr><a href="javascript:void(0)" title="Contents"><img src="../wht_tab1.gif" border="0"></a><a href="whnvp31.htm" target="_parent" title="Index"><img src="../wht_tab4.gif" border="0"></a><a href="whnvp32.htm" target="_parent" title="Search"><img src="../wht_tab6.gif" border="0"></a><a href="whnvp33.htm" target="_parent" title="Glossary"><img src="../wht_tab8.gif" border="0"></a></nobr>
<nobr><a href="javascript:void(0)" title="Contents"><img src="../wht_tab1.gif" border="0"></a><a href="whnvp32.htm" target="_parent" title="Search"><img src="../wht_tab6.gif" border="0"></a><a href="whnvp33.htm" target="_parent" title="Glossary"><img src="../wht_tab8.gif" border="0"></a></nobr>
</td>
</tr>
</table>

2
doc/salome/gui/GEOM/whgdata/whnvt31.htm
View File

@ -35,7 +35,7 @@ A:hover {color:Navy; } A:hover {font-family:Tahoma; } A:hover {font-size:8pt; }
<table class="tabs" width="100%">
<tr>
<td class="tabs">
<nobr><a href="whnvp30.htm" target="_parent" title="Contents"><img src="../wht_tab2.gif" border="0"></a><a href="javascript:void(0)" title="Index"><img src="../wht_tab3.gif" border="0"></a><a href="whnvp32.htm" target="_parent" title="Search"><img src="../wht_tab6.gif" border="0"></a><a href="whnvp33.htm" target="_parent" title="Glossary"><img src="../wht_tab8.gif" border="0"></a></nobr>
<nobr><a href="whnvp30.htm" target="_parent" title="Contents"><img src="../wht_tab2.gif" border="0"></a><a href="whnvp32.htm" target="_parent" title="Search"><img src="../wht_tab6.gif" border="0"></a><a href="whnvp33.htm" target="_parent" title="Glossary"><img src="../wht_tab8.gif" border="0"></a></nobr>
</td>
</tr>
</table>

2
doc/salome/gui/GEOM/whgdata/whnvt32.htm
View File

@ -35,7 +35,7 @@ A:hover {color:Navy; } A:hover {font-family:Tahoma; } A:hover {font-size:8pt; }
<table class="tabs" width="100%">
<tr>
<td class="tabs">
<nobr><a href="whnvp30.htm" target="_parent" title="Contents"><img src="../wht_tab2.gif" border="0"></a><a href="whnvp31.htm" target="_parent" title="Index"><img src="../wht_tab4.gif" border="0"></a><a href="javascript:void(0)" title="Search"><img src="../wht_tab5.gif" border="0"></a><a href="whnvp33.htm" target="_parent" title="Glossary"><img src="../wht_tab8.gif" border="0"></a></nobr>
<nobr><a href="whnvp30.htm" target="_parent" title="Contents"><img src="../wht_tab2.gif" border="0"></a><a href="javascript:void(0)" title="Search"><img src="../wht_tab5.gif" border="0"></a><a href="whnvp33.htm" target="_parent" title="Glossary"><img src="../wht_tab8.gif" border="0"></a></nobr>
</td>
</tr>
</table>

2
doc/salome/gui/GEOM/whgdata/whnvt33.htm
View File

@ -35,7 +35,7 @@ A:hover {color:Navy; } A:hover {font-family:Tahoma; } A:hover {font-size:8pt; }
<table class="tabs" width="100%">
<tr>
<td class="tabs">
<nobr><a href="whnvp30.htm" target="_parent" title="Contents"><img src="../wht_tab2.gif" border="0"></a><a href="whnvp31.htm" target="_parent" title="Index"><img src="../wht_tab4.gif" border="0"></a><a href="whnvp32.htm" target="_parent" title="Search"><img src="../wht_tab6.gif" border="0"></a><a href="javascript:void(0)" title="Glossary"><img src="../wht_tab7.gif" border="0"></a></nobr>
<nobr><a href="whnvp30.htm" target="_parent" title="Contents"><img src="../wht_tab2.gif" border="0"></a><a href="whnvp32.htm" target="_parent" title="Search"><img src="../wht_tab6.gif" border="0"></a><a href="javascript:void(0)" title="Glossary"><img src="../wht_tab7.gif" border="0"></a></nobr>
</td>
</tr>
</table>

2
doc/salome/gui/GEOM/whproj.htm
View File

@ -14,7 +14,7 @@
setLangId("1033");
setDataPath("whdata");
addToc("whtoc.htm");
addIdx("whidx.htm");
addFts("whfts.htm");
addGlo("whglo.htm");

2
doc/salome/gui/GEOM/whproj.xml
View File

@ -1,3 +1,3 @@
<?xml version='1.0' encoding='windows-1252' ?>
<project langid="1033" datapath="whxdata" toc="whtoc.xml" index="whidx.xml" fts="whfts.xml" glossary="whglo.xml" >
<project langid="1033" datapath="whxdata" toc="whtoc.xml" fts="whfts.xml" glossary="whglo.xml" >
</project>

1
doc/salome/gui/GEOM/whres.xml
View File

@ -81,7 +81,6 @@
<panes show="0">
<toc />
<index />
<fts />
<glossary />
</panes>

4
doc/salome/gui/GEOM/whskin_info.htm
View File

@ -9,10 +9,10 @@
<table>
<tr><td> Start Page </td><td>geom.htm</td></tr>
<tr><td> Skin Name </td><td>Default</td></tr>
<tr><td> Generating Time </td><td>16:19 11/25/2004</td></tr>
<tr><td> Generating Time </td><td>13:16 03/01/2005</td></tr>
<tr><td> Language ID </td><td>1033</td></tr>
<tr><td> Compile Script </td><td>webhelp5_compile_script.xml</td></tr>
<tr><td> Compile Build Version </td><td>13.00.584</td></tr>
<tr><td> Compile Build Version </td><td>13.10.606</td></tr>
<tr><td> Product Name </td><td>WebHelp 5.50</td></tr>
<tr><td> Authoring Tool Name </td><td>RoboHelp X5</td></tr>
<table>

1
doc/salome/gui/GEOM/whskin_papplet.htm
View File

@ -36,7 +36,6 @@ function setShowPane(sName)
gsInitPane=sName;
}
addPane("toc","whtdhtml.htm");
addPane("idx","whidhtml.htm");
addPane("fts","whfdhtml.htm");
addPane("glo","whgdhtml.htm");
setShowPane("toc");

1
doc/salome/gui/GEOM/whskin_pdhtml.htm
View File

@ -53,7 +53,6 @@ function writeWebHelpPane()
var strProjectFileHTM = "whproj.htm";
addProject(bPreferXML, strProjectFileXML, strProjectFileHTM);
addPane("toc","whtdhtml.htm");
addPane("idx","whidhtml.htm");
addPane("fts","whfdhtml.htm");
addPane("glo","whgdhtml.htm");
setShowPane("toc");

1
doc/salome/gui/GEOM/whskin_tbars.htm
View File

@ -83,7 +83,6 @@ setButtonBgColor("searchform","", true);
setButtonBgColor("banner","", true);
addButton("toc",BTN_TEXT|BTN_IMG,"Contents","","","","",0,0,"","","","","","");
addButton("idx",BTN_TEXT|BTN_IMG,"Index","","","","",0,0,"","","","","","");
addButton("fts",BTN_TEXT|BTN_IMG,"Search","","","","",0,0,"","","","","","");
addButton("glo",BTN_TEXT|BTN_IMG,"Glossary","","","","",0,0,"","","","","","");
addButton("searchform",BTN_TEXT,"","","","","",0,0,"","","","","","");

2
doc/salome/gui/GEOM/whstart.js
View File

@ -31,7 +31,7 @@ function delayReload()
}
}
var gsToolbarOrder = "toc|idx|fts|glo|blankblock|searchform|banner";
var gsToolbarOrder = "toc|fts|glo|blankblock|searchform|banner";
var gsMinibarOrder = "blankblock|hide2|";
var gsTopic = "files/introduction_to_geom.htm";

4
doc/salome/gui/GEOM/whxdata/whfts.xml
View File

@ -1,8 +1,6 @@
<?xml version='1.0' encoding='windows-1252' ?>
<fts>
<chunkinfo url="whfwdata0.xml" first="0" last="geometry"/>
<chunkinfo url="whfwdata1.xml" first="geompy" last="radiu"/>
<chunkinfo url="whfwdata2.xml" first="radius" last="zmin"/>
<chunkinfo url="whfwdata0.xml" first="0" last="zmin"/>
<tchunkinfo first="0" last="16" url="whftdata0.xml" />

536
doc/salome/gui/GEOM/whxdata/whfwdata0.xml
View File

@ -2,6 +2,7 @@
<ftswdata>
<key name="0"> 1,12, </key>
<key name="1"> 1,15,3,4,7,5,11,12,13,10,9,16, </key>
<key name="12"> 9, </key>
<key name="1d"> 3,10, </key>
<key name="1st"> 3,11,12,13,10, </key>
<key name="2"> 14,1,15,3,4,5,11,12,13,10,9, </key>
@ -14,13 +15,14 @@
<key name="3st"> 13, </key>
<key name="4"> 14,15,4,12,10, </key>
<key name="5"> 15,7,12, </key>
<key name="6"> 14,12, </key>
<key name="6"> 14,12,9, </key>
<key name="7"> 12, </key>
<key name="8"> 12, </key>
<key name="9"> 15,12, </key>
<key name="90"> 15, </key>
<key name="abl"> 15, </key>
<key name="absolut"> 15, </key>
<key name="accessibl"> 13, </key>
<key name="accord"> 3,12, </key>
<key name="accordanc"> 12, </key>
<key name="achiev"> 12, </key>
@ -48,10 +50,11 @@
<key name="associat"> 6, </key>
<key name="attribut"> 6, </key>
<key name="automatical"> 14,3, </key>
<key name="availabl"> 6,12, </key>
<key name="availabl"> 14,15,6,12,16, </key>
<key name="ax"> 3, </key>
<key name="axi"> 3,7,11,13,9, </key>
<key name="b"> 3, </key>
<key name="background"> 16, </key>
<key name="bas"> 7,11,12,13, </key>
<key name="baseshap"> 7, </key>
<key name="basi"> 7, </key>
@ -60,7 +63,7 @@
<key name="befor"> 15,12, </key>
<key name="below"> 14, </key>
<key name="bezi"> 3,12, </key>
<key name="block"> 14,0,10, </key>
<key name="block"> 14,0,10,9, </key>
<key name="boolean"> 2,4,5,9, </key>
<key name="both"> 6, </key>
<key name="bound"> 9, </key>
@ -68,6 +71,7 @@
<key name="boundary"> 12, </key>
<key name="boundingbox"> 9, </key>
<key name="box"> 14,1,15,3,4,8,7,5,11,12,13,10,9,16, </key>
<key name="break"> 10, </key>
<key name="brep"> 2,8, </key>
<key name="brows"> 3,6,8, </key>
<key name="bsplin"> 12, </key>
@ -85,6 +89,7 @@
<key name="chang"> 1, </key>
<key name="check"> 12,10,9, </key>
<key name="checkbox"> 12,13, </key>
<key name="checkcompoundofblock"> 9, </key>
<key name="checkshap"> 9, </key>
<key name="choos"> 6,8,10, </key>
<key name="circl"> 3, </key>
@ -100,20 +105,23 @@
<key name="complex"> 2,4,7,10, </key>
<key name="component"> 15,3,13, </key>
<key name="compos"> 14,9, </key>
<key name="compound"> 14,4,5,12,13,10, </key>
<key name="compound"> 14,4,5,12,13,10,9, </key>
<key name="compsolid"> 7, </key>
<key name="comput"> 10,9, </key>
<key name="con"> 11, </key>
<key name="concern"> 9, </key>
<key name="condition"> 9, </key>
<key name="confirm"> 8, </key>
<key name="conical"> 12, </key>
<key name="connect"> 5,10, </key>
<key name="consider"> 12, </key>
<key name="connect"> 5,10,9, </key>
<key name="connection"> 9, </key>
<key name="consider"> 12,9, </key>
<key name="consol"> 9, </key>
<key name="constraint"> 14, </key>
<key name="construct"> 14,5,11, </key>
<key name="construction"> 2,4, </key>
<key name="constructor"> 3,11,12,13,10, </key>
<key name="contain"> 15,8,12, </key>
<key name="contain"> 15,8,12,10, </key>
<key name="content"> 8, </key>
<key name="continuiti"> 12, </key>
<key name="continuity"> 12, </key>
@ -129,7 +137,7 @@
<key name="coupl"> 15, </key>
<key name="creat"> 14,15,3,6,7,5,11,12,13,10,9,16, </key>
<key name="creategroup"> 16, </key>
<key name="creation"> 2,7,12,10, </key>
<key name="creation"> 2,7,12,10,16, </key>
<key name="current"> 15,6, </key>
<key name="curv"> 15,3,7,12, </key>
<key name="curve2dmod"> 12, </key>
@ -141,11 +149,12 @@
<key name="d1"> 10, </key>
<key name="d2"> 10, </key>
<key name="data"> 9, </key>
<key name="default"> 15, </key>
<key name="default"> 15,16, </key>
<key name="defin"> 15,3,11,12,13,10, </key>
<key name="definit"> 12,9, </key>
<key name="definition"> 7,12, </key>
<key name="deflection"> 10, </key>
<key name="degenerat"> 9, </key>
<key name="degre"> 15,7,12, </key>
<key name="delet"> 10, </key>
<key name="density"> 10, </key>
@ -190,7 +199,8 @@
<key name="e2"> 14, </key>
<key name="e3"> 14, </key>
<key name="e4"> 14, </key>
<key name="edg"> 14,3,7,5,12,10, </key>
<key name="easi"> 16, </key>
<key name="edg"> 14,3,7,5,12,10,9, </key>
<key name="edgeid"> 12, </key>
<key name="edit"> 16, </key>
<key name="egdemaxtol"> 9, </key>
@ -200,14 +210,16 @@
<key name="elementary"> 14, </key>
<key name="ellips"> 3, </key>
<key name="empty"> 12, </key>
<key name="encounter"> 9, </key>
<key name="end"> 15,3,12,13, </key>
<key name="ent"> 3,8, </key>
<key name="entity"> 15,3,7,5,11,16, </key>
<key name="entir"> 9, </key>
<key name="entity"> 14,15,3,7,5,11,16, </key>
<key name="equal"> 15, </key>
<key name="eras"> 6, </key>
<key name="eraseall"> 6, </key>
<key name="eraseon"> 6, </key>
<key name="error"> 12, </key>
<key name="error"> 12,9, </key>
<key name="etc"> 5,12, </key>
<key name="exampl"> 14,1,15,3,4,7,5,11,12,13,10,16, </key>
<key name="except"> 12, </key>
@ -215,6 +227,7 @@
<key name="explod"> 0,5,10, </key>
<key name="export"> 2,8, </key>
<key name="exportation"> 8, </key>
<key name="extra"> 9, </key>
<key name="extract"> 10, </key>
<key name="extrud"> 7, </key>
<key name="extrusion"> 7, </key>
@ -224,7 +237,7 @@
<key name="f4"> 14, </key>
<key name="f5"> 14, </key>
<key name="f6"> 14, </key>
<key name="fac"> 14,3,7,5,12,13,10, </key>
<key name="fac"> 14,3,7,5,12,13,10,9, </key>
<key name="face1"> 10, </key>
<key name="face2"> 10, </key>
<key name="facemaxtol"> 9, </key>
@ -240,12 +253,15 @@
<key name="fix"> 12, </key>
<key name="fixfacesiz"> 12, </key>
<key name="fixshap"> 12, </key>
<key name="follow"> 14,4,6,5, </key>
<key name="flag"> 9, </key>
<key name="follow"> 4,6,5,9, </key>
<key name="format"> 2,8, </key>
<key name="formatnam"> 8, </key>
<key name="four"> 14, </key>
<key name="fre"> 12, </key>
<key name="function"> 2,5, </key>
<key name="functionaliti"> 14, </key>
<key name="functionality"> 15,16, </key>
<key name="fus"> 4, </key>
<key name="gap"> 12, </key>
<key name="general"> 14, </key>
@ -256,5 +272,497 @@
<key name="geometric"> 14, </key>
<key name="geometrical"> 1,2,3,4,6,8,7,5,11,12,13,10,9,16, </key>
<key name="geometry"> 12, </key>
<key name="geompy"> 14,15,3,4,8,7,5,11,12,13,10,9,16, </key>
<key name="get"> 4,5,9, </key>
<key name="getfreeboundary"> 12, </key>
<key name="getfreefacesid"> 12, </key>
<key name="getobjectid"> 16, </key>
<key name="getsubshapeid"> 5, </key>
<key name="gg"> 1, </key>
<key name="giv"> 3, </key>
<key name="given"> 3,5,12,13,10,9, </key>
<key name="glu"> 12,10,9, </key>
<key name="graphic"> 6, </key>
<key name="gravity"> 9, </key>
<key name="group"> 10,16, </key>
<key name="gui"> 10, </key>
<key name="half"> 3, </key>
<key name="handl"> 16, </key>
<key name="hav"> 5,12, </key>
<key name="height"> 7,11, </key>
<key name="hexahedral"> 14,10, </key>
<key name="hexahedron"> 14, </key>
<key name="hid"> 6, </key>
<key name="highlight"> 12,9, </key>
<key name="hol"> 12, </key>
<key name="i"> 6, </key>
<key name="i11"> 9, </key>
<key name="i12"> 9, </key>
<key name="i13"> 9, </key>
<key name="i21"> 9, </key>
<key name="i22"> 9, </key>
<key name="i23"> 9, </key>
<key name="i31"> 9, </key>
<key name="i32"> 9, </key>
<key name="i33"> 9, </key>
<key name="id"> 1,6,5,12,10,16, </key>
<key name="if"> 5,12,10,9,16, </key>
<key name="ig"> 2,8, </key>
<key name="imag"> 13, </key>
<key name="import"> 2,6,8,9, </key>
<key name="importation"> 8, </key>
<key name="in"> 13, </key>
<key name="increas"> 12, </key>
<key name="independent"> 4,6, </key>
<key name="indic"> 10, </key>
<key name="inertia"> 9, </key>
<key name="inform"> 9, </key>
<key name="initial"> 13, </key>
<key name="inquir"> 9, </key>
<key name="inretia"> 9, </key>
<key name="insert"> 12, </key>
<key name="insid"> 10, </key>
<key name="integ"> 10, </key>
<key name="integer"> 10, </key>
<key name="intend"> 12, </key>
<key name="interactive"> 10, </key>
<key name="intermediat"> 14, </key>
<key name="internal"> 12, </key>
<key name="intersect"> 10, </key>
<key name="intersection"> 10, </key>
<key name="introduction"> 14,2, </key>
<key name="invalid"> 12, </key>
<key name="investigat"> 9, </key>
<key name="isbyparamet"> 12, </key>
<key name="iscommonvertex"> 12, </key>
<key name="iso"> 1, </key>
<key name="isolin"> 1, </key>
<key name="iteration"> 7, </key>
<key name="itself"> 12, </key>
<key name="ix"> 9, </key>
<key name="iy"> 9, </key>
<key name="iz"> 9, </key>
<key name="just"> 14, </key>
<key name="keep"> 13, </key>
<key name="last"> 3,5, </key>
<key name="lc"> 3, </key>
<key name="least"> 3, </key>
<key name="length"> 15,12,9, </key>
<key name="les"> 12, </key>
<key name="limit"> 10, </key>
<key name="lin"> 15,3,10, </key>
<key name="list"> 15,3,7,5,12,10,16, </key>
<key name="listoffaceid"> 10, </key>
<key name="listofgeomshap"> 12, </key>
<key name="listofid"> 5,12, </key>
<key name="listofkeepinsid"> 10, </key>
<key name="listofmaterial"> 10, </key>
<key name="listofremoveinsid"> 10, </key>
<key name="listofshap"> 3,5,12,10, </key>
<key name="listofshapeid"> 10, </key>
<key name="listoftool"> 10, </key>
<key name="listofwireid"> 12, </key>
<key name="local"> 15,3,13, </key>
<key name="locat"> 3, </key>
<key name="location"> 3,8,13, </key>
<key name="lwp"> 15, </key>
<key name="ly"> 15,12, </key>
<key name="main"> 14,0,15,3,4,6,7,5,11,12,13,10,9,16, </key>
<key name="mainshap"> 16, </key>
<key name="major"> 3,11, </key>
<key name="mak"> 13,10,16, </key>
<key name="makearc"> 3, </key>
<key name="makebezi"> 3, </key>
<key name="makeblockexplod"> 10, </key>
<key name="makeboolean"> 4, </key>
<key name="makebox"> 11, </key>
<key name="makecdg"> 9, </key>
<key name="makechamferedg"> 10, </key>
<key name="makechamferfac"> 10, </key>
<key name="makecircl"> 3, </key>
<key name="makecompound"> 5, </key>
<key name="makecon"> 11, </key>
<key name="makecylind"> 11, </key>
<key name="makeedg"> 5, </key>
<key name="makeellips"> 3, </key>
<key name="makefac"> 5, </key>
<key name="makefil"> 7, </key>
<key name="makefillet"> 10, </key>
<key name="makegluefac"> 12, </key>
<key name="makehexasolid"> 14, </key>
<key name="makehexasolidtwofac"> 14, </key>
<key name="makeinterpol"> 3, </key>
<key name="makelin"> 3, </key>
<key name="makemark"> 3, </key>
<key name="makemirrorbyplan"> 13, </key>
<key name="makemultirotation1d"> 13, </key>
<key name="makemultirotation2d"> 13, </key>
<key name="makemultitransformation1d"> 10, </key>
<key name="makemultitransformation2d"> 10, </key>
<key name="makemultitranslation1d"> 13, </key>
<key name="makemultitranslation2d"> 13, </key>
<key name="makeoffset"> 13, </key>
<key name="makepartition"> 10, </key>
<key name="makepip"> 7, </key>
<key name="makeplan"> 3, </key>
<key name="makepolylin"> 3, </key>
<key name="makeposition"> 13, </key>
<key name="makeprism"> 7, </key>
<key name="makequadfac"> 14, </key>
<key name="makequadfaceedg"> 14, </key>
<key name="makequadfacevertic"> 14, </key>
<key name="makerevolution"> 7, </key>
<key name="makerotation"> 13, </key>
<key name="makescaletransform"> 13, </key>
<key name="makesew"> 12, </key>
<key name="makeshell"> 5, </key>
<key name="makesketch"> 15, </key>
<key name="makesolid"> 5, </key>
<key name="makespher"> 11, </key>
<key name="maketoru"> 11, </key>
<key name="maketranslation"> 13, </key>
<key name="makevector"> 3, </key>
<key name="makevertex"> 3, </key>
<key name="makewir"> 5, </key>
<key name="manual"> 3, </key>
<key name="mas"> 9, </key>
<key name="material"> 10, </key>
<key name="matrix"> 9, </key>
<key name="max"> 7,12,10, </key>
<key name="maxdegre"> 7, </key>
<key name="maximal"> 7,12,10,9, </key>
<key name="maximum"> 12,10, </key>
<key name="maxnbfac"> 10, </key>
<key name="maxtoleranc"> 12, </key>
<key name="maxtolerance3d"> 12, </key>
<key name="mean"> 15,13, </key>
<key name="measur"> 9, </key>
<key name="measurement"> 9, </key>
<key name="mention"> 14, </key>
<key name="menu"> 14,0,1,15,3,4,6,8,7,5,11,12,13,10,9,16, </key>
<key name="merg"> 12, </key>
<key name="mesh"> 14,10, </key>
<key name="meshingdeflection"> 10, </key>
<key name="method"> 5, </key>
<key name="middl"> 3, </key>
<key name="min"> 7,10,9, </key>
<key name="mindegre"> 7, </key>
<key name="mindistanc"> 9, </key>
<key name="minimal"> 7,10,9, </key>
<key name="minimum"> 10, </key>
<key name="minnbfac"> 10, </key>
<key name="minor"> 3,11, </key>
<key name="mirror"> 13, </key>
<key name="mod"> 1,12, </key>
<key name="model"> 2,10, </key>
<key name="modifi"> 3,12,13, </key>
<key name="modification"> 12,13, </key>
<key name="modify"> 13, </key>
<key name="modul"> 2,6, </key>
<key name="moment"> 9, </key>
<key name="mov"> 13, </key>
<key name="much"> 16, </key>
<key name="multi"> 0,13,10, </key>
<key name="multitud"> 10, </key>
<key name="must"> 12,13,9, </key>
<key name="nam"> 14,3,4,8,7,5,11,12,13,10, </key>
<key name="nbit"> 7, </key>
<key name="nbsplitpoint"> 12, </key>
<key name="nbtim"> 13,10, </key>
<key name="nbtimes1"> 13, </key>
<key name="nbtimes2"> 13, </key>
<key name="nbtimesu"> 10, </key>
<key name="nbtimesv"> 10, </key>
<key name="necessary"> 15,6,12,9, </key>
<key name="need"> 12, </key>
<key name="negativ"> 13, </key>
<key name="neigbour"> 12, </key>
<key name="new"> 14,15,3,7,5,11,12,16, </key>
<key name="nod"> 3, </key>
<key name="noerror"> 12, </key>
<key name="normal"> 3,7,13, </key>
<key name="notion"> 14, </key>
<key name="numb"> 1,7,12,13,10, </key>
<key name="number"> 10, </key>
<key name="numeb"> 10, </key>
<key name="object"> 1,2,3,4,6,8,7,5,11,12,13,10,9,16, </key>
<key name="occ"> 1,6,12,16, </key>
<key name="occur"> 12, </key>
<key name="offer"> 16, </key>
<key name="offset"> 13, </key>
<key name="ok"> 3,8, </key>
<key name="on"> 15,3,4,6,12,13,10, </key>
<key name="open"> 12, </key>
<key name="openwir"> 12, </key>
<key name="operation"> 14,2,4,6,7,12,13,10,16, </key>
<key name="operator"> 12, </key>
<key name="opposit"> 11, </key>
<key name="optimization"> 2, </key>
<key name="option"> 0, </key>
<key name="ord"> 12,9, </key>
<key name="orient"> 14,3, </key>
<key name="origin"> 3,11, </key>
<key name="otherwis"> 12,13, </key>
<key name="outsid"> 10, </key>
<key name="ox"> 15,3, </key>
<key name="oy"> 3, </key>
<key name="oz"> 15,3, </key>
<key name="paramet"> 3,5,12, </key>
<key name="parameter"> 1,15,3,7,12, </key>
<key name="paramt"> 12, </key>
<key name="part"> 4,11, </key>
<key name="partition"> 10, </key>
<key name="pas"> 3, </key>
<key name="path"> 7, </key>
<key name="pathshap"> 7, </key>
<key name="pattern"> 13, </key>
<key name="perform"> 10,16, </key>
<key name="perpendicular"> 15, </key>
<key name="pip"> 7, </key>
<key name="plan"> 15,3,13,10, </key>
<key name="planar"> 15,3,5, </key>
<key name="platform"> 16, </key>
<key name="plung"> 10, </key>
<key name="point"> 14,15,3,11,12,13,9, </key>
<key name="point1"> 3, </key>
<key name="point2"> 3, </key>
<key name="point3"> 3, </key>
<key name="pointcoordinat"> 9, </key>
<key name="polylin"> 3, </key>
<key name="pop"> 1,6, </key>
<key name="position"> 3,12, </key>
<key name="possibility"> 12, </key>
<key name="possibl"> 6,12,10,9, </key>
<key name="precision"> 12, </key>
<key name="predefin"> 15, </key>
<key name="preferenc"> 16, </key>
<key name="pres"> 3, </key>
<key name="preview"> 3, </key>
<key name="previou"> 15, </key>
<key name="primitiv"> 2,11, </key>
<key name="print"> 9, </key>
<key name="prism"> 7, </key>
<key name="problem"> 12, </key>
<key name="proces"> 12,10, </key>
<key name="processshap"> 12, </key>
<key name="project"> 16, </key>
<key name="propagat"> 10, </key>
<key name="propagation"> 10, </key>
<key name="properti"> 1,9, </key>
<key name="put"> 10, </key>
<key name="python"> 9, </key>
<key name="quadrangl"> 14,3,9, </key>
<key name="radian"> 12, </key>
<key name="radiu"> 15,3,11,10, </key>
<key name="radius"> 3,11, </key>
<key name="radius1"> 11, </key>
<key name="radius2"> 11, </key>
<key name="radiusmajor"> 3,11, </key>
<key name="radiusminor"> 3,11, </key>
<key name="rang"> 2,12, </key>
<key name="re"> 12, </key>
<key name="reasonabl"> 6, </key>
<key name="reconstruction"> 10, </key>
<key name="referenc"> 3, </key>
<key name="regard"> 3, </key>
<key name="relativ"> 15, </key>
<key name="remov"> 12,13,16, </key>
<key name="removeobject"> 16, </key>
<key name="removeweb"> 10, </key>
<key name="repair"> 2,12, </key>
<key name="repetition"> 13, </key>
<key name="represent"> 3, </key>
<key name="request"> 5, </key>
<key name="requir"> 6,8,12, </key>
<key name="requireddegre"> 12, </key>
<key name="requirednbsegment"> 12, </key>
<key name="respect"> 15,12, </key>
<key name="restriction"> 12, </key>
<key name="result"> 14,15,3,4,7,5,11,12,13,10,9,16, </key>
<key name="resultant"> 12, </key>
<key name="retriev"> 5,12, </key>
<key name="return"> 5,12,10,9,16, </key>
<key name="revers"> 13, </key>
<key name="revolution"> 7,12, </key>
<key name="right"> 1,6, </key>
<key name="rotat"> 7,13, </key>
<key name="rotation"> 13, </key>
<key name="s"> 3,5,12,13,10,16, </key>
<key name="salom"> 2,16, </key>
<key name="sam"> 15,12, </key>
<key name="sameparamet"> 12, </key>
<key name="satisfy"> 9, </key>
<key name="scal"> 13, </key>
<key name="se"> 8,9, </key>
<key name="search"> 8, </key>
<key name="second"> 4,11,13,10, </key>
<key name="section"> 4,10, </key>
<key name="segment"> 15,12, </key>
<key name="select"> 0,1,15,3,4,6,8,7,5,11,12,10,9,16, </key>
<key name="selection"> 15,3,10, </key>
<key name="sens"> 10, </key>
<key name="serv"> 3,7, </key>
<key name="set"> 1,3,12,13,10, </key>
<key name="setcolor"> 1, </key>
<key name="setdisplaymod"> 1, </key>
<key name="settransparency"> 1, </key>
<key name="sew"> 12, </key>
<key name="sg"> 6, </key>
<key name="shad"> 1, </key>
<key name="shap"> 1,2,4,6,8,7,5,12,13,10,9,16, </key>
<key name="shape1"> 4,9, </key>
<key name="shape2"> 4,9, </key>
<key name="shapesto"> 12, </key>
<key name="shapetyp"> 10,16, </key>
<key name="shar"> 12, </key>
<key name="shel"> 5,12,13, </key>
<key name="shell"> 14,7,5,13, </key>
<key name="short"> 1, </key>
<key name="should"> 12,9, </key>
<key name="shown"> 3, </key>
<key name="sid"> 3, </key>
<key name="sign"> 13, </key>
<key name="six"> 14, </key>
<key name="siz"> 3,12,10, </key>
<key name="sketch"> 15, </key>
<key name="small"> 3,12, </key>
<key name="solid"> 14,7,5,11,13,10, </key>
<key name="soon"> 3, </key>
<key name="spac"> 3,9, </key>
<key name="specifi"> 3,12,10, </key>
<key name="specific"> 14, </key>
<key name="specify"> 12,13, </key>
<key name="spher"> 11, </key>
<key name="splin"> 3, </key>
<key name="split"> 12, </key>
<key name="splitangl"> 12, </key>
<key name="splitclosedfac"> 12, </key>
<key name="splitcontinuity"> 12, </key>
<key name="spot"> 12, </key>
<key name="stag"> 14, </key>
<key name="standard"> 8, </key>
<key name="start"> 15,3,13, </key>
<key name="step"> 2,8,13, </key>
<key name="step1"> 13, </key>
<key name="step2"> 13, </key>
<key name="str"> 15,8, </key>
<key name="strip"> 12, </key>
<key name="study"> 6, </key>
<key name="sub"> 5,12,16, </key>
<key name="submenu"> 0,5,12,9, </key>
<key name="subshap"> 5,10,16, </key>
<key name="subshapeall"> 5, </key>
<key name="subshapeid"> 16, </key>
<key name="suppres"> 12, </key>
<key name="suppressfac"> 12, </key>
<key name="suppresshol"> 12, </key>
<key name="suppressinternalwir"> 12, </key>
<key name="surfac"> 12,13,9, </key>
<key name="surfacecontinuity"> 12, </key>
<key name="surfacemod"> 12, </key>
<key name="symmetrical"> 13, </key>
<key name="symmetry"> 11,13, </key>
<key name="system"> 3,13, </key>
<key name="tangent"> 15, </key>
<key name="target"> 15,10, </key>
<key name="tetrahedral"> 14, </key>
<key name="theendlc"> 13, </key>
<key name="them"> 12, </key>
<key name="theobject"> 13, </key>
<key name="therefor"> 15, </key>
<key name="theshap"> 12, </key>
<key name="thestartlc"> 13, </key>
<key name="thetoleranc"> 12, </key>
<key name="tim"> 13, </key>
<key name="tobezi"> 12, </key>
<key name="toggl"> 16, </key>
<key name="tol2d"> 7, </key>
<key name="tol3d"> 7, </key>
<key name="toleranc"> 7,12,9, </key>
<key name="tolerance2d"> 12, </key>
<key name="tolerance3d"> 12, </key>
<key name="tool"> 9, </key>
<key name="toru"> 11, </key>
<key name="transform"> 4,13,10, </key>
<key name="transformation"> 0,2,13,10, </key>
<key name="translat"> 13, </key>
<key name="translation"> 13,10, </key>
<key name="transparency"> 1, </key>
<key name="trihedron"> 3, </key>
<key name="trimsiz"> 3, </key>
<key name="tru"> 12,10,9, </key>
<key name="tui"> 14,1,15,3,4,6,8,7,5,11,12,13,10,9,16, </key>
<key name="tupl"> 9, </key>
<key name="two"> 14,4,11,12,13,10,9, </key>
<key name="typ"> 15,4,5,11,12,10,9,16, </key>
<key name="typeofshap"> 5, </key>
<key name="underly"> 12, </key>
<key name="up"> 1,6,11,10, </key>
<key name="updat"> 3, </key>
<key name="us"> 14,2,15,3,4,6,7,5,12,13,10,9,16, </key>
<key name="useful"> 16, </key>
<key name="v1"> 14, </key>
<key name="v2"> 14, </key>
<key name="v3"> 14, </key>
<key name="v4"> 14, </key>
<key name="val"> 12, </key>
<key name="valid"> 9, </key>
<key name="validity"> 9, </key>
<key name="valu"> 1,15,3,7,11,12,13,10,9, </key>
<key name="variou"> 12, </key>
<key name="vector"> 15,3,7,11,13, </key>
<key name="vertex"> 3,7,5,11,12,13,9, </key>
<key name="vertex1"> 5, </key>
<key name="vertex2"> 5, </key>
<key name="vertexmaxtol"> 9, </key>
<key name="vertexmintol"> 9, </key>
<key name="vertic"> 14,3,5,11,12,13, </key>
<key name="via"> 14,15,13,16, </key>
<key name="view"> 1,3,6,12,9,16, </key>
<key name="viewer"> 6, </key>
<key name="visibility"> 6, </key>
<key name="visualization"> 1,6, </key>
<key name="volum"> 9, </key>
<key name="vtk"> 6, </key>
<key name="vx"> 15, </key>
<key name="wantplanarfac"> 5, </key>
<key name="wat"> 10, </key>
<key name="waterdensity"> 10, </key>
<key name="weight"> 10, </key>
<key name="whati"> 9, </key>
<key name="wheth"> 9, </key>
<key name="whil"> 12, </key>
<key name="whos"> 5,9, </key>
<key name="wid"> 2, </key>
<key name="will"> 3,8,12,13,10, </key>
<key name="wir"> 14,7,5,12, </key>
<key name="wirefram"> 1, </key>
<key name="wish"> 8, </key>
<key name="within"> 1,12, </key>
<key name="work"> 15,3,6,12,16, </key>
<key name="x"> 15,3,9, </key>
<key name="x1"> 11, </key>
<key name="x2"> 11, </key>
<key name="xdx"> 3, </key>
<key name="xdy"> 3, </key>
<key name="xdz"> 3, </key>
<key name="xmax"> 9, </key>
<key name="xmin"> 9, </key>
<key name="xoy"> 15, </key>
<key name="xyz"> 3, </key>
<key name="y"> 15,3,9, </key>
<key name="y1"> 11, </key>
<key name="y2"> 11, </key>
<key name="ydx"> 3, </key>
<key name="ydy"> 3, </key>
<key name="ydz"> 3, </key>
<key name="ymax"> 9, </key>
<key name="ymin"> 9, </key>
<key name="your"> 8,12,9,16, </key>
<key name="z"> 3,10,9, </key>
<key name="z1"> 11, </key>
<key name="z2"> 11, </key>
<key name="zmax"> 9, </key>
<key name="zmin"> 9, </key>
</ftswdata>

21
doc/salome/gui/GEOM/working_with_groups.htm
View File

@ -81,12 +81,21 @@ else
</script>
<h1>Working with groups</h1>
<p>The <span style="font-style: italic;"><I>Salome</I></span> platform offers
such a useful functionality as creation and editing groups of subshapes
of a geometrical object which makes handling subshapes much easier. However
the functionality is available in the OCC viewer only. If other viewer
is used in your project by default, you can toggle the OCC viewer via
Preferences / Viewer background / OCC viewer. &nbsp;</p>
<p>&nbsp;</p>
<p class=TODO>To perform operations with groups:</p>
<p class=TODO>&nbsp;</p>
<p class="whs1">In the main menu select <span style="font-weight: bold;"><B>New
entity &gt; Groups</B></span>.</p>
entity &gt; Group</B></span>.</p>
<p>&nbsp;</p>
@ -104,9 +113,10 @@ else
<p class="whs3">&nbsp;</p>
<p class="whs3"><b>TUI Command:</b><i> </i><span style="font-style: italic;"><I>geompy.CreateGroup(MainShape,
ShapeType)</I></span>, where MainShape is a shape for which the group is created,
ShapeType is a type of shapes in the created group.</p>
<p class="whs3"><b style="font-weight: bold;">TUI Command:</b><i>
</i><span style="font-style: italic;"><I>geompy.CreateGroup(MainShape, ShapeType)</I></span>,
where MainShape is a shape for which the group is created, ShapeType is
a type of shapes in the created group.</p>
<p class="whs3">&nbsp;</p>
@ -149,7 +159,8 @@ else
<p class="whs3">&nbsp;</p>
<p class="whs3"><b>TUI Command:</b><i> </i></p>
<p class="whs3"><b style="font-weight: bold;">TUI Command:</b><i>
</i></p>
<ul type="disc" class="whs9">

12
idl/GEOM_Gen.idl
View File

@ -2046,6 +2046,18 @@ module GEOM
* \param theObject is a GEOM object which IOR is requested
*/
string GetStringFromIOR (in GEOM_Object theObject);
/*!
* Returns a name with which a GEOM object was dumped into python script
* \param theStudyEntry is an entry of the GEOM object in the study
*/
string GetDumpName (in string theStudyEntry);
/*!
* Returns all names with which a GEOM objects was dumped
* into python script to avoid the same names in SMESH script
*/
string_array GetAllDumpNames();
};
};

4
resources/GEOMCatalog.xml
View File

@ -16,7 +16,7 @@
<component-username>Geometry</component-username>
<component-type>Geom</component-type>
<component-author>NRI</component-author>
<component-version>2.2.0</component-version>
<component-version>2.2.2</component-version>
<component-comment>Geometry component</component-comment>
<component-multistudy>1</component-multistudy>
<component-icone>ModuleGeom.png</component-icone>
@ -526,7 +526,7 @@
<component-username>GEOM_Superv</component-username>
<component-type>OTHER</component-type>
<component-author>mkr</component-author>
<component-version>2.2.0</component-version>
<component-version>2.2.2</component-version>
<component-comment>Supervision wrapper for Geometry component</component-comment>
<component-multistudy>1</component-multistudy>
<component-icone></component-icone>

101
src/BasicGUI/BasicGUI.cxx
View File

@ -30,14 +30,13 @@ using namespace std;
#include "BasicGUI.h"
#include "GeometryGUI.h"
#include "QAD_RightFrame.h"
#include "QAD_Desktop.h"
#include "OCCViewer_Viewer3d.h"
#include "OCCViewer_ViewFrame.h"
#include "OCCViewer_AISSelector.h"
#include "SUIT_Session.h"
#include "SUIT_Desktop.h"
#include "SUIT_ViewWindow.h"
#include "OCCViewer_ViewWindow.h"
#include "OCCViewer_ViewModel.h"
#include "OCCViewer_ViewManager.h"
#include "OCCViewer_ViewPort3d.h"
#include "SALOMEGUI_QtCatchCorbaException.hxx"
#include "utilities.h"
#include <Precision.hxx>
@ -63,10 +62,10 @@ BasicGUI* BasicGUI::myGUIObject = 0;
// function : GetBasicGUI()
// purpose : Get the only BasicGUI object [ static ]
//=======================================================================
BasicGUI* BasicGUI::GetBasicGUI()
BasicGUI* BasicGUI::GetBasicGUI( GeometryGUI* parent )
{
if ( myGUIObject == 0 ) {
myGUIObject = new BasicGUI();
myGUIObject = new BasicGUI( parent );
}
return myGUIObject;
}
@ -75,8 +74,8 @@ BasicGUI* BasicGUI::GetBasicGUI()
// function : BasicGUI()
// purpose : Constructor
//=======================================================================
BasicGUI::BasicGUI() :
GEOMGUI()
BasicGUI::BasicGUI( GeometryGUI* parent ) :
GEOMGUI(parent)
{
}
@ -94,55 +93,45 @@ BasicGUI::~BasicGUI()
// function : OnGUIEvent()
// purpose :
//=======================================================================
bool BasicGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
bool BasicGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
{
GeometryGUI::GetGeomGUI()->EmitSignalDeactivateDialog();
SALOME_Selection* Sel = SALOME_Selection::Selection(QAD_Application::getDesktop()->getActiveStudy()->getSelection());
getGeometryGUI()->EmitSignalDeactivateDialog();
QDialog* aDlg = NULL;
switch ( theCommandID )
{
case 4011: // POINT
{
Handle(AIS_InteractiveContext) ic;
QAD_StudyFrame* aFrame = QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame();
if ( aFrame->getTypeView() == VIEW_OCC)
{
OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)aFrame->getRightFrame()->getViewFrame())->getViewer();
ic = v3d->getAISContext();
}
aDlg = new BasicGUI_PointDlg( parent, "", Sel );
break;
}
aDlg = new BasicGUI_PointDlg( getGeometryGUI(), parent, "" );
break;
case 4012: // LINE
aDlg = new BasicGUI_LineDlg(parent, "", Sel);
aDlg = new BasicGUI_LineDlg( getGeometryGUI(), parent, "" );
break;
case 4013: // CIRCLE
aDlg = new BasicGUI_CircleDlg(parent, "", Sel);
aDlg = new BasicGUI_CircleDlg( getGeometryGUI(), parent, "");
break;
case 4014: // ELLIPSE
aDlg = new BasicGUI_EllipseDlg(parent, "", Sel);
aDlg = new BasicGUI_EllipseDlg( getGeometryGUI(), parent, "" );
break;
case 4015: // ARC
aDlg = new BasicGUI_ArcDlg(parent, "", Sel);
aDlg = new BasicGUI_ArcDlg( getGeometryGUI(), parent, "" );
break ;
case 4016: // VECTOR
aDlg = new BasicGUI_VectorDlg(parent, "", Sel);
aDlg = new BasicGUI_VectorDlg( getGeometryGUI(), parent, "" );
break;
case 4017: // PLANE
aDlg = new BasicGUI_PlaneDlg(parent, "", Sel);
aDlg = new BasicGUI_PlaneDlg( getGeometryGUI(), parent, "");
break;
case 4018: // WORKING PLANE
aDlg = new BasicGUI_WorkingPlaneDlg(parent, "", Sel);
aDlg = new BasicGUI_WorkingPlaneDlg( getGeometryGUI(), parent, "" );
break;
case 4019: // CURVE
aDlg = new BasicGUI_CurveDlg( parent, "", Sel );
aDlg = new BasicGUI_CurveDlg( getGeometryGUI(), parent, "" );
break;
case 4020: // REPAIR
aDlg = new BasicGUI_MarkerDlg( parent, Sel );
aDlg = new BasicGUI_MarkerDlg( getGeometryGUI(), parent );
break;
default:
parent->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
SUIT_Session::session()->activeApplication()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
break;
}
@ -157,42 +146,42 @@ bool BasicGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
// function : 0nMousePress()
// purpose : [static] manage mouse events
//=================================================================================
bool BasicGUI::OnMousePress( QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* theFrame )
bool BasicGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow )
{
QDialog* aDlg = GeometryGUI::GetGeomGUI()->GetActiveDialogBox();
QDialog* aDlg = getGeometryGUI()->GetActiveDialogBox();
// Create Point dialog, OCC viewer
if ( aDlg && aDlg->isA( "BasicGUI_PointDlg" ) && theFrame->getTypeView() == VIEW_OCC && pe->state() != Qt::ControlButton )
if ( aDlg && aDlg->isA( "BasicGUI_PointDlg" ) && theViewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() && pe->state() != Qt::ControlButton )
{
BasicGUI_PointDlg* aPntDlg = (BasicGUI_PointDlg*) aDlg;
if ( aPntDlg->acceptMouseEvent() )
{
OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)theFrame->getRightFrame()->getViewFrame())->getViewer();
Handle (AIS_InteractiveContext) ic = v3d->getAISContext();
{
OCCViewer_Viewer* anOCCViewer = ((OCCViewer_ViewManager*)(theViewWindow->getViewManager()))->getOCCViewer();
Handle(AIS_InteractiveContext) ic = anOCCViewer->getAISContext();
gp_Pnt aPnt;
ic->InitSelected();
if( pe->state() == Qt::ShiftButton )
v3d->getAISSelector()->shiftSelect(); // Append selection
ic->ShiftSelect(); // Append selection
else
v3d->getAISSelector()->select(); // New selection
ic->Select(); // New selection
ic->InitSelected();
if( ic->MoreSelected() )
{
TopoDS_Shape aShape = ic->SelectedShape();
if ( !aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX )
aPnt = BRep_Tool::Pnt( TopoDS::Vertex( ic->SelectedShape() ) );
}
{
TopoDS_Shape aShape = ic->SelectedShape();
if ( !aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX )
aPnt = BRep_Tool::Pnt( TopoDS::Vertex( ic->SelectedShape() ) );
}
else
{
OCCViewer_ViewPort* vp = ((OCCViewer_ViewFrame*)theFrame->getRightFrame()->getViewFrame())->getViewPort();
aPnt = ConvertClickToPoint( pe->x(), pe->y(), ((OCCViewer_ViewPort3d*)vp)->getView() );
}
{
OCCViewer_ViewPort3d* vp = ((OCCViewer_ViewWindow*)theViewWindow)->getViewPort();
aPnt = ConvertClickToPoint( pe->x(), pe->y(), vp->getView() );
}
aPntDlg->OnPointSelected( aPnt ); // "feed" the point to point construction dialog
} // acceptMouseEvent()
} // acceptMouseEvent()
}
return false;
}
@ -229,8 +218,8 @@ gp_Pnt BasicGUI::ConvertClickToPoint( int x, int y, Handle(V3d_View) aView)
//=====================================================================================
extern "C"
{
GEOMGUI* GetLibGUI()
GEOMGUI* GetLibGUI( GeometryGUI* parent )
{
return BasicGUI::GetBasicGUI();
return BasicGUI::GetBasicGUI( parent );
}
}

9
src/BasicGUI/BasicGUI.h
View File

@ -33,6 +33,7 @@
#include "GEOMBase.h"
#include <V3d_View.hxx>
//=================================================================================
// class : BasicGUI
// purpose :
@ -40,16 +41,16 @@
class BasicGUI : public GEOMGUI
{
protected:
BasicGUI(); // hide constructor to avoid direct creation
BasicGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation
public :
~BasicGUI();
// Get the only BasicGUI object
static BasicGUI* GetBasicGUI();
static BasicGUI* GetBasicGUI( GeometryGUI* parent );
bool OnGUIEvent(int theCommandID, QAD_Desktop* parent);
bool OnMousePress(QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame);
bool OnGUIEvent(int theCommandID, SUIT_Desktop* parent);
bool OnMousePress(QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow);
gp_Pnt ConvertClickToPoint( int x, int y, Handle(V3d_View) aView );

49
src/BasicGUI/BasicGUI_ArcDlg.cxx
View File

@ -28,7 +28,13 @@
#include "BasicGUI_ArcDlg.h"
#include "QAD_Desktop.h"
#include "SUIT_Desktop.h"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h"
#include <qlabel.h>
#include <BRepBuilderAPI_MakeEdge.hxx>
#include <GC_MakeArcOfCircle.hxx>
#include <Geom_TrimmedCurve.hxx>
@ -47,11 +53,12 @@ using namespace std;
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BasicGUI_ArcDlg::BasicGUI_ArcDlg(QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, Sel, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
BasicGUI_ArcDlg::BasicGUI_ArcDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu),
myGeometryGUI()
{
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_ARC")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_ARC")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
setCaption(tr("GEOM_ARC_TITLE"));
@ -97,7 +104,7 @@ BasicGUI_ArcDlg::~BasicGUI_ArcDlg()
void BasicGUI_ArcDlg::Init()
{
/* init variables */
myGeomGUI->SetState( 0 );
// myGeometryGUI->SetState( 0 );
globalSelection( GEOM_POINT );
myEditCurrentArgument = Group3Pnts->LineEdit1;
@ -107,8 +114,8 @@ void BasicGUI_ArcDlg::Init()
/* signals and slots connections */
connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel()));
connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
@ -121,7 +128,8 @@ void BasicGUI_ArcDlg::Init()
connect(Group3Pnts->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
connect(Group3Pnts->LineEdit3, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
initName( tr( "GEOM_ARC" ) );
}
@ -176,7 +184,7 @@ void BasicGUI_ArcDlg::SelectionIntoArgument()
{
myEditCurrentArgument->setText("");
if ( mySelection->IObjectCount() != 1 )
if ( IObjectCount() != 1 )
{
if ( myEditCurrentArgument == Group3Pnts->LineEdit1 ) myPoint1 = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == Group3Pnts->LineEdit2 ) myPoint2 = GEOM::GEOM_Object::_nil();
@ -186,7 +194,7 @@ void BasicGUI_ArcDlg::SelectionIntoArgument()
// nbSel == 1
Standard_Boolean aRes = Standard_False;
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( mySelection->firstIObject(), aRes );
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), aRes );
if ( !CORBA::is_nil( aSelectedObject ) && aRes )
{
myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
@ -240,9 +248,10 @@ void BasicGUI_ArcDlg::LineEditReturnPressed()
void BasicGUI_ArcDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
myGeomGUI->SetState( 0 );
// myGeometryGUI->SetState( 0 );
globalSelection( GEOM_POINT );
myEditCurrentArgument = Group3Pnts->LineEdit1;
@ -260,7 +269,7 @@ void BasicGUI_ArcDlg::ActivateThisDialog()
//=================================================================================
void BasicGUI_ArcDlg::DeactivateActiveDialog()
{
myGeomGUI->SetState( -1 );
// myGeometryGUI->SetState( -1 );
GEOMBase_Skeleton::DeactivateActiveDialog();
}
@ -280,7 +289,7 @@ void BasicGUI_ArcDlg::enterEvent(QEvent* e)
//=================================================================================
GEOM::GEOM_IOperations_ptr BasicGUI_ArcDlg::createOperation()
{
return getGeomEngine()->GetICurvesOperations( getStudyId() );
return myGeometryGUI->GetGeomGen()->GetICurvesOperations( getStudyId() );
}
//=================================================================================
@ -289,7 +298,7 @@ GEOM::GEOM_IOperations_ptr BasicGUI_ArcDlg::createOperation()
//=================================================================================
static bool isEqual( const GEOM::GEOM_Object_var& thePnt1, const GEOM::GEOM_Object_var& thePnt2 )
{
return thePnt1->_is_equivalent( thePnt2 );
return thePnt1->_is_equivalent( thePnt2 );
}
//=================================================================================
@ -299,7 +308,7 @@ static bool isEqual( const GEOM::GEOM_Object_var& thePnt1, const GEOM::GEOM_Obje
bool BasicGUI_ArcDlg::isValid( QString& msg )
{
return !myPoint1->_is_nil() && !myPoint2->_is_nil() && !myPoint3->_is_nil() &&
!isEqual( myPoint1, myPoint2 ) && !isEqual( myPoint1, myPoint3 ) && !isEqual( myPoint2, myPoint3 );
!isEqual( myPoint1, myPoint2 ) && !isEqual( myPoint1, myPoint3 ) && !isEqual( myPoint2, myPoint3 );
}
//=================================================================================
@ -309,8 +318,8 @@ bool BasicGUI_ArcDlg::isValid( QString& msg )
bool BasicGUI_ArcDlg::execute( ObjectList& objects )
{
GEOM::GEOM_Object_var anObj = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeArc( myPoint1, myPoint2, myPoint3 );
if ( !anObj->_is_nil() )
objects.push_back( anObj._retn() );
if ( !anObj->_is_nil() )
objects.push_back( anObj._retn() );
return true;
}
@ -320,6 +329,6 @@ bool BasicGUI_ArcDlg::execute( ObjectList& objects )
//=================================================================================
void BasicGUI_ArcDlg::closeEvent( QCloseEvent* e )
{
myGeomGUI->SetState( -1 );
// myGeometryGUI->SetState( -1 );
GEOMBase_Skeleton::closeEvent( e );
}

4
src/BasicGUI/BasicGUI_ArcDlg.h
View File

@ -41,7 +41,7 @@ class BasicGUI_ArcDlg : public GEOMBase_Skeleton
Q_OBJECT
public:
BasicGUI_ArcDlg( QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0 );
BasicGUI_ArcDlg( GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~BasicGUI_ArcDlg();
protected:
@ -56,6 +56,8 @@ private :
void Init();
void enterEvent(QEvent* e);
GeometryGUI* myGeometryGUI;
GEOM::GEOM_Object_var myPoint1, myPoint2, myPoint3;
DlgRef_3Sel_QTD* Group3Pnts;

118
src/BasicGUI/BasicGUI_CircleDlg.cxx
View File

@ -28,8 +28,12 @@
#include "BasicGUI_CircleDlg.h"
#include "QAD_Desktop.h"
#include "QAD_Config.h"
#include "SUIT_Desktop.h"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h"
#include <qlabel.h>
#include "GEOMImpl_Types.hxx"
@ -42,12 +46,13 @@
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BasicGUI_CircleDlg::BasicGUI_CircleDlg(QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, Sel, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
BasicGUI_CircleDlg::BasicGUI_CircleDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu),
myGeometryGUI(theGeometryGUI)
{
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_CIRCLE_PV")));
QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_CIRCLE_PNTS")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_CIRCLE_PV")));
QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_CIRCLE_PNTS")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
setCaption(tr("GEOM_CIRCLE_TITLE"));
@ -110,11 +115,11 @@ void BasicGUI_CircleDlg::Init()
myPoint = myDir = myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil();
myGeomGUI->SetState( 0 );
// myGeometryGUI->SetState( 0 );
/* Get setting of step value from file configuration */
QString St = QAD_CONFIG->getSetting("Geometry:SettingsGeomStep");
double aStep = St.toDouble();
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
double aStep = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
/* min, max, step and decimals for spin boxes & initial values */
GroupPntVecR->SpinBox_DX->RangeStepAndValidator(0.001, 999.999, aStep, 3);
@ -122,8 +127,8 @@ void BasicGUI_CircleDlg::Init()
/* signals and slots connections */
connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel()));
connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
@ -139,9 +144,10 @@ void BasicGUI_CircleDlg::Init()
connect(GroupPntVecR->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
connect(GroupPntVecR->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPntVecR->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPntVecR->SpinBox_DX, SLOT(SetStep(double)));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
initName( tr( "GEOM_CIRCLE" ) );
@ -155,39 +161,40 @@ void BasicGUI_CircleDlg::Init()
//=================================================================================
void BasicGUI_CircleDlg::ConstructorsClicked( int constructorId )
{
disconnect( mySelection, 0, this, 0 );
disconnect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 0, this, 0 );
myPoint = myDir = myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil();
switch ( constructorId )
{
case 0:
{
Group3Pnts->hide();
resize(0, 0);
GroupPntVecR->show();
myEditCurrentArgument = GroupPntVecR->LineEdit1;
GroupPntVecR->LineEdit1->setText("");
GroupPntVecR->LineEdit2->setText("");
break;
Group3Pnts->hide();
resize(0, 0);
GroupPntVecR->show();
myEditCurrentArgument = GroupPntVecR->LineEdit1;
GroupPntVecR->LineEdit1->setText("");
GroupPntVecR->LineEdit2->setText("");
break;
}
case 1:
{
GroupPntVecR->hide();
resize( 0, 0 );
Group3Pnts->show();
myEditCurrentArgument = Group3Pnts->LineEdit1;
Group3Pnts->LineEdit1->setText("");
Group3Pnts->LineEdit2->setText("");
Group3Pnts->LineEdit3->setText("");
break;
case 1:
{
GroupPntVecR->hide();
resize( 0, 0 );
Group3Pnts->show();
myEditCurrentArgument = Group3Pnts->LineEdit1;
Group3Pnts->LineEdit1->setText("");
Group3Pnts->LineEdit2->setText("");
Group3Pnts->LineEdit3->setText("");
break;
}
}
myEditCurrentArgument->setFocus();
globalSelection( GEOM_POINT );
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
globalSelection( GEOM_POINT );
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
}
//=================================================================================
@ -231,7 +238,7 @@ void BasicGUI_CircleDlg::SelectionIntoArgument()
{
myEditCurrentArgument->setText("");
if ( mySelection->IObjectCount() != 1 )
if ( IObjectCount() != 1 )
{
if ( myEditCurrentArgument == GroupPntVecR->LineEdit1 ) myPoint = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == GroupPntVecR->LineEdit2 ) myDir = GEOM::GEOM_Object::_nil();
@ -243,7 +250,7 @@ void BasicGUI_CircleDlg::SelectionIntoArgument()
// nbSel == 1
Standard_Boolean aRes = Standard_False;
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( mySelection->firstIObject(), aRes );
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), aRes );
if ( !CORBA::is_nil( aSelectedObject ) && aRes )
{
myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
@ -308,9 +315,10 @@ void BasicGUI_CircleDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
globalSelection( GEOM_POINT );
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
myGeomGUI->SetState( 0 );
// myGeometryGUI->SetState( 0 );
ConstructorsClicked( getConstructorId() );
}
@ -332,7 +340,7 @@ void BasicGUI_CircleDlg::enterEvent(QEvent* e)
//=================================================================================
void BasicGUI_CircleDlg::DeactivateActiveDialog()
{
myGeomGUI->SetState( -1 );
// myGeometryGUI->SetState( -1 );
GEOMBase_Skeleton::DeactivateActiveDialog();
}
@ -360,7 +368,7 @@ double BasicGUI_CircleDlg::getRadius() const
//=================================================================================
GEOM::GEOM_IOperations_ptr BasicGUI_CircleDlg::createOperation()
{
return getGeomEngine()->GetICurvesOperations( getStudyId() );
return myGeometryGUI->GetGeomGen()->GetICurvesOperations( getStudyId() );
}
//=================================================================================
@ -369,7 +377,7 @@ GEOM::GEOM_IOperations_ptr BasicGUI_CircleDlg::createOperation()
//=================================================================================
static bool isEqual( const GEOM::GEOM_Object_var& thePnt1, const GEOM::GEOM_Object_var& thePnt2 )
{
return thePnt1->_is_equivalent( thePnt2 );
return thePnt1->_is_equivalent( thePnt2 );
}
//=================================================================================
@ -378,13 +386,13 @@ static bool isEqual( const GEOM::GEOM_Object_var& thePnt1, const GEOM::GEOM_Obje
//=================================================================================
bool BasicGUI_CircleDlg::isValid( QString& msg )
{
const int id = getConstructorId();
if ( id == 0 )
return !myPoint->_is_nil() && !myDir->_is_nil() && getRadius() > 0;
else if ( id == 1 )
return !myPoint1->_is_nil() && !myPoint2->_is_nil() && !myPoint3->_is_nil() &&
!isEqual( myPoint1, myPoint2 ) && !isEqual( myPoint1, myPoint3 ) && !isEqual( myPoint2, myPoint3 );
return false;
const int id = getConstructorId();
if ( id == 0 )
return !myPoint->_is_nil() && !myDir->_is_nil() && getRadius() > 0;
else if ( id == 1 )
return !myPoint1->_is_nil() && !myPoint2->_is_nil() && !myPoint3->_is_nil() &&
!isEqual( myPoint1, myPoint2 ) && !isEqual( myPoint1, myPoint3 ) && !isEqual( myPoint2, myPoint3 );
return false;
}
//=================================================================================
@ -394,9 +402,9 @@ bool BasicGUI_CircleDlg::isValid( QString& msg )
bool BasicGUI_CircleDlg::execute( ObjectList& objects )
{
bool res = false;
GEOM::GEOM_Object_var anObj;
switch ( getConstructorId() )
{
case 0 :
@ -408,10 +416,10 @@ bool BasicGUI_CircleDlg::execute( ObjectList& objects )
res = true;
break;
}
if ( !anObj->_is_nil() )
objects.push_back( anObj._retn() );
return res;
}
@ -421,7 +429,7 @@ bool BasicGUI_CircleDlg::execute( ObjectList& objects )
//=================================================================================
void BasicGUI_CircleDlg::closeEvent( QCloseEvent* e )
{
myGeomGUI->SetState( -1 );
// myGeometryGUI->SetState( -1 );
GEOMBase_Skeleton::closeEvent( e );
}

8
src/BasicGUI/BasicGUI_CircleDlg.h
View File

@ -35,8 +35,8 @@
#include "BasicGUI.h"
#include "GEOM_EdgeFilter.hxx"
#include "GEOM_ShapeTypeFilter.hxx"
//#include "GEOM_EdgeFilter.hxx"
//#include "GEOM_ShapeTypeFilter.hxx"
#include <gp_Dir.hxx>
@ -49,7 +49,7 @@ class BasicGUI_CircleDlg : public GEOMBase_Skeleton
Q_OBJECT
public:
BasicGUI_CircleDlg(QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0);
BasicGUI_CircleDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
~BasicGUI_CircleDlg();
protected:
@ -65,6 +65,8 @@ private :
void enterEvent(QEvent* e);
double getRadius() const;
GeometryGUI* myGeometryGUI;
GEOM::GEOM_Object_var myPoint, myDir, myPoint1, myPoint2, myPoint3;
DlgRef_2Sel1Spin* GroupPntVecR;

50
src/BasicGUI/BasicGUI_CurveDlg.cxx
View File

@ -27,8 +27,13 @@
#include "BasicGUI_CurveDlg.h"
#include "QAD_Desktop.h"
#include "QAD_Config.h"
#include "SUIT_Desktop.h"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h"
#include <qlabel.h>
#include "utilities.h"
#include "SALOME_ListIteratorOfListIO.hxx"
@ -45,14 +50,15 @@ using namespace std;
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BasicGUI_CurveDlg::BasicGUI_CurveDlg(QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, Sel, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
BasicGUI_CurveDlg::BasicGUI_CurveDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu),
myGeometryGUI(theGeometryGUI)
{
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_POLYLINE")));
QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_SPLINE")));
QPixmap image3(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_BEZIER")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_POLYLINE")));
QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SPLINE")));
QPixmap image3(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BEZIER")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
setCaption(tr("GEOM_CURVE_TITLE"));
@ -100,8 +106,8 @@ void BasicGUI_CurveDlg::Init()
/* signals and slots connections */
connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel()));
connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
@ -110,7 +116,8 @@ void BasicGUI_CurveDlg::Init()
connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
initName( tr( "GEOM_CURVE" ) );
ConstructorsClicked( 0 );
@ -201,22 +208,22 @@ void BasicGUI_CurveDlg::SelectionIntoArgument()
Standard_Boolean aRes = Standard_False;
int i = 0;
myPoints->length( mySelection->IObjectCount() ); // this length may be greater than number of objects,
myPoints->length( IObjectCount() ); // this length may be greater than number of objects,
// that will actually be put into myPoints
for ( SALOME_ListIteratorOfListIO anIt( mySelection->StoredIObjects() ); anIt.More(); anIt.Next() )
for ( SALOME_ListIteratorOfListIO anIt( selectedIO() ); anIt.More(); anIt.Next() )
{
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( anIt.Value(), aRes );
if ( !CORBA::is_nil( aSelectedObject ) && aRes )
{
//TopoDS_Shape aPointShape;
//if ( myGeomBase->GetShape( aSelectedObject, aPointShape, TopAbs_VERTEX ) )
myPoints[i++] = aSelectedObject;
myPoints[i++] = aSelectedObject;
}
}
myPoints->length( i ); // this is the right length, smaller of equal to the previously set
if ( i )
GroupPoints->LineEdit1->setText( QString::number( i ) + "_" + tr( "GEOM_POINT" ) + tr( "_S_" ) );
displayPreview();
}
@ -228,9 +235,10 @@ void BasicGUI_CurveDlg::SelectionIntoArgument()
void BasicGUI_CurveDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
myGeomGUI->SetState( 0 );
// myGeometryGUI->SetState( 0 );
globalSelection( GEOM_POINT );
ConstructorsClicked( getConstructorId() );
@ -242,7 +250,7 @@ void BasicGUI_CurveDlg::ActivateThisDialog()
//=================================================================================
void BasicGUI_CurveDlg::DeactivateActiveDialog()
{
myGeomGUI->SetState( -1 );
// myGeometryGUI->SetState( -1 );
GEOMBase_Skeleton::DeactivateActiveDialog();
}
@ -262,7 +270,7 @@ void BasicGUI_CurveDlg::enterEvent(QEvent* e)
//=================================================================================
GEOM::GEOM_IOperations_ptr BasicGUI_CurveDlg::createOperation()
{
return getGeomEngine()->GetICurvesOperations( getStudyId() );
return myGeometryGUI->GetGeomGen()->GetICurvesOperations( getStudyId() );
}
//=================================================================================
@ -312,7 +320,7 @@ bool BasicGUI_CurveDlg::execute( ObjectList& objects )
//=================================================================================
void BasicGUI_CurveDlg::closeEvent( QCloseEvent* e )
{
myGeomGUI->SetState( -1 );
// myGeometryGUI->SetState( -1 );
GEOMBase_Skeleton::closeEvent( e );
}

6
src/BasicGUI/BasicGUI_CurveDlg.h
View File

@ -33,7 +33,7 @@
#include "BasicGUI.h"
#include "GEOM_ShapeTypeFilter.hxx"
//#include "GEOM_ShapeTypeFilter.hxx"
//=================================================================================
// class : BasicGUI_CurveDlg
@ -44,7 +44,7 @@ class BasicGUI_CurveDlg : public GEOMBase_Skeleton
Q_OBJECT
public:
BasicGUI_CurveDlg(QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0);
BasicGUI_CurveDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
~BasicGUI_CurveDlg();
protected:
@ -59,6 +59,8 @@ private :
void Init();
void enterEvent(QEvent* e);
GeometryGUI* myGeometryGUI;
DlgRef_1Sel_QTD* GroupPoints;
GEOM::ListOfGO_var myPoints;

48
src/BasicGUI/BasicGUI_EllipseDlg.cxx
View File

@ -26,8 +26,13 @@
// $Header$
#include "BasicGUI_EllipseDlg.h"
#include "QAD_Desktop.h"
#include "QAD_Config.h"
#include "SUIT_Desktop.h"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h"
#include <qlabel.h>
#include "GEOMImpl_Types.hxx"
@ -42,11 +47,11 @@ using namespace std;
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BasicGUI_EllipseDlg::BasicGUI_EllipseDlg(QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, Sel, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
BasicGUI_EllipseDlg::BasicGUI_EllipseDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI)
{
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_ELLIPSE_PV")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_ELLIPSE_PV")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
setCaption(tr("GEOM_ELLIPSE_TITLE"));
@ -96,11 +101,12 @@ void BasicGUI_EllipseDlg::Init()
myPoint = myDir = GEOM::GEOM_Object::_nil();
myGeomGUI->SetState( 0 );
// myGeometryGUI->SetState( 0 );
/* Get setting of step value from file configuration */
QString St = QAD_CONFIG->getSetting("Geometry:SettingsGeomStep");
double step = St.toDouble();
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
double aMajorR( 200. ), aMinorR( 100. );
/* min, max, step and decimals for spin boxes & initial values */
@ -111,8 +117,8 @@ void BasicGUI_EllipseDlg::Init()
/* signals and slots connections */
connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel()));
connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
@ -126,10 +132,11 @@ void BasicGUI_EllipseDlg::Init()
connect(GroupPoints->SpinBox_DX, 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(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DY, SLOT(SetStep(double)));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
initName( tr( "GEOM_ELLIPSE" ) );
}
@ -184,7 +191,7 @@ void BasicGUI_EllipseDlg::SelectionIntoArgument()
{
myEditCurrentArgument->setText("");
if ( mySelection->IObjectCount() != 1 )
if ( IObjectCount() != 1 )
{
if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) myPoint = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) myDir = GEOM::GEOM_Object::_nil();
@ -192,7 +199,7 @@ void BasicGUI_EllipseDlg::SelectionIntoArgument()
}
Standard_Boolean aRes = Standard_False;
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( mySelection->firstIObject(), aRes );
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), aRes );
if ( !CORBA::is_nil( aSelectedObject ) && aRes )
{
myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
@ -246,7 +253,8 @@ void BasicGUI_EllipseDlg::LineEditReturnPressed()
void BasicGUI_EllipseDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
GroupPoints->LineEdit1->setFocus();
myEditCurrentArgument = GroupPoints->LineEdit1;
@ -264,7 +272,7 @@ void BasicGUI_EllipseDlg::ActivateThisDialog()
//=================================================================================
void BasicGUI_EllipseDlg::DeactivateActiveDialog()
{
myGeomGUI->SetState( -1 );
// myGeometryGUI->SetState( -1 );
GEOMBase_Skeleton::DeactivateActiveDialog();
}
@ -293,7 +301,7 @@ void BasicGUI_EllipseDlg::ValueChangedInSpinBox(double newValue)
//=================================================================================
GEOM::GEOM_IOperations_ptr BasicGUI_EllipseDlg::createOperation()
{
return getGeomEngine()->GetICurvesOperations( getStudyId() );
return myGeometryGUI->GetGeomGen()->GetICurvesOperations( getStudyId() );
}
//=================================================================================
@ -334,7 +342,7 @@ bool BasicGUI_EllipseDlg::execute( ObjectList& objects )
//=================================================================================
void BasicGUI_EllipseDlg::closeEvent( QCloseEvent* e )
{
myGeomGUI->SetState( -1 );
// myGeometryGUI->SetState( -1 );
GEOMBase_Skeleton::closeEvent( e );
}

8
src/BasicGUI/BasicGUI_EllipseDlg.h
View File

@ -33,8 +33,8 @@
#include "BasicGUI.h"
#include "GEOM_ShapeTypeFilter.hxx"
#include "GEOM_EdgeFilter.hxx"
//#include "GEOM_ShapeTypeFilter.hxx"
//#include "GEOM_EdgeFilter.hxx"
#include <gp_Dir.hxx>
//=================================================================================
@ -46,7 +46,7 @@ class BasicGUI_EllipseDlg : public GEOMBase_Skeleton
Q_OBJECT
public:
BasicGUI_EllipseDlg(QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0);
BasicGUI_EllipseDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
~BasicGUI_EllipseDlg();
protected:
@ -61,6 +61,8 @@ private :
void Init();
void enterEvent(QEvent* e);
GeometryGUI* myGeometryGUI;
GEOM::GEOM_Object_var myPoint, myDir;
DlgRef_2Sel2Spin* GroupPoints;

49
src/BasicGUI/BasicGUI_LineDlg.cxx
View File

@ -28,7 +28,12 @@
#include "BasicGUI_LineDlg.h"
#include "QAD_Desktop.h"
#include "SUIT_Desktop.h"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h"
#include <qlabel.h>
#include "GEOMImpl_Types.hxx"
@ -43,11 +48,11 @@ using namespace std;
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BasicGUI_LineDlg::BasicGUI_LineDlg(QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, Sel, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
BasicGUI_LineDlg::BasicGUI_LineDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI)
{
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_LINE_2P")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM",tr("ICON_DLG_LINE_2P")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM",tr("ICON_SELECT")));
setCaption(tr("GEOM_LINE_TITLE"));
@ -94,13 +99,13 @@ void BasicGUI_LineDlg::Init()
myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
myGeomGUI->SetState( 0 );
// myGeometryGUI->SetState( 0 );
globalSelection( GEOM_POINT );
/* signals and slots connections */
connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel()));
connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
@ -111,8 +116,9 @@ void BasicGUI_LineDlg::Init()
connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
initName( tr("GEOM_LINE") );
}
@ -144,7 +150,7 @@ bool BasicGUI_LineDlg::ClickOnApply()
{
if ( !onAccept() )
return false;
initName();
return true;
}
@ -158,7 +164,7 @@ void BasicGUI_LineDlg::SelectionIntoArgument()
{
myEditCurrentArgument->setText("");
if ( mySelection->IObjectCount() != 1 )
if ( IObjectCount() != 1 )
{
if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) myPoint1 = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) myPoint2 = GEOM::GEOM_Object::_nil();
@ -167,14 +173,14 @@ void BasicGUI_LineDlg::SelectionIntoArgument()
// nbSel == 1
Standard_Boolean aRes = Standard_False;
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( mySelection->firstIObject(), aRes );
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), aRes );
if ( !CORBA::is_nil( aSelectedObject ) && aRes )
{
myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) myPoint1 = aSelectedObject;
else if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) myPoint2 = aSelectedObject;
}
displayPreview();
}
@ -214,9 +220,10 @@ void BasicGUI_LineDlg::LineEditReturnPressed()
void BasicGUI_LineDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
myGeomGUI->SetState( 0 );
// myGeometryGUI->SetState( 0 );
globalSelection( GEOM_POINT );
myEditCurrentArgument = GroupPoints->LineEdit1;
@ -233,7 +240,7 @@ void BasicGUI_LineDlg::ActivateThisDialog()
//=================================================================================
void BasicGUI_LineDlg::DeactivateActiveDialog()
{
myGeomGUI->SetState( -1 );
// myGeometryGUI->SetState( -1 );
GEOMBase_Skeleton::DeactivateActiveDialog();
}
@ -253,7 +260,7 @@ void BasicGUI_LineDlg::enterEvent(QEvent* e)
//=================================================================================
GEOM::GEOM_IOperations_ptr BasicGUI_LineDlg::createOperation()
{
return getGeomEngine()->GetIBasicOperations( getStudyId() );
return myGeometryGUI->GetGeomGen()->GetIBasicOperations( getStudyId() );
}
//=================================================================================
@ -272,8 +279,8 @@ bool BasicGUI_LineDlg::isValid( QString& msg )
bool BasicGUI_LineDlg::execute( ObjectList& objects )
{
GEOM::GEOM_Object_var anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->MakeLineTwoPnt( myPoint1, myPoint2 );
if ( !anObj->_is_nil() )
objects.push_back( anObj._retn() );
if ( !anObj->_is_nil() )
objects.push_back( anObj._retn() );
return true;
}
@ -283,7 +290,7 @@ bool BasicGUI_LineDlg::execute( ObjectList& objects )
//=================================================================================
void BasicGUI_LineDlg::closeEvent( QCloseEvent* e )
{
myGeomGUI->SetState( -1 );
// myGeometryGUI->SetState( -1 );
GEOMBase_Skeleton::closeEvent( e );
}

4
src/BasicGUI/BasicGUI_LineDlg.h
View File

@ -42,7 +42,7 @@ class BasicGUI_LineDlg : public GEOMBase_Skeleton
Q_OBJECT
public:
BasicGUI_LineDlg(QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0);
BasicGUI_LineDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
~BasicGUI_LineDlg();
protected:
@ -57,6 +57,8 @@ private :
void Init();
void enterEvent(QEvent* e);
GeometryGUI* myGeometryGUI;
GEOM::GEOM_Object_var myPoint1;
GEOM::GEOM_Object_var myPoint2;

130
src/BasicGUI/BasicGUI_MarkerDlg.cxx
View File

@ -28,11 +28,14 @@
#include "BasicGUI_MarkerDlg.h"
#include "DlgRef_SpinBox.h"
#include "QAD_Desktop.h"
#include "QAD_RightFrame.h"
#include "VTKViewer_ViewFrame.h"
#include "OCCViewer_ViewFrame.h"
#include "QAD_Config.h"
#include "SUIT_Desktop.h"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h"
#include <qlabel.h>
#include "GEOMImpl_Types.hxx"
#include "utilities.h"
@ -54,14 +57,14 @@
// class : BasicGUI_MarkerDlg()
// purpose : Constructor
//=================================================================================
BasicGUI_MarkerDlg::BasicGUI_MarkerDlg( QWidget* theParent, SALOME_Selection* theSel )
: GEOMBase_Skeleton( theParent, "BasicGUI_MarkerDlg", theSel, false,
WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
BasicGUI_MarkerDlg::BasicGUI_MarkerDlg( GeometryGUI* theGeometryGUI, QWidget* theParent )
: GEOMBase_Skeleton( theParent, "BasicGUI_MarkerDlg", false,
WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI)
{
QPixmap iconCS1 ( QAD_Desktop::getResourceManager()->loadPixmap( "GEOM", tr( "ICON_MARKER" ) ) );
QPixmap iconCS2 ( QAD_Desktop::getResourceManager()->loadPixmap( "GEOM", tr( "ICON_MARKER2" ) ) );
QPixmap iconCS3 ( QAD_Desktop::getResourceManager()->loadPixmap( "GEOM", tr( "ICON_MARKER3" ) ) );
QPixmap iconSelect( QAD_Desktop::getResourceManager()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
QPixmap iconCS1 ( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_MARKER" ) ) );
QPixmap iconCS2 ( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_MARKER2" ) ) );
QPixmap iconCS3 ( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_MARKER3" ) ) );
QPixmap iconSelect( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
setCaption( tr( "CAPTION" ) );
@ -116,7 +119,7 @@ BasicGUI_MarkerDlg::BasicGUI_MarkerDlg( QWidget* theParent, SALOME_Selection* th
Layout1->addWidget( Group1, 2, 0 );
Layout1->addWidget( Group2, 2, 0 );
Init( theSel );
Init();
}
@ -133,7 +136,7 @@ BasicGUI_MarkerDlg::~BasicGUI_MarkerDlg()
// function : Init()
// purpose :
//=================================================================================
void BasicGUI_MarkerDlg::Init( SALOME_Selection* theSel )
void BasicGUI_MarkerDlg::Init()
{
myBlockPreview = false;
myConstructorId = -1;
@ -142,9 +145,7 @@ void BasicGUI_MarkerDlg::Init( SALOME_Selection* theSel )
Group2->LineEdit1->setReadOnly( true );
Group2->LineEdit2->setReadOnly( true );
Group2->LineEdit3->setReadOnly( true );
GeometryGUI* aGeomGUI = GeometryGUI::GetGeomGUI();
connect(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int)));
connect(Group1->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(Group2->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
@ -157,20 +158,23 @@ void BasicGUI_MarkerDlg::Init( SALOME_Selection* theSel )
connect(Group2->LineEdit3, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( onClose() ) );
connect( aGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( onDeactivate() ) );
connect( aGeomGUI, SIGNAL( SignalCloseAllDialogs() ), this, SLOT( onClose() ) );
connect( myGeometryGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( onDeactivate() ) );
connect( myGeometryGUI, SIGNAL( SignalCloseAllDialogs() ), this, SLOT( onClose() ) );
connect( buttonOk, SIGNAL( clicked() ), this, SLOT( onOk() ) );
connect( buttonApply, SIGNAL( clicked() ), this, SLOT( onApply() ) );
connect( mySelection, SIGNAL( currentSelectionChanged() ), this, SLOT( onSelectionDone() ) );
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL( currentSelectionChanged() ), this, SLOT( onSelectionDone() ) );
initName( tr( "LCS_NAME" ) );
QString aStr = QAD_CONFIG->getSetting( "Geometry:SettingsGeomStep" );
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
for ( DataMap::iterator anIter = myData.begin(); anIter != myData.end(); ++anIter )
{
anIter.data()->RangeStepAndValidator( -999.999, 999.999, aStr.toDouble(), 3 );
anIter.data()->RangeStepAndValidator( -999.999, 999.999, step, 3 );
connect( anIter.data(), SIGNAL( valueChanged( double ) ),
this, SLOT( onValueChanged( double ) ) );
}
@ -184,6 +188,9 @@ void BasicGUI_MarkerDlg::Init( SALOME_Selection* theSel )
ConstructorsClicked( 0 );
//@
/*
QAD_ViewFrame* aFrame = QAD_Application::getDesktop()->getActiveApp()->
getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame();
@ -197,6 +204,7 @@ void BasicGUI_MarkerDlg::Init( SALOME_Selection* theSel )
OCCViewer_ViewFrame* aOCCFrame = dynamic_cast<OCCViewer_ViewFrame*>( aFrame );
if ( aOCCFrame )
aOCCFrame->AdjustTrihedrons( true );
*/
}
//=================================================================================
@ -215,7 +223,7 @@ void BasicGUI_MarkerDlg::ConstructorsClicked( int constructorId )
myConstructorId = constructorId;
disconnect(mySelection, 0, this, 0);
disconnect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 0, this, 0);
switch (constructorId)
{
@ -257,7 +265,8 @@ void BasicGUI_MarkerDlg::ConstructorsClicked( int constructorId )
}
}
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(onSelectionDone()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(onSelectionDone()));
onSelectionDone();
}
@ -301,11 +310,11 @@ bool BasicGUI_MarkerDlg::onApply()
//=================================================================================
void BasicGUI_MarkerDlg::onSelectionDone0()
{
if ( mySelection->IObjectCount() == 1 )
if ( IObjectCount() == 1 )
{
Standard_Boolean aRes = Standard_False;
Handle(SALOME_InteractiveObject) anIO = mySelection->firstIObject();
Handle(SALOME_InteractiveObject) anIO = firstIObject();
GEOM::GEOM_Object_var aSelectedObj = GEOMBase::ConvertIOinGEOMObject( anIO, aRes );
if ( aRes && !aSelectedObj->_is_nil() )
@ -336,24 +345,22 @@ void BasicGUI_MarkerDlg::onSelectionDone0()
myData[ DX2 ]->SetValue( aYDir.X() );
myData[ DY2 ]->SetValue( aYDir.Y() );
myData[ DZ2 ]->SetValue( aYDir.Z() );
//mySelection->ClearIObjects();
((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr()->clearSelected();
}
}
else
{
if ( mySelection->HasIndex( anIO ) )
TColStd_IndexedMapOfInteger aMap;
((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr()->GetIndexes( anIO, aMap );
if ( aMap.Extent() == 1 )
{
TColStd_IndexedMapOfInteger aMap;
mySelection->GetIndex( anIO, aMap );
if ( aMap.Extent() == 1 )
{
int anIndex = aMap( 1 );
TopTools_IndexedMapOfShape aShapes;
TopExp::MapShapes( aShape, aShapes );
aShape = aShapes.FindKey( anIndex );
//mySelection->ClearIObjects();
}
}
int anIndex = aMap( 1 );
TopTools_IndexedMapOfShape aShapes;
TopExp::MapShapes( aShape, aShapes );
aShape = aShapes.FindKey( anIndex );
((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr()->clearSelected();
}
if ( !aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX )
{
@ -387,9 +394,9 @@ void BasicGUI_MarkerDlg::onSelectionDone()
myEditCurrentArgument->setText("");
QString aName;
if ( mySelection->IObjectCount() == 1 ) {
if ( IObjectCount() == 1 ) {
Standard_Boolean aRes = Standard_False;
Handle(SALOME_InteractiveObject) anIO = mySelection->firstIObject();
Handle(SALOME_InteractiveObject) anIO = firstIObject();
GEOM::GEOM_Object_var aSelectedObj = GEOMBase::ConvertIOinGEOMObject( anIO, aRes );
if ( !CORBA::is_nil( aSelectedObj ) && aRes ) {
@ -397,16 +404,18 @@ void BasicGUI_MarkerDlg::onSelectionDone()
TopoDS_Shape aShape;
if ( myGeomBase->GetShape( aSelectedObj, aShape, TopAbs_SHAPE ) ) {
GEOM::short_array anIndexes;
if ( mySelection->HasIndex( anIO ) ) {
TColStd_IndexedMapOfInteger aMap;
mySelection->GetIndex( anIO, aMap );
TColStd_IndexedMapOfInteger aMap;
((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr()->GetIndexes( anIO, aMap );
if ( !aMap.IsEmpty() ) {
int anIndex = aMap( 1 );
TopTools_IndexedMapOfShape aShapes;
TopExp::MapShapes( aShape, aShapes );
aShape = aShapes.FindKey( anIndex );
}
if ( getConstructorId() == 1 ) {
if ( getConstructorId() == 1 ) {
if ( !aShape.IsNull() ) {
gp_Pnt aPnt;
if (aShape.ShapeType() == TopAbs_VERTEX) {
@ -423,7 +432,7 @@ void BasicGUI_MarkerDlg::onSelectionDone()
aPnt = aSystem.CentreOfMass();
}
gp_Ax3 anAx3;
anAx3.Transform(aShape.Location().Transformation());
if(aShape.ShapeType() == TopAbs_FACE) {
@ -434,33 +443,33 @@ void BasicGUI_MarkerDlg::onSelectionDone()
anAx3 = aPln.Position();
}
}
gp_Dir aDirX = anAx3.XDirection();
gp_Dir aDirY = anAx3.YDirection();
myData[ X ]->SetValue( aPnt.X() );
myData[ Y ]->SetValue( aPnt.Y() );
myData[ Z ]->SetValue( aPnt.Z() );
myData[ DX1 ]->SetValue( aDirX.X() );
myData[ DY1 ]->SetValue( aDirX.Y() );
myData[ DZ1 ]->SetValue( aDirX.Z() );
myData[ DX2 ]->SetValue( aDirY.X() );
myData[ DY2 ]->SetValue( aDirY.Y() );
myData[ DZ2 ]->SetValue( aDirY.Z() );
myEditCurrentArgument->setText( aName );
}
else {
myData[ X ]->SetValue( 0 );
myData[ Y ]->SetValue( 0 );
myData[ Z ]->SetValue( 0 );
myData[ DX1 ]->SetValue( 0 );
myData[ DY1 ]->SetValue( 0 );
myData[ DZ1 ]->SetValue( 0 );
myData[ DX2 ]->SetValue( 0 );
myData[ DY2 ]->SetValue( 0 );
myData[ DZ2 ]->SetValue( 0 );
@ -486,7 +495,7 @@ void BasicGUI_MarkerDlg::onSelectionDone()
gp_Pnt aP1 = BRep_Tool::Pnt(TopExp::FirstVertex(TopoDS::Edge(aShape)));
gp_Pnt aP2 = BRep_Tool::Pnt(TopExp::LastVertex(TopoDS::Edge(aShape)));
gp_Dir aDir(gp_Vec(aP1, aP2));
myData[ DX1 ]->SetValue( aDir.X() );
myData[ DY1 ]->SetValue( aDir.Y() );
myData[ DZ1 ]->SetValue( aDir.Z() );
@ -503,7 +512,7 @@ void BasicGUI_MarkerDlg::onSelectionDone()
gp_Pnt aP1 = BRep_Tool::Pnt(TopExp::FirstVertex(TopoDS::Edge(aShape)));
gp_Pnt aP2 = BRep_Tool::Pnt(TopExp::LastVertex(TopoDS::Edge(aShape)));
gp_Dir aDir(gp_Vec(aP1, aP2));
myData[ DX2 ]->SetValue( aDir.X() );
myData[ DY2 ]->SetValue( aDir.Y() );
myData[ DZ2 ]->SetValue( aDir.Z() );
@ -524,11 +533,11 @@ void BasicGUI_MarkerDlg::onSelectionDone()
myData[ X ]->SetValue( 0 );
myData[ Y ]->SetValue( 0 );
myData[ Z ]->SetValue( 0 );
myData[ DX1 ]->SetValue( 0 );
myData[ DY1 ]->SetValue( 0 );
myData[ DZ1 ]->SetValue( 0 );
myData[ DX2 ]->SetValue( 0 );
myData[ DY2 ]->SetValue( 0 );
myData[ DZ2 ]->SetValue( 0 );
@ -551,7 +560,7 @@ void BasicGUI_MarkerDlg::onSelectionDone()
}
}
}
displayPreview();
}
@ -603,7 +612,8 @@ void BasicGUI_MarkerDlg::LineEditReturnPressed()
void BasicGUI_MarkerDlg::onActivate()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect( mySelection, SIGNAL( currentSelectionChanged() ), this, SLOT( onSelectionDone() ) );
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL( currentSelectionChanged() ), this, SLOT( onSelectionDone() ) );
ConstructorsClicked( getConstructorId() );
}
@ -633,7 +643,7 @@ void BasicGUI_MarkerDlg::enterEvent(QEvent* e)
//=================================================================================
GEOM::GEOM_IOperations_ptr BasicGUI_MarkerDlg::createOperation()
{
return getGeomEngine()->GetIBasicOperations( getStudyId() );
return myGeometryGUI->GetGeomGen()->GetIBasicOperations( getStudyId() );
}
//=================================================================================

6
src/BasicGUI/BasicGUI_MarkerDlg.h
View File

@ -46,9 +46,9 @@ private:
typedef QMap< int, DlgRef_SpinBox* > DataMap;
public:
BasicGUI_MarkerDlg( QWidget*, SALOME_Selection* );
BasicGUI_MarkerDlg( GeometryGUI* theGeometryGUI, QWidget* );
virtual ~BasicGUI_MarkerDlg();
void Init( SALOME_Selection* );
void Init();
protected:
virtual GEOM::GEOM_IOperations_ptr createOperation();
@ -64,6 +64,8 @@ private :
void enterEvent( QEvent* e );
void onSelectionDone0();
GeometryGUI* myGeometryGUI;
private slots:
void onOk();
void onClose();

60
src/BasicGUI/BasicGUI_PlaneDlg.cxx
View File

@ -27,8 +27,13 @@
// $Header$
#include "BasicGUI_PlaneDlg.h"
#include "QAD_Config.h"
#include "QAD_Desktop.h"
#include "SUIT_Desktop.h"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h"
#include <qlabel.h>
#include "GEOMImpl_Types.hxx"
@ -41,13 +46,13 @@ using namespace std;
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BasicGUI_PlaneDlg::BasicGUI_PlaneDlg(QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, Sel, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
BasicGUI_PlaneDlg::BasicGUI_PlaneDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI)
{
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_PLANE_PV")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_PLANE_3PNTS")));
QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_PLANE_FACE")));
QPixmap image3(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_PLANE_PV")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_PLANE_3PNTS")));
QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_PLANE_FACE")));
QPixmap image3(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
setCaption(tr("GEOM_PLANE_TITLE"));
@ -118,11 +123,12 @@ void BasicGUI_PlaneDlg::Init()
myPoint = myDir = myPoint1 = myPoint2 = myPoint3 = myFace = GEOM::GEOM_Object::_nil();
myGeomGUI->SetState( 0 );
// myGeometryGUI->SetState( 0 );
/* Get setting of step value from file configuration */
QString St = QAD_CONFIG->getSetting("Geometry:SettingsGeomStep");
double aStep = St.toDouble();
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
double aStep = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
double aTrimSize = 2000.0;
/* min, max, step and decimals for spin boxes */
@ -135,8 +141,8 @@ void BasicGUI_PlaneDlg::Init()
/* signals and slots connections */
connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel()));
connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
@ -160,11 +166,11 @@ void BasicGUI_PlaneDlg::Init()
connect(Group3Pnts->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)), GroupPntDir->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), Group3Pnts->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupFace->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPntDir->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), Group3Pnts->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupFace->SpinBox_DX, SLOT(SetStep(double)));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
initName( tr( "GEOM_PLANE" ) );
@ -180,7 +186,7 @@ void BasicGUI_PlaneDlg::Init()
//=================================================================================
void BasicGUI_PlaneDlg::ConstructorsClicked(int constructorId)
{
disconnect(mySelection, 0, this, 0);
disconnect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 0, this, 0);
myPoint = myDir = myPoint1 = myPoint2 = myPoint3 = myFace = GEOM::GEOM_Object::_nil();
switch ( constructorId )
@ -233,7 +239,8 @@ void BasicGUI_PlaneDlg::ConstructorsClicked(int constructorId)
}
myEditCurrentArgument->setFocus();
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
}
@ -279,7 +286,7 @@ void BasicGUI_PlaneDlg::SelectionIntoArgument()
{
myEditCurrentArgument->setText("");
if ( mySelection->IObjectCount() != 1 )
if ( IObjectCount() != 1 )
{
if ( myEditCurrentArgument == GroupPntDir->LineEdit1 ) myPoint = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == GroupPntDir->LineEdit2 ) myDir = GEOM::GEOM_Object::_nil();
@ -292,7 +299,7 @@ void BasicGUI_PlaneDlg::SelectionIntoArgument()
// nbSel == 1
Standard_Boolean aRes = Standard_False;
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( mySelection->firstIObject(), aRes );
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), aRes );
if ( !CORBA::is_nil( aSelectedObject ) && aRes )
{
myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
@ -363,9 +370,10 @@ void BasicGUI_PlaneDlg::LineEditReturnPressed()
void BasicGUI_PlaneDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
myGeomGUI->SetState( 0 );
// myGeometryGUI->SetState( 0 );
ConstructorsClicked( getConstructorId() );
}
@ -376,7 +384,7 @@ void BasicGUI_PlaneDlg::ActivateThisDialog()
//=================================================================================
void BasicGUI_PlaneDlg::DeactivateActiveDialog()
{
myGeomGUI->SetState( -1 );
// myGeometryGUI->SetState( -1 );
GEOMBase_Skeleton::DeactivateActiveDialog();
}
@ -421,7 +429,7 @@ double BasicGUI_PlaneDlg::getSize() const
//=================================================================================
GEOM::GEOM_IOperations_ptr BasicGUI_PlaneDlg::createOperation()
{
return getGeomEngine()->GetIBasicOperations( getStudyId() );
return myGeometryGUI->GetGeomGen()->GetIBasicOperations( getStudyId() );
}
//=================================================================================
@ -493,7 +501,7 @@ bool BasicGUI_PlaneDlg::execute( ObjectList& objects )
//=================================================================================
void BasicGUI_PlaneDlg::closeEvent( QCloseEvent* e )
{
myGeomGUI->SetState( -1 );
// myGeometryGUI->SetState( -1 );
GEOMBase_Skeleton::closeEvent( e );
}

4
src/BasicGUI/BasicGUI_PlaneDlg.h
View File

@ -44,7 +44,7 @@ class BasicGUI_PlaneDlg : public GEOMBase_Skeleton
Q_OBJECT
public:
BasicGUI_PlaneDlg( QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0);
BasicGUI_PlaneDlg( GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
~BasicGUI_PlaneDlg();
protected:
@ -60,6 +60,8 @@ private :
void enterEvent(QEvent* e);
double getSize() const;
GeometryGUI* myGeometryGUI;
GEOM::GEOM_Object_var myPoint, myDir, myPoint1, myPoint2, myPoint3, myFace;
DlgRef_2Sel1Spin* GroupPntDir;

201
src/BasicGUI/BasicGUI_PointDlg.cxx
View File

@ -29,13 +29,14 @@
using namespace std;
#include "BasicGUI_PointDlg.h"
#include "QAD_RightFrame.h"
#include "QAD_Desktop.h"
#include "QAD_Config.h"
#include "OCCViewer_Viewer3d.h"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h"
#include "GEOMImpl_Types.hxx"
#include <qlabel.h>
#include "utilities.h"
#include <gp_Pnt.hxx>
@ -54,13 +55,13 @@ using namespace std;
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BasicGUI_PointDlg::BasicGUI_PointDlg(QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, Sel, modal, fl )
BasicGUI_PointDlg::BasicGUI_PointDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, modal, fl ), myGeometryGUI(theGeometryGUI)
{
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_POINT")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_POINT_EDGE")));
QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image3(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_POINT_REF")));
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_POINT")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_POINT_EDGE")));
QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image3(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_POINT_REF")));
setCaption(tr("GEOM_POINT_TITLE"));
@ -146,12 +147,12 @@ void BasicGUI_PointDlg::Init()
myEditCurrentArgument = 0;
myGeomGUI->SetState( 0 );
// myGeometryGUI->SetState( 0 );
/* Get setting of step value from file configuration */
QString St = QAD_CONFIG->getSetting("Geometry:SettingsGeomStep");
double step = St.toDouble();
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
/* min, max, step and decimals for spin boxes */
GroupXYZ->SpinBox_DX->RangeStepAndValidator(-999.999, 999.999, step, 3);
GroupXYZ->SpinBox_DY->RangeStepAndValidator(-999.999, 999.999, step, 3);
@ -173,8 +174,8 @@ void BasicGUI_PointDlg::Init()
/* signals and slots connections */
connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel()));
connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
@ -191,18 +192,19 @@ void BasicGUI_PointDlg::Init()
connect(GroupRefPoint->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(GroupRefPoint->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupOnCurve->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupXYZ->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupXYZ->SpinBox_DY, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupXYZ->SpinBox_DZ, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupRefPoint->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupRefPoint->SpinBox_DY, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupRefPoint->SpinBox_DZ, SLOT(SetStep(double)));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupOnCurve->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupXYZ->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupXYZ->SpinBox_DY, SLOT(SetStep(double)));
connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupXYZ->SpinBox_DZ, SLOT(SetStep(double)));
connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupRefPoint->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupRefPoint->SpinBox_DY, SLOT(SetStep(double)));
connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupRefPoint->SpinBox_DZ, SLOT(SetStep(double)));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
initName( tr("GEOM_VERTEX") );
ConstructorsClicked( 0 );
}
@ -292,7 +294,7 @@ bool BasicGUI_PointDlg::ClickOnApply()
{
if ( !onAccept() )
return false;
initName();
ConstructorsClicked( getConstructorId() );
return true;
@ -315,49 +317,48 @@ void BasicGUI_PointDlg::ClickOnCancel()
//=================================================================================
void BasicGUI_PointDlg::SelectionIntoArgument()
{
const int id = getConstructorId();
const int id = getConstructorId();
if ( ( id == 1 || id == 2 ) && myEditCurrentArgument != 0 )
{
myEditCurrentArgument->setText("");
myX->setText( "" );
myY->setText( "" );
myZ->setText( "" );
myRefPoint = myEdge = GEOM::GEOM_Object::_nil();
}
{
myEditCurrentArgument->setText("");
myX->setText( "" );
myY->setText( "" );
myZ->setText( "" );
myRefPoint = myEdge = GEOM::GEOM_Object::_nil();
}
if ( mySelection->IObjectCount() == 1 )
{
Standard_Boolean aRes = Standard_False;
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( mySelection->firstIObject(), aRes );
if ( !CORBA::is_nil( aSelectedObject ) && aRes )
if ( IObjectCount() == 1 )
{
Standard_Boolean aRes = Standard_False;
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), aRes );
if ( !CORBA::is_nil( aSelectedObject ) && aRes )
{
if ( id == 0 )
{
// get CORBA reference to data object
TopoDS_Shape aShape = GeometryGUI::GetGeomGUI()->GetShapeReader().GetShape(
GeometryGUI::GetGeomGUI()->GetGeomGen(), aSelectedObject );
if ( !aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX )
{
gp_Pnt aPnt = BRep_Tool::Pnt( TopoDS::Vertex( aShape ) );
GroupXYZ->SpinBox_DX->SetValue( aPnt.X() );
GroupXYZ->SpinBox_DY->SetValue( aPnt.Y() );
GroupXYZ->SpinBox_DZ->SetValue( aPnt.Z() );
}
}
else if ( id == 1 )
{
myRefPoint = aSelectedObject;
GroupRefPoint->LineEdit1->setText( GEOMBase::GetName( aSelectedObject ) );
}
else if ( id == 2 )
{
myEdge = aSelectedObject;
GroupOnCurve->LineEdit1->setText( GEOMBase::GetName( aSelectedObject ) );
}
if ( id == 0 )
{
// get CORBA reference to data object
TopoDS_Shape aShape = myGeometryGUI->GetShapeReader().GetShape( myGeometryGUI->GetGeomGen(), aSelectedObject );
if ( !aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX )
{
gp_Pnt aPnt = BRep_Tool::Pnt( TopoDS::Vertex( aShape ) );
GroupXYZ->SpinBox_DX->SetValue( aPnt.X() );
GroupXYZ->SpinBox_DY->SetValue( aPnt.Y() );
GroupXYZ->SpinBox_DZ->SetValue( aPnt.Z() );
}
}
else if ( id == 1 )
{
myRefPoint = aSelectedObject;
GroupRefPoint->LineEdit1->setText( GEOMBase::GetName( aSelectedObject ) );
}
else if ( id == 2 )
{
myEdge = aSelectedObject;
GroupOnCurve->LineEdit1->setText( GEOMBase::GetName( aSelectedObject ) );
}
}
}
}
displayPreview();
}
@ -370,10 +371,10 @@ void BasicGUI_PointDlg::LineEditReturnPressed()
{
QLineEdit* send = (QLineEdit*)sender();
if ( send == GroupRefPoint->LineEdit1 || send == GroupOnCurve->LineEdit1 )
{
myEditCurrentArgument = send;
GEOMBase_Skeleton::LineEditReturnPressed();
}
{
myEditCurrentArgument = send;
GEOMBase_Skeleton::LineEditReturnPressed();
}
}
@ -396,7 +397,7 @@ void BasicGUI_PointDlg::SetEditCurrentArgument()
{
GroupOnCurve->LineEdit1->setFocus();
myEditCurrentArgument = GroupOnCurve->LineEdit1;
globalSelection( GEOM_EDGE );
}
}
@ -420,7 +421,7 @@ void BasicGUI_PointDlg::enterEvent(QEvent* e)
void BasicGUI_PointDlg::ActivateThisDialog( )
{
GEOMBase_Skeleton::ActivateThisDialog();
myGeomGUI->SetState( 0 );
// myGeometryGUI->SetState( 0 );
ConstructorsClicked( getConstructorId() );
}
@ -431,7 +432,7 @@ void BasicGUI_PointDlg::ActivateThisDialog( )
//=================================================================================
void BasicGUI_PointDlg::DeactivateActiveDialog()
{
myGeomGUI->SetState( -1 );
// myGeometryGUI->SetState( -1 );
GEOMBase_Skeleton::DeactivateActiveDialog();
}
@ -476,7 +477,7 @@ void BasicGUI_PointDlg::OnPointSelected( const gp_Pnt& thePnt )
//=================================================================================
GEOM::GEOM_IOperations_ptr BasicGUI_PointDlg::createOperation()
{
return getGeomEngine()->GetIBasicOperations( getStudyId() );
return myGeometryGUI->GetGeomGen()->GetIBasicOperations( getStudyId() );
}
//=================================================================================
@ -485,14 +486,14 @@ GEOM::GEOM_IOperations_ptr BasicGUI_PointDlg::createOperation()
//=================================================================================
bool BasicGUI_PointDlg::isValid( QString& msg )
{
const int id = getConstructorId();
if ( id == 0 )
return true;
else if ( id == 1 )
return !myRefPoint->_is_nil();
else if ( id == 2 )
return !myEdge->_is_nil();
return false;
const int id = getConstructorId();
if ( id == 0 )
return true;
else if ( id == 1 )
return !myRefPoint->_is_nil();
else if ( id == 2 )
return !myEdge->_is_nil();
return false;
}
//=================================================================================
@ -523,8 +524,8 @@ bool BasicGUI_PointDlg::execute( ObjectList& objects )
double dy = GroupRefPoint->SpinBox_DY->GetValue();
double dz = GroupRefPoint->SpinBox_DZ->GetValue();
anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->MakePointWithReference( myRefPoint, dx, dy, dz );
res = true;
anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->MakePointWithReference( myRefPoint, dx, dy, dz );
res = true;
break;
}
case 2 :
@ -534,26 +535,26 @@ bool BasicGUI_PointDlg::execute( ObjectList& objects )
}
if ( getConstructorId() == 1 || getConstructorId() == 2 )
{
TopoDS_Shape aShape;
if ( GEOMBase::GetShape( anObj, aShape ) && !aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX )
{
gp_Pnt aPnt = BRep_Tool::Pnt( TopoDS::Vertex( aShape ) );
myX->setText( QString( "%1" ).arg( aPnt.X() ) );
myY->setText( QString( "%1" ).arg( aPnt.Y() ) );
myZ->setText( QString( "%1" ).arg( aPnt.Z() ) );
TopoDS_Shape aShape;
if ( GEOMBase::GetShape( anObj, aShape ) && !aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX )
{
gp_Pnt aPnt = BRep_Tool::Pnt( TopoDS::Vertex( aShape ) );
myX->setText( QString( "%1" ).arg( aPnt.X() ) );
myY->setText( QString( "%1" ).arg( aPnt.Y() ) );
myZ->setText( QString( "%1" ).arg( aPnt.Z() ) );
}
else
{
myX->setText( "" );
myY->setText( "" );
myZ->setText( "" );
}
}
else
{
myX->setText( "" );
myY->setText( "" );
myZ->setText( "" );
}
}
if ( !anObj->_is_nil() )
objects.push_back( anObj._retn() );
return res;
}
@ -563,6 +564,6 @@ bool BasicGUI_PointDlg::execute( ObjectList& objects )
//=================================================================================
void BasicGUI_PointDlg::closeEvent( QCloseEvent* e )
{
myGeomGUI->SetState( -1 );
// myGeometryGUI->SetState( -1 );
GEOMBase_Skeleton::closeEvent( e );
}

4
src/BasicGUI/BasicGUI_PointDlg.h
View File

@ -46,7 +46,7 @@ class BasicGUI_PointDlg : public GEOMBase_Skeleton
Q_OBJECT
public:
BasicGUI_PointDlg(QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0);
BasicGUI_PointDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
~BasicGUI_PointDlg();
@ -66,6 +66,8 @@ private :
void enterEvent(QEvent* e);
double getParameter() const;
GeometryGUI* myGeometryGUI;
GEOM::GEOM_Object_var myEdge;
GEOM::GEOM_Object_var myRefPoint;

55
src/BasicGUI/BasicGUI_VectorDlg.cxx
View File

@ -29,8 +29,12 @@
using namespace std;
#include "BasicGUI_VectorDlg.h"
#include "QAD_Desktop.h"
#include "QAD_Config.h"
#include "SUIT_Desktop.h"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h"
#include <qlabel.h>
#include "GEOMImpl_Types.hxx"
@ -43,15 +47,15 @@ using namespace std;
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BasicGUI_VectorDlg::BasicGUI_VectorDlg(QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, Sel, modal, fl )
BasicGUI_VectorDlg::BasicGUI_VectorDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, modal, fl ), myGeometryGUI(theGeometryGUI)
{
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_VECTOR_2P")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_VECTOR_DXYZ")));
QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_VECTOR_2P")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_VECTOR_DXYZ")));
QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
setCaption(tr("GEOM_VECTOR_TITLE"));
/***************************************************************/
GroupConstructors->setTitle(tr("GEOM_VECTOR"));
RadioButton1->setPixmap(image0);
@ -106,9 +110,9 @@ void BasicGUI_VectorDlg::Init()
myPoint2 = GEOM::GEOM_Object::_nil();
/* Get setting of step value from file configuration */
QString St = QAD_CONFIG->getSetting("Geometry:SettingsGeomStep");
double step = St.toDouble();
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
/* min, max, step and decimals for spin boxes */
GroupDimensions->SpinBox_DX->RangeStepAndValidator(-999.999, 999.999, step, 3);
GroupDimensions->SpinBox_DY->RangeStepAndValidator(-999.999, 999.999, step, 3);
@ -123,8 +127,8 @@ void BasicGUI_VectorDlg::Init()
/* signals and slots connections */
connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel()));
connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
@ -140,13 +144,14 @@ void BasicGUI_VectorDlg::Init()
connect(GroupDimensions->SpinBox_DY, 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(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY, SLOT(SetStep(double)));
connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DZ, SLOT(SetStep(double)));
connect(GroupDimensions->CheckBox1, SIGNAL(stateChanged(int)), this, SLOT(ReverseVector(int)));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
initName( tr("GEOM_VECTOR") );
@ -161,7 +166,7 @@ void BasicGUI_VectorDlg::Init()
//=================================================================================
void BasicGUI_VectorDlg::ConstructorsClicked( int constructorId )
{
disconnect(mySelection, 0, this, 0);
disconnect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 0, this, 0);
myPoint1 = GEOM::GEOM_Object::_nil();
myPoint2 = GEOM::GEOM_Object::_nil();
@ -178,7 +183,8 @@ void BasicGUI_VectorDlg::ConstructorsClicked( int constructorId )
GroupPoints->LineEdit2->setText("");
globalSelection( GEOM_POINT );
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
break;
}
case 1:
@ -246,7 +252,7 @@ void BasicGUI_VectorDlg::SelectionIntoArgument()
{
myEditCurrentArgument->setText("");
if ( mySelection->IObjectCount() != 1 )
if ( IObjectCount() != 1 )
{
if ( myEditCurrentArgument == GroupPoints->LineEdit1 )
myPoint1 = GEOM::GEOM_Object::_nil();
@ -257,7 +263,7 @@ void BasicGUI_VectorDlg::SelectionIntoArgument()
// nbSel == 1
Standard_Boolean aRes = Standard_False;
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( mySelection->firstIObject(), aRes );
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), aRes );
if ( !CORBA::is_nil( aSelectedObject ) && aRes )
{
myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
@ -304,7 +310,8 @@ void BasicGUI_VectorDlg::LineEditReturnPressed()
void BasicGUI_VectorDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
ConstructorsClicked( getConstructorId() );
}
@ -315,7 +322,7 @@ void BasicGUI_VectorDlg::ActivateThisDialog()
//=================================================================================
void BasicGUI_VectorDlg::DeactivateActiveDialog()
{
myGeomGUI->SetState( -1 );
// myGeometryGUI->SetState( -1 );
GEOMBase_Skeleton::DeactivateActiveDialog();
}
@ -361,7 +368,7 @@ void BasicGUI_VectorDlg::ReverseVector(int state)
//=================================================================================
GEOM::GEOM_IOperations_ptr BasicGUI_VectorDlg::createOperation()
{
return getGeomEngine()->GetIBasicOperations( getStudyId() );
return myGeometryGUI->GetGeomGen()->GetIBasicOperations( getStudyId() );
}
//=================================================================================

6
src/BasicGUI/BasicGUI_VectorDlg.h
View File

@ -34,7 +34,7 @@
#include "DlgRef_3Spin1Check.h"
#include "BasicGUI.h"
#include "GEOM_ShapeTypeFilter.hxx"
//#include "GEOM_ShapeTypeFilter.hxx"
//=================================================================================
// class : BasicGUI_VectorDlg
@ -45,7 +45,7 @@ class BasicGUI_VectorDlg : public GEOMBase_Skeleton
Q_OBJECT
public:
BasicGUI_VectorDlg(QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0);
BasicGUI_VectorDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
~BasicGUI_VectorDlg();
protected:
@ -58,6 +58,8 @@ private :
void Init();
void enterEvent(QEvent* e);
GeometryGUI* myGeometryGUI;
GEOM::GEOM_Object_var myPoint1;
GEOM::GEOM_Object_var myPoint2;

68
src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
View File

@ -30,11 +30,10 @@ using namespace std;
#include "GEOMBase.h"
#include "OCCViewer_Viewer3d.h"
#include "OCCViewer_ViewPort3d.h"
#include "QAD_StudyFrame.h"
#include "QAD_RightFrame.h"
#include "QAD_Desktop.h"
#include "SUIT_Desktop.h"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h"
#include <Geom_Surface.hxx>
#include <Geom_Plane.hxx>
@ -52,6 +51,7 @@ using namespace std;
#include "GEOMImpl_Types.hxx"
#include <qcheckbox.h>
#include <qlabel.h>
//=================================================================================
// class : BasicGUI_WorkingPlaneDlg()
@ -60,13 +60,13 @@ using namespace std;
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BasicGUI_WorkingPlaneDlg::BasicGUI_WorkingPlaneDlg(QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, Sel, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
BasicGUI_WorkingPlaneDlg::BasicGUI_WorkingPlaneDlg(GeometryGUI* theGeometryGUI , QWidget* parent, const char* name, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI)
{
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_WPLANE_FACE")));
QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_WPLANE_VECTOR")));
QPixmap image3(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_WPLANE_ORIGIN")));
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_WPLANE_FACE")));
QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_WPLANE_VECTOR")));
QPixmap image3(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_WPLANE_ORIGIN")));
setCaption(tr("GEOM_WPLANE_TITLE"));
@ -121,9 +121,9 @@ void BasicGUI_WorkingPlaneDlg::Init()
{
/* init variables */
myEditCurrentArgument = Group1->LineEdit1;
myWPlane = GeometryGUI::GetGeomGUI()->GetWorkingPlane();
myWPlane = myGeometryGUI->GetWorkingPlane();
myGeomGUI->SetState( 0 );
// myGeometryGUI->SetState( 0 );
myFace = GEOM::GEOM_Object::_nil();
myVectX = GEOM::GEOM_Object::_nil();
@ -136,8 +136,8 @@ void BasicGUI_WorkingPlaneDlg::Init()
/* signals and slots connections */
connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel()));
connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
connect(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int)));
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
@ -153,7 +153,8 @@ void BasicGUI_WorkingPlaneDlg::Init()
connect(Group3->GroupBox1, SIGNAL(clicked(int)), this, SLOT(GroupClicked(int)));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
initName( tr( "GEOM_WPLANE" ) );
ConstructorsClicked(0);
@ -165,8 +166,8 @@ void BasicGUI_WorkingPlaneDlg::Init()
//=================================================================================
void BasicGUI_WorkingPlaneDlg::ConstructorsClicked(int constructorId)
{
disconnect(mySelection, 0, this, 0);
myGeomGUI->SetState( 0 );
disconnect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 0, this, 0);
// myGeometryGUI->SetState( 0 );
switch (constructorId)
{
@ -183,7 +184,8 @@ void BasicGUI_WorkingPlaneDlg::ConstructorsClicked(int constructorId)
Group1->LineEdit1->setText("");
myFace = GEOM::GEOM_Object::_nil();
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
break;
}
case 1:
@ -201,7 +203,8 @@ void BasicGUI_WorkingPlaneDlg::ConstructorsClicked(int constructorId)
myVectX = GEOM::GEOM_Object::_nil();
myVectZ = GEOM::GEOM_Object::_nil();
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
break;
}
case 2:
@ -245,7 +248,7 @@ void BasicGUI_WorkingPlaneDlg::ClickOnOk()
bool BasicGUI_WorkingPlaneDlg::ClickOnApply()
{
buttonApply->setFocus();
QAD_Application::getDesktop()->putInfo(tr(""));
myGeometryGUI->application()->putInfo(tr(""));
const int id = getConstructorId();
if (id == 0) {
@ -258,8 +261,8 @@ bool BasicGUI_WorkingPlaneDlg::ClickOnApply()
gp_Pln aPln = aGPlane->Pln();
myWPlane = aPln.Position();
GeometryGUI::GetGeomGUI()->SetWorkingPlane(myWPlane);
GeometryGUI::GetGeomGUI()->ActiveWorkingPlane();
myGeometryGUI->SetWorkingPlane(myWPlane);
myGeometryGUI->ActiveWorkingPlane();
return true;
}
}
@ -301,8 +304,8 @@ bool BasicGUI_WorkingPlaneDlg::ClickOnApply()
myWPlane = gp_Ax3(BRep_Tool::Pnt(V1), aDirZ, aDirX);
GeometryGUI::GetGeomGUI()->SetWorkingPlane(myWPlane);
GeometryGUI::GetGeomGUI()->ActiveWorkingPlane();
myGeometryGUI->SetWorkingPlane(myWPlane);
myGeometryGUI->ActiveWorkingPlane();
return true;
}
} else if (id == 2) {
@ -324,8 +327,8 @@ bool BasicGUI_WorkingPlaneDlg::ClickOnApply()
myWPlane = gp_Ax3(P1, aDirZ, aDirX);
GeometryGUI::GetGeomGUI()->SetWorkingPlane(myWPlane);
GeometryGUI::GetGeomGUI()->ActiveWorkingPlane();
myGeometryGUI->SetWorkingPlane(myWPlane);
myGeometryGUI->ActiveWorkingPlane();
return true;
}
return false;
@ -340,7 +343,7 @@ void BasicGUI_WorkingPlaneDlg::SelectionIntoArgument()
myEditCurrentArgument->setText("");
const int id = getConstructorId();
if ( mySelection->IObjectCount() != 1 ) {
if ( IObjectCount() != 1 ) {
if(id == 0)
myFace = GEOM::GEOM_Object::_nil();
else if(id == 1) {
@ -354,7 +357,7 @@ void BasicGUI_WorkingPlaneDlg::SelectionIntoArgument()
// nbSel == 1
Standard_Boolean aRes = Standard_False;
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(mySelection->firstIObject(), aRes);
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), aRes);
if(!aRes || CORBA::is_nil( aSelectedObject ))
return;
@ -417,7 +420,8 @@ void BasicGUI_WorkingPlaneDlg::LineEditReturnPressed()
void BasicGUI_WorkingPlaneDlg::ActivateThisDialog( )
{
GEOMBase_Skeleton::ActivateThisDialog();
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
ConstructorsClicked( getConstructorId() );
}
@ -429,7 +433,7 @@ void BasicGUI_WorkingPlaneDlg::ActivateThisDialog( )
//=================================================================================
void BasicGUI_WorkingPlaneDlg::DeactivateActiveDialog()
{
myGeomGUI->SetState( -1 );
// myGeometryGUI->SetState( -1 );
GEOMBase_Skeleton::DeactivateActiveDialog();
}
@ -458,6 +462,6 @@ void BasicGUI_WorkingPlaneDlg::enterEvent(QEvent* e)
//=================================================================================
void BasicGUI_WorkingPlaneDlg::closeEvent( QCloseEvent* e )
{
myGeomGUI->SetState( -1 );
// myGeometryGUI->SetState( -1 );
GEOMBase_Skeleton::closeEvent( e );
}

4
src/BasicGUI/BasicGUI_WorkingPlaneDlg.h
View File

@ -43,7 +43,7 @@ class BasicGUI_WorkingPlaneDlg : public GEOMBase_Skeleton
Q_OBJECT
public:
BasicGUI_WorkingPlaneDlg( QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0 );
BasicGUI_WorkingPlaneDlg( GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~BasicGUI_WorkingPlaneDlg();
virtual void closeEvent( QCloseEvent* e );
@ -52,6 +52,8 @@ private:
void Init();
void enterEvent(QEvent* e);
GeometryGUI* myGeometryGUI;
GEOM::GEOM_Object_var myFace;
GEOM::GEOM_Object_var myVectX;
GEOM::GEOM_Object_var myVectZ;

8
src/BasicGUI/Makefile.in
View File

@ -64,15 +64,15 @@ LIB_MOC = \
BasicGUI_CurveDlg.h \
BasicGUI_MarkerDlg.h
LIB_CLIENT_IDL = SALOME_GenericObj.idl
LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Exception.idl SALOME_Component.idl
LIB_SERVER_IDL =
# additionnal information to compil and link file
CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome
CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome
LDFLAGS += -lGEOMFiltersSelection -lGEOMBase -lGEOMGUI
LDFLAGS += -lGEOMFiltersSelection -lGEOMBase -lGEOM
@CONCLUDE@

48
src/BlocksGUI/BlocksGUI.cxx
View File

@ -34,10 +34,11 @@
#include "BlocksGUI_ExplodeDlg.h"
#include "BlocksGUI_PropagateDlg.h"
#include "SALOMEGUI_QtCatchCorbaException.hxx"
#include "GeometryGUI.h"
#include "QAD_Desktop.h"
#include "QAD_MessageBox.h"
#include "SUIT_Desktop.h"
#include "SUIT_MessageBox.h"
#include "SUIT_Session.h"
BlocksGUI* BlocksGUI::myGUIObject = 0;
@ -45,10 +46,10 @@ BlocksGUI* BlocksGUI::myGUIObject = 0;
// function : GetBlocksGUI()
// purpose : Get the only BlocksGUI object [ static ]
//=======================================================================
BlocksGUI* BlocksGUI::GetBlocksGUI()
BlocksGUI* BlocksGUI::GetBlocksGUI( GeometryGUI* parent )
{
if ( myGUIObject == 0 )
myGUIObject = new BlocksGUI();
myGUIObject = new BlocksGUI( parent );
return myGUIObject;
}
@ -57,8 +58,8 @@ BlocksGUI* BlocksGUI::GetBlocksGUI()
// function : BlocksGUI()
// purpose : Constructor
//=======================================================================
BlocksGUI::BlocksGUI()
: GEOMGUI()
BlocksGUI::BlocksGUI( GeometryGUI* parent )
: GEOMGUI( parent )
{
}
@ -74,46 +75,43 @@ BlocksGUI::~BlocksGUI()
// function : OnGUIEvent()
// purpose :
//=======================================================================
bool BlocksGUI::OnGUIEvent( int theCommandID, QAD_Desktop* parent )
bool BlocksGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
{
GeometryGUI::GetGeomGUI()->EmitSignalDeactivateDialog();
SALOME_Selection* Sel = SALOME_Selection::Selection
(QAD_Application::getDesktop()->getActiveStudy()->getSelection());
getGeometryGUI()->EmitSignalDeactivateDialog();
QDialog* aDlg = NULL;
switch (theCommandID)
{
case 9999:
aDlg = new BlocksGUI_BlockDlg (parent, Sel);
aDlg = new BlocksGUI_BlockDlg (parent);
break;
case 9998:
aDlg = new BlocksGUI_TrsfDlg (parent, Sel);
aDlg = new BlocksGUI_TrsfDlg (parent);
break;
case 9997:
aDlg = new BlocksGUI_QuadFaceDlg (parent, Sel);
aDlg = new BlocksGUI_QuadFaceDlg (parent);
break;
case 9996:
// aDlg = new BlocksGUI_CheckMultiBlockDlg (parent, Sel);
QAD_MessageBox::warn1 (parent,
QObject::tr("WRN_WARNING"),
QObject::tr("WRN_NOT_IMPLEMENTED"),
QObject::tr("BUT_OK"));
SUIT_MessageBox::warn1 (parent,
QObject::tr("WRN_WARNING"),
QObject::tr("WRN_NOT_IMPLEMENTED"),
QObject::tr("BUT_OK"));
break;
case 9995:
aDlg = new BlocksGUI_ExplodeDlg (parent, Sel);
aDlg = new BlocksGUI_ExplodeDlg (parent);
break;
case 99991:
aDlg = new BlocksGUI_PropagateDlg (parent, "", Sel);
aDlg = new BlocksGUI_PropagateDlg (parent, "");
break;
default:
parent->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
SUIT_Session::session()->activeApplication()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
break;
}
@ -128,8 +126,8 @@ bool BlocksGUI::OnGUIEvent( int theCommandID, QAD_Desktop* parent )
//=====================================================================================
extern "C"
{
GEOMGUI* GetLibGUI()
GEOMGUI* GetLibGUI( GeometryGUI* parent )
{
return BlocksGUI::GetBlocksGUI();
return BlocksGUI::GetBlocksGUI( parent );
}
}

6
src/BlocksGUI/BlocksGUI.h
View File

@ -37,15 +37,15 @@
class BlocksGUI : public GEOMGUI
{
protected:
BlocksGUI(); // hide constructor to avoid direct creation
BlocksGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation
public:
~BlocksGUI();
// Get the only BuildGUI object
static BlocksGUI* GetBlocksGUI();
static BlocksGUI* GetBlocksGUI( GeometryGUI* parent );
bool OnGUIEvent (int theCommandID, QAD_Desktop* parent);
bool OnGUIEvent (int theCommandID, SUIT_Desktop* parent);
private:
static BlocksGUI* myGUIObject; // the only BlocksGUI object

28
src/BlocksGUI/BlocksGUI_BlockDlg.cxx
View File

@ -27,25 +27,28 @@
#include "BlocksGUI_BlockDlg.h"
#include "QAD_Desktop.h"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h"
#include "GEOMImpl_Types.hxx"
using namespace std;
#include <qlabel.h>
//=================================================================================
// class : BlocksGUI_BlockDlg()
// purpose : Constructs a BlocksGUI_BlockDlg which is a child of 'parent'.
//=================================================================================
BlocksGUI_BlockDlg::BlocksGUI_BlockDlg (QWidget* parent,
SALOME_Selection* Sel,
bool modal)
: GEOMBase_Skeleton(parent, "BlockDlg", Sel, modal,
: GEOMBase_Skeleton(parent, "BlockDlg", modal,
WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
{
QPixmap image0 (QAD_Desktop::getResourceManager()->loadPixmap("GEOM", tr("ICON_DLG_BLOCK_2F")));
QPixmap image1 (QAD_Desktop::getResourceManager()->loadPixmap("GEOM", tr("ICON_DLG_BLOCK_6F")));
QPixmap imageS (QAD_Desktop::getResourceManager()->loadPixmap("GEOM", tr("ICON_SELECT")));
QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BLOCK_2F")));
QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BLOCK_6F")));
QPixmap imageS (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
setCaption(tr("GEOM_BLOCK_TITLE"));
@ -129,7 +132,8 @@ void BlocksGUI_BlockDlg::Init()
connect(Group6F->PushButton5, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(Group6F->PushButton6, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
// init controls and fields
initName(tr("GEOM_BLOCK"));
@ -182,7 +186,8 @@ void BlocksGUI_BlockDlg::ConstructorsClicked (int constructorId)
globalSelection(GEOM_FACE);
SelectionIntoArgument();
// connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
}
//=================================================================================
@ -217,7 +222,7 @@ void BlocksGUI_BlockDlg::SelectionIntoArgument()
erasePreview();
myEditCurrentArgument->setText("");
if (mySelection->IObjectCount() != 1)
if (IObjectCount() != 1)
{
if (myEditCurrentArgument == Group2F->LineEdit1 ||
myEditCurrentArgument == Group6F->LineEdit1)
@ -239,7 +244,7 @@ void BlocksGUI_BlockDlg::SelectionIntoArgument()
// nbSel == 1
Standard_Boolean testResult = Standard_False;
GEOM::GEOM_Object_var aSelectedObject =
GEOMBase::ConvertIOinGEOMObject( mySelection->firstIObject(), testResult );
GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult );
if (!testResult || CORBA::is_nil( aSelectedObject ))
return;
@ -304,7 +309,8 @@ void BlocksGUI_BlockDlg::SetEditCurrentArgument()
void BlocksGUI_BlockDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
globalSelection(GEOM_FACE);

1
src/BlocksGUI/BlocksGUI_BlockDlg.h
View File

@ -43,7 +43,6 @@ class BlocksGUI_BlockDlg : public GEOMBase_Skeleton
public:
BlocksGUI_BlockDlg (QWidget* parent,
SALOME_Selection* Sel,
bool modal = FALSE);
~BlocksGUI_BlockDlg();

44
src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
View File

@ -31,7 +31,10 @@
#include "GEOM_Displayer.h"
#include "QAD_Desktop.h"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h"
#include "OCCViewer_ViewModel.h"
#include "SALOME_ListIteratorOfListIO.hxx"
#include "utilities.h"
@ -41,19 +44,19 @@
#include <qmessagebox.h>
#include <qtextedit.h>
#include <qcheckbox.h>
#include <qlabel.h>
//=================================================================================
// class : BlocksGUI_ExplodeDlg()
// purpose : Constructs a BlocksGUI_ExplodeDlg which is a child of 'parent'.
//=================================================================================
BlocksGUI_ExplodeDlg::BlocksGUI_ExplodeDlg (QWidget* parent,
SALOME_Selection* Sel,
bool modal)
: GEOMBase_Skeleton(parent, "ExplodeDlg", Sel, modal,
: GEOMBase_Skeleton(parent, "ExplodeDlg", modal,
WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
{
QPixmap image1 (QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_BLOCK_EXPLODE")));
QPixmap imageS (QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BLOCK_EXPLODE")));
QPixmap imageS (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
setCaption(tr("GEOM_BLOCK_EXPLODE_TITLE"));
@ -129,7 +132,8 @@ void BlocksGUI_ExplodeDlg::Init()
mySpinBoxMin->RangeStepAndValidator(0.0, 999.0, SpecificStep, 3);
mySpinBoxMax->RangeStepAndValidator(0.0, 999.0, SpecificStep, 3);
if (QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() != VIEW_OCC)
if (SUIT_Session::session()->activeApplication()->desktop()->activeWindow()->getViewManager()->getType()
!= OCCViewer_Viewer::Type())
myCheckBtn->setEnabled(false);
// signals and slots connections
@ -143,7 +147,8 @@ void BlocksGUI_ExplodeDlg::Init()
connect(myCheckBtn, SIGNAL(stateChanged(int)), this, SLOT(SubShapeToggled()));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
myConstructorId = -1;
ConstructorsClicked(0);
@ -194,7 +199,7 @@ void BlocksGUI_ExplodeDlg::ClickOnOk()
//=================================================================================
bool BlocksGUI_ExplodeDlg::ClickOnApply()
{
QAD_Application::getDesktop()->putInfo(tr(""));
SUIT_Session::session()->activeApplication()->putInfo(tr(""));
// Explode all sub shapes
if (isAllSubShapes()) {
@ -230,10 +235,10 @@ void BlocksGUI_ExplodeDlg::SelectionIntoArgument()
myObject = GEOM::GEOM_Object::_nil();
mySelName->setText("");
if (mySelection->IObjectCount() == 1) {
if (IObjectCount() == 1) {
Standard_Boolean aResult = Standard_False;
GEOM::GEOM_Object_var anObj =
GEOMBase::ConvertIOinGEOMObject(mySelection->firstIObject(), aResult);
GEOMBase::ConvertIOinGEOMObject(firstIObject(), aResult);
if ( aResult && !anObj->_is_nil() && GEOMBase::IsShape( anObj ) ) {
myObject = anObj;
@ -268,7 +273,8 @@ void BlocksGUI_ExplodeDlg::SetEditCurrentArgument()
void BlocksGUI_ExplodeDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
activateSelection();
}
@ -315,12 +321,14 @@ void BlocksGUI_ExplodeDlg::activateSelection()
erasePreview(true);
if (isAllSubShapes()) { // Sub-shapes selection disabled
disconnect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
disconnect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
globalSelection( GEOM_ALLSHAPES );
if (myObject->_is_nil()) {
SelectionIntoArgument();
}
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
} else {
displayPreview(true, true, false);
globalSelection(GEOM_PREVIEW);
@ -333,8 +341,8 @@ void BlocksGUI_ExplodeDlg::activateSelection()
//=================================================================================
void BlocksGUI_ExplodeDlg::updateButtonState()
{
if (QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() != VIEW_OCC ||
myObject->_is_nil()) {
if (SUIT_Session::session()->activeApplication()->desktop()->activeWindow()->getViewManager()->getType()
!= OCCViewer_Viewer::Type() || myObject->_is_nil()) {
myCheckBtn->setChecked(FALSE);
myCheckBtn->setEnabled(FALSE);
} else {
@ -387,7 +395,7 @@ bool BlocksGUI_ExplodeDlg::isValid (QString&)
if (IsPreview())
return !myObject->_is_nil();
else
return !myObject->_is_nil() && (isAllSubShapes() || mySelection->IObjectCount());
return !myObject->_is_nil() && (isAllSubShapes() || IObjectCount());
default:
return false;
}
@ -434,7 +442,7 @@ bool BlocksGUI_ExplodeDlg::execute (ObjectList& objects)
QMap<QString, char> selected;
// Get names of selected objects
SALOME_ListIteratorOfListIO it (mySelection->StoredIObjects());
SALOME_ListIteratorOfListIO it (selectedIO());
for (; it.More(); it.Next()) {
selected.insert(it.Value()->getName(), 0);
}
@ -443,7 +451,7 @@ bool BlocksGUI_ExplodeDlg::execute (ObjectList& objects)
ObjectList toRemoveFromEnggine;
ObjectList::iterator anIter;
for (anIter = myTmpObjs.begin(); anIter != myTmpObjs.end(); ++anIter) {
if (selected.contains(GeometryGUI::GetORB()->object_to_string(*anIter)))
if (selected.contains(myGeomGUI->getApp()->orb()->object_to_string(*anIter)))
objects.push_back(*anIter);
else
toRemoveFromEnggine.push_back(*anIter);

1
src/BlocksGUI/BlocksGUI_ExplodeDlg.h
View File

@ -44,7 +44,6 @@ class BlocksGUI_ExplodeDlg : public GEOMBase_Skeleton
public:
BlocksGUI_ExplodeDlg (QWidget* parent,
SALOME_Selection* Sel,
bool modal = FALSE);
~BlocksGUI_ExplodeDlg();

32
src/BlocksGUI/BlocksGUI_PropagateDlg.cxx
View File

@ -28,10 +28,15 @@
using namespace std;
#include "BlocksGUI_PropagateDlg.h"
#include "QAD_Desktop.h"
#include "GEOMImpl_Types.hxx"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h"
#include <TColStd_MapOfInteger.hxx>
#include <qlabel.h>
//=================================================================================
// class : BlocksGUI_PropagateDlg()
@ -40,11 +45,11 @@ using namespace std;
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BlocksGUI_PropagateDlg::BlocksGUI_PropagateDlg(QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, Sel, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
BlocksGUI_PropagateDlg::BlocksGUI_PropagateDlg(QWidget* parent, const char* name, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
{
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_PROPAGATE")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_PROPAGATE")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
setCaption(tr("GEOM_PROPAGATE_TITLE"));
@ -93,7 +98,7 @@ void BlocksGUI_PropagateDlg::Init()
myObject = GEOM::GEOM_Object::_nil();
ResultName->setText( "" );
myGeomGUI->SetState( 0 );
//myGeomGUI->SetState( 0 );
/* signals and slots connections */
connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel()));
@ -161,8 +166,8 @@ void BlocksGUI_PropagateDlg::SelectionIntoArgument()
mySelName->setText("");
myObject = GEOM::GEOM_Object::_nil();
if ( mySelection->IObjectCount() == 1 ) {
Handle(SALOME_InteractiveObject) anIO = mySelection->firstIObject();
if ( IObjectCount() == 1 ) {
Handle(SALOME_InteractiveObject) anIO = firstIObject();
Standard_Boolean aRes;
myObject = GEOMBase::ConvertIOinGEOMObject( anIO, aRes );
if ( aRes )
@ -203,7 +208,7 @@ void BlocksGUI_PropagateDlg::LineEditReturnPressed()
//=================================================================================
void BlocksGUI_PropagateDlg::DeactivateActiveDialog()
{
myGeomGUI->SetState( -1 );
//myGeomGUI->SetState( -1 );
GEOMBase_Skeleton::DeactivateActiveDialog();
}
@ -219,7 +224,7 @@ void BlocksGUI_PropagateDlg::ActivateThisDialog()
mySelName->setText("");
myObject = GEOM::GEOM_Object::_nil();
myGeomGUI->SetState( 0 );
//myGeomGUI->SetState( 0 );
activateSelection();
}
@ -241,7 +246,7 @@ void BlocksGUI_PropagateDlg::enterEvent(QEvent* e)
//=================================================================================
void BlocksGUI_PropagateDlg::closeEvent(QCloseEvent* e)
{
myGeomGUI->SetState( -1 );
//myGeomGUI->SetState( -1 );
GEOMBase_Skeleton::closeEvent( e );
}
@ -297,7 +302,8 @@ void BlocksGUI_PropagateDlg::activateSelection()
if (myObject->_is_nil()) {
SelectionIntoArgument();
}
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
}
//================================================================

2
src/BlocksGUI/BlocksGUI_PropagateDlg.h
View File

@ -41,7 +41,7 @@ class BlocksGUI_PropagateDlg : public GEOMBase_Skeleton
Q_OBJECT
public:
BlocksGUI_PropagateDlg(QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0);
BlocksGUI_PropagateDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
~BlocksGUI_PropagateDlg();
protected:

30
src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx
View File

@ -26,27 +26,29 @@
// $Header$
#include "BlocksGUI_QuadFaceDlg.h"
#include "QAD_Desktop.h"
#include "GEOMImpl_Types.hxx"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h"
//using namespace std;
#include <qlabel.h>
//=================================================================================
// class : BlocksGUI_QuadFaceDlg()
// purpose : Constructs a BlocksGUI_QuadFaceDlg which is a child of 'parent'.
//=================================================================================
BlocksGUI_QuadFaceDlg::BlocksGUI_QuadFaceDlg (QWidget* parent,
SALOME_Selection* Sel,
bool modal)
: GEOMBase_Skeleton(parent, "QuadFaceDlg", Sel, modal,
: GEOMBase_Skeleton(parent, "QuadFaceDlg", modal,
WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
{
QPixmap image1 (QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_QUAD_FACE_4_VERT")));
QPixmap image2 (QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_QUAD_FACE_2_EDGE")));
QPixmap image3 (QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_QUAD_FACE_4_EDGE")));
QPixmap imageS (QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_QUAD_FACE_4_VERT")));
QPixmap image2 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_QUAD_FACE_2_EDGE")));
QPixmap image3 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_QUAD_FACE_4_EDGE")));
QPixmap imageS (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
setCaption(tr("GEOM_QUAD_FACE_TITLE"));
@ -127,7 +129,8 @@ void BlocksGUI_QuadFaceDlg::Init()
for (anIterBtn = mySelBtn.begin(); anIterBtn != mySelBtn.end(); ++anIterBtn)
connect(anIterBtn.data(), SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
// init controls and fields
initName(tr("GEOM_QUAD_FACE"));
@ -226,8 +229,8 @@ void BlocksGUI_QuadFaceDlg::SelectionIntoArgument()
GEOM::GEOM_Object_var anObj;
Standard_Boolean aResult = Standard_False;
if (mySelection->IObjectCount() == 1) {
anObj = GEOMBase::ConvertIOinGEOMObject(mySelection->firstIObject(), aResult);
if (IObjectCount() == 1) {
anObj = GEOMBase::ConvertIOinGEOMObject(firstIObject(), aResult);
if (aResult) {
if (anObj->_is_nil()) {
aResult = Standard_False;
@ -280,7 +283,8 @@ void BlocksGUI_QuadFaceDlg::SetEditCurrentArgument()
void BlocksGUI_QuadFaceDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
activateSelection();
displayPreview();

1
src/BlocksGUI/BlocksGUI_QuadFaceDlg.h
View File

@ -44,7 +44,6 @@ class BlocksGUI_QuadFaceDlg : public GEOMBase_Skeleton
public:
BlocksGUI_QuadFaceDlg (QWidget* parent,
SALOME_Selection* Sel,
bool modal = FALSE);
~BlocksGUI_QuadFaceDlg();

35
src/BlocksGUI/BlocksGUI_TrsfDlg.cxx
View File

@ -29,23 +29,27 @@
#include "DlgRef_SpinBox.h"
#include "QAD_Desktop.h"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h"
#include "OCCViewer_ViewModel.h"
#include <TColStd_IndexedMapOfInteger.hxx>
#include <qlabel.h>
//=================================================================================
// class : BlocksGUI_TrsfDlg()
// purpose : Constructs a BlocksGUI_TrsfDlg which is a child of 'parent'.
//=================================================================================
BlocksGUI_TrsfDlg::BlocksGUI_TrsfDlg (QWidget* parent,
SALOME_Selection* Sel,
bool modal)
: GEOMBase_Skeleton(parent, "TrsfDlg", Sel, modal,
: GEOMBase_Skeleton(parent, "TrsfDlg", modal,
WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
{
QPixmap image1 (QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_BLOCK_MULTITRSF_SIMPLE")));
QPixmap image2 (QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_BLOCK_MULTITRSF_DOUBLE")));
QPixmap imageS (QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BLOCK_MULTITRSF_SIMPLE")));
QPixmap image2 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BLOCK_MULTITRSF_DOUBLE")));
QPixmap imageS (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
setCaption(tr("GEOM_BLOCK_MULTITRSF_TITLE"));
@ -153,7 +157,8 @@ void BlocksGUI_TrsfDlg::Init()
for (anIterSpin = mySpinBox.begin(); anIterSpin != mySpinBox.end(); ++anIterSpin)
connect(anIterSpin.data(), SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
// init controls and fields
initName(tr("GEOM_BLOCK_MULTITRSF"));
@ -254,10 +259,10 @@ void BlocksGUI_TrsfDlg::SelectionIntoArgument()
// If selection of main object is activated
if (aCurrFocus == MainObj1 || aCurrFocus == MainObj2) {
if (mySelection->IObjectCount() == 1) {
if (IObjectCount() == 1) {
Standard_Boolean aResult = Standard_False;
GEOM::GEOM_Object_var anObj =
GEOMBase::ConvertIOinGEOMObject(mySelection->firstIObject(), aResult);
GEOMBase::ConvertIOinGEOMObject(firstIObject(), aResult);
if (aResult && !anObj->_is_nil() && GEOMBase::IsShape( anObj ) ) {
myShape = anObj;
@ -274,14 +279,14 @@ void BlocksGUI_TrsfDlg::SelectionIntoArgument()
else if (aCurrFocus == Face1 || aCurrFocus == Face2 ||
aCurrFocus == Face1U || aCurrFocus == Face2U ||
aCurrFocus == Face1V || aCurrFocus == Face2V) {
if (mySelection->IObjectCount() == 1) {
if (IObjectCount() == 1) {
Standard_Boolean aResult = Standard_False;
GEOM::GEOM_Object_var anObj =
GEOMBase::ConvertIOinGEOMObject(mySelection->firstIObject(), aResult);
GEOMBase::ConvertIOinGEOMObject(firstIObject(), aResult);
if ( aResult && !anObj->_is_nil() && GEOMBase::IsShape( anObj ) ) {
TColStd_IndexedMapOfInteger anIndexes;
mySelection->GetIndex(mySelection->firstIObject(), anIndexes);
((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr()->GetIndexes( firstIObject(), anIndexes );
if (anIndexes.Extent() == 1) {
int anIndex = anIndexes(1);
@ -325,7 +330,8 @@ void BlocksGUI_TrsfDlg::SetEditCurrentArgument()
void BlocksGUI_TrsfDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
activateSelection();
displayPreview();
@ -391,7 +397,8 @@ void BlocksGUI_TrsfDlg::activateSelection()
myEditCurrentArgument == mySelName[ Face2V ])) {
// Local selection is available only in the OCC Viewer
if ( QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC ) {
if (SUIT_Session::session()->activeApplication()->desktop()->activeWindow()->getViewManager()->getType()
!= OCCViewer_Viewer::Type()) {
localSelection(myShape, TopAbs_FACE);
} else {
return;

1
src/BlocksGUI/BlocksGUI_TrsfDlg.h
View File

@ -45,7 +45,6 @@ class BlocksGUI_TrsfDlg : public GEOMBase_Skeleton
public:
BlocksGUI_TrsfDlg (QWidget* parent,
SALOME_Selection* Sel,
bool modal = FALSE);
~BlocksGUI_TrsfDlg();

6
src/BlocksGUI/Makefile.in
View File

@ -54,14 +54,14 @@ LIB_MOC = \
BlocksGUI_PropagateDlg.h \
BlocksGUI_TrsfDlg.h
LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl
LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl
LIB_SERVER_IDL =
# additionnal information to compil and link file
CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome
CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome
LDFLAGS += -lGEOMFiltersSelection -lGEOMBase

22
src/BooleanGUI/BooleanGUI.cxx
View File

@ -29,21 +29,22 @@
using namespace std;
#include "BooleanGUI.h"
#include "QAD_Desktop.h"
#include "SALOMEGUI_QtCatchCorbaException.hxx"
#include "SUIT_Desktop.h"
#include "BooleanGUI_Dialog.h"
#include "GeometryGUI.h"
BooleanGUI* BooleanGUI::myGUIObject = 0;
//=======================================================================
// function : GetBooleanGUI()
// purpose : Get the only BooleanGUI object [ static ]
//=======================================================================
BooleanGUI* BooleanGUI::GetBooleanGUI()
BooleanGUI* BooleanGUI::GetBooleanGUI( GeometryGUI* parent )
{
if ( myGUIObject == 0 ) {
// init BooleanGUI only once
myGUIObject = new BooleanGUI();
myGUIObject = new BooleanGUI( parent );
}
return myGUIObject;
}
@ -52,7 +53,7 @@ BooleanGUI* BooleanGUI::GetBooleanGUI()
// function : BooleanGUI()
// purpose : Constructor
//=======================================================================
BooleanGUI::BooleanGUI() : GEOMGUI()
BooleanGUI::BooleanGUI( GeometryGUI* parent ) : GEOMGUI( parent )
{
}
@ -70,10 +71,9 @@ BooleanGUI::~BooleanGUI()
// function : OnGUIEvent()
// purpose :
//=======================================================================
bool BooleanGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
bool BooleanGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
{
GeometryGUI::GetGeomGUI()->EmitSignalDeactivateDialog();
SALOME_Selection* Sel = SALOME_Selection::Selection(QAD_Application::getDesktop()->getActiveStudy()->getSelection());
getGeometryGUI()->EmitSignalDeactivateDialog();
int anOperation = 0;
if ( theCommandID == 5011 )
@ -87,7 +87,7 @@ bool BooleanGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
else
return false;
QDialog* aDlg = new BooleanGUI_Dialog( anOperation, parent, "", Sel);
QDialog* aDlg = new BooleanGUI_Dialog( anOperation, parent, "");
aDlg->show();
return true;
@ -98,8 +98,8 @@ bool BooleanGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
//=====================================================================================
extern "C"
{
GEOMGUI* GetLibGUI()
GEOMGUI* GetLibGUI( GeometryGUI* parent )
{
return BooleanGUI::GetBooleanGUI();
return BooleanGUI::GetBooleanGUI( parent );
}
}

6
src/BooleanGUI/BooleanGUI.h
View File

@ -38,7 +38,7 @@
class BooleanGUI : public GEOMGUI
{
protected:
BooleanGUI(); // hide constructor to avoid direct creation
BooleanGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation
public:
enum BooleanOperation { COMMON = 1, CUT = 2, FUSE = 3, SECTION = 4 };
@ -46,9 +46,9 @@ public:
~BooleanGUI();
// Get the only BooleanGUI object
static BooleanGUI* GetBooleanGUI();
static BooleanGUI* GetBooleanGUI( GeometryGUI* parent );
bool OnGUIEvent(int theCommandID, QAD_Desktop* parent);
bool OnGUIEvent(int theCommandID, SUIT_Desktop* parent);
private:
static BooleanGUI* myGUIObject; // the only BooleanGUI object

30
src/BooleanGUI/BooleanGUI_Dialog.cxx
View File

@ -31,7 +31,11 @@ using namespace std;
#include "BooleanGUI.h"
#include "DlgRef_2Sel_QTD.h"
#include "QAD_Desktop.h"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h"
#include <qlabel.h>
//=================================================================================
// class : BooleanGUI_Dialog()
@ -40,8 +44,8 @@ using namespace std;
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BooleanGUI_Dialog::BooleanGUI_Dialog( const int theOperation, QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, Sel, modal, fl),
BooleanGUI_Dialog::BooleanGUI_Dialog( const int theOperation, QWidget* parent, const char* name, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, modal, fl),
myOperation( theOperation )
{
QPixmap image0;
@ -49,27 +53,27 @@ BooleanGUI_Dialog::BooleanGUI_Dialog( const int theOperation, QWidget* parent, c
switch ( myOperation )
{
case BooleanGUI::COMMON:
image0 = QPixmap( QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_COMMON")));
image0 = QPixmap( SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_COMMON")));
aTitle = tr("GEOM_COMMON");
aCaption = tr("GEOM_COMMON_TITLE");
break;
case BooleanGUI::CUT:
image0 = QPixmap( QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_CUT")));
image0 = QPixmap( SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_CUT")));
aTitle = tr("GEOM_CUT");
aCaption = tr("GEOM_CUT_TITLE");
break;
case BooleanGUI::FUSE:
image0 = QPixmap( QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_FUSE")));
image0 = QPixmap( SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_FUSE")));
aTitle = tr("GEOM_FUSE");
aCaption = tr("GEOM_FUSE_TITLE");
break;
case BooleanGUI::SECTION:
image0 = QPixmap( QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_SECTION")));
image0 = QPixmap( SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SECTION")));
aTitle = tr("GEOM_SECTION");
aCaption = tr("GEOM_SECTION_TITLE");
break;
}
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
setCaption( aCaption );
@ -134,7 +138,8 @@ void BooleanGUI_Dialog::Init()
connect(myGroup->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(myGroup->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
initName( GroupConstructors->title() );
@ -175,7 +180,7 @@ void BooleanGUI_Dialog::SelectionIntoArgument()
{
myEditCurrentArgument->setText( "" );
if ( mySelection->IObjectCount() != 1 )
if ( IObjectCount() != 1 )
{
if ( myEditCurrentArgument == myGroup->LineEdit1 ) myObject1 = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == myGroup->LineEdit2 ) myObject2 = GEOM::GEOM_Object::_nil();
@ -184,7 +189,7 @@ void BooleanGUI_Dialog::SelectionIntoArgument()
// nbSel == 1
Standard_Boolean aRes = Standard_False;
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( mySelection->firstIObject(), aRes );
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), aRes );
if ( !CORBA::is_nil( aSelectedObject ) && aRes && GEOMBase::IsShape( aSelectedObject ) )
{
myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
@ -234,7 +239,8 @@ void BooleanGUI_Dialog::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
globalSelection( GEOM_ALLSHAPES );
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
}

2
src/BooleanGUI/BooleanGUI_Dialog.h
View File

@ -42,7 +42,7 @@ class BooleanGUI_Dialog : public GEOMBase_Skeleton
Q_OBJECT
public:
BooleanGUI_Dialog( const int theOperation, QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0);
BooleanGUI_Dialog( const int theOperation, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
~BooleanGUI_Dialog();
protected:

6
src/BooleanGUI/Makefile.in
View File

@ -46,14 +46,14 @@ LIB_SRC = BooleanGUI.cxx \
LIB_MOC = \
BooleanGUI_Dialog.h
LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl
LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl
LIB_SERVER_IDL =
# additionnal information to compil and link file
CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome
CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome
LDFLAGS += -lGEOMBase

41
src/BuildGUI/BuildGUI.cxx
View File

@ -28,8 +28,8 @@
#include "BuildGUI.h"
#include "SALOMEGUI_QtCatchCorbaException.hxx"
#include "QAD_Desktop.h"
#include "SUIT_Desktop.h"
#include "SUIT_Session.h"
#include "BuildGUI_EdgeDlg.h" // Method EDGE
#include "BuildGUI_WireDlg.h" // Method WIRE
@ -38,16 +38,18 @@
#include "BuildGUI_SolidDlg.h" // Method SOLID
#include "BuildGUI_CompoundDlg.h" // Method COMPOUND
#include "GeometryGUI.h"
BuildGUI* BuildGUI::myGUIObject = 0;
//=======================================================================
// function : GetBuildGUI()
// purpose : Get the only BuildGUI object [ static ]
//=======================================================================
BuildGUI* BuildGUI::GetBuildGUI()
BuildGUI* BuildGUI::GetBuildGUI( GeometryGUI* parent )
{
if ( myGUIObject == 0 )
myGUIObject = new BuildGUI();
myGUIObject = new BuildGUI( parent );
return myGUIObject;
}
@ -56,8 +58,8 @@ BuildGUI* BuildGUI::GetBuildGUI()
// function : BuildGUI()
// purpose : Constructor
//=======================================================================
BuildGUI::BuildGUI()
: GEOMGUI()
BuildGUI::BuildGUI( GeometryGUI* parent )
: GEOMGUI( parent )
{
}
@ -75,25 +77,24 @@ BuildGUI::~BuildGUI()
// function : OnGUIEvent()
// purpose :
//=======================================================================
bool BuildGUI::OnGUIEvent( int theCommandID, QAD_Desktop* parent )
bool BuildGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
{
GeometryGUI::GetGeomGUI()->EmitSignalDeactivateDialog();
getGeometryGUI()->EmitSignalDeactivateDialog();
SALOME_Selection* Sel = SALOME_Selection::Selection(
QAD_Application::getDesktop()->getActiveStudy()->getSelection() );
QDialog* aDlg = NULL;
switch ( theCommandID )
{
case 4081: aDlg = new BuildGUI_EdgeDlg ( parent, "", Sel ); break;
case 4082: aDlg = new BuildGUI_WireDlg ( parent, "", Sel ); break;
case 4083: aDlg = new BuildGUI_FaceDlg ( parent, "", Sel ); break;
case 4084: aDlg = new BuildGUI_ShellDlg ( parent, "", Sel ); break;
case 4085: aDlg = new BuildGUI_SolidDlg ( parent, "", Sel ); break;
case 4086: aDlg = new BuildGUI_CompoundDlg( parent, "", Sel ); break;
case 4081: aDlg = new BuildGUI_EdgeDlg ( parent, "" ); break;
case 4082: aDlg = new BuildGUI_WireDlg ( parent, "" ); break;
case 4083: aDlg = new BuildGUI_FaceDlg ( parent, "" ); break;
case 4084: aDlg = new BuildGUI_ShellDlg ( parent, "" ); break;
case 4085: aDlg = new BuildGUI_SolidDlg ( parent, "" ); break;
case 4086: aDlg = new BuildGUI_CompoundDlg( parent, "" ); break;
default: parent->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); break;
default:
SUIT_Session::session()->activeApplication()->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) );
break;
}
if ( aDlg != NULL )
@ -107,8 +108,8 @@ bool BuildGUI::OnGUIEvent( int theCommandID, QAD_Desktop* parent )
//=====================================================================================
extern "C"
{
GEOMGUI* GetLibGUI()
GEOMGUI* GetLibGUI( GeometryGUI* parent )
{
return BuildGUI::GetBuildGUI();
return BuildGUI::GetBuildGUI( parent );
}
}

6
src/BuildGUI/BuildGUI.h
View File

@ -38,15 +38,15 @@
class BuildGUI : public GEOMGUI
{
protected:
BuildGUI(); // hide constructor to avoid direct creation
BuildGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation
public :
~BuildGUI();
// Get the only BuildGUI object
static BuildGUI* GetBuildGUI();
static BuildGUI* GetBuildGUI( GeometryGUI* parent );
bool OnGUIEvent( int theCommandID, QAD_Desktop* parent );
bool OnGUIEvent( int theCommandID, SUIT_Desktop* parent );
private:
static BuildGUI* myGUIObject; // the only BuildGUI object

25
src/BuildGUI/BuildGUI_CompoundDlg.cxx
View File

@ -27,9 +27,14 @@
// $Header$
#include "BuildGUI_CompoundDlg.h"
#include "QAD_Desktop.h"
#include "GEOMImpl_Types.hxx"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h"
#include <qlabel.h>
//=================================================================================
// class : BuildGUI_CompoundDlg()
// purpose : Constructs a BuildGUI_CompoundDlg which is a child of 'parent', with the
@ -37,11 +42,11 @@
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BuildGUI_CompoundDlg::BuildGUI_CompoundDlg(QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, Sel, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
BuildGUI_CompoundDlg::BuildGUI_CompoundDlg(QWidget* parent, const char* name, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
{
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_COMPOUND")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_COMPOUND")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
setCaption(tr("GEOM_COMPOUND_TITLE"));
@ -91,7 +96,8 @@ void BuildGUI_CompoundDlg::Init()
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
connect(GroupShapes->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
globalSelection( GEOM_ALLSHAPES );
@ -134,13 +140,13 @@ void BuildGUI_CompoundDlg::SelectionIntoArgument()
QString aString = ""; /* name of selection */
myOkShapes = false;
int nbSel = GEOMBase::GetNameOfSelectedIObjects( mySelection, aString, true );
int nbSel = GEOMBase::GetNameOfSelectedIObjects( selectedIO(), aString, true );
if ( nbSel == 0 )
return;
if ( nbSel != 1 )
aString = QString( "%1_objects").arg( nbSel );
GEOMBase::ConvertListOfIOInListOfGO( mySelection->StoredIObjects(), myShapes, true );
GEOMBase::ConvertListOfIOInListOfGO( selectedIO(), myShapes, true );
myEditCurrentArgument->setText( aString );
myOkShapes = true;
}
@ -171,7 +177,8 @@ void BuildGUI_CompoundDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
globalSelection( GEOM_ALLSHAPES );
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
}

2
src/BuildGUI/BuildGUI_CompoundDlg.h
View File

@ -41,7 +41,7 @@ class BuildGUI_CompoundDlg : public GEOMBase_Skeleton
Q_OBJECT
public:
BuildGUI_CompoundDlg(QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0);
BuildGUI_CompoundDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
~BuildGUI_CompoundDlg();
protected:

25
src/BuildGUI/BuildGUI_EdgeDlg.cxx
View File

@ -32,9 +32,14 @@
#include <Precision.hxx>
#include "utilities.h"
#include "QAD_Desktop.h"
#include "GEOMImpl_Types.hxx"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h"
#include <qlabel.h>
//=================================================================================
// class : BuildGUI_EdgeDlg()
// purpose : Constructs a BuildGUI_EdgeDlg which is a child of 'parent', with the
@ -42,11 +47,11 @@
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BuildGUI_EdgeDlg::BuildGUI_EdgeDlg(QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, Sel, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
BuildGUI_EdgeDlg::BuildGUI_EdgeDlg(QWidget* parent, const char* name, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
{
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_EDGE")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_EDGE")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
setCaption(tr("GEOM_EDGE_TITLE"));
@ -109,7 +114,8 @@ void BuildGUI_EdgeDlg::Init()
connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
initName( tr( "GEOM_EDGE") );
}
@ -149,7 +155,7 @@ void BuildGUI_EdgeDlg::SelectionIntoArgument()
erasePreview();
myEditCurrentArgument->setText("");
if(mySelection->IObjectCount() != 1) {
if(IObjectCount() != 1) {
if(myEditCurrentArgument == GroupPoints->LineEdit1)
myOkPoint1 = false;
else if(myEditCurrentArgument == GroupPoints->LineEdit2)
@ -159,7 +165,7 @@ void BuildGUI_EdgeDlg::SelectionIntoArgument()
// nbSel == 1
Standard_Boolean testResult = Standard_False;
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(mySelection->firstIObject(), testResult );
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult );
if(!testResult)
return;
@ -225,7 +231,8 @@ void BuildGUI_EdgeDlg::SetEditCurrentArgument()
void BuildGUI_EdgeDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
globalSelection( GEOM_POINT );
displayPreview();
}

2
src/BuildGUI/BuildGUI_EdgeDlg.h
View File

@ -41,7 +41,7 @@ class BuildGUI_EdgeDlg : public GEOMBase_Skeleton
Q_OBJECT
public:
BuildGUI_EdgeDlg(QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0);
BuildGUI_EdgeDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
~BuildGUI_EdgeDlg();
protected:

24
src/BuildGUI/BuildGUI_FaceDlg.cxx
View File

@ -28,11 +28,15 @@
using namespace std;
#include "BuildGUI_FaceDlg.h"
#include "QAD_Desktop.h"
#include "GEOMImpl_Types.hxx"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h"
//Qt includes
#include <qcheckbox.h>
#include <qlabel.h>
//=================================================================================
// class : BuildGUI_FaceDlg()
@ -41,11 +45,11 @@ using namespace std;
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BuildGUI_FaceDlg::BuildGUI_FaceDlg(QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, Sel, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
BuildGUI_FaceDlg::BuildGUI_FaceDlg(QWidget* parent, const char* name, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
{
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_FACE")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_FACE")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
setCaption(tr("GEOM_FACE_TITLE"));
@ -98,7 +102,8 @@ void BuildGUI_FaceDlg::Init()
connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
connect(GroupWire->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
connect(GroupWire->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
initName(tr("GEOM_FACE"));
}
@ -138,7 +143,7 @@ void BuildGUI_FaceDlg::SelectionIntoArgument()
myEditCurrentArgument->setText("");
QString aName;
int aNbSel = GEOMBase::GetNameOfSelectedIObjects(mySelection, aName);
int aNbSel = GEOMBase::GetNameOfSelectedIObjects(selectedIO(), aName);
if(aNbSel < 1)
{
@ -146,7 +151,7 @@ void BuildGUI_FaceDlg::SelectionIntoArgument()
return;
}
GEOMBase::ConvertListOfIOInListOfGO(mySelection->StoredIObjects(), myWires);
GEOMBase::ConvertListOfIOInListOfGO(selectedIO(), myWires);
if (!myWires.length())
return;
if(aNbSel != 1)
@ -183,7 +188,8 @@ void BuildGUI_FaceDlg::SetEditCurrentArgument()
void BuildGUI_FaceDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
globalSelection( GEOM_WIRE );
}

2
src/BuildGUI/BuildGUI_FaceDlg.h
View File

@ -41,7 +41,7 @@ class BuildGUI_FaceDlg : public GEOMBase_Skeleton
Q_OBJECT
public:
BuildGUI_FaceDlg(QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0);
BuildGUI_FaceDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
~BuildGUI_FaceDlg();
protected:

28
src/BuildGUI/BuildGUI_ShellDlg.cxx
View File

@ -27,10 +27,16 @@
// $Header:
#include "BuildGUI_ShellDlg.h"
#include "QAD_Desktop.h"
#include "GEOMImpl_Types.hxx"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h"
#include "TColStd_MapOfInteger.hxx"
#include <qlabel.h>
//=================================================================================
// class : BuildGUI_ShellDlg()
// purpose : Constructs a BuildGUI_ShellDlg which is a child of 'parent', with the
@ -38,11 +44,11 @@
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BuildGUI_ShellDlg::BuildGUI_ShellDlg(QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, Sel, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
BuildGUI_ShellDlg::BuildGUI_ShellDlg(QWidget* parent, const char* name, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
{
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap("GEOM", tr("ICON_DLG_BUILD_SHELL")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM", tr("ICON_SELECT")));
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BUILD_SHELL")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
setCaption(tr("GEOM_SHELL_TITLE"));
@ -99,7 +105,8 @@ void BuildGUI_ShellDlg::Init()
connect(GroupShell->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
initName(tr("GEOM_SHELL"));
}
@ -140,13 +147,13 @@ void BuildGUI_ShellDlg::SelectionIntoArgument()
QString aString;
myOkFacesAndShells = false;
int nbSel = GEOMBase::GetNameOfSelectedIObjects( mySelection, aString, true );
int nbSel = GEOMBase::GetNameOfSelectedIObjects( selectedIO(), aString, true );
if ( nbSel == 0 )
return;
if ( nbSel != 1 )
aString = QString( "%1_objects ").arg( nbSel );
GEOMBase::ConvertListOfIOInListOfGO( mySelection->StoredIObjects(), myFacesAndShells, true );
GEOMBase::ConvertListOfIOInListOfGO( selectedIO(), myFacesAndShells, true );
if ( !myFacesAndShells.length() )
return;
@ -183,7 +190,8 @@ void BuildGUI_ShellDlg::SetEditCurrentArgument()
void BuildGUI_ShellDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
TColStd_MapOfInteger aMap;
aMap.Add(GEOM_SHELL);
aMap.Add(GEOM_FACE);

Some files were not shown because too many files have changed in this diff Show More