ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-27 09:00:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge with PAL & integrate MakeFaces

Browse Source
This commit is contained in:
dcq 2004-04-07 09:34:56 +00:00
parent 0adc8f5b4c
commit c90c084d61
18 changed files with 414 additions and 94 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 1.4.0 of GEOM This is the version 1.4.1 of GEOM
Compatible with : Compatible with :
- KERNEL 1.4.0 - KERNEL 1.4.1

9
Makefile.in
View File

@ -14,11 +14,12 @@ VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl
@COMMENCE@ @COMMENCE@
SUBDIRS = idl src SUBDIRS = idl src doc
RESOURCES_FILES = \ RESOURCES_FILES = \
GEOM_en.xml \ GEOM_en.xml \
GEOM_fr.xml \ GEOM_fr.xml \
GEOM.config \
GEOMCatalog.xml \ GEOMCatalog.xml \
GEOMDS_Resources \ GEOMDS_Resources \
arc.png \ arc.png \
@ -144,10 +145,10 @@ include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref
# test if SALOMEconfig.h has changed (contents) # test if SALOMEconfig.h has changed (contents)
salome_adm/unix/SALOMEconfig.ref: salome_adm/unix/SALOMEconfig.h salome_adm/unix/SALOMEconfig.ref: salome_adm/unix/SALOMEconfig.h
@if ! [ -a $@ ]; then \ @if ! [ -a $@ ]; then \
cp -p $< $@; \ cp -p -f $< $@; \
fi; \ fi; \
if ! cmp $< $@; then \ if ! cmp $< $@; then \
cp -p $< $@; \ cp -p -f $< $@; \
fi; \ fi; \
include/salome/sstream: salome_adm/unix/sstream include/salome/sstream: salome_adm/unix/sstream
@ -171,7 +172,7 @@ install-include: $(include_list)
$(INSTALL) -d $(includedir) $(INSTALL) -d $(includedir)
@for f in X $(include_list); do \ @for f in X $(include_list); do \
if test $$f != X; then \ if test $$f != X; then \
($(INSTALL_DATA) $$f $(includedir)/. || exit 1); \ ($(INSTALL_DATA) -p $$f $(includedir)/. || exit 1); \
fi; \ fi; \
done done

8
adm_local/unix/make_commence.in
View File

@ -131,7 +131,7 @@ OMNIORB_CXXFLAGS = @OMNIORB_CXXFLAGS@
OMNIORB_IDL = @OMNIORB_IDL@ OMNIORB_IDL = @OMNIORB_IDL@
OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome
OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@
OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@
@ -148,7 +148,7 @@ CORBA_INCLUDES = @CORBA_INCLUDES@
CORBA_LIBS = @CORBA_LIBS@ CORBA_LIBS = @CORBA_LIBS@
CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ CORBA_CXXFLAGS = @CORBA_CXXFLAGS@
IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome
IDLPYFLAGS = @IDLPYFLAGS@ IDLPYFLAGS = @IDLPYFLAGS@
IDL = @IDL@ IDL = @IDL@
@ -202,13 +202,13 @@ idldir=${prefix}/idl/salome
sharedpydir=@libdir@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules sharedpydir=@libdir@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules
incmakedir=${prefix}/salome_adm/unix incmakedir=${prefix}/salome_adm/unix
docdir=$(datadir)/doc docdir=${prefix}/doc/salome
# #
# begin of package rules # begin of package rules
# #
.PHONY: all lib bin inc resources data doc tests install uninstall dep depend depend_idl cleandep mostlyclean clean distclean .PHONY: all lib bin inc resources data docs tests install uninstall dep depend depend_idl cleandep mostlyclean clean distclean
.SUFFIXES: .cxx .cc .c .f .o .lo .idl .py .i .ui .po .qm .SUFFIXES: .cxx .cc .c .f .o .lo .idl .py .i .ui .po .qm

2
bin/VERSION
View File

@ -1 +1 @@
THIS IS SALOME - GEOM VERSION: 1.4.0 THIS IS SALOME - GEOM VERSION: 1.4.1

11
configure.in.base
View File

@ -15,6 +15,7 @@
# Created from configure.in.base # Created from configure.in.base
# #
AC_INIT(src) AC_INIT(src)
AC_CONFIG_AUX_DIR(${KERNEL_ROOT_DIR}/salome_adm/unix/config_files) AC_CONFIG_AUX_DIR(${KERNEL_ROOT_DIR}/salome_adm/unix/config_files)
AC_CANONICAL_HOST AC_CANONICAL_HOST
@ -294,7 +295,7 @@ else
fi fi
# make other build directories # make other build directories
for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources share/salome/doc idl for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources idl
do do
# if test ! -d $rep ; then # if test ! -d $rep ; then
# eval mkdir $rep # eval mkdir $rep
@ -327,14 +328,16 @@ dnl copy shells and utilities contained in the bin directory
dnl excluding .in files (treated in AC-OUTPUT below) and CVS dnl excluding .in files (treated in AC-OUTPUT below) and CVS
dnl directory dnl directory
cd bin mkdir -p bin/salome
cd bin/salome
for i in $ROOT_SRCDIR/bin/* for i in $ROOT_SRCDIR/bin/*
do do
local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"` local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"`
case "$local_bin" in case "$local_bin" in
*.in | *~) ;; *.in | *~) ;;
./bin/CVS) ;; ./bin/CVS | ./bin/salome) ;;
*) ln -fs $i; echo $local_bin ;; *) /usr/bin/install -C $i .; echo $local_bin ;;
esac esac
done done
cd $ROOT_BUILDDIR cd $ROOT_BUILDDIR

11
doc/Makefile.in
View File

@ -11,9 +11,11 @@ top_builddir=..
srcdir=@srcdir@ srcdir=@srcdir@
VPATH=.:@srcdir@ VPATH=.:@srcdir@
SUBDIRS=html SUBDIRS= salome
doc: @COMMENCE@
docs:
@@SETX@; for d in $(SUBDIRS); do \ @@SETX@; for d in $(SUBDIRS); do \
(cd $$d && $(MAKE) $@) || exit 1; \ (cd $$d && $(MAKE) $@) || exit 1; \
done done
@ -31,3 +33,8 @@ install:
@@SETX@; for d in $(SUBDIRS); do \ @@SETX@; for d in $(SUBDIRS); do \
(cd $$d && $(MAKE) $@) || exit 1; \ (cd $$d && $(MAKE) $@) || exit 1; \
done done
uninstall:
@@SETX@; for d in $(SUBDIRS); do \
(cd $$d && $(MAKE) $@) || exit 1; \
done

95
doc/salome/GEOM_index.html Normal file
View File

@ -0,0 +1,95 @@
<!DOCTYPE doctype PUBLIC "-//w3c//dtd html 4.0 transitional//en">
<html>
<head>
<meta http-equiv="Content-Type"
content="text/html; charset=iso-8859-1">
<meta name="GENERATOR"
content="Mozilla/4.73 [en] (WinNT; I) [Netscape]">
<title>Geometry Module Documentation</title>
</head>
<body bgcolor="#cccccc" text="#000000" link="#0000ee" alink="#0000ee"
vlink="#551a8b">
<div align="center"> &nbsp;
<center>
<center>&nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
&nbsp;&nbsp;</center>
<table width="96%" align="center">
<tbody>
<tr>
<td><a href="http://www.opencascade.com"><img
src="tui/GEOM/sources/logocorp.gif" border="0" height="46" width="122">
</a></td>
<td>
<div align="right"><a href="http://www.opencascade.org/SALOME/"><img
src="tui/GEOM/sources/application.gif" border="0" height="46" width="108">
</a></div>
</td>
</tr>
</tbody>
</table>
<div align="center">
<center>
<hr width="100%" size="2">
<h1>Geometry MODULE Documentation</h1>
</center>
</div>
<table width="96%">
<tbody>
</tbody>
</table>
</center>
<div align="center">
<p> <img src="tui/GEOM/sources/Application-About.png"
alt="Application-About.png" width="30%" height="20%">
&nbsp; &nbsp;&nbsp; </p>
</div>
<center>
<table width="96%">
<tbody>
</tbody>
</table>
<br>
<br>
<br>
</center>
<address> </address>
<center><big><a href="gui/GEOM/geom.html">GUI Documentation</a></big></center>
<address> </address>
<center></center>
<center><br>
</center>
<address> </address>
<center><big><a href="tui/GEOM/index.html">TUI Documentation</a></big></center>
<address> </address>
<center></center>
<center><br>
<br>
</center>
</div>
<br>
<br>
<br>
</body>
</html>

44
doc/salome/Makefile.in Normal file
View File

@ -0,0 +1,44 @@
# -* Makefile *-
#
# Author : Patrick GOLDBRONN (CEA)
# Date : 30/11/2001
# $Header$
#
# source path
top_srcdir=@top_srcdir@
top_builddir=../..
srcdir=@srcdir@
VPATH=.:@srcdir@
SUBDIRS= tui gui
@COMMENCE@
docs:
@@SETX@; for d in $(SUBDIRS); do \
(cd $$d && $(MAKE) $@) || exit 1; \
done; \
cp -f $(srcdir)/GEOM_index.html GEOM_index.html
clean:
@@SETX@; for d in $(SUBDIRS); do \
(cd $$d && $(MAKE) $@) || exit 1; \
done
distclean: clean
@@SETX@; for d in $(SUBDIRS); do \
(cd $$d && $(MAKE) $@) || exit 1; \
done
install:
$(MAKE) docs
(cd tui && $(MAKE) install);
(cd gui && $(MAKE) install);
cp -f GEOM_index.html $(docdir)
uninstall:
@@SETX@; for d in $(SUBDIRS); do \
(cd $$d && $(MAKE) $@) || exit 1; \
done; \
rm -fr $(docdir)/GEOM_index.html

33
doc/salome/gui/Makefile.in Normal file
View File

@ -0,0 +1,33 @@
# Copyright (C) 2003 CEA/DEN, EDF R&D
#
#
#
# File : Makefile.in
# Author : Vasily Rusyaev (Open Cascade NN)
# Module : doc
# $Header:
top_srcdir=@top_srcdir@
top_builddir=../../..
srcdir=@srcdir@
VPATH=.:@srcdir@
@COMMENCE@
docs:
cp -fr $(srcdir)/GEOM ./
-find $(PWD) -name CVS -exec rm -rf {} \;
clean:
rm -fr `ls | grep -v "Makefile"`
distclean: clean
rm -fr GEOM
install:
mkdir -p $(docdir)/gui
cp -rf GEOM $(docdir)/gui
-find $(PWD) -name CVS -exec rm -rf {} \;
uninstall:
rm -rf $(docdir)/gui/GEOM

19
idl/Makefile.in
View File

@ -6,7 +6,7 @@
top_srcdir=@top_srcdir@ top_srcdir=@top_srcdir@
top_builddir=.. top_builddir=..
srcdir=@srcdir@ srcdir=@srcdir@
VPATH=.:$(srcdir):${KERNEL_ROOT_DIR}/idl/salome VPATH=.:${KERNEL_ROOT_DIR}/idl/salome
@COMMENCE@ @COMMENCE@
@ -17,11 +17,14 @@ IDL_FILES = \
PY_CLIENT_IDL = $(IDL_FILES) PY_CLIENT_IDL = $(IDL_FILES)
# we copy all idl file in $(top_builddir)/idl # we copy all idl file in $(top_builddir)/idl
inc: $(IDL_FILES:%=$(top_builddir)/idl/%) inc: $(top_builddir)/idl/salome $(IDL_FILES:%=$(top_builddir)/idl/salome/%)
$(IDL_FILES:%=$(top_builddir)/idl/%):$(top_builddir)/idl/%:% $(top_builddir)/idl/salome:
mkdir $@
$(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%)
# $(CP) $< $@ # $(CP) $< $@
cp -f $< $@ cp -f $^ $(top_builddir)/idl/salome
lib: pyidl lib: pyidl
@ -33,7 +36,7 @@ pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py)
$(PYTHON_BUILD_SITE): $(PYTHON_BUILD_SITE):
$(INSTALL) -d $@ $(INSTALL) -d $@
$(PYTHON_BUILD_SITE)/%_idl.py: %.idl $(PYTHON_BUILD_SITE)/%_idl.py: $(top_builddir)/idl/salome/%.idl
$(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_BUILD_SITE) $< $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_BUILD_SITE) $<
@ -41,12 +44,12 @@ $(PYTHON_BUILD_SITE)/%_idl.py: %.idl
install: install-pyidl install-idl install: install-pyidl install-idl
# create directory $(idldir) and copy idl files into it # create directory $(idldir) and copy idl files into it
install-idl: $(IDL_FILES) install-idl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%)
$(INSTALL) -d $(idldir) $(INSTALL) -d $(idldir)
$(INSTALL_DATA) $^ $(idldir) $(INSTALL_DATA) $^ $(idldir)
install-pyidl: $(IDL_FILES) install-pyidl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%)
$(INSTALL) -d $(PYTHON_SITE_INSTALL) $(INSTALL) -d $(PYTHON_SITE_INSTALL)
@for file in $^ dummy; do \ @for file in $^ dummy; do \
if [ $$file != "dummy" ]; then \ if [ $$file != "dummy" ]; then \
@ -61,6 +64,6 @@ cleandep:
distclean: distclean:
-$(RM) *.py -$(RM) *.py
-$(RM) $(IDL_FILES:%=$(top_builddir)/idl/%) -$(RM) $(IDL_FILES:%=$(top_builddir)/idl/salome/%)
-$(RM) Makefile -$(RM) Makefile

1
resources/GEOM.config Normal file
View File

@ -0,0 +1 @@
language=en

119
src/DlgRef/DlgRef_4Sel1List_QTD.cxx
View File

@ -41,15 +41,11 @@ DlgRef_4Sel1List_QTD::DlgRef_4Sel1List_QTD( QWidget* parent, const char* name,
Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1");
LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" ); TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
TextLabel1->setText( trUtf8( "TL1" ) );
Layout1->addWidget( LineEdit2, 1, 2 ); Layout1->addWidget( TextLabel1, 0, 0 );
PushButton4 = new QPushButton( GroupBox1, "PushButton4" );
PushButton4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton4->sizePolicy().hasHeightForWidth() ) );
PushButton4->setText( trUtf8( "" ) );
Layout1->addWidget( PushButton4, 4, 1 );
PushButton1 = new QPushButton( GroupBox1, "PushButton1" ); PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) ); PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
@ -57,49 +53,10 @@ DlgRef_4Sel1List_QTD::DlgRef_4Sel1List_QTD( QWidget* parent, const char* name,
Layout1->addWidget( PushButton1, 0, 1 ); Layout1->addWidget( PushButton1, 0, 1 );
LineEdit4 = new QLineEdit( GroupBox1, "LineEdit4" );
Layout1->addWidget( LineEdit4, 4, 2 );
PushButton3 = new QPushButton( GroupBox1, "PushButton3" );
PushButton3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton3->sizePolicy().hasHeightForWidth() ) );
PushButton3->setText( trUtf8( "" ) );
Layout1->addWidget( PushButton3, 3, 1 );
PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
PushButton2->setText( trUtf8( "" ) );
Layout1->addWidget( PushButton2, 1, 1 );
TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
TextLabel1->setText( trUtf8( "TL1" ) );
Layout1->addWidget( TextLabel1, 0, 0 );
TextLabel4 = new QLabel( GroupBox1, "TextLabel4" );
TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
TextLabel4->setText( trUtf8( "TL4" ) );
Layout1->addWidget( TextLabel4, 3, 0 );
QSpacerItem* spacer = new QSpacerItem( 0, 80, QSizePolicy::Minimum, QSizePolicy::Expanding );
Layout1->addItem( spacer, 5, 2 );
LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" ); LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
Layout1->addWidget( LineEdit1, 0, 2 ); Layout1->addWidget( LineEdit1, 0, 2 );
TextLabel5 = new QLabel( GroupBox1, "TextLabel5" );
TextLabel5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel5->sizePolicy().hasHeightForWidth() ) );
TextLabel5->setText( trUtf8( "TL5" ) );
Layout1->addWidget( TextLabel5, 4, 0 );
LineEdit3 = new QLineEdit( GroupBox1, "LineEdit3" );
Layout1->addWidget( LineEdit3, 3, 2 );
TextLabel2 = new QLabel( GroupBox1, "TextLabel2" ); TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) ); TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
@ -107,10 +64,16 @@ DlgRef_4Sel1List_QTD::DlgRef_4Sel1List_QTD( QWidget* parent, const char* name,
Layout1->addWidget( TextLabel2, 1, 0 ); Layout1->addWidget( TextLabel2, 1, 0 );
ComboBox1 = new QComboBox( FALSE, GroupBox1, "ComboBox1" ); PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
ComboBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, ComboBox1->sizePolicy().hasHeightForWidth() ) ); PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
PushButton2->setText( trUtf8( "" ) );
Layout1->addWidget( PushButton2, 1, 1 );
LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
Layout1->addWidget( LineEdit2, 1, 2 );
Layout1->addWidget( ComboBox1, 2, 2 );
TextLabel3 = new QLabel( GroupBox1, "TextLabel3" ); TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) ); TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
@ -118,9 +81,65 @@ DlgRef_4Sel1List_QTD::DlgRef_4Sel1List_QTD( QWidget* parent, const char* name,
Layout1->addMultiCellWidget( TextLabel3, 2, 2, 0, 1 ); Layout1->addMultiCellWidget( TextLabel3, 2, 2, 0, 1 );
ComboBox1 = new QComboBox( FALSE, GroupBox1, "ComboBox1" );
ComboBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, ComboBox1->sizePolicy().hasHeightForWidth() ) );
Layout1->addWidget( ComboBox1, 2, 2 );
GroupBox1Layout->addLayout( Layout1, 0, 0 ); GroupBox1Layout->addLayout( Layout1, 0, 0 );
DlgRef_4Sel1List_QTDLayout->addWidget( GroupBox1, 0, 0 ); DlgRef_4Sel1List_QTDLayout->addWidget( GroupBox1, 0, 0 );
GroupBox2 = new QGroupBox( this, "GroupBox2" );
GroupBox2->setTitle( trUtf8( "" ) );
GroupBox2->setColumnLayout(0, Qt::Vertical );
GroupBox2->layout()->setSpacing( 6 );
GroupBox2->layout()->setMargin( 11 );
GroupBox2Layout = new QGridLayout( GroupBox2->layout() );
GroupBox2Layout->setAlignment( Qt::AlignTop );
Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2");
TextLabel4 = new QLabel( GroupBox2, "TextLabel4" );
TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
TextLabel4->setText( trUtf8( "TL4" ) );
Layout2->addWidget( TextLabel4, 0, 0 );
QSpacerItem* spacer = new QSpacerItem( 0, 80, QSizePolicy::Minimum, QSizePolicy::Expanding );
Layout1->addItem( spacer, 5, 2 );
PushButton3 = new QPushButton( GroupBox2, "PushButton3" );
PushButton3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton3->sizePolicy().hasHeightForWidth() ) );
PushButton3->setText( trUtf8( "" ) );
Layout2->addWidget( PushButton3, 0, 1 );
LineEdit3 = new QLineEdit( GroupBox2, "LineEdit3" );
Layout2->addWidget( LineEdit3, 0, 2 );
TextLabel5 = new QLabel( GroupBox2, "TextLabel5" );
TextLabel5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel5->sizePolicy().hasHeightForWidth() ) );
TextLabel5->setText( trUtf8( "TL5" ) );
Layout2->addWidget( TextLabel5, 1, 0 );
PushButton4 = new QPushButton( GroupBox2, "PushButton4" );
PushButton4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton4->sizePolicy().hasHeightForWidth() ) );
PushButton4->setText( trUtf8( "" ) );
Layout2->addWidget( PushButton4, 1, 1 );
LineEdit4 = new QLineEdit( GroupBox2, "LineEdit4" );
Layout2->addWidget( LineEdit4, 1, 2 );
GroupBox2Layout->addLayout( Layout2, 0, 0 );
DlgRef_4Sel1List_QTDLayout->addWidget( GroupBox2, 1, 0 );
} }
/* /*

3
src/DlgRef/DlgRef_4Sel1List_QTD.h
View File

@ -29,6 +29,7 @@ public:
~DlgRef_4Sel1List_QTD(); ~DlgRef_4Sel1List_QTD();
QGroupBox* GroupBox1; QGroupBox* GroupBox1;
QGroupBox* GroupBox2;
QLineEdit* LineEdit2; QLineEdit* LineEdit2;
QPushButton* PushButton4; QPushButton* PushButton4;
QPushButton* PushButton1; QPushButton* PushButton1;
@ -48,7 +49,9 @@ public:
protected: protected:
QGridLayout* DlgRef_4Sel1List_QTDLayout; QGridLayout* DlgRef_4Sel1List_QTDLayout;
QGridLayout* GroupBox1Layout; QGridLayout* GroupBox1Layout;
QGridLayout* GroupBox2Layout;
QGridLayout* Layout1; QGridLayout* Layout1;
QGridLayout* Layout2;
}; };
#endif // DLGREF_4SEL1LIST_QTD_H #endif // DLGREF_4SEL1LIST_QTD_H

82
src/GEOM/GEOM_Gen_i.cc
View File

@ -159,6 +159,8 @@ using namespace std;
#include CORBA_SERVER_HEADER(SALOMEDS_Attributes) #include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
#include "Utils_ExceptHandlers.hxx"
Standard_EXPORT static Standard_Boolean IsValid(const TopoDS_Shape& S) { Standard_EXPORT static Standard_Boolean IsValid(const TopoDS_Shape& S) {
#if OCC_VERSION_MAJOR >= 5 #if OCC_VERSION_MAJOR >= 5
return BRepAlgo::IsValid(S); return BRepAlgo::IsValid(S);
@ -363,6 +365,7 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy,
CORBA::Object_ptr theObject, CORBA::Object_ptr theObject,
const char* theName) throw (SALOME::SALOME_Exception) const char* theName) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
SALOMEDS::SObject_var aResultSO; SALOMEDS::SObject_var aResultSO;
if(CORBA::is_nil(theObject)) return aResultSO; if(CORBA::is_nil(theObject)) return aResultSO;
@ -1023,6 +1026,7 @@ int GEOM_Gen_i::SuppressFacesGlue( const TopoDS_Shape& S,
TopoDS_Shape& aCompoundOfShells ) TopoDS_Shape& aCompoundOfShells )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
BRepTools_Quilt Glue; BRepTools_Quilt Glue;
aCompoundOfShells.Nullify() ; aCompoundOfShells.Nullify() ;
@ -1111,6 +1115,7 @@ GEOM::GEOM_Shape::ListOfSubShapeID* GEOM_Gen_i::IndexOfFacesOfSubShell( const To
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape::ListOfSubShapeID_var ListOfID = new GEOM::GEOM_Shape::ListOfSubShapeID; GEOM::GEOM_Shape::ListOfSubShapeID_var ListOfID = new GEOM::GEOM_Shape::ListOfSubShapeID;
ListOfID->length(0) ; ListOfID->length(0) ;
if( subShell.IsNull() || subShell.ShapeType() != TopAbs_SHELL ) { if( subShell.IsNull() || subShell.ShapeType() != TopAbs_SHELL ) {
@ -1227,6 +1232,7 @@ GEOM::GEOM_Gen::ListOfGeomShapes* GEOM_Gen_i::SuppressFaces( GEOM::GEOM_Shape_pt
const GEOM::GEOM_Shape::ListOfSubShapeID& ListOfID ) const GEOM::GEOM_Shape::ListOfSubShapeID& ListOfID )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Gen::ListOfGeomShapes_var listOfGeomShapes = new GEOM::GEOM_Gen::ListOfGeomShapes; GEOM::GEOM_Gen::ListOfGeomShapes_var listOfGeomShapes = new GEOM::GEOM_Gen::ListOfGeomShapes;
listOfGeomShapes->length(0) ; listOfGeomShapes->length(0) ;
@ -1375,6 +1381,7 @@ void GEOM_Gen_i::SuppressHoleSubRoutine( const TopoDS_Shape& mainShape,
TopTools_MapOfShape& MSwireEndEdges ) TopTools_MapOfShape& MSwireEndEdges )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
TopTools_MapOfShape MS ; TopTools_MapOfShape MS ;
TopTools_SequenceOfShape SU ; TopTools_SequenceOfShape SU ;
FreeEdgesFromMapOfFace(MSfaces, MS) ; /* MS = free edges of MSfaces */ FreeEdgesFromMapOfFace(MSfaces, MS) ; /* MS = free edges of MSfaces */
@ -1475,6 +1482,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::SuppressHolesInFaceOrShell( GEOM::GEOM_Shape_pt
const GEOM::GEOM_Shape::ListOfSubShapeID& ListIdWires ) const GEOM::GEOM_Shape::ListOfSubShapeID& ListIdWires )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result; GEOM::GEOM_Shape_var result;
if( ListIdWires.length() < 1 ) if( ListIdWires.length() < 1 )
@ -1637,6 +1645,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::SuppressHole( GEOM::GEOM_Shape_ptr shape,
const GEOM::GEOM_Shape::ListOfSubShapeID& ListIdEndFace ) const GEOM::GEOM_Shape::ListOfSubShapeID& ListIdEndFace )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result; GEOM::GEOM_Shape_var result;
TopoDS_Face aFace ; TopoDS_Face aFace ;
TopoDS_Wire aWire ; TopoDS_Wire aWire ;
@ -1926,6 +1935,7 @@ bool GEOM_Gen_i::BuildShapeHoleNotTraversing( const TopoDS_Shape& aShape,
TopoDS_Shape& resultTds ) TopoDS_Shape& resultTds )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
BRep_Builder B; BRep_Builder B;
TopExp_Explorer exp ; TopExp_Explorer exp ;
TopoDS_Face newFace ; TopoDS_Face newFace ;
@ -1984,6 +1994,7 @@ bool GEOM_Gen_i::BuildShapeHoleTraversing( const TopoDS_Shape& aShape,
TopoDS_Shape& resultTds ) TopoDS_Shape& resultTds )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
BRep_Builder B; BRep_Builder B;
TopExp_Explorer exp ; TopExp_Explorer exp ;
TopoDS_Face newFace ; TopoDS_Face newFace ;
@ -2123,6 +2134,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::SubShape(GEOM::GEOM_Shape_ptr shape,
const GEOM::GEOM_Shape::ListOfSubShapeID& ListOfID) const GEOM::GEOM_Shape::ListOfSubShapeID& ListOfID)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
return SubShapesOne(shape, (TopAbs_ShapeEnum) ShapeType, ListOfID); return SubShapesOne(shape, (TopAbs_ShapeEnum) ShapeType, ListOfID);
} }
@ -2136,6 +2148,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::SubShapeSorted(GEOM::GEOM_Shape_ptr shape,
const GEOM::GEOM_Shape::ListOfSubShapeID& ListOfID) const GEOM::GEOM_Shape::ListOfSubShapeID& ListOfID)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
return SubShapesOne(shape, (TopAbs_ShapeEnum) ShapeType, ListOfID, Standard_True); return SubShapesOne(shape, (TopAbs_ShapeEnum) ShapeType, ListOfID, Standard_True);
} }
@ -2150,6 +2163,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::SubShapesOne( GEOM::GEOM_Shape_ptr shape,
const Standard_Boolean Sort) const Standard_Boolean Sort)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result; GEOM::GEOM_Shape_var result;
TopoDS_Shape mainShape; TopoDS_Shape mainShape;
TopoDS_Shape mainTopo = GetTopoShape(shape); TopoDS_Shape mainTopo = GetTopoShape(shape);
@ -2230,6 +2244,7 @@ GEOM::GEOM_Gen::ListOfGeomShapes* GEOM_Gen_i::SubShapeAll(GEOM::GEOM_Shape_ptr s
CORBA::Short ShapeType) CORBA::Short ShapeType)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
return SubShapesAll(shape, (TopAbs_ShapeEnum) ShapeType); return SubShapesAll(shape, (TopAbs_ShapeEnum) ShapeType);
} }
@ -2242,6 +2257,7 @@ GEOM::GEOM_Gen::ListOfGeomShapes* GEOM_Gen_i::SubShapeAllSorted(GEOM::GEOM_Shape
CORBA::Short ShapeType) CORBA::Short ShapeType)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
return SubShapesAll(shape, (TopAbs_ShapeEnum) ShapeType, Standard_True); return SubShapesAll(shape, (TopAbs_ShapeEnum) ShapeType, Standard_True);
} }
@ -2256,6 +2272,7 @@ GEOM::GEOM_Gen::ListOfGeomShapes* GEOM_Gen_i::SubShapesAll(GEOM::GEOM_Shape_ptr
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
/* List of sub shapes returned */ /* List of sub shapes returned */
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Gen::ListOfGeomShapes_var listOfGeomShapes = new GEOM::GEOM_Gen::ListOfGeomShapes; GEOM::GEOM_Gen::ListOfGeomShapes_var listOfGeomShapes = new GEOM::GEOM_Gen::ListOfGeomShapes;
listOfGeomShapes->length(0) ; listOfGeomShapes->length(0) ;
@ -2351,6 +2368,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeBoolean(GEOM::GEOM_Shape_ptr shape1,
CORBA::Long operation) CORBA::Long operation)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result; GEOM::GEOM_Shape_var result;
TopoDS_Shape shape ; TopoDS_Shape shape ;
TopoDS_Shape aShape1 ; TopoDS_Shape aShape1 ;
@ -2427,6 +2445,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeFuse(GEOM::GEOM_Shape_ptr shape1,
GEOM::GEOM_Shape_ptr shape2) GEOM::GEOM_Shape_ptr shape2)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result; GEOM::GEOM_Shape_var result;
TopoDS_Shape aShape1 = GetTopoShape(shape1) ; TopoDS_Shape aShape1 = GetTopoShape(shape1) ;
TopoDS_Shape aShape2 = GetTopoShape(shape2) ; TopoDS_Shape aShape2 = GetTopoShape(shape2) ;
@ -2515,7 +2534,7 @@ GEOM::DirStruct GEOM_Gen_i::MakeDirection(const GEOM::PointStruct& p)
GEOM::DirStruct d ; GEOM::DirStruct d ;
d.PS.x = p.x ; d.PS.y = p.y ; d.PS.z = p.z ; d.PS.x = p.x ; d.PS.y = p.y ; d.PS.z = p.z ;
return d ; return d ;
} }
//================================================================================= //=================================================================================
// function : MakeBox() // function : MakeBox()
@ -2529,6 +2548,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeBox(CORBA::Double x1,
CORBA::Double z2) CORBA::Double z2)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
gp_Pnt P1(x1,y1,z1); gp_Pnt P1(x1,y1,z1);
gp_Pnt P2(x2,y2,z2); gp_Pnt P2(x2,y2,z2);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
@ -2561,6 +2581,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeCylinder(const GEOM::PointStruct& pstruct,
CORBA::Double height) CORBA::Double height)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result; GEOM::GEOM_Shape_var result;
TopoDS_Shape tds ; TopoDS_Shape tds ;
gp_Pnt p(pstruct.x, pstruct.y, pstruct.z) ; gp_Pnt p(pstruct.x, pstruct.y, pstruct.z) ;
@ -2593,6 +2614,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeSphere(CORBA::Double x1,
CORBA::Double radius) CORBA::Double radius)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape tds ; TopoDS_Shape tds ;
try { try {
@ -2621,6 +2643,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeTorus( const GEOM::PointStruct& pstruct,
CORBA::Double minor_radius ) CORBA::Double minor_radius )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result; GEOM::GEOM_Shape_var result;
TopoDS_Shape tds ; TopoDS_Shape tds ;
gp_Pnt p(pstruct.x, pstruct.y, pstruct.z) ; gp_Pnt p(pstruct.x, pstruct.y, pstruct.z) ;
@ -2655,6 +2678,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeCone(const GEOM::PointStruct& pstruct,
CORBA::Double height) CORBA::Double height)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result; GEOM::GEOM_Shape_var result;
TopoDS_Shape tds ; TopoDS_Shape tds ;
gp_Pnt p(pstruct.x, pstruct.y, pstruct.z) ; gp_Pnt p(pstruct.x, pstruct.y, pstruct.z) ;
@ -2693,6 +2717,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeCone(const GEOM::PointStruct& pstruct,
GEOM::GEOM_Shape_ptr GEOM_Gen_i::ImportIGES(const char* filename) GEOM::GEOM_Shape_ptr GEOM_Gen_i::ImportIGES(const char* filename)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
//VRV: OCC 4.0 migration //VRV: OCC 4.0 migration
IGESControl_Reader aReader; IGESControl_Reader aReader;
@ -2703,8 +2728,11 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::ImportIGES(const char* filename)
THROW_SALOME_CORBA_EXCEPTION("Error in reading import file", SALOME::BAD_PARAM); } THROW_SALOME_CORBA_EXCEPTION("Error in reading import file", SALOME::BAD_PARAM); }
MESSAGE("ImportIGES : all Geometry Transfer" << endl ) ; MESSAGE("ImportIGES : all Geometry Transfer" << endl ) ;
aReader.Clear(); //OCC 5.1.2 porting
aReader.TransferRoots(false); // aReader.Clear();
// aReader.TransferRoots(false);
aReader.ClearShapes();
aReader.TransferRoots();
MESSAGE("ImportIGES : count of shapes produced = " << aReader.NbShapes() << endl ); MESSAGE("ImportIGES : count of shapes produced = " << aReader.NbShapes() << endl );
TopoDS_Shape shape = aReader.OneShape(); TopoDS_Shape shape = aReader.OneShape();
@ -2734,6 +2762,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::ImportIGES(const char* filename)
GEOM::GEOM_Shape_ptr GEOM_Gen_i::ImportSTEP(const char* filename) GEOM::GEOM_Shape_ptr GEOM_Gen_i::ImportSTEP(const char* filename)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
//VRV: OCC 4.0 migration //VRV: OCC 4.0 migration
STEPControl_Reader aReader; STEPControl_Reader aReader;
@ -2809,6 +2838,7 @@ GEOM::GEOM_Shape_ptr
const CORBA::Short Limit) const CORBA::Short Limit)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var aResult; GEOM::GEOM_Shape_var aResult;
TopoDS_Shape tds ; TopoDS_Shape tds ;
//MESSAGE ("In Partition"); //MESSAGE ("In Partition");
@ -2978,6 +3008,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeFilling(GEOM::GEOM_Shape_ptr myShape,
CORBA::Short nbiter) CORBA::Short nbiter)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Face tds ; TopoDS_Face tds ;
TopoDS_Shape aShape = GetTopoShape(myShape) ; TopoDS_Shape aShape = GetTopoShape(myShape) ;
@ -3174,6 +3205,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeGlueFaces(GEOM::GEOM_Shape_ptr myShape,
// appliquer BRepTools_SameParameter au compshell // appliquer BRepTools_SameParameter au compshell
// (rendre parametres 2D des edges identiques aux parametres 3D) // (rendre parametres 2D des edges identiques aux parametres 3D)
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape tds ; TopoDS_Shape tds ;
TopoDS_Shape aShape = GetTopoShape(myShape) ; TopoDS_Shape aShape = GetTopoShape(myShape) ;
@ -3312,6 +3344,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeSewing( const GEOM::GEOM_Gen::ListOfIOR& Li
CORBA::Double precision ) CORBA::Double precision )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape tds ; TopoDS_Shape tds ;
BRepOffsetAPI_Sewing aMethod ; BRepOffsetAPI_Sewing aMethod ;
@ -3350,6 +3383,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeSewingShape( GEOM::GEOM_Shape_ptr aShape,
CORBA::Double precision ) CORBA::Double precision )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape tds, S ; TopoDS_Shape tds, S ;
BRepOffsetAPI_Sewing aMethod ; BRepOffsetAPI_Sewing aMethod ;
@ -3393,6 +3427,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeSewingShape( GEOM::GEOM_Shape_ptr aShape,
GEOM::GEOM_Shape_ptr GEOM_Gen_i::OrientationChange(GEOM::GEOM_Shape_ptr aShape) GEOM::GEOM_Shape_ptr GEOM_Gen_i::OrientationChange(GEOM::GEOM_Shape_ptr aShape)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
BRep_Builder aBuilder; BRep_Builder aBuilder;
@ -3535,6 +3570,7 @@ GEOM::GEOM_Gen::ListOfIOR* GEOM_Gen_i::GetObjects(GEOM::GEOM_Shape_ptr shape)
GEOM::GEOM_Shape_ptr GEOM_Gen_i::ImportBREP(const char* filename) GEOM::GEOM_Shape_ptr GEOM_Gen_i::ImportBREP(const char* filename)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
TopoDS_Shape tds ; TopoDS_Shape tds ;
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
@ -3565,6 +3601,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakePlane(const GEOM::PointStruct& pstruct,
CORBA::Double trimsize) CORBA::Double trimsize)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape tds ; TopoDS_Shape tds ;
@ -3598,7 +3635,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeVertex(CORBA::Double x,
CORBA::Double z) CORBA::Double z)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
gp_Pnt P(x,y,z); gp_Pnt P(x,y,z);
TopoDS_Shape tds = BRepBuilderAPI_MakeVertex(P).Shape(); TopoDS_Shape tds = BRepBuilderAPI_MakeVertex(P).Shape();
@ -3621,6 +3658,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeFace( GEOM::GEOM_Shape_ptr wire,
CORBA::Boolean wantplanarface ) CORBA::Boolean wantplanarface )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape aShape; TopoDS_Shape aShape;
TopoDS_Shape tds; TopoDS_Shape tds;
@ -3717,6 +3755,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeFaces(const GEOM::GEOM_Gen::ListOfIOR& List
GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeShell( const GEOM::GEOM_Gen::ListOfIOR& ListShapes ) GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeShell( const GEOM::GEOM_Gen::ListOfIOR& ListShapes )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
BRepTools_Quilt Glue; BRepTools_Quilt Glue;
TopoDS_Shape C; TopoDS_Shape C;
@ -3758,6 +3797,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeShell( const GEOM::GEOM_Gen::ListOfIOR& Lis
GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeSolid( const GEOM::GEOM_Gen::ListOfIOR& ListShapes ) GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeSolid( const GEOM::GEOM_Gen::ListOfIOR& ListShapes )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
Standard_Integer ish = 0; Standard_Integer ish = 0;
TopoDS_Compound Res; TopoDS_Compound Res;
@ -3806,6 +3846,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeLine(const GEOM::PointStruct& pstruct,
const GEOM::DirStruct& dstruct) const GEOM::DirStruct& dstruct)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
gp_Pnt P1(pstruct.x, pstruct.y, pstruct.z); gp_Pnt P1(pstruct.x, pstruct.y, pstruct.z);
gp_Pnt P2(dstruct.PS.x, dstruct.PS.y, dstruct.PS.z) ; gp_Pnt P2(dstruct.PS.x, dstruct.PS.y, dstruct.PS.z) ;
@ -3839,6 +3880,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeVector(const GEOM::PointStruct& pstruct1,
const GEOM::PointStruct& pstruct2) const GEOM::PointStruct& pstruct2)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape tds ; TopoDS_Shape tds ;
@ -3872,6 +3914,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeCircle(const GEOM::PointStruct& pstruct,
CORBA::Double radius) CORBA::Double radius)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result; GEOM::GEOM_Shape_var result;
TopoDS_Shape tds ; TopoDS_Shape tds ;
@ -3905,6 +3948,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeEllipse( const GEOM::PointStruct& pstruct,
CORBA::Double radius_minor ) CORBA::Double radius_minor )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result; GEOM::GEOM_Shape_var result;
TopoDS_Shape tds ; TopoDS_Shape tds ;
@ -3939,6 +3983,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeArc(const GEOM::PointStruct& pInit,
const GEOM::PointStruct& pEnd) const GEOM::PointStruct& pEnd)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result; GEOM::GEOM_Shape_var result;
try { try {
gp_Pnt pI(pInit.x, pInit.y, pInit.z) ; gp_Pnt pI(pInit.x, pInit.y, pInit.z) ;
@ -3978,6 +4023,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeTranslation( GEOM::GEOM_Shape_ptr myShape,
CORBA::Double z) CORBA::Double z)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape aShape = GetTopoShape(myShape) ; TopoDS_Shape aShape = GetTopoShape(myShape) ;
if( aShape.IsNull() ) { if( aShape.IsNull() ) {
@ -4008,6 +4054,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeMultiTranslation1D( GEOM::GEOM_Shape_ptr my
CORBA::Short nbtimes ) CORBA::Short nbtimes )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape tds ; TopoDS_Shape tds ;
@ -4063,6 +4110,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeMultiTranslation2D( GEOM::GEOM_Shape_ptr my
CORBA::Short nbtimes2 ) CORBA::Short nbtimes2 )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape tds ; TopoDS_Shape tds ;
@ -4120,6 +4168,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeMultiRotation1D( GEOM::GEOM_Shape_ptr mySha
CORBA::Short nbtimes) CORBA::Short nbtimes)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape tds ; TopoDS_Shape tds ;
TopoDS_Shape aShape = GetTopoShape(myShape) ; TopoDS_Shape aShape = GetTopoShape(myShape) ;
@ -4173,6 +4222,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeMultiRotation2D( GEOM::GEOM_Shape_ptr mySha
CORBA::Short nbtimes2 ) CORBA::Short nbtimes2 )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape tds ; TopoDS_Shape tds ;
TopoDS_Shape aShape = GetTopoShape(myShape) ; TopoDS_Shape aShape = GetTopoShape(myShape) ;
@ -4257,6 +4307,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeMultiRotation2D( GEOM::GEOM_Shape_ptr mySha
GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeCopy( GEOM::GEOM_Shape_ptr Shape) GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeCopy( GEOM::GEOM_Shape_ptr Shape)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape tds ; TopoDS_Shape tds ;
TopoDS_Shape aShape = GetTopoShape(Shape) ; TopoDS_Shape aShape = GetTopoShape(Shape) ;
@ -4282,6 +4333,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeMirrorByPlane(GEOM::GEOM_Shape_ptr myShape,
GEOM::GEOM_Shape_ptr shapePlane) GEOM::GEOM_Shape_ptr shapePlane)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape tds ; TopoDS_Shape tds ;
TopoDS_Shape aShape = GetTopoShape(myShape) ; TopoDS_Shape aShape = GetTopoShape(myShape) ;
@ -4334,6 +4386,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeRotation( GEOM::GEOM_Shape_ptr myShape,
CORBA::Double angle) CORBA::Double angle)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape tds ; TopoDS_Shape tds ;
TopoDS_Shape aShape = GetTopoShape(myShape) ; TopoDS_Shape aShape = GetTopoShape(myShape) ;
@ -4372,6 +4425,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeScaleTransform(GEOM::GEOM_Shape_ptr myShape
CORBA::Double factor) CORBA::Double factor)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape tds ; TopoDS_Shape tds ;
TopoDS_Shape aShape = GetTopoShape(myShape) ; TopoDS_Shape aShape = GetTopoShape(myShape) ;
@ -4405,6 +4459,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeScaleTransform(GEOM::GEOM_Shape_ptr myShape
GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeCompound( const GEOM::GEOM_Gen::ListOfIOR& ListShapes ) GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeCompound( const GEOM::GEOM_Gen::ListOfIOR& ListShapes )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Compound C; TopoDS_Compound C;
BRep_Builder aBuilder; BRep_Builder aBuilder;
@ -4438,6 +4493,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeEdge(const GEOM::PointStruct& pstruct1,
const GEOM::PointStruct& pstruct2) const GEOM::PointStruct& pstruct2)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape tds ; TopoDS_Shape tds ;
@ -4468,6 +4524,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeEdge(const GEOM::PointStruct& pstruct1,
GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeWire( const GEOM::GEOM_Gen::ListOfIOR& ListShapes ) GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeWire( const GEOM::GEOM_Gen::ListOfIOR& ListShapes )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
BRepBuilderAPI_MakeWire MW ; BRepBuilderAPI_MakeWire MW ;
TopoDS_Shape tds, Shape ; TopoDS_Shape tds, Shape ;
@ -4511,6 +4568,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeRevolution(GEOM::GEOM_Shape_ptr myShape,
double angle) double angle)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape tds ; TopoDS_Shape tds ;
TopoDS_Shape aShape = GetTopoShape(myShape) ; TopoDS_Shape aShape = GetTopoShape(myShape) ;
@ -4544,6 +4602,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakePipe( GEOM::GEOM_Shape_ptr pathShape,
GEOM::GEOM_Shape_ptr baseShape ) GEOM::GEOM_Shape_ptr baseShape )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape tds ; TopoDS_Shape tds ;
TopoDS_Wire aWire ; TopoDS_Wire aWire ;
@ -4600,6 +4659,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakePrism( GEOM::GEOM_Shape_ptr myShape,
const GEOM::PointStruct& P2 ) const GEOM::PointStruct& P2 )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape tds ; TopoDS_Shape tds ;
TopoDS_Shape aShape = GetTopoShape(myShape) ; TopoDS_Shape aShape = GetTopoShape(myShape) ;
@ -4633,6 +4693,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakePrism( GEOM::GEOM_Shape_ptr myShape,
GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeCDG(GEOM::GEOM_Shape_ptr aShape) GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeCDG(GEOM::GEOM_Shape_ptr aShape)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape tds ; TopoDS_Shape tds ;
TopoDS_Shape shape = GetTopoShape(aShape) ; TopoDS_Shape shape = GetTopoShape(aShape) ;
@ -4687,6 +4748,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::Archimede(GEOM::GEOM_Shape_ptr aShape,
CORBA::Double aMeshingDeflection) CORBA::Double aMeshingDeflection)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result; GEOM::GEOM_Shape_var result;
double cste = -1; double cste = -1;
@ -4760,6 +4822,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeFillet( GEOM::GEOM_Shape_ptr shape,
const GEOM::GEOM_Shape::ListOfSubShapeID& ListOfID ) const GEOM::GEOM_Shape::ListOfSubShapeID& ListOfID )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result; GEOM::GEOM_Shape_var result;
TopoDS_Shape tds ; TopoDS_Shape tds ;
@ -4779,7 +4842,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeFillet( GEOM::GEOM_Shape_ptr shape,
fill.Add(E); fill.Add(E);
} }
for (int i = 1;i<=fill.NbContours();i++) { for (int i = 1;i<=fill.NbContours();i++) {
fill.SetRadius(radius,i); fill.SetRadius(radius,i,i);
} }
tds = fill.Shape(); tds = fill.Shape();
@ -4794,7 +4857,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeFillet( GEOM::GEOM_Shape_ptr shape,
} }
} }
for (int i = 1;i<=fill.NbContours();i++) { for (int i = 1;i<=fill.NbContours();i++) {
fill.SetRadius(radius,i); fill.SetRadius(radius,i,i);
} }
tds = fill.Shape(); tds = fill.Shape();
} }
@ -4824,6 +4887,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeChamfer( GEOM::GEOM_Shape_ptr shape,
const GEOM::GEOM_Shape::ListOfSubShapeID& ListOfID ) const GEOM::GEOM_Shape::ListOfSubShapeID& ListOfID )
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result; GEOM::GEOM_Shape_var result;
TopoDS_Shape tds ; TopoDS_Shape tds ;
@ -4882,6 +4946,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeChamfer( GEOM::GEOM_Shape_ptr shape,
CORBA::Boolean GEOM_Gen_i::CheckShape(GEOM::GEOM_Shape_ptr shape) CORBA::Boolean GEOM_Gen_i::CheckShape(GEOM::GEOM_Shape_ptr shape)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
TopoDS_Shape S = GetTopoShape(shape) ; TopoDS_Shape S = GetTopoShape(shape) ;
if( S.IsNull() ) { if( S.IsNull() ) {
THROW_SALOME_CORBA_EXCEPTION("Shape is null", SALOME::BAD_PARAM); THROW_SALOME_CORBA_EXCEPTION("Shape is null", SALOME::BAD_PARAM);
@ -4902,6 +4967,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakePlacedBox(CORBA::Double x1, CORBA::Double
CORBA::Double delta1, CORBA::Double delta2, CORBA::Double delta3) CORBA::Double delta1, CORBA::Double delta2, CORBA::Double delta3)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape tds ; TopoDS_Shape tds ;
@ -4941,6 +5007,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakePanel(GEOM::GEOM_Shape_ptr shape,
CORBA::Double delta) CORBA::Double delta)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Shape_var result ; GEOM::GEOM_Shape_var result ;
TopoDS_Shape tds ; TopoDS_Shape tds ;
TopoDS_Shape aShape = GetTopoShape(shape) ; TopoDS_Shape aShape = GetTopoShape(shape) ;
@ -5017,6 +5084,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakePanel(GEOM::GEOM_Shape_ptr shape,
void GEOM_Gen_i::ExportIGES(const char* filename,GEOM::GEOM_Shape_ptr theShape) void GEOM_Gen_i::ExportIGES(const char* filename,GEOM::GEOM_Shape_ptr theShape)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
if (theShape->_is_nil()) if (theShape->_is_nil())
{ {
THROW_SALOME_CORBA_EXCEPTION("Export IGES aborted", SALOME::BAD_PARAM); THROW_SALOME_CORBA_EXCEPTION("Export IGES aborted", SALOME::BAD_PARAM);
@ -5049,6 +5117,7 @@ void GEOM_Gen_i::ExportIGES(const char* filename,GEOM::GEOM_Shape_ptr theShape)
void GEOM_Gen_i::ExportBREP(const char* filename,GEOM::GEOM_Shape_ptr theShape) void GEOM_Gen_i::ExportBREP(const char* filename,GEOM::GEOM_Shape_ptr theShape)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
if (theShape->_is_nil()) if (theShape->_is_nil())
{ {
THROW_SALOME_CORBA_EXCEPTION("Export BRep aborted", SALOME::BAD_PARAM); THROW_SALOME_CORBA_EXCEPTION("Export BRep aborted", SALOME::BAD_PARAM);
@ -5073,6 +5142,7 @@ void GEOM_Gen_i::ExportBREP(const char* filename,GEOM::GEOM_Shape_ptr theShape)
void GEOM_Gen_i::ExportSTEP(const char* filename,GEOM::GEOM_Shape_ptr theShape) void GEOM_Gen_i::ExportSTEP(const char* filename,GEOM::GEOM_Shape_ptr theShape)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException);
if (theShape->_is_nil()) if (theShape->_is_nil())
{ {
THROW_SALOME_CORBA_EXCEPTION("Export STEP aborted", SALOME::BAD_PARAM); THROW_SALOME_CORBA_EXCEPTION("Export STEP aborted", SALOME::BAD_PARAM);

2
src/GEOMBase/GEOMBase.cxx
View File

@ -227,6 +227,7 @@ bool GEOMBase::CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QString
needDisplay = true; needDisplay = true;
SALOMEDS::SObject_var obj = ActiveStudy->getStudyDocument()->FindObjectID(anIObject->getEntry()); SALOMEDS::SObject_var obj = ActiveStudy->getStudyDocument()->FindObjectID(anIObject->getEntry());
if(!obj->_is_nil()) { if(!obj->_is_nil()) {
if (strcmp(obj->GetFatherComponent()->GetName(), "GEOM")) continue;
GEOM::GEOM_Shape_var aShape; GEOM::GEOM_Shape_var aShape;
if(obj->FindAttribute(aTmpAttr, "AttributeIOR")) { if(obj->FindAttribute(aTmpAttr, "AttributeIOR")) {
char *str = SALOMEDS::AttributeIOR::_narrow(aTmpAttr)->Value(); char *str = SALOMEDS::AttributeIOR::_narrow(aTmpAttr)->Value();
@ -370,6 +371,7 @@ bool GEOMBase::CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QString
SALOMEDS::SObject_var obj = ActiveStudy->getStudyDocument()->FindObjectID(anIObject->getEntry()); SALOMEDS::SObject_var obj = ActiveStudy->getStudyDocument()->FindObjectID(anIObject->getEntry());
if(!obj->_is_nil()) { if(!obj->_is_nil()) {
if (strcmp(obj->GetFatherComponent()->GetName(), "GEOM")) continue;
GEOM::GEOM_Shape_var aShape; GEOM::GEOM_Shape_var aShape;
if(obj->FindAttribute(aTmpAttr, "AttributeIOR")) { if(obj->FindAttribute(aTmpAttr, "AttributeIOR")) {
char *str = SALOMEDS::AttributeIOR::_narrow(aTmpAttr)->Value(); char *str = SALOMEDS::AttributeIOR::_narrow(aTmpAttr)->Value();

41
src/GEOMGUI/GeometryGUI.cxx
View File

@ -26,7 +26,6 @@
// Module : GEOM // Module : GEOM
// $Header$ // $Header$
using namespace std;
#include "GeometryGUI.h" #include "GeometryGUI.h"
// Open CASCADE Includes // Open CASCADE Includes
@ -40,9 +39,12 @@ using namespace std;
#include "OCCViewer_Viewer3d.h" #include "OCCViewer_Viewer3d.h"
#include "OCCViewer_ViewPort3d.h" #include "OCCViewer_ViewPort3d.h"
#include "VTKViewer_ViewFrame.h" #include "VTKViewer_ViewFrame.h"
#include "VTKViewer_InteractorStyleSALOME.h"
#include "SALOME_Selection.h" #include "SALOME_Selection.h"
using namespace std;
/* The object itself created in the static method 'GetOrCreateGEOMBase()' */ /* The object itself created in the static method 'GetOrCreateGEOMBase()' */
static GEOMContext* GeomGUI = 0; static GEOMContext* GeomGUI = 0;
@ -336,6 +338,30 @@ bool GeometryGUI::OnMousePress(QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFr
return false; return false;
} }
static void UpdateVtkSelection(QAD_Desktop* parent)
{
if (!parent->getActiveStudy()) return;
QList<QAD_StudyFrame> aFrameList = parent->getActiveStudy()->getStudyFrames();
for (QAD_StudyFrame* aStudyFrame = aFrameList.first(); aStudyFrame; aStudyFrame = aFrameList.next()) {
if (aStudyFrame->getTypeView() == VIEW_VTK) {
QAD_ViewFrame* aViewFrame = aStudyFrame->getRightFrame()->getViewFrame();
VTKViewer_ViewFrame* aVtkViewFrame = dynamic_cast<VTKViewer_ViewFrame*>(aViewFrame);
if (!aVtkViewFrame) continue;
VTKViewer_RenderWindowInteractor* anInteractor = aVtkViewFrame->getRWInteractor();
if (anInteractor) {
anInteractor->SetSelectionProp();
anInteractor->SetSelectionTolerance();
VTKViewer_InteractorStyleSALOME* aStyle = anInteractor->GetInteractorStyleSALOME();
if (aStyle) {
aStyle->setPreselectionProp();
}
}
}
}
}
//================================================================================= //=================================================================================
// function : SetSettings() // function : SetSettings()
@ -409,6 +435,9 @@ bool GeometryGUI::SetSettings(QAD_Desktop* parent)
Mb->setItemEnabled(413, ViewOCC);// ShadingColor Settings Mb->setItemEnabled(413, ViewOCC);// ShadingColor Settings
Mb->setItemEnabled(414, ViewOCC);// Isos Settings Mb->setItemEnabled(414, ViewOCC);// Isos Settings
// PAL5356: update VTK selection
::UpdateVtkSelection(parent);
return true; return true;
} }
@ -530,6 +559,10 @@ void GeometryGUI::activeStudyChanged(QAD_Desktop* parent)
GeomGUI->EmitSignalCloseAllDialogs(); GeomGUI->EmitSignalCloseAllDialogs();
GeomGUI = 0; GeomGUI = 0;
} }
// PAL5356: update VTK selection
::UpdateVtkSelection(parent);
return; return;
} }
@ -595,4 +628,10 @@ extern "C"
buffer[0] = (int)VIEW_OCC; buffer[0] = (int)VIEW_OCC;
if (--bufferSize) buffer[1] = (int)VIEW_VTK; if (--bufferSize) buffer[1] = (int)VIEW_VTK;
} }
void deactivate()
{
if ( GeomGUI )
GeomGUI->EmitSignalCloseAllDialogs();
}
} }

3
src/OperationGUI/OperationGUI_FilletDlg.cxx
View File

@ -448,8 +448,7 @@ void OperationGUI_FilletDlg::MakePreview()
for(int i = 1; i <= fill.NbContours(); i++) { for(int i = 1; i <= fill.NbContours(); i++) {
try { try {
//fill.SetRadius(myRadius,i,i); fill.SetRadius(myRadius,i,i);
fill.SetRadius(myRadius,i);
} }
catch(Standard_Failure) { catch(Standard_Failure) {
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();

1
src/OperationGUI/OperationGUI_PartitionDlg.cxx
View File

@ -52,6 +52,7 @@ OperationGUI_PartitionDlg::OperationGUI_PartitionDlg(QWidget* parent, const char
GroupPoints = new DlgRef_4Sel1List_QTD(this, "GroupPoints"); GroupPoints = new DlgRef_4Sel1List_QTD(this, "GroupPoints");
GroupPoints->GroupBox1->setTitle(tr("GEOM_PARTITION")); GroupPoints->GroupBox1->setTitle(tr("GEOM_PARTITION"));
GroupPoints->GroupBox2->setTitle(tr("SUPPRESS_RESULT"));
GroupPoints->TextLabel1->setText(tr("GEOM_OBJECTS")); GroupPoints->TextLabel1->setText(tr("GEOM_OBJECTS"));
GroupPoints->TextLabel2->setText(tr("GEOM_TOOL_OBJECT")); GroupPoints->TextLabel2->setText(tr("GEOM_TOOL_OBJECT"));
GroupPoints->TextLabel3->setText(tr("GEOM_RECONSTRUCTION_LIMIT")); GroupPoints->TextLabel3->setText(tr("GEOM_RECONSTRUCTION_LIMIT"));