mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2024-11-14 09:38:34 +05:00
DCQ : Merge with Ecole_Ete_a6.
This commit is contained in:
parent
10f156c322
commit
a596550f89
4
INSTALL
4
INSTALL
@ -1,3 +1,3 @@
|
|||||||
This is the version 1.4.0 of GEOM
|
This is the version 2.0.0 of GEOM
|
||||||
Compatible with :
|
Compatible with :
|
||||||
- KERNEL 1.4.0
|
- KERNEL 2.0.0
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ C_DEPEND_FLAG = @C_DEPEND_FLAG@
|
|||||||
# C++
|
# C++
|
||||||
|
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
CXXFLAGS = @CXXFLAGS@
|
CXXFLAGS = @CXXFLAGS@ -Wparentheses -Wreturn-type -Wmissing-declarations -Winline
|
||||||
CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
|
CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
|
||||||
|
|
||||||
# JAVA
|
# JAVA
|
||||||
@ -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
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
THIS IS SALOME - GEOM VERSION: 1.4.0
|
THIS IS SALOME - GEOM VERSION: 2.0.0
|
||||||
|
@ -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,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
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# General configuration options
|
# General configuration options
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
PROJECT_NAME = "SALOME - GEOM - v.1.4.0"
|
PROJECT_NAME = "SALOME - GEOM - v.2.0.0"
|
||||||
PROJECT_NUMBER = id#1.1
|
PROJECT_NUMBER = id#1.1
|
||||||
OUTPUT_DIRECTORY = ../
|
OUTPUT_DIRECTORY = ../
|
||||||
OUTPUT_LANGUAGE = English
|
OUTPUT_LANGUAGE = English
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
foldersTree = gFld("<b>SALOME v.1.4.0 </b>", "", "")
|
foldersTree = gFld("<b>SALOME v.2.0.0 </b>", "", "")
|
||||||
insDoc(foldersTree, gLnk("Main Page", "", "main.html"))
|
insDoc(foldersTree, gLnk("Main Page", "", "main.html"))
|
||||||
|
|
||||||
aux1 = insFld(foldersTree, gFld("TUI Reference Guide", ""))
|
aux1 = insFld(foldersTree, gFld("TUI Reference Guide", ""))
|
||||||
|
95
doc/salome/GEOM_index.html
Normal file
95
doc/salome/GEOM_index.html
Normal 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">
|
||||||
|
<center>
|
||||||
|
<center>
|
||||||
|
</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%">
|
||||||
|
</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
44
doc/salome/Makefile.in
Normal 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
33
doc/salome/gui/Makefile.in
Normal 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
|
@ -191,6 +191,11 @@ module GEOM
|
|||||||
in double major_radius,
|
in double major_radius,
|
||||||
in double minor_radius) raises (SALOME::SALOME_Exception) ;
|
in double minor_radius) raises (SALOME::SALOME_Exception) ;
|
||||||
|
|
||||||
|
//-----------------------------------------------------------//
|
||||||
|
// Sketcher //
|
||||||
|
//-----------------------------------------------------------//
|
||||||
|
GEOM_Shape MakeSketcher (in string Cmd) raises (SALOME::SALOME_Exception) ;
|
||||||
|
|
||||||
//-----------------------------------------------------------//
|
//-----------------------------------------------------------//
|
||||||
// Primitives Construction //
|
// Primitives Construction //
|
||||||
//-----------------------------------------------------------//
|
//-----------------------------------------------------------//
|
||||||
|
@ -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
1
resources/GEOM.config
Normal file
@ -0,0 +1 @@
|
|||||||
|
language=en
|
@ -71,21 +71,6 @@
|
|||||||
<endsubmenu />
|
<endsubmenu />
|
||||||
<separator pos-id=""/>
|
<separator pos-id=""/>
|
||||||
<popup-item item-id="404" pos-id="" label-id="Sketch" icon-id="sketch.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="404" pos-id="" label-id="Sketch" icon-id="sketch.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<submenu label-id="Sketch Constraints" item-id="405" pos-id="">
|
|
||||||
<popup-item item-id="4051" pos-id="" label-id="Set Plane" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
|
||||||
<separator pos-id=""/>
|
|
||||||
<popup-item item-id="4052" pos-id="" label-id="Tangent" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
|
||||||
<popup-item item-id="4053" pos-id="" label-id="Perpendicular" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
|
||||||
</submenu>
|
|
||||||
<endsubmenu />
|
|
||||||
<submenu label-id="Sketch Options" item-id="406" pos-id="">
|
|
||||||
<popup-item item-id="4061" pos-id="" label-id="Length Dimension" icon-id="" tooltip-id="" accel-id="" toggle-id="true" execute-action=""/>
|
|
||||||
<popup-item item-id="4062" pos-id="" label-id="Angle Dimension" icon-id="" tooltip-id="" accel-id="" toggle-id="true" execute-action=""/>
|
|
||||||
<popup-item item-id="4063" pos-id="" label-id="Radius Dimension" icon-id="" tooltip-id="" accel-id="" toggle-id="true" execute-action=""/>
|
|
||||||
<popup-item item-id="4064" pos-id="" label-id="X Dimension" icon-id="" tooltip-id="" accel-id="" toggle-id="false" execute-action=""/>
|
|
||||||
<popup-item item-id="4065" pos-id="" label-id="Y Dimension" icon-id="" tooltip-id="" accel-id="" toggle-id="false" execute-action=""/>
|
|
||||||
</submenu>
|
|
||||||
<endsubmenu />
|
|
||||||
<separator pos-id=""/>
|
<separator pos-id=""/>
|
||||||
<popup-item item-id="407" pos-id="" label-id="Explode" icon-id="subshape.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="407" pos-id="" label-id="Explode" icon-id="subshape.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<submenu label-id="Build" item-id="408" pos-id="">
|
<submenu label-id="Build" item-id="408" pos-id="">
|
||||||
@ -257,19 +242,5 @@
|
|||||||
<popup-item item-id="901" pos-id="" label-id="Rename" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="901" pos-id="" label-id="Rename" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
</popupmenu>
|
</popupmenu>
|
||||||
|
|
||||||
<popupmenu label-id="Sketch" context-id="Sketch" parent-id="Viewer" object-id="">
|
|
||||||
<popup-item item-id="4041" pos-id="" label-id="Segment" icon-id="" tooltip-id="" accel-id="" toggle-id="true" execute-action=""/>
|
|
||||||
<popup-item item-id="4042" pos-id="" label-id="Arc" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
|
||||||
<separator pos-id=""/>
|
|
||||||
<popup-item item-id="4043" pos-id="" label-id="Set Angle" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
|
||||||
<popup-item item-id="4044" pos-id="" label-id="Set X" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
|
||||||
<popup-item item-id="4045" pos-id="" label-id="Set Y" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
|
||||||
<separator pos-id=""/>
|
|
||||||
<popup-item item-id="4046" pos-id="" label-id="Undo" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
|
||||||
<separator pos-id=""/>
|
|
||||||
<popup-item item-id="4047" pos-id="" label-id="End" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
|
||||||
<popup-item item-id="4048" pos-id="" label-id="Close" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
|
||||||
</popupmenu>
|
|
||||||
|
|
||||||
</desktop> <!-- DESKTOP END -->
|
</desktop> <!-- DESKTOP END -->
|
||||||
</application> <!-- APPLICATION END -->
|
</application> <!-- APPLICATION END -->
|
||||||
|
@ -39,110 +39,120 @@
|
|||||||
</menu-item>
|
</menu-item>
|
||||||
|
|
||||||
<!-- ************************* New Entity (menubar) ******************************* -->
|
<!-- ************************* New Entity (menubar) ******************************* -->
|
||||||
<menu-item label-id="Nouvelle entité" item-id="30" pos-id="3">
|
<menu-item label-id="Nouvelle entité" item-id="40" pos-id="3">
|
||||||
<submenu label-id="Construction basique" item-id="301" pos-id="1">
|
<submenu label-id="Construction basique" item-id="401" pos-id="1">
|
||||||
<popup-item item-id="3011" pos-id="" label-id="Point" icon-id="point2.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="4011" pos-id="" label-id="Point" icon-id="point2.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="3012" pos-id="" label-id="Ligne" icon-id="line.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="4012" pos-id="" label-id="Ligne" icon-id="line.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="3013" pos-id="" label-id="Cercle" icon-id="circle.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="4013" pos-id="" label-id="Cercle" icon-id="circle.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="3014" pos-id="" label-id="Ellipse" icon-id="ellipse.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="4014" pos-id="" label-id="Ellipse" icon-id="ellipse.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="3015" pos-id="" label-id="Arc" icon-id="arc.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="4015" pos-id="" label-id="Arc" icon-id="arc.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<separator pos-id="6"/>
|
<separator pos-id="6"/>
|
||||||
<popup-item item-id="3016" pos-id="" label-id="Vecteur" icon-id="vector.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="4016" pos-id="" label-id="Vecteur" icon-id="vector.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="3017" pos-id="" label-id="Plan" icon-id="plane.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="4017" pos-id="" label-id="Plan" icon-id="plane.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="3018" pos-id="" label-id="Plan de travail" icon-id="planeWorking.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="4018" pos-id="" label-id="Plan de travail" icon-id="planeWorking.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
</submenu>
|
</submenu>
|
||||||
<endsubmenu />
|
<endsubmenu />
|
||||||
<submenu label-id="Primitives" item-id="302" pos-id="2">
|
<submenu label-id="Primitives" item-id="402" pos-id="2">
|
||||||
<popup-item item-id="3021" pos-id="" label-id="Boite" icon-id="box.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="4021" pos-id="" label-id="Boite" icon-id="box.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="3022" pos-id="" label-id="Cylindre" icon-id="cylinder.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="4022" pos-id="" label-id="Cylindre" icon-id="cylinder.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="3023" pos-id="" label-id="Sphère" icon-id="sphere.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="4023" pos-id="" label-id="Sphère" icon-id="sphere.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="3024" pos-id="" label-id="Tore" icon-id="torus.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="4024" pos-id="" label-id="Tore" icon-id="torus.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
|
<popup-item item-id="4025" pos-id="" label-id="Cone" icon-id="cone.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
</submenu>
|
</submenu>
|
||||||
<popup-item item-id="303" pos-id="" label-id="Eclater" icon-id="subshape.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<endsubmenu />
|
||||||
<popup-item item-id="309" pos-id="" label-id="Supprime des faces" icon-id="supressface.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<submenu label-id="Generation" item-id="403" pos-id="3">
|
||||||
<popup-item item-id="314" pos-id="" label-id="Supprime un trou" icon-id="supresshole.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="4031" pos-id="" label-id="Extrusion" icon-id="prism.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
|
<popup-item item-id="4032" pos-id="" label-id="Revolution" icon-id="revol.png"tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
|
<popup-item item-id="4033" pos-id="" label-id="Filling" icon-id="filling.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
|
<popup-item item-id="4034" pos-id="" label-id="Pipe" icon-id="pipe.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
|
</submenu>
|
||||||
|
<endsubmenu />
|
||||||
<separator pos-id=""/>
|
<separator pos-id=""/>
|
||||||
<popup-item item-id="304" pos-id="" label-id="Arête" icon-id="build_edge.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="404" pos-id="" label-id="Sketch" icon-id="sketch.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="305" pos-id="" label-id="Wire" icon-id="build_wire.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<separator pos-id=""/>
|
||||||
<popup-item item-id="306" pos-id="" label-id="Face" icon-id="build_face.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="407" pos-id="" label-id="Eclater" icon-id="subshape.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="308" pos-id="" label-id="Compound" icon-id="build_compound.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<submenu label-id="Construction" item-id="408" pos-id="">
|
||||||
|
<popup-item item-id="4081" pos-id="" label-id="Arête" icon-id="build_edge.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
|
<popup-item item-id="4082" pos-id="" label-id="Wire" icon-id="build_wire.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
|
<popup-item item-id="4083" pos-id="" label-id="Face" icon-id="build_face.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
|
<popup-item item-id="4084" pos-id="" label-id="Shell" icon-id="build_shell.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
|
<popup-item item-id="4085" pos-id="" label-id="Solid" icon-id="build_solid.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
|
<popup-item item-id="4086" pos-id="" label-id="Compound" icon-id="build_compound.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
|
</submenu>
|
||||||
|
<endsubmenu />
|
||||||
</menu-item>
|
</menu-item>
|
||||||
|
|
||||||
|
|
||||||
<!-- ************************ Operations (menubar) *********************************** -->
|
<!-- ************************ Operations (menubar) *********************************** -->
|
||||||
<menu-item label-id="Opérations" item-id="40" pos-id="4">
|
<menu-item label-id="Opérations" item-id="50" pos-id="4">
|
||||||
<submenu label-id="Booléennes" item-id="401" pos-id="1">
|
<submenu label-id="Booléennes" item-id="501" pos-id="1">
|
||||||
<popup-item item-id="4011" pos-id="" label-id="Union" icon-id="fuse.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="5011" pos-id="" label-id="Union" icon-id="fuse.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="4012" pos-id="" label-id="Commun" icon-id="common.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="5012" pos-id="" label-id="Commun" icon-id="common.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="4013" pos-id="" label-id="Couper" icon-id="cut.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="5013" pos-id="" label-id="Couper" icon-id="cut.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="4014" pos-id="" label-id="Section" icon-id="section.png"tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="5014" pos-id="" label-id="Section" icon-id="section.png"tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
</submenu>
|
</submenu>
|
||||||
<endsubmenu />
|
<endsubmenu />
|
||||||
<submenu label-id="Transformation" item-id="402" pos-id="2">
|
<submenu label-id="Transformation" item-id="502" pos-id="2">
|
||||||
<popup-item item-id="4021" pos-id="" label-id="Translation" icon-id="translation.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="5021" pos-id="" label-id="Translation" icon-id="translation.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="4022" pos-id="" label-id="Rotation" icon-id="rotate.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="5022" pos-id="" label-id="Rotation" icon-id="rotate.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="4023" pos-id="" label-id="Symétrie par un plan" icon-id="mirrorPlane.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="5023" pos-id="" label-id="Symétrie par un plan" icon-id="mirrorPlane.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="4024" pos-id="" label-id="Facteur d'échelle" icon-id="scale.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="5024" pos-id="" label-id="Facteur d'échelle" icon-id="scale.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<separator pos-id=""/>
|
<separator pos-id=""/>
|
||||||
<popup-item item-id="4030" pos-id="" label-id="Multi-Translation" icon-id="multitranslation.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="5025" pos-id="" label-id="Multi-Translation" icon-id="multitranslation.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="4040" pos-id="" label-id="Multi-Rotation" icon-id="multirotation.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="5026" pos-id="" label-id="Multi-Rotation" icon-id="multirotation.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
</submenu>
|
</submenu>
|
||||||
<endsubmenu />
|
<endsubmenu />
|
||||||
<submenu label-id="Construction" item-id="403" pos-id="3">
|
<popup-item item-id="503" pos-id="" label-id="Partition" icon-id="partition.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="4031" pos-id="" label-id="Extrusion" icon-id="prism.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="504" pos-id="" label-id="Archimede" icon-id="archimede.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="4032" pos-id="" label-id="Révolution" icon-id="revol.png"tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<separator pos-id=""/>
|
||||||
<popup-item item-id="4033" pos-id="" label-id="Filling" icon-id="filling.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="505" pos-id="" label-id="Congé" icon-id="fillet.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="4034" pos-id="" label-id="Pipe création ?" icon-id="pipe.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="506" pos-id="" label-id="Chanfrein" icon-id="chamfer.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
</submenu>
|
|
||||||
<endsubmenu />
|
|
||||||
<popup-item item-id="4025" pos-id="" label-id="Partition" icon-id="partition.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
|
||||||
<popup-item item-id="4026" pos-id="" label-id="Archimede" icon-id="archimede.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
|
||||||
<popup-item item-id="4027" pos-id="" label-id="Congé" icon-id="fillet.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
|
||||||
<popup-item item-id="4028" pos-id="" label-id="Chanfrein" icon-id="chamfer.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
|
||||||
</menu-item>
|
</menu-item>
|
||||||
|
|
||||||
|
|
||||||
<!-- ************************** Advanced (menubar) ************************************** -->
|
<!-- ************************** Advanced (menubar) ************************************** -->
|
||||||
<menu-item label-id="Avancé" item-id="50" pos-id="5">
|
<menu-item label-id="Avancé" item-id="60" pos-id="5">
|
||||||
<popup-item item-id="501" pos-id="" label-id="Couture" icon-id="sewing.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="601" pos-id="" label-id="Couture" icon-id="sewing.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="502" pos-id="" label-id="Orientation" icon-id="orientation.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="602" pos-id="" label-id="Orientation" icon-id="orientation.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
|
<popup-item item-id="603" pos-id="" label-id="Suppression de faces" icon-id="supressface.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
|
<popup-item item-id="604" pos-id="" label-id="Suppression de trou" icon-id="supresshole.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
</menu-item>
|
</menu-item>
|
||||||
|
|
||||||
|
|
||||||
<!-- ************************** Mesures (menubar) ************************************ -->
|
<!-- ************************** Mesures (menubar) ************************************ -->
|
||||||
<menu-item label-id="Mesures" item-id="60" pos-id="6">
|
<menu-item label-id="Mesures" item-id="70" pos-id="6">
|
||||||
<popup-item item-id="601" pos-id="" label-id="Fondamentales" icon-id="linear.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="701" pos-id="" label-id="Fondamentales" icon-id="linear.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<separator pos-id="4"/>
|
<separator pos-id="4"/>
|
||||||
<popup-item item-id="604" pos-id="" label-id="Centre de gravité" icon-id="centergravity.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="702" pos-id="" label-id="Centre de gravité" icon-id="centergravity.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="605" pos-id="" label-id="Axes d'inertie" icon-id="axisinertia.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="703" pos-id="" label-id="Axes d'inertie" icon-id="axisinertia.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<separator pos-id="7"/>
|
<separator pos-id="7"/>
|
||||||
<submenu label-id="Dimensions" item-id="606" pos-id="8">
|
<submenu label-id="Dimensions" item-id="704" pos-id="8">
|
||||||
<popup-item item-id="6060" pos-id="" label-id="Boite englobante" icon-id="bounding.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="7041" pos-id="" label-id="Boite englobante" icon-id="bounding.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="6061" pos-id="" label-id="Distance minimale" icon-id="mindist.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="7042" pos-id="" label-id="Distance minimale" icon-id="mindist.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
</submenu>
|
</submenu>
|
||||||
<endsubmenu />
|
<endsubmenu />
|
||||||
<separator pos-id="9"/>
|
<separator pos-id="9"/>
|
||||||
<popup-item item-id="607" pos-id="" label-id="Tolérance" icon-id="tolerance.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="705" pos-id="" label-id="Tolérance" icon-id="tolerance.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<separator pos-id=""/>
|
<separator pos-id=""/>
|
||||||
<popup-item item-id="608" pos-id="" label-id="Whatis" icon-id="whatis.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="706" pos-id="" label-id="Whatis" icon-id="whatis.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="609" pos-id="" label-id="Check" icon-id="check.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="707" pos-id="" label-id="Check" icon-id="check.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
</menu-item>
|
</menu-item>
|
||||||
|
|
||||||
<!-- ********************************* Tools (menubar) ************************************ -->
|
<!-- ********************************* Tools (menubar) ************************************ -->
|
||||||
<menu-item label-id="Outils" item-id="5" pos-id="">
|
<menu-item label-id="Outils" item-id="5" pos-id="">
|
||||||
<separator pos-id=""/>
|
<separator pos-id=""/>
|
||||||
<popup-item item-id="5001" pos-id="" label-id="Check Géométrie" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="5103" pos-id="" label-id="Check Géométrie" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
|
<popup-item item-id="5104" pos-id="" label-id="Charger Script" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
</menu-item>
|
</menu-item>
|
||||||
|
|
||||||
<!-- ********************************* Settings (menubar) ********************************* -->
|
<!-- ********************************* Settings (menubar) ********************************* -->
|
||||||
<menu-item label-id="Préférences" item-id="4" pos-id="">
|
<menu-item label-id="Préférences" item-id="4" pos-id="">
|
||||||
<submenu label-id="Géométry" item-id="40" pos-id="-1">
|
<submenu label-id="Géométry" item-id="41" pos-id="-1">
|
||||||
<popup-item item-id="701" pos-id="" label-id="Avec copie" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="411" pos-id="" label-id="Nommer/Ranger automatiquement" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="702" pos-id="" label-id="Nommer/Ranger automatiquement" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<separator pos-id=""/>
|
||||||
<popup-item item-id="703" pos-id="" label-id="Couleur" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="412" pos-id="" label-id="Couleur" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="704" pos-id="" label-id="Isos" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="413" pos-id="" label-id="Isos" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="705" pos-id="" label-id="Valeur d'increment" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="414" pos-id="" label-id="Valeur d'increment" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
</submenu>
|
</submenu>
|
||||||
<endsubmenu />
|
<endsubmenu />
|
||||||
<separator pos-id="-1"/>
|
<separator pos-id="-1"/>
|
||||||
@ -150,16 +160,15 @@
|
|||||||
|
|
||||||
<!-- ***************************** View (menubar) ************************************ -->
|
<!-- ***************************** View (menubar) ************************************ -->
|
||||||
<menu-item label-id="Affichage" item-id="2" pos-id="">
|
<menu-item label-id="Affichage" item-id="2" pos-id="">
|
||||||
<submenu label-id="Mode d'affichage" item-id="21" pos-id="6">
|
<submenu label-id="Mode d'affichage" item-id="21" pos-id="5">
|
||||||
<popup-item item-id="6021" pos-id="" label-id="Ombré" icon-id="shading.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="211" pos-id="" label-id="Ombré" icon-id="shading.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<separator pos-id=""/>
|
<separator pos-id=""/>
|
||||||
<popup-item item-id="6022" pos-id="" label-id="Afficher tout" icon-id="displayall.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="212" pos-id="" label-id="Afficher tout" icon-id="displayall.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="6023" pos-id="" label-id="Afficher seulement" icon-id="display.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="213" pos-id="" label-id="Afficher seulement" icon-id="display.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="6024" pos-id="" label-id="Effacer tout" icon-id="eraseall.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="214" pos-id="" label-id="Effacer tout" icon-id="eraseall.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="6025" pos-id="" label-id="Effacer seulement" icon-id="erase.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="215" pos-id="" label-id="Effacer seulement" icon-id="erase.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
</submenu>
|
</submenu>
|
||||||
<endsubmenu />
|
<endsubmenu />
|
||||||
<separator pos-id="7"/>
|
|
||||||
</menu-item>
|
</menu-item>
|
||||||
|
|
||||||
</menubar> <!-- MENUBAR END -->
|
</menubar> <!-- MENUBAR END -->
|
||||||
@ -167,80 +176,67 @@
|
|||||||
|
|
||||||
<!-- ///////////////////////////////////// TOOLBARS ////////////////////////////////////// -->
|
<!-- ///////////////////////////////////// TOOLBARS ////////////////////////////////////// -->
|
||||||
<toolbar label-id="Construction basique">
|
<toolbar label-id="Construction basique">
|
||||||
<toolbutton-item item-id="3011" pos-id="" label-id="Point" icon-id="point2.png" tooltip-id="Point" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="4011" pos-id="" label-id="Point" icon-id="point2.png" tooltip-id="Point" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<toolbutton-item item-id="3012" pos-id="" label-id="Ligne" icon-id="line.png" tooltip-id="Ligne" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="4012" pos-id="" label-id="Ligne" icon-id="line.png" tooltip-id="Ligne" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<toolbutton-item item-id="3013" pos-id="" label-id="Cercle" icon-id="circle.png" tooltip-id="Cercle" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="4013" pos-id="" label-id="Cercle" icon-id="circle.png" tooltip-id="Cercle" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<toolbutton-item item-id="3014" pos-id="" label-id="Ellipse" icon-id="ellipse.png" tooltip-id="Ellipse" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="4014" pos-id="" label-id="Ellipse" icon-id="ellipse.png" tooltip-id="Ellipse" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<toolbutton-item item-id="3015" pos-id="" label-id="Arc" icon-id="arc.png" tooltip-id="Arc" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="4015" pos-id="" label-id="Arc" icon-id="arc.png" tooltip-id="Arc" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<toolbutton-item item-id="3016" pos-id="" label-id="Vecteur" icon-id="vector.png" tooltip-id="Vecteur" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="4016" pos-id="" label-id="Vecteur" icon-id="vector.png" tooltip-id="Vecteur" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<toolbutton-item item-id="3017" pos-id="" label-id="Plan" icon-id="plane.png" tooltip-id="Plan" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="4017" pos-id="" label-id="Plan" icon-id="plane.png" tooltip-id="Plan" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<toolbutton-item item-id="3018" pos-id="" label-id="Plan de travail" icon-id="planeWorking.png" tooltip-id="Plan de travail" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="4018" pos-id="" label-id="Plan de travail" icon-id="planeWorking.png" tooltip-id="Plan de travail" accel-id="" toggle-id="" execute-action=""/>
|
||||||
</toolbar>
|
</toolbar>
|
||||||
|
|
||||||
<toolbar label-id="Primitives">
|
<toolbar label-id="Primitives">
|
||||||
<toolbutton-item item-id="3021" label-id="Boite" icon-id="box.png" tooltip-id="Construction d'une boite" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="4021" label-id="Boite" icon-id="box.png" tooltip-id="Construction d'une boite" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<toolbutton-item item-id="3022" label-id="Cylindre" icon-id="cylinder.png" tooltip-id="Construction d'un cylindre" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="4022" label-id="Cylindre" icon-id="cylinder.png" tooltip-id="Construction d'un cylindre" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<toolbutton-item item-id="3023" label-id="Sphère" icon-id="sphere.png" tooltip-id="Construction d'une sphère" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="4023" label-id="Sphère" icon-id="sphere.png" tooltip-id="Construction d'une sphère" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<toolbutton-item item-id="3024" label-id="Tore" icon-id="torus.png" tooltip-id="Construction d'un tore" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="4024" label-id="Tore" icon-id="torus.png" tooltip-id="Construction d'un tore" accel-id="" toggle-id="" execute-action=""/>
|
||||||
|
<toolbutton-item item-id="4025" label-id="Cone" icon-id="cone.png" tooltip-id="Cone" accel-id="" toggle-id="" execute-action=""/>
|
||||||
</toolbar>
|
</toolbar>
|
||||||
|
|
||||||
<toolbar label-id="Opé. Booléennes">
|
<toolbar label-id="Opé. Booléennes">
|
||||||
<toolbutton-item item-id="4011" label-id="Union" icon-id="fuse.png" tooltip-id="Union de deux shapes" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="5011" label-id="Union" icon-id="fuse.png" tooltip-id="Union de deux shapes" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<toolbutton-item item-id="4012" label-id="Commun" icon-id="common.png" tooltip-id="Partie commune entre deux shapes" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="5012" label-id="Commun" icon-id="common.png" tooltip-id="Partie commune entre deux shapes" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<toolbutton-item item-id="4013" label-id="Couper" icon-id="cut.png" tooltip-id="Coupe la première shape par la seconde" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="5013" label-id="Couper" icon-id="cut.png" tooltip-id="Coupe la première shape par la seconde" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<toolbutton-item item-id="4014" label-id="Section" icon-id="section.png" tooltip-id="Section entre deux shapes" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="5014" label-id="Section" icon-id="section.png" tooltip-id="Section entre deux shapes" accel-id="" toggle-id="" execute-action=""/>
|
||||||
</toolbar>
|
</toolbar>
|
||||||
|
|
||||||
<toolbar label-id="Construction">
|
<toolbar label-id="Construction">
|
||||||
<toolbutton-item item-id="4031" label-id="Extrusion" icon-id="prism.png" tooltip-id="Shape construite par extrusion" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="4031" label-id="Extrusion" icon-id="prism.png" tooltip-id="Shape construite par extrusion" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<toolbutton-item item-id="4032" label-id="Révolution" icon-id="revol.png" tooltip-id="Shape construite par révolution" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="4032" label-id="Révolution" icon-id="revol.png" tooltip-id="Shape construite par révolution" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="4033" pos-id="" label-id="'Filling'" icon-id="filling.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="4033" label-id="Filling" icon-id="filling.png" tooltip-id="Generation by filling" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="4034" pos-id="" label-id="'Pipe' création" icon-id="pipe.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="4034" label-id="Pipe" icon-id="pipe.png" tooltip-id="Pipe mode generation" accel-id="" toggle-id="" execute-action=""/>
|
||||||
</toolbar>
|
</toolbar>
|
||||||
|
|
||||||
<toolbar label-id="Transformation">
|
<toolbar label-id="Transformation">
|
||||||
<toolbutton-item item-id="4021" label-id="Translation" icon-id="translation.png" tooltip-id="Translation d'une shape"accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="5021" label-id="Translation" icon-id="translation.png" tooltip-id="Translation d'une shape"accel-id="" toggle-id="" execute-action=""/>
|
||||||
<toolbutton-item item-id="4022" label-id="Rotation" icon-id="rotate.png" tooltip-id="Rotation d'une shape" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="5022" label-id="Rotation" icon-id="rotate.png" tooltip-id="Rotation d'une shape" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<toolbutton-item item-id="4023" label-id="Symétrie" icon-id="mirrorPlane.png" tooltip-id="Symétrie" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="5023" label-id="Symétrie" icon-id="mirrorPlane.png" tooltip-id="Symétrie" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<toolbutton-item item-id="4024" label-id="Facteur d'échelle" icon-id="scale.png" tooltip-id="Facteur d'échelle" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="5024" label-id="Facteur d'échelle" icon-id="scale.png" tooltip-id="Facteur d'échelle" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<separatorTB/>
|
<separatorTB/>
|
||||||
<toolbutton-item item-id="4030" label-id="Multi-Translation" icon-id="multitranslation.png" tooltip-id="Multi-translation d'une shape" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="5025" label-id="Multi-Translation" icon-id="multitranslation.png" tooltip-id="Multi-translation d'une shape" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<toolbutton-item item-id="4040" label-id="Multi-Rotation" icon-id="multirotation.png" tooltip-id="Multi-rotation d'une shape" accel-id="" toggle-id="" execute-action=""/>
|
<toolbutton-item item-id="5026" label-id="Multi-Rotation" icon-id="multirotation.png" tooltip-id="Multi-rotation d'une shape" accel-id="" toggle-id="" execute-action=""/>
|
||||||
</toolbar>
|
</toolbar>
|
||||||
|
|
||||||
|
|
||||||
<!-- ################################# POPUP MENU ################################# -->
|
<!-- ################################# POPUP MENU ################################# -->
|
||||||
<popupmenu label-id="Menu contextuel du Viewer" context-id="" parent-id="Viewer" object-id="">
|
<popupmenu label-id="Menu contextuel du Viewer" context-id="" parent-id="Viewer" object-id="">
|
||||||
<submenu label-id="Propriétés" item-id="803" pos-id="6">
|
<submenu label-id="Propriétés" item-id="803" pos-id="6">
|
||||||
<popup-item item-id="8021" pos-id="" label-id="Filaire/Ombré" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="8031" pos-id="" label-id="Filaire/Ombré" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<separator pos-id=""/>
|
<separator pos-id=""/>
|
||||||
<popup-item item-id="8031" pos-id="" label-id="Couleur" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="8032" pos-id="" label-id="Couleur" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="8032" pos-id="" label-id="Transparence" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="8033" pos-id="" label-id="Transparence" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<popup-item item-id="8033" pos-id="" label-id="Isos" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="8034" pos-id="" label-id="Isos" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
</submenu>
|
</submenu>
|
||||||
<endsubmenu />
|
<endsubmenu />
|
||||||
<separator pos-id=""/>
|
<separator pos-id=""/>
|
||||||
<popup-item item-id="801" pos-id="" label-id="Ajouter dans l'étude" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="804" pos-id="" label-id="Ajouter dans l'étude" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
</popupmenu>
|
</popupmenu>
|
||||||
|
|
||||||
<popupmenu label-id="Menu contextuel" context-id="" parent-id="ObjectBrowser" object-id="">
|
<popupmenu label-id="Menu contextuel" context-id="" parent-id="ObjectBrowser" object-id="">
|
||||||
<popup-item item-id="9024" pos-id="" label-id="Ouverture" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="9024" pos-id="" label-id="Ouverture" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
<separator pos-id=""/>
|
<separator pos-id=""/>
|
||||||
<popup-item item-id="901" pos-id="2" label-id="Renommer" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
<popup-item item-id="901" pos-id="" label-id="Renommer" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
||||||
</popupmenu>
|
|
||||||
|
|
||||||
<popupmenu label-id="Sketch" context-id="Sketch" parent-id="Viewer" object-id="">
|
|
||||||
<popup-item item-id="10000" pos-id="" label-id="Segment" icon-id="" tooltip-id="" accel-id="" toggle-id="true" execute-action=""/>
|
|
||||||
<popup-item item-id="10001" pos-id="" label-id="Arc" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
|
||||||
<separator pos-id=""/>
|
|
||||||
<popup-item item-id="10002" pos-id="" label-id="Set Angle" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
|
||||||
<popup-item item-id="10003" pos-id="" label-id="Set X" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
|
||||||
<popup-item item-id="10004" pos-id="" label-id="Set Y" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
|
||||||
<separator pos-id=""/>
|
|
||||||
<popup-item item-id="10006" pos-id="" label-id="Undo" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
|
||||||
<separator pos-id=""/>
|
|
||||||
<popup-item item-id="10007" pos-id="" label-id="End" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
|
||||||
<popup-item item-id="10008" pos-id="" label-id="Close" icon-id="" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
|
|
||||||
</popupmenu>
|
</popupmenu>
|
||||||
|
|
||||||
</desktop> <!-- DESKTOP END -->
|
</desktop> <!-- DESKTOP END -->
|
||||||
|
@ -406,3 +406,4 @@ void VolumeSection::getZ( double& min, double& max)
|
|||||||
min = Zmin;
|
min = Zmin;
|
||||||
max = Zmax;
|
max = Zmax;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -201,7 +201,7 @@ gp_Pnt BasicGUI::ConvertClickToPoint(Standard_Real x, Standard_Real y, Handle(V3
|
|||||||
|
|
||||||
gp_Pln PlaneOfTheView = gp_Pln(AtPoint,EyeDir);
|
gp_Pln PlaneOfTheView = gp_Pln(AtPoint,EyeDir);
|
||||||
Standard_Real X, Y, Z;
|
Standard_Real X, Y, Z;
|
||||||
aView->Convert(x, y, X, Y, Z);
|
aView->Convert(int(x), int(y), X, Y, Z);
|
||||||
gp_Pnt ConvertedPoint(X, Y, Z);
|
gp_Pnt ConvertedPoint(X, Y, Z);
|
||||||
|
|
||||||
gp_Pnt2d ConvertedPointOnPlane = ProjLib::Project(PlaneOfTheView, ConvertedPoint);
|
gp_Pnt2d ConvertedPointOnPlane = ProjLib::Project(PlaneOfTheView, ConvertedPoint);
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "BasicGUI_ArcDlg.h"
|
#include "BasicGUI_ArcDlg.h"
|
||||||
|
|
||||||
#include <BRepBuilderAPI_MakeEdge.hxx>
|
#include <BRepBuilderAPI_MakeEdge.hxx>
|
||||||
@ -34,6 +33,10 @@ using namespace std;
|
|||||||
#include <Geom_TrimmedCurve.hxx>
|
#include <Geom_TrimmedCurve.hxx>
|
||||||
#include <Precision.hxx>
|
#include <Precision.hxx>
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : BasicGUI_ArcDlg()
|
// class : BasicGUI_ArcDlg()
|
||||||
// purpose : Constructs a BasicGUI_ArcDlg which is a child of 'parent', with the
|
// purpose : Constructs a BasicGUI_ArcDlg which is a child of 'parent', with the
|
||||||
@ -137,6 +140,7 @@ void BasicGUI_ArcDlg::ClickOnOk()
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void BasicGUI_ArcDlg::ClickOnApply()
|
void BasicGUI_ArcDlg::ClickOnApply()
|
||||||
{
|
{
|
||||||
|
buttonApply->setFocus();
|
||||||
QAD_Application::getDesktop()->putInfo(tr(""));
|
QAD_Application::getDesktop()->putInfo(tr(""));
|
||||||
if (mySimulationTopoDs.IsNull())
|
if (mySimulationTopoDs.IsNull())
|
||||||
return;
|
return;
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "BasicGUI_CircleDlg.h"
|
#include "BasicGUI_CircleDlg.h"
|
||||||
|
|
||||||
#include <gp_Lin.hxx>
|
#include <gp_Lin.hxx>
|
||||||
@ -35,6 +34,10 @@ using namespace std;
|
|||||||
#include <BRepAdaptor_Curve.hxx>
|
#include <BRepAdaptor_Curve.hxx>
|
||||||
#include "QAD_Config.h"
|
#include "QAD_Config.h"
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : BasicGUI_CircleDlg()
|
// class : BasicGUI_CircleDlg()
|
||||||
// purpose : Constructs a BasicGUI_CircleDlg which is a child of 'parent', with the
|
// purpose : Constructs a BasicGUI_CircleDlg which is a child of 'parent', with the
|
||||||
@ -147,6 +150,7 @@ void BasicGUI_CircleDlg::ClickOnOk()
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void BasicGUI_CircleDlg::ClickOnApply()
|
void BasicGUI_CircleDlg::ClickOnApply()
|
||||||
{
|
{
|
||||||
|
buttonApply->setFocus();
|
||||||
QAD_Application::getDesktop()->putInfo(tr(""));
|
QAD_Application::getDesktop()->putInfo(tr(""));
|
||||||
if (mySimulationTopoDs.IsNull())
|
if (mySimulationTopoDs.IsNull())
|
||||||
return;
|
return;
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "BasicGUI_EllipseDlg.h"
|
#include "BasicGUI_EllipseDlg.h"
|
||||||
|
|
||||||
#include <gp_Lin.hxx>
|
#include <gp_Lin.hxx>
|
||||||
@ -34,6 +33,10 @@ using namespace std;
|
|||||||
#include <BRepAdaptor_Curve.hxx>
|
#include <BRepAdaptor_Curve.hxx>
|
||||||
#include "QAD_Config.h"
|
#include "QAD_Config.h"
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : BasicGUI_EllipseDlg()
|
// class : BasicGUI_EllipseDlg()
|
||||||
// purpose : Constructs a BasicGUI_EllipseDlg which is a child of 'parent', with the
|
// purpose : Constructs a BasicGUI_EllipseDlg which is a child of 'parent', with the
|
||||||
@ -153,6 +156,7 @@ void BasicGUI_EllipseDlg::ClickOnOk()
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void BasicGUI_EllipseDlg::ClickOnApply()
|
void BasicGUI_EllipseDlg::ClickOnApply()
|
||||||
{
|
{
|
||||||
|
buttonApply->setFocus();
|
||||||
QAD_Application::getDesktop()->putInfo(tr(""));
|
QAD_Application::getDesktop()->putInfo(tr(""));
|
||||||
if (mySimulationTopoDs.IsNull())
|
if (mySimulationTopoDs.IsNull())
|
||||||
return;
|
return;
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "BasicGUI_LineDlg.h"
|
#include "BasicGUI_LineDlg.h"
|
||||||
|
|
||||||
#include <BRepBuilderAPI_MakeEdge.hxx>
|
#include <BRepBuilderAPI_MakeEdge.hxx>
|
||||||
@ -34,6 +33,10 @@ using namespace std;
|
|||||||
#include <BRep_Builder.hxx>
|
#include <BRep_Builder.hxx>
|
||||||
#include <Precision.hxx>
|
#include <Precision.hxx>
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : BasicGUI_LineDlg()
|
// class : BasicGUI_LineDlg()
|
||||||
// purpose : Constructs a BasicGUI_LineDlg which is a child of 'parent', with the
|
// purpose : Constructs a BasicGUI_LineDlg which is a child of 'parent', with the
|
||||||
@ -135,6 +138,7 @@ void BasicGUI_LineDlg::ClickOnOk()
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void BasicGUI_LineDlg::ClickOnApply()
|
void BasicGUI_LineDlg::ClickOnApply()
|
||||||
{
|
{
|
||||||
|
buttonApply->setFocus();
|
||||||
QAD_Application::getDesktop()->putInfo(tr(""));
|
QAD_Application::getDesktop()->putInfo(tr(""));
|
||||||
if (mySimulationTopoDs.IsNull())
|
if (mySimulationTopoDs.IsNull())
|
||||||
return;
|
return;
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "BasicGUI_PlaneDlg.h"
|
#include "BasicGUI_PlaneDlg.h"
|
||||||
|
|
||||||
#include <BRepBuilderAPI_MakeFace.hxx>
|
#include <BRepBuilderAPI_MakeFace.hxx>
|
||||||
@ -37,6 +36,10 @@ using namespace std;
|
|||||||
#include <Precision.hxx>
|
#include <Precision.hxx>
|
||||||
#include "QAD_Config.h"
|
#include "QAD_Config.h"
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : BasicGUI_PlaneDlg()
|
// class : BasicGUI_PlaneDlg()
|
||||||
// purpose : Constructs a BasicGUI_PlaneDlg which is a child of 'parent', with the
|
// purpose : Constructs a BasicGUI_PlaneDlg which is a child of 'parent', with the
|
||||||
@ -273,6 +276,7 @@ void BasicGUI_PlaneDlg::ClickOnOk()
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void BasicGUI_PlaneDlg::ClickOnApply()
|
void BasicGUI_PlaneDlg::ClickOnApply()
|
||||||
{
|
{
|
||||||
|
buttonApply->setFocus();
|
||||||
QAD_Application::getDesktop()->putInfo(tr(""));
|
QAD_Application::getDesktop()->putInfo(tr(""));
|
||||||
if (mySimulationTopoDs.IsNull())
|
if (mySimulationTopoDs.IsNull())
|
||||||
return;
|
return;
|
||||||
|
@ -259,6 +259,7 @@ void BasicGUI_PointDlg::ClickOnOk()
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void BasicGUI_PointDlg::ClickOnApply()
|
void BasicGUI_PointDlg::ClickOnApply()
|
||||||
{
|
{
|
||||||
|
buttonApply->setFocus();
|
||||||
QAD_Application::getDesktop()->putInfo(tr(""));
|
QAD_Application::getDesktop()->putInfo(tr(""));
|
||||||
if(mySimulationTopoDs.IsNull())
|
if(mySimulationTopoDs.IsNull())
|
||||||
return;
|
return;
|
||||||
|
@ -237,6 +237,7 @@ void BasicGUI_VectorDlg::ClickOnOk()
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void BasicGUI_VectorDlg::ClickOnApply()
|
void BasicGUI_VectorDlg::ClickOnApply()
|
||||||
{
|
{
|
||||||
|
buttonApply->setFocus();
|
||||||
QAD_Application::getDesktop()->putInfo(tr(""));
|
QAD_Application::getDesktop()->putInfo(tr(""));
|
||||||
if (mySimulationTopoDs.IsNull())
|
if (mySimulationTopoDs.IsNull())
|
||||||
return;
|
return;
|
||||||
|
@ -127,6 +127,7 @@ void BasicGUI_WorkingPlaneDlg::ClickOnOk()
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void BasicGUI_WorkingPlaneDlg::ClickOnApply()
|
void BasicGUI_WorkingPlaneDlg::ClickOnApply()
|
||||||
{
|
{
|
||||||
|
buttonApply->setFocus();
|
||||||
QAD_Application::getDesktop()->putInfo(tr(""));
|
QAD_Application::getDesktop()->putInfo(tr(""));
|
||||||
if(myOkPlane)
|
if(myOkPlane)
|
||||||
myBasicGUI->MakeWorkingPlane(myLoc, myDir);
|
myBasicGUI->MakeWorkingPlane(myLoc, myDir);
|
||||||
|
@ -52,8 +52,8 @@ BooleanGUI_CutDlg::BooleanGUI_CutDlg(QWidget* parent, const char* name, BooleanG
|
|||||||
|
|
||||||
GroupCut = new DlgRef_2Sel_QTD(this, "GroupCut");
|
GroupCut = new DlgRef_2Sel_QTD(this, "GroupCut");
|
||||||
GroupCut->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
|
GroupCut->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
|
||||||
GroupCut->TextLabel1->setText(tr("GEOM_OBJECT_I").arg("1"));
|
GroupCut->TextLabel1->setText(tr("GEOM_MAIN_OBJECT"));
|
||||||
GroupCut->TextLabel2->setText(tr("GEOM_OBJECT_I").arg("2"));
|
GroupCut->TextLabel2->setText(tr("GEOM_TOOL_OBJECT"));
|
||||||
GroupCut->PushButton1->setPixmap(image1);
|
GroupCut->PushButton1->setPixmap(image1);
|
||||||
GroupCut->PushButton2->setPixmap(image1);
|
GroupCut->PushButton2->setPixmap(image1);
|
||||||
|
|
||||||
|
@ -26,12 +26,15 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "BuildGUI_EdgeDlg.h"
|
#include "BuildGUI_EdgeDlg.h"
|
||||||
|
|
||||||
#include <BRepBuilderAPI_MakeEdge.hxx>
|
#include <BRepBuilderAPI_MakeEdge.hxx>
|
||||||
#include <Precision.hxx>
|
#include <Precision.hxx>
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : BuildGUI_EdgeDlg()
|
// class : BuildGUI_EdgeDlg()
|
||||||
// purpose : Constructs a BuildGUI_EdgeDlg which is a child of 'parent', with the
|
// purpose : Constructs a BuildGUI_EdgeDlg which is a child of 'parent', with the
|
||||||
|
@ -52,7 +52,7 @@ BuildGUI_FaceDlg::BuildGUI_FaceDlg(QWidget* parent, const char* name, BuildGUI*
|
|||||||
|
|
||||||
GroupPoints = new DlgRef_1Sel1Check_QTD(this, "GroupPoints");
|
GroupPoints = new DlgRef_1Sel1Check_QTD(this, "GroupPoints");
|
||||||
GroupPoints->GroupBox1->setTitle(tr("GEOM_FACE_FFW"));
|
GroupPoints->GroupBox1->setTitle(tr("GEOM_FACE_FFW"));
|
||||||
GroupPoints->TextLabel1->setText(tr("GEOM_WIRE"));
|
GroupPoints->TextLabel1->setText(tr("GEOM_WIRES"));
|
||||||
GroupPoints->CheckButton1->setText(tr("GEOM_FACE_OPT"));
|
GroupPoints->CheckButton1->setText(tr("GEOM_FACE_OPT"));
|
||||||
GroupPoints->PushButton1->setPixmap(image1);
|
GroupPoints->PushButton1->setPixmap(image1);
|
||||||
|
|
||||||
|
@ -87,7 +87,7 @@ void BuildGUI_ShellDlg::Init()
|
|||||||
myEditCurrentArgument = GroupShell->LineEdit1;
|
myEditCurrentArgument = GroupShell->LineEdit1;
|
||||||
myOkListShapes = false;
|
myOkListShapes = false;
|
||||||
|
|
||||||
myFaceFilter = new GEOM_FaceFilter(StdSelect_Plane, myGeom);
|
myFaceFilter = new GEOM_ShapeTypeFilter(TopAbs_FACE, myGeom);
|
||||||
/* Filter for the next selection */
|
/* Filter for the next selection */
|
||||||
mySelection->AddFilter(myFaceFilter) ;
|
mySelection->AddFilter(myFaceFilter) ;
|
||||||
|
|
||||||
@ -163,10 +163,8 @@ void BuildGUI_ShellDlg::SelectionIntoArgument()
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void BuildGUI_ShellDlg::SetEditCurrentArgument()
|
void BuildGUI_ShellDlg::SetEditCurrentArgument()
|
||||||
{
|
{
|
||||||
QPushButton* send = (QPushButton*)sender();
|
mySelection->ClearFilters();
|
||||||
mySelection->ClearFilters() ;
|
|
||||||
GroupShell->LineEdit1->setFocus();
|
GroupShell->LineEdit1->setFocus();
|
||||||
myEditCurrentArgument = GroupShell->LineEdit1;
|
|
||||||
mySelection->AddFilter(myFaceFilter);
|
mySelection->AddFilter(myFaceFilter);
|
||||||
this->SelectionIntoArgument();
|
this->SelectionIntoArgument();
|
||||||
return;
|
return;
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
|
|
||||||
#include "BuildGUI.h"
|
#include "BuildGUI.h"
|
||||||
|
|
||||||
#include "GEOM_FaceFilter.hxx"
|
#include "GEOM_ShapeTypeFilter.hxx"
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : BuildGUI_ShellDlg
|
// class : BuildGUI_ShellDlg
|
||||||
@ -54,7 +54,7 @@ private:
|
|||||||
|
|
||||||
BuildGUI* myBuildGUI;
|
BuildGUI* myBuildGUI;
|
||||||
|
|
||||||
Handle(GEOM_FaceFilter) myFaceFilter; /* Filters selection */
|
Handle(GEOM_ShapeTypeFilter) myFaceFilter; /* Filters selection */
|
||||||
GEOM::GEOM_Gen::ListOfIOR myListShapes;
|
GEOM::GEOM_Gen::ListOfIOR myListShapes;
|
||||||
bool myOkListShapes; /* to check when arguments is defined */
|
bool myOkListShapes; /* to check when arguments is defined */
|
||||||
|
|
||||||
@ -64,7 +64,6 @@ private slots:
|
|||||||
void ClickOnOk();
|
void ClickOnOk();
|
||||||
void ClickOnApply();
|
void ClickOnApply();
|
||||||
void SetEditCurrentArgument();
|
void SetEditCurrentArgument();
|
||||||
void LineEditReturnPressed();
|
|
||||||
void SelectionIntoArgument();
|
void SelectionIntoArgument();
|
||||||
void ActivateThisDialog();
|
void ActivateThisDialog();
|
||||||
|
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header:
|
// $Header:
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "DisplayGUI.h"
|
#include "DisplayGUI.h"
|
||||||
|
|
||||||
#include "QAD_RightFrame.h"
|
#include "QAD_RightFrame.h"
|
||||||
@ -39,6 +38,10 @@ using namespace std;
|
|||||||
|
|
||||||
#include <AIS_ListIteratorOfListOfInteractive.hxx>
|
#include <AIS_ListIteratorOfListOfInteractive.hxx>
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=======================================================================
|
//=======================================================================
|
||||||
// function : DisplayGUI()
|
// function : DisplayGUI()
|
||||||
// purpose : Constructor
|
// purpose : Constructor
|
||||||
@ -232,6 +235,11 @@ void DisplayGUI::BuildPresentation(const Handle(SALOME_InteractiveObject)& theIO
|
|||||||
if(theIO.IsNull())
|
if(theIO.IsNull())
|
||||||
MESSAGE("BuildPresentation(): null SALOME_InteractiveObject passed")
|
MESSAGE("BuildPresentation(): null SALOME_InteractiveObject passed")
|
||||||
|
|
||||||
|
Standard_Boolean testResult;
|
||||||
|
GEOM::GEOM_Shape_var myGeomShape = myDisplayGUI->myGeomBase->ConvertIOinGEOMShape(theIO, testResult);
|
||||||
|
if(!testResult)
|
||||||
|
return;
|
||||||
|
|
||||||
if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
|
if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
|
||||||
// VTK
|
// VTK
|
||||||
|
|
||||||
|
@ -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 );
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -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
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
** Form implementation generated from reading ui file 'DlgRef_Skeleton_QTD.ui'
|
** Form implementation generated from reading ui file 'DlgRef_Skeleton_QTD.ui'
|
||||||
**
|
**
|
||||||
** Created: mar sep 23 15:06:58 2003
|
** Created: Fri Apr 16 12:57:26 2004
|
||||||
** by: The User Interface Compiler (uic)
|
** by: The User Interface Compiler (uic)
|
||||||
**
|
**
|
||||||
** WARNING! All changes made in this file will be lost!
|
** WARNING! All changes made in this file will be lost!
|
||||||
@ -11,6 +11,8 @@
|
|||||||
#include <qvariant.h>
|
#include <qvariant.h>
|
||||||
#include <qbuttongroup.h>
|
#include <qbuttongroup.h>
|
||||||
#include <qgroupbox.h>
|
#include <qgroupbox.h>
|
||||||
|
#include <qlabel.h>
|
||||||
|
#include <qlineedit.h>
|
||||||
#include <qpushbutton.h>
|
#include <qpushbutton.h>
|
||||||
#include <qradiobutton.h>
|
#include <qradiobutton.h>
|
||||||
#include <qlayout.h>
|
#include <qlayout.h>
|
||||||
@ -29,7 +31,7 @@ DlgRef_Skeleton_QTD::DlgRef_Skeleton_QTD( QWidget* parent, const char* name, bo
|
|||||||
{
|
{
|
||||||
if ( !name )
|
if ( !name )
|
||||||
setName( "DlgRef_Skeleton_QTD" );
|
setName( "DlgRef_Skeleton_QTD" );
|
||||||
resize( 307, 147 );
|
resize( 321, 295 );
|
||||||
setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) );
|
setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) );
|
||||||
setCaption( trUtf8( "DlgRef_Skeleton_QTD" ) );
|
setCaption( trUtf8( "DlgRef_Skeleton_QTD" ) );
|
||||||
setSizeGripEnabled( TRUE );
|
setSizeGripEnabled( TRUE );
|
||||||
@ -37,6 +39,12 @@ DlgRef_Skeleton_QTD::DlgRef_Skeleton_QTD( QWidget* parent, const char* name, bo
|
|||||||
|
|
||||||
Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1");
|
Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1");
|
||||||
|
|
||||||
|
GroupMedium = new QGroupBox( this, "GroupMedium" );
|
||||||
|
GroupMedium->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupMedium->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
GroupMedium->setTitle( trUtf8( "" ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( GroupMedium, 2, 0 );
|
||||||
|
|
||||||
GroupButtons = new QGroupBox( this, "GroupButtons" );
|
GroupButtons = new QGroupBox( this, "GroupButtons" );
|
||||||
GroupButtons->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupButtons->sizePolicy().hasHeightForWidth() ) );
|
GroupButtons->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupButtons->sizePolicy().hasHeightForWidth() ) );
|
||||||
GroupButtons->setTitle( trUtf8( "" ) );
|
GroupButtons->setTitle( trUtf8( "" ) );
|
||||||
@ -63,7 +71,7 @@ DlgRef_Skeleton_QTD::DlgRef_Skeleton_QTD( QWidget* parent, const char* name, bo
|
|||||||
Layout3->addWidget( buttonCancel );
|
Layout3->addWidget( buttonCancel );
|
||||||
GroupButtonsLayout->addLayout( Layout3 );
|
GroupButtonsLayout->addLayout( Layout3 );
|
||||||
|
|
||||||
Layout1->addWidget( GroupButtons, 2, 0 );
|
Layout1->addWidget( GroupButtons, 3, 0 );
|
||||||
|
|
||||||
GroupConstructors = new QButtonGroup( this, "GroupConstructors" );
|
GroupConstructors = new QButtonGroup( this, "GroupConstructors" );
|
||||||
GroupConstructors->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, GroupConstructors->sizePolicy().hasHeightForWidth() ) );
|
GroupConstructors->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, GroupConstructors->sizePolicy().hasHeightForWidth() ) );
|
||||||
@ -92,11 +100,28 @@ DlgRef_Skeleton_QTD::DlgRef_Skeleton_QTD( QWidget* parent, const char* name, bo
|
|||||||
|
|
||||||
Layout1->addWidget( GroupConstructors, 0, 0 );
|
Layout1->addWidget( GroupConstructors, 0, 0 );
|
||||||
|
|
||||||
GroupMedium = new QGroupBox( this, "GroupMedium" );
|
GroupBoxName = new QGroupBox( this, "GroupBoxName" );
|
||||||
GroupMedium->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupMedium->sizePolicy().hasHeightForWidth() ) );
|
GroupBoxName->setTitle( trUtf8( "Result name" ) );
|
||||||
GroupMedium->setTitle( trUtf8( "" ) );
|
GroupBoxName->setColumnLayout(0, Qt::Vertical );
|
||||||
|
GroupBoxName->layout()->setSpacing( 6 );
|
||||||
|
GroupBoxName->layout()->setMargin( 11 );
|
||||||
|
GroupBoxNameLayout = new QGridLayout( GroupBoxName->layout() );
|
||||||
|
GroupBoxNameLayout->setAlignment( Qt::AlignTop );
|
||||||
|
|
||||||
Layout1->addWidget( GroupMedium, 1, 0 );
|
Layout66 = new QGridLayout( 0, 1, 1, 0, 6, "Layout66");
|
||||||
|
|
||||||
|
ResultName = new QLineEdit( GroupBoxName, "ResultName" );
|
||||||
|
|
||||||
|
Layout66->addWidget( ResultName, 0, 1 );
|
||||||
|
|
||||||
|
NameLabel = new QLabel( GroupBoxName, "NameLabel" );
|
||||||
|
NameLabel->setText( trUtf8( "Name" ) );
|
||||||
|
|
||||||
|
Layout66->addWidget( NameLabel, 0, 0 );
|
||||||
|
|
||||||
|
GroupBoxNameLayout->addLayout( Layout66, 0, 0 );
|
||||||
|
|
||||||
|
Layout1->addWidget( GroupBoxName, 1, 0 );
|
||||||
|
|
||||||
DlgRef_Skeleton_QTDLayout->addLayout( Layout1, 0, 0 );
|
DlgRef_Skeleton_QTDLayout->addLayout( Layout1, 0, 0 );
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
** Form interface generated from reading ui file 'DlgRef_Skeleton_QTD.ui'
|
** Form interface generated from reading ui file 'DlgRef_Skeleton_QTD.ui'
|
||||||
**
|
**
|
||||||
** Created: mar sep 23 15:06:57 2003
|
** Created: Fri Apr 16 12:57:26 2004
|
||||||
** by: The User Interface Compiler (uic)
|
** by: The User Interface Compiler (uic)
|
||||||
**
|
**
|
||||||
** WARNING! All changes made in this file will be lost!
|
** WARNING! All changes made in this file will be lost!
|
||||||
@ -16,6 +16,8 @@ class QHBoxLayout;
|
|||||||
class QGridLayout;
|
class QGridLayout;
|
||||||
class QButtonGroup;
|
class QButtonGroup;
|
||||||
class QGroupBox;
|
class QGroupBox;
|
||||||
|
class QLabel;
|
||||||
|
class QLineEdit;
|
||||||
class QPushButton;
|
class QPushButton;
|
||||||
class QRadioButton;
|
class QRadioButton;
|
||||||
|
|
||||||
@ -27,6 +29,7 @@ public:
|
|||||||
DlgRef_Skeleton_QTD( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
|
DlgRef_Skeleton_QTD( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
|
||||||
~DlgRef_Skeleton_QTD();
|
~DlgRef_Skeleton_QTD();
|
||||||
|
|
||||||
|
QGroupBox* GroupMedium;
|
||||||
QGroupBox* GroupButtons;
|
QGroupBox* GroupButtons;
|
||||||
QPushButton* buttonOk;
|
QPushButton* buttonOk;
|
||||||
QPushButton* buttonApply;
|
QPushButton* buttonApply;
|
||||||
@ -35,7 +38,9 @@ public:
|
|||||||
QRadioButton* RadioButton1;
|
QRadioButton* RadioButton1;
|
||||||
QRadioButton* RadioButton2;
|
QRadioButton* RadioButton2;
|
||||||
QRadioButton* RadioButton3;
|
QRadioButton* RadioButton3;
|
||||||
QGroupBox* GroupMedium;
|
QGroupBox* GroupBoxName;
|
||||||
|
QLineEdit* ResultName;
|
||||||
|
QLabel* NameLabel;
|
||||||
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@ -45,6 +50,8 @@ protected:
|
|||||||
QHBoxLayout* Layout3;
|
QHBoxLayout* Layout3;
|
||||||
QGridLayout* GroupConstructorsLayout;
|
QGridLayout* GroupConstructorsLayout;
|
||||||
QHBoxLayout* Layout2;
|
QHBoxLayout* Layout2;
|
||||||
|
QGridLayout* GroupBoxNameLayout;
|
||||||
|
QGridLayout* Layout66;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // DLGREF_SKELETON_QTD_H
|
#endif // DLGREF_SKELETON_QTD_H
|
||||||
|
@ -8,8 +8,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>307</width>
|
<width>321</width>
|
||||||
<height>147</height>
|
<height>295</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
@ -51,6 +51,22 @@
|
|||||||
<number>6</number>
|
<number>6</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QGroupBox" row="2" column="0">
|
<widget class="QGroupBox" row="2" column="0">
|
||||||
|
<property name="name">
|
||||||
|
<cstring>GroupMedium</cstring>
|
||||||
|
</property>
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy>
|
||||||
|
<hsizetype>7</hsizetype>
|
||||||
|
<vsizetype>7</vsizetype>
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="title">
|
||||||
|
<string></string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
<widget class="QGroupBox" row="3" column="0">
|
||||||
<property name="name">
|
<property name="name">
|
||||||
<cstring>GroupButtons</cstring>
|
<cstring>GroupButtons</cstring>
|
||||||
</property>
|
</property>
|
||||||
@ -203,19 +219,51 @@
|
|||||||
</widget>
|
</widget>
|
||||||
<widget class="QGroupBox" row="1" column="0">
|
<widget class="QGroupBox" row="1" column="0">
|
||||||
<property name="name">
|
<property name="name">
|
||||||
<cstring>GroupMedium</cstring>
|
<cstring>GroupBoxName</cstring>
|
||||||
</property>
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy>
|
|
||||||
<hsizetype>7</hsizetype>
|
|
||||||
<vsizetype>7</vsizetype>
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string></string>
|
<string>Result name</string>
|
||||||
</property>
|
</property>
|
||||||
|
<grid>
|
||||||
|
<property name="name">
|
||||||
|
<cstring>unnamed</cstring>
|
||||||
|
</property>
|
||||||
|
<property name="margin">
|
||||||
|
<number>11</number>
|
||||||
|
</property>
|
||||||
|
<property name="spacing">
|
||||||
|
<number>6</number>
|
||||||
|
</property>
|
||||||
|
<widget class="QLayoutWidget" row="0" column="0">
|
||||||
|
<property name="name">
|
||||||
|
<cstring>Layout66</cstring>
|
||||||
|
</property>
|
||||||
|
<grid>
|
||||||
|
<property name="name">
|
||||||
|
<cstring>unnamed</cstring>
|
||||||
|
</property>
|
||||||
|
<property name="margin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="spacing">
|
||||||
|
<number>6</number>
|
||||||
|
</property>
|
||||||
|
<widget class="QLineEdit" row="0" column="1">
|
||||||
|
<property name="name">
|
||||||
|
<cstring>ResultName</cstring>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
<widget class="QLabel" row="0" column="0">
|
||||||
|
<property name="name">
|
||||||
|
<cstring>NameLabel</cstring>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Name</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</grid>
|
||||||
|
</widget>
|
||||||
|
</grid>
|
||||||
</widget>
|
</widget>
|
||||||
</grid>
|
</grid>
|
||||||
</widget>
|
</widget>
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header:
|
// $Header:
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "EntityGUI.h"
|
#include "EntityGUI.h"
|
||||||
|
|
||||||
#include "QAD_RightFrame.h"
|
#include "QAD_RightFrame.h"
|
||||||
@ -36,19 +35,19 @@ using namespace std;
|
|||||||
#include "SALOMEGUI_ImportOperation.h"
|
#include "SALOMEGUI_ImportOperation.h"
|
||||||
#include "SALOMEGUI_QtCatchCorbaException.hxx"
|
#include "SALOMEGUI_QtCatchCorbaException.hxx"
|
||||||
|
|
||||||
#include <BRepTools_WireExplorer.hxx>
|
|
||||||
#include <TopoDS_Wire.hxx>
|
|
||||||
#include <TopoDS_Compound.hxx>
|
#include <TopoDS_Compound.hxx>
|
||||||
#include <BRep_Tool.hxx>
|
|
||||||
#include <BRep_Builder.hxx>
|
#include <BRep_Builder.hxx>
|
||||||
#include <TopExp.hxx>
|
|
||||||
#include <TopExp_Explorer.hxx>
|
#include <TopExp_Explorer.hxx>
|
||||||
#include <Geom_Circle.hxx>
|
|
||||||
#include <Precision.hxx>
|
|
||||||
|
|
||||||
#include "DisplayGUI.h"
|
#include "DisplayGUI.h"
|
||||||
|
|
||||||
|
#include "EntityGUI_SketcherDlg.h" // Sketcher
|
||||||
#include "EntityGUI_SubShapeDlg.h" // Method SUBSHAPE
|
#include "EntityGUI_SubShapeDlg.h" // Method SUBSHAPE
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=======================================================================
|
//=======================================================================
|
||||||
// function : EntityGUI()
|
// function : EntityGUI()
|
||||||
// purpose : Constructor
|
// purpose : Constructor
|
||||||
@ -59,6 +58,9 @@ EntityGUI::EntityGUI() :
|
|||||||
myGeomBase = new GEOMBase();
|
myGeomBase = new GEOMBase();
|
||||||
myGeomGUI = GEOMContext::GetGeomGUI();
|
myGeomGUI = GEOMContext::GetGeomGUI();
|
||||||
myGeom = myGeomGUI->myComponentGeom;
|
myGeom = myGeomGUI->myComponentGeom;
|
||||||
|
|
||||||
|
mySimulationShape1 = new AIS_Shape(TopoDS_Shape());
|
||||||
|
mySimulationShape2 = new AIS_Shape(TopoDS_Shape());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -81,126 +83,12 @@ bool EntityGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
|
|||||||
myEntityGUI->myGeomGUI->EmitSignalDeactivateDialog();
|
myEntityGUI->myGeomGUI->EmitSignalDeactivateDialog();
|
||||||
SALOME_Selection* Sel = SALOME_Selection::Selection(QAD_Application::getDesktop()->getActiveStudy()->getSelection());
|
SALOME_Selection* Sel = SALOME_Selection::Selection(QAD_Application::getDesktop()->getActiveStudy()->getSelection());
|
||||||
|
|
||||||
QMenuBar* Mb = QAD_Application::getDesktop()->getMainMenuBar();
|
|
||||||
|
|
||||||
switch (theCommandID)
|
switch (theCommandID)
|
||||||
{
|
{
|
||||||
case 404: // SKETCHER
|
case 404: // SKETCHER
|
||||||
{
|
{
|
||||||
((OCCViewer_ViewFrame*)QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->onViewTop(); // DCQ : 28/02/2002
|
((OCCViewer_ViewFrame*)QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->onViewTop(); // DCQ : 28/02/2002
|
||||||
|
EntityGUI_SketcherDlg* aDlg = new EntityGUI_SketcherDlg(parent, "", myEntityGUI, Sel);
|
||||||
OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer();
|
|
||||||
|
|
||||||
myEntityGUI->myGeomGUI->GetSketcher() = Sketch(v3d->getViewer3d());
|
|
||||||
myEntityGUI->myGeomGUI->myState = 2;
|
|
||||||
|
|
||||||
Mb->setItemChecked(4052, false);
|
|
||||||
Mb->setItemChecked(4053, false);
|
|
||||||
|
|
||||||
myEntityGUI->myGeomGUI->GetSketcher().SetParameterVisibility(LENGTH_PARAMETER, Mb->isItemChecked(4061));
|
|
||||||
myEntityGUI->myGeomGUI->GetSketcher().SetParameterVisibility(ANGLE_PARAMETER, Mb->isItemChecked(4062));
|
|
||||||
myEntityGUI->myGeomGUI->GetSketcher().SetParameterVisibility(RADIUS_PARAMETER, Mb->isItemChecked(4063));
|
|
||||||
myEntityGUI->myGeomGUI->GetSketcher().SetParameterVisibility(XVALUE_PARAMETER, Mb->isItemChecked(4064));
|
|
||||||
myEntityGUI->myGeomGUI->GetSketcher().SetParameterVisibility(YVALUE_PARAMETER, Mb->isItemChecked(4065));
|
|
||||||
|
|
||||||
myEntityGUI->myGeomGUI->GetSketcher().SetTransitionStatus(NOCONSTRAINT);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 4041: // SKETCH Segment
|
|
||||||
{
|
|
||||||
myEntityGUI->myGeomGUI->GetSketcher().ChangeMode(SEGMENT);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 4042: // SKETCH Arc
|
|
||||||
{
|
|
||||||
myEntityGUI->myGeomGUI->GetSketcher().ChangeMode(ARC_CHORD);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 4043: // SKETCH Set Angle
|
|
||||||
{
|
|
||||||
myEntityGUI->OnSketchSetAngle();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 4044: // SKETCH Set X
|
|
||||||
{
|
|
||||||
myEntityGUI->OnSketchSetx();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 4045: // SKETCH Set Y
|
|
||||||
{
|
|
||||||
myEntityGUI->OnSketchSety();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 4046: // SKETCH Delete
|
|
||||||
{
|
|
||||||
myEntityGUI->OnSketchDelete();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 4047: // SKETCH End
|
|
||||||
{
|
|
||||||
myEntityGUI->OnSketchEnd();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 4048: // SKETCH Close
|
|
||||||
{
|
|
||||||
myEntityGUI->OnSketchClose();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 4051: // sketcher Set Plane
|
|
||||||
{
|
|
||||||
//TO DO
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 4052: // sketcher TANGENT
|
|
||||||
{
|
|
||||||
Mb->setItemChecked(theCommandID, !Mb->isItemChecked(theCommandID));
|
|
||||||
if(Mb->isItemChecked(theCommandID) == true)
|
|
||||||
myEntityGUI->myGeomGUI->GetSketcher().SetTransitionStatus(TANGENT);
|
|
||||||
else
|
|
||||||
myEntityGUI->myGeomGUI->GetSketcher().SetTransitionStatus(NOCONSTRAINT);
|
|
||||||
|
|
||||||
Mb->setItemChecked(4053, false);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 4053: // sketcher PERPENDICULAR
|
|
||||||
{
|
|
||||||
Mb->setItemChecked(theCommandID, !Mb->isItemChecked(theCommandID));
|
|
||||||
if(Mb->isItemChecked(theCommandID) == true)
|
|
||||||
myEntityGUI->myGeomGUI->GetSketcher().SetTransitionStatus(PERPENDICULAR);
|
|
||||||
else
|
|
||||||
myEntityGUI->myGeomGUI->GetSketcher().SetTransitionStatus(NOCONSTRAINT);
|
|
||||||
|
|
||||||
Mb->setItemChecked(4052, false);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 4061: // SKETCH OptionsOnofflengthdimension
|
|
||||||
{
|
|
||||||
Mb->setItemChecked(theCommandID, !Mb->isItemChecked(theCommandID));
|
|
||||||
myEntityGUI->myGeomGUI->GetSketcher().SetParameterVisibility(LENGTH_PARAMETER, Mb->isItemChecked(theCommandID));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 4062: // SKETCH OptionsOnoffangledimension
|
|
||||||
{
|
|
||||||
Mb->setItemChecked(theCommandID, !Mb->isItemChecked(theCommandID));
|
|
||||||
myEntityGUI->myGeomGUI->GetSketcher().SetParameterVisibility(ANGLE_PARAMETER, Mb->isItemChecked(theCommandID));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 4063: // SKETCH OptionsOnoffradiusdimension
|
|
||||||
{
|
|
||||||
Mb->setItemChecked(theCommandID, !Mb->isItemChecked(theCommandID));
|
|
||||||
myEntityGUI->myGeomGUI->GetSketcher().SetParameterVisibility(RADIUS_PARAMETER, Mb->isItemChecked(theCommandID));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 4064: // SKETCH OptionsOnoffxdimension
|
|
||||||
{
|
|
||||||
Mb->setItemChecked(theCommandID, !Mb->isItemChecked(theCommandID));
|
|
||||||
myEntityGUI->myGeomGUI->GetSketcher().SetParameterVisibility(XVALUE_PARAMETER, Mb->isItemChecked(theCommandID));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 4065: // SKETCH OptionsOnoffydimension
|
|
||||||
{
|
|
||||||
Mb->setItemChecked(theCommandID, !Mb->isItemChecked(theCommandID));
|
|
||||||
myEntityGUI->myGeomGUI->GetSketcher().SetParameterVisibility(YVALUE_PARAMETER, Mb->isItemChecked(theCommandID));
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 407: // EXPLODE : use ic
|
case 407: // EXPLODE : use ic
|
||||||
@ -223,258 +111,101 @@ bool EntityGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//=======================================================================
|
|
||||||
// function : OnSketchSetAngle()
|
|
||||||
// purpose :
|
|
||||||
//=======================================================================
|
|
||||||
void EntityGUI::OnSketchSetAngle()
|
|
||||||
{
|
|
||||||
Standard_Real anAngle = myGeomGUI->GetSketcher().GetSegmentAngle()/PI180;
|
|
||||||
Sketch::fitInResol(anAngle);
|
|
||||||
Standard_Boolean res = false;
|
|
||||||
QString Value = QString("%1").arg(anAngle);
|
|
||||||
anAngle = myGeomBase->Parameter(res, Value, tr("GEOM_MEN_ANGLE"), tr("GEOM_MEN_ENTER_ANGLE"),
|
|
||||||
-180.0, +180.0, 6) * PI180;
|
|
||||||
|
|
||||||
if(res) {
|
|
||||||
myGeomGUI->GetSketcher().SetSegmentAngle(anAngle);
|
|
||||||
QMenuBar* Mb = QAD_Application::getDesktop()->getMainMenuBar();
|
|
||||||
Mb->setItemChecked(4052, false);
|
|
||||||
Mb->setItemChecked(4053, false);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//=======================================================================
|
|
||||||
// function : OnSketchSetx()
|
|
||||||
// purpose :
|
|
||||||
//=======================================================================
|
|
||||||
void EntityGUI::OnSketchSetx()
|
|
||||||
{
|
|
||||||
Standard_Boolean res = false;
|
|
||||||
double X = myGeomBase->Parameter(res, "0.", tr("GEOM_MEN_X"), tr("GEOM_MEN_SKETCHER_X"),
|
|
||||||
2.0 * Precision::Confusion(), 1E6, 6);
|
|
||||||
if(res)
|
|
||||||
myGeomGUI->GetSketcher().SetXDimension(X);
|
|
||||||
QMenuBar* Mb = QAD_Application::getDesktop()->getMainMenuBar();
|
|
||||||
Mb->setItemChecked(4052, false);
|
|
||||||
Mb->setItemChecked(4053, false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//=======================================================================
|
|
||||||
// function : OnSketchSety()
|
|
||||||
// purpose :
|
|
||||||
//=======================================================================
|
|
||||||
void EntityGUI::OnSketchSety()
|
|
||||||
{
|
|
||||||
Standard_Boolean res = false;
|
|
||||||
double Y = myGeomBase->Parameter(res, "0.", tr("GEOM_MEN_Y"), tr("GEOM_MEN_SKETCHER_Y"), 2.0 * Precision::Confusion(), 1E6, 6);
|
|
||||||
if(res)
|
|
||||||
myGeomGUI->GetSketcher().SetYDimension(Y);
|
|
||||||
QMenuBar* Mb = QAD_Application::getDesktop()->getMainMenuBar();
|
|
||||||
Mb->setItemChecked(4052, false);
|
|
||||||
Mb->setItemChecked(4053, false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//=======================================================================
|
|
||||||
// function : OnSketchDelete()
|
|
||||||
// purpose :
|
|
||||||
//=======================================================================
|
|
||||||
void EntityGUI::OnSketchDelete()
|
|
||||||
{
|
|
||||||
if(myGeomGUI->GetSketcher().GetmyEdgesNumber() == 1) {
|
|
||||||
QMenuBar* Mb = QAD_Application::getDesktop()->getMainMenuBar();
|
|
||||||
Mb->setItemEnabled(405, false); // SKETCH CONTRAINTS
|
|
||||||
myGeomGUI->GetSketcher().SetTransitionStatus(NOCONSTRAINT);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(myGeomGUI->GetSketcher().Delete())
|
|
||||||
myGeomGUI->myState = -1;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//=======================================================================
|
|
||||||
// function : OnSketchClose()
|
|
||||||
// purpose :
|
|
||||||
//=======================================================================
|
|
||||||
void EntityGUI::OnSketchClose()
|
|
||||||
{
|
|
||||||
OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer();
|
|
||||||
Handle(AIS_InteractiveContext) myContext = v3d->getAISContext();
|
|
||||||
|
|
||||||
TopoDS_Wire W = myGeomGUI->GetSketcher().Close();
|
|
||||||
if(!W.IsNull()) {
|
|
||||||
GEOM::GEOM_Gen::ListOfIOR_var listShapes = new GEOM::GEOM_Gen::ListOfIOR;
|
|
||||||
listShapes->length(0);
|
|
||||||
unsigned int i = 0;
|
|
||||||
|
|
||||||
BRepTools_WireExplorer Ex(W);
|
|
||||||
while(Ex.More()) {
|
|
||||||
TopoDS_Edge E = Ex.Current();
|
|
||||||
gp_Pnt pt1, pt2;
|
|
||||||
|
|
||||||
pt1 = BRep_Tool::Pnt(TopExp::FirstVertex(E));
|
|
||||||
pt2 = BRep_Tool::Pnt(TopExp::LastVertex(E));
|
|
||||||
|
|
||||||
gp_Pnt CenterPoint;
|
|
||||||
Handle(Geom_Curve) Curve;
|
|
||||||
Handle(Geom_Circle) Circle;
|
|
||||||
gp_Circ Circ;
|
|
||||||
Standard_Real First,Last;
|
|
||||||
|
|
||||||
Curve = BRep_Tool::Curve(E,First,Last);
|
|
||||||
if(Curve->IsKind(STANDARD_TYPE(Geom_Circle))) {
|
|
||||||
Circle = Handle(Geom_Circle)::DownCast(Curve); // pointer on geom_circ
|
|
||||||
Circ = Circle->Circ(); // gp_Circ
|
|
||||||
|
|
||||||
Curve->D0((First + Last) / 2., CenterPoint);
|
|
||||||
|
|
||||||
GEOM::PointStruct pI = myGeom->MakePointStruct(pt1.X(), pt1.Y(), pt1.Z());
|
|
||||||
GEOM::PointStruct pC = myGeom->MakePointStruct(CenterPoint.X(), CenterPoint.Y(), CenterPoint.Z());
|
|
||||||
GEOM::PointStruct pE = myGeom->MakePointStruct(pt2.X(), pt2.Y(), pt2.Z());
|
|
||||||
|
|
||||||
GEOM::GEOM_Shape_var arc;
|
|
||||||
|
|
||||||
try {
|
|
||||||
arc = myGeom->MakeArc(pI, pC, pE);
|
|
||||||
}
|
|
||||||
catch (const SALOME::SALOME_Exception& S_ex) {
|
|
||||||
QtCatchCorbaException(S_ex);
|
|
||||||
}
|
|
||||||
|
|
||||||
listShapes->length(i+1);
|
|
||||||
listShapes[i] = strdup(arc->Name());
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
GEOM::PointStruct pI = myGeom->MakePointStruct(pt1.X(), pt1.Y(), pt1.Z());
|
|
||||||
GEOM::PointStruct pE = myGeom->MakePointStruct(pt2.X(), pt2.Y(), pt2.Z());
|
|
||||||
GEOM::GEOM_Shape_var segment;
|
|
||||||
|
|
||||||
try {
|
|
||||||
segment = myGeom->MakeEdge(pI,pE);
|
|
||||||
}
|
|
||||||
catch (const SALOME::SALOME_Exception& S_ex) {
|
|
||||||
QtCatchCorbaException(S_ex);
|
|
||||||
}
|
|
||||||
|
|
||||||
listShapes->length(i+1);
|
|
||||||
listShapes[i] = strdup(segment->Name());
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
Ex.Next();
|
|
||||||
}
|
|
||||||
GEOM::GEOM_Shape_var Wire = myGeom->MakeWire(listShapes);
|
|
||||||
TopoDS_Shape S = myGeomGUI->GetShapeReader().GetShape(myGeom, Wire);
|
|
||||||
Standard_CString type;
|
|
||||||
myGeomBase->GetShapeTypeString(S,type);
|
|
||||||
Wire->NameType(type);
|
|
||||||
|
|
||||||
if(myGeomBase->Display(Wire))
|
|
||||||
QAD_Application::getDesktop()->putInfo(tr("GEOM_PRP_DONE"));
|
|
||||||
}
|
|
||||||
myGeomGUI->myState = -1;
|
|
||||||
QMenuBar* Mb = QAD_Application::getDesktop()->getMainMenuBar();
|
|
||||||
Mb->setItemEnabled(405, false); // SKETCH CONTRAINTS
|
|
||||||
myGeomGUI->GetSketcher().SetTransitionStatus(NOCONSTRAINT);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//=======================================================================
|
//=======================================================================
|
||||||
// function : OnSketchEnd()
|
// function : OnSketchEnd()
|
||||||
// purpose :
|
// purpose :
|
||||||
//=======================================================================
|
//=======================================================================
|
||||||
void EntityGUI::OnSketchEnd()
|
void EntityGUI::OnSketchEnd(const char *Cmd)
|
||||||
{
|
{
|
||||||
OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer();
|
|
||||||
Handle (AIS_InteractiveContext) myContext = v3d->getAISContext();
|
|
||||||
|
|
||||||
TopoDS_Wire W = myGeomGUI->GetSketcher().End();
|
|
||||||
if(!W.IsNull()) {
|
|
||||||
GEOM::GEOM_Gen::ListOfIOR_var listShapes = new GEOM::GEOM_Gen::ListOfIOR;
|
|
||||||
listShapes->length(0);
|
|
||||||
unsigned int i = 0;
|
|
||||||
|
|
||||||
BRepTools_WireExplorer Ex(W);
|
|
||||||
while(Ex.More()) {
|
|
||||||
TopoDS_Edge E = TopoDS::Edge(Ex.Current());
|
|
||||||
|
|
||||||
gp_Pnt pt1, pt2;
|
|
||||||
pt1 = BRep_Tool::Pnt(TopExp::FirstVertex(E));
|
|
||||||
pt2 = BRep_Tool::Pnt(TopExp::LastVertex(E));
|
|
||||||
|
|
||||||
gp_Pnt CenterPoint;
|
|
||||||
Handle(Geom_Curve) Curve;
|
|
||||||
Handle(Geom_Circle) Circle;
|
|
||||||
gp_Circ Circ;
|
|
||||||
Standard_Real First,Last;
|
|
||||||
|
|
||||||
Curve = BRep_Tool::Curve(E,First,Last);
|
|
||||||
if(Curve->IsKind(STANDARD_TYPE(Geom_Circle))) {
|
|
||||||
Circle = Handle(Geom_Circle)::DownCast(Curve); // pointer on geom_circ
|
|
||||||
Circ = Circle->Circ(); // gp_Circ
|
|
||||||
|
|
||||||
Curve->D0((First + Last) / 2., CenterPoint);
|
|
||||||
|
|
||||||
GEOM::PointStruct pI = myGeom->MakePointStruct(pt1.X(), pt1.Y(), pt1.Z());
|
|
||||||
GEOM::PointStruct pC = myGeom->MakePointStruct(CenterPoint.X(), CenterPoint.Y(), CenterPoint.Z());
|
|
||||||
GEOM::PointStruct pE = myGeom->MakePointStruct(pt2.X(), pt2.Y(), pt2.Z());
|
|
||||||
|
|
||||||
GEOM::GEOM_Shape_var arc;
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
arc = myGeom->MakeArc(pI, pC, pE);
|
GEOM::GEOM_Shape_var result = myGeom->MakeSketcher(Cmd);
|
||||||
|
if(result->_is_nil()) {
|
||||||
|
QAD_Application::getDesktop()->putInfo(tr("GEOM_PRP_NULLSHAPE"));
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
catch (const SALOME::SALOME_Exception& S_ex) {
|
result->NameType(tr("GEOM_WIRE"));
|
||||||
QtCatchCorbaException(S_ex);
|
if(myGeomBase->Display(result))
|
||||||
}
|
|
||||||
|
|
||||||
listShapes->length(i+1);
|
|
||||||
listShapes[i] = strdup(arc->Name());
|
|
||||||
i++;
|
|
||||||
} else {
|
|
||||||
GEOM::PointStruct pI = myGeom->MakePointStruct(pt1.X(), pt1.Y(), pt1.Z());
|
|
||||||
GEOM::PointStruct pE = myGeom->MakePointStruct(pt2.X(), pt2.Y(), pt2.Z());
|
|
||||||
GEOM::GEOM_Shape_var segment;
|
|
||||||
|
|
||||||
try {
|
|
||||||
segment = myGeom->MakeEdge(pI,pE);
|
|
||||||
}
|
|
||||||
catch (const SALOME::SALOME_Exception& S_ex) {
|
|
||||||
QtCatchCorbaException(S_ex);
|
|
||||||
}
|
|
||||||
|
|
||||||
listShapes->length(i+1);
|
|
||||||
listShapes[i] = strdup(segment->Name());
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
Ex.Next();
|
|
||||||
}
|
|
||||||
|
|
||||||
GEOM::GEOM_Shape_var Wire = myGeom->MakeWire(listShapes);
|
|
||||||
TopoDS_Shape S = myGeomGUI->GetShapeReader().GetShape(myGeom, Wire);
|
|
||||||
Standard_CString type;
|
|
||||||
myGeomBase->GetShapeTypeString(S,type);
|
|
||||||
Wire->NameType(type);
|
|
||||||
|
|
||||||
if(myGeomBase->Display(Wire))
|
|
||||||
QAD_Application::getDesktop()->putInfo(tr("GEOM_PRP_DONE"));
|
QAD_Application::getDesktop()->putInfo(tr("GEOM_PRP_DONE"));
|
||||||
}
|
}
|
||||||
myGeomGUI->myState = -1;
|
catch(const SALOME::SALOME_Exception& S_ex) {
|
||||||
QMenuBar* Mb = QAD_Application::getDesktop()->getMainMenuBar();
|
QtCatchCorbaException(S_ex);
|
||||||
Mb->setItemEnabled(405, false); // SKETCH CONTRAINTS
|
}
|
||||||
myGeomGUI->GetSketcher().SetTransitionStatus(NOCONSTRAINT);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//=====================================================================================
|
||||||
|
// function : DisplaySimulationShape()
|
||||||
|
// purpose : Displays 'this->mySimulationShape' a pure graphical shape from a TopoDS_Shape
|
||||||
|
//=====================================================================================
|
||||||
|
void EntityGUI::DisplaySimulationShape(const TopoDS_Shape& S1, const TopoDS_Shape& S2)
|
||||||
|
{
|
||||||
|
//NRI DEBUG : 14/02/2002
|
||||||
|
if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() > VIEW_OCC)
|
||||||
|
return;
|
||||||
|
|
||||||
|
OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer();
|
||||||
|
Handle(AIS_InteractiveContext) ic = v3d->getAISContext();
|
||||||
|
try {
|
||||||
|
if(!S1.IsNull()) {
|
||||||
|
/* erase any previous */
|
||||||
|
ic->Erase(mySimulationShape1, Standard_True, Standard_False);
|
||||||
|
ic->ClearPrs(mySimulationShape1);
|
||||||
|
|
||||||
|
mySimulationShape1 = new AIS_Shape(TopoDS_Shape());
|
||||||
|
mySimulationShape1->Set(S1);
|
||||||
|
mySimulationShape1->SetColor(Quantity_NOC_RED);
|
||||||
|
|
||||||
|
ic->Deactivate(mySimulationShape1);
|
||||||
|
ic->Display(mySimulationShape1, Standard_False);
|
||||||
|
mySimulationShape1->UnsetColor();
|
||||||
|
}
|
||||||
|
if(!S2.IsNull()) {
|
||||||
|
ic->Erase(mySimulationShape2, Standard_True, Standard_False);
|
||||||
|
ic->ClearPrs(mySimulationShape2);
|
||||||
|
|
||||||
|
mySimulationShape2 = new AIS_Shape(TopoDS_Shape());
|
||||||
|
mySimulationShape2->Set(S2);
|
||||||
|
mySimulationShape2->SetColor(Quantity_NOC_VIOLET);
|
||||||
|
|
||||||
|
ic->Deactivate(mySimulationShape2);
|
||||||
|
ic->Display(mySimulationShape2, Standard_False);
|
||||||
|
mySimulationShape2->UnsetColor();
|
||||||
|
}
|
||||||
|
ic->UpdateCurrentViewer();
|
||||||
|
}
|
||||||
|
catch(Standard_Failure) {
|
||||||
|
MESSAGE("Exception catched in EntityGUI::DisplaySimulationShape ");
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//==================================================================================
|
||||||
|
// function : EraseSimulationShape()
|
||||||
|
// purpose : Clears the display of 'mySimulationShape' a pure graphical shape
|
||||||
|
//==================================================================================
|
||||||
|
void EntityGUI::EraseSimulationShape(int Sh)
|
||||||
|
{
|
||||||
|
int count = QAD_Application::getDesktop()->getActiveStudy()->getStudyFramesCount();
|
||||||
|
for(int i = 0; i < count; i++) {
|
||||||
|
if(QAD_Application::getDesktop()->getActiveStudy()->getStudyFrame(i)->getTypeView() == VIEW_OCC) {
|
||||||
|
OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)QAD_Application::getDesktop()->getActiveStudy()->getStudyFrame(i)->getRightFrame()->getViewFrame())->getViewer();
|
||||||
|
Handle(AIS_InteractiveContext) ic = v3d->getAISContext();
|
||||||
|
if(Sh < 1) {
|
||||||
|
ic->Erase(mySimulationShape1, Standard_True, Standard_False);
|
||||||
|
ic->ClearPrs(mySimulationShape1);
|
||||||
|
}
|
||||||
|
if(Sh <= 1) {
|
||||||
|
ic->Erase(mySimulationShape2, Standard_True, Standard_False);
|
||||||
|
ic->ClearPrs(mySimulationShape2);
|
||||||
|
}
|
||||||
|
ic->UpdateCurrentViewer();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
//=====================================================================================
|
//=====================================================================================
|
||||||
// function : SObjectExist()
|
// function : SObjectExist()
|
||||||
// purpose :
|
// purpose :
|
||||||
@ -579,7 +310,7 @@ bool EntityGUI::OnSubShapeGetAll(const TopoDS_Shape& ShapeTopo, const char* Shap
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
aResult->NameType(tr("GEOM_SHAPE"));
|
aResult->NameType(tr("GEOM_SHAPE"));
|
||||||
sprintf(nameG, "%s_%d", tr("GEOM_SHAPE").latin1(), myGeomGUI->GetNbGeom()++);
|
sprintf(nameG, "%s_%d", tr("GEOM_SHAPE").latin1(), myGeomGUI->myNbGeom++);
|
||||||
}
|
}
|
||||||
SALOMEDS::SObject_var SO = aStudy->FindObjectIOR(aResult->Name());
|
SALOMEDS::SObject_var SO = aStudy->FindObjectIOR(aResult->Name());
|
||||||
|
|
||||||
@ -814,7 +545,7 @@ bool EntityGUI::OnSubShapeGetSelected(const TopoDS_Shape& ShapeTopo, const char*
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
aResult->NameType(tr("GEOM_SHAPE"));
|
aResult->NameType(tr("GEOM_SHAPE"));
|
||||||
sprintf (nameG, "%s_%d", tr("GEOM_SHAPE").latin1(), myGeomGUI->GetNbGeom()++);
|
sprintf (nameG, "%s_%d", tr("GEOM_SHAPE").latin1(), myGeomGUI->myNbGeom++);
|
||||||
}
|
}
|
||||||
result = new GEOM_AISShape(Exp.Current(), nameG);
|
result = new GEOM_AISShape(Exp.Current(), nameG);
|
||||||
IO = new GEOM_InteractiveObject(aResult->Name(), myGeomGUI->GetFatherior(), "GEOM");
|
IO = new GEOM_InteractiveObject(aResult->Name(), myGeomGUI->GetFatherior(), "GEOM");
|
||||||
@ -823,10 +554,10 @@ bool EntityGUI::OnSubShapeGetSelected(const TopoDS_Shape& ShapeTopo, const char*
|
|||||||
else {
|
else {
|
||||||
if ( myGeomBase->GetShapeTypeString(compound,Type)) {
|
if ( myGeomBase->GetShapeTypeString(compound,Type)) {
|
||||||
aResult->NameType(Type);
|
aResult->NameType(Type);
|
||||||
sprintf (nameG, "%s_%d", Type, myGeomGUI->GetNbGeom()++);
|
sprintf (nameG, "%s_%d", Type, myGeomGUI->myNbGeom++);
|
||||||
} else {
|
} else {
|
||||||
aResult->NameType(tr("GEOM_SHAPE"));
|
aResult->NameType(tr("GEOM_SHAPE"));
|
||||||
sprintf (nameG, "%s_%d", tr("GEOM_SHAPE").latin1(), myGeomGUI->GetNbGeom()++);
|
sprintf (nameG, "%s_%d", tr("GEOM_SHAPE").latin1(), myGeomGUI->myNbGeom++);
|
||||||
}
|
}
|
||||||
result = new GEOM_AISShape(compound, nameG);
|
result = new GEOM_AISShape(compound, nameG);
|
||||||
IO = new GEOM_InteractiveObject(aResult->Name(), myGeomGUI->GetFatherior(), "GEOM");
|
IO = new GEOM_InteractiveObject(aResult->Name(), myGeomGUI->GetFatherior(), "GEOM");
|
||||||
|
@ -45,14 +45,10 @@ public :
|
|||||||
|
|
||||||
static bool OnGUIEvent(int theCommandID, QAD_Desktop* parent);
|
static bool OnGUIEvent(int theCommandID, QAD_Desktop* parent);
|
||||||
|
|
||||||
/* Sketcher management */
|
void OnSketchEnd(const char *Cmd);
|
||||||
void OnSketchSetAngle();
|
|
||||||
void OnSketchSetx();
|
|
||||||
void OnSketchSety();
|
|
||||||
|
|
||||||
void OnSketchDelete();
|
void DisplaySimulationShape(const TopoDS_Shape& S1, const TopoDS_Shape& S2);
|
||||||
void OnSketchClose();
|
void EraseSimulationShape(int Sh = 0);
|
||||||
void OnSketchEnd();
|
|
||||||
|
|
||||||
/* Methods for sub shapes explode */
|
/* Methods for sub shapes explode */
|
||||||
bool SObjectExist(SALOMEDS::SObject_ptr theFatherObject, const char* IOR);
|
bool SObjectExist(SALOMEDS::SObject_ptr theFatherObject, const char* IOR);
|
||||||
@ -60,6 +56,10 @@ public :
|
|||||||
bool OnSubShapeGetSelected(const TopoDS_Shape& ShapeTopo, const char* ShapeTopoIOR, const int SubShapeType,
|
bool OnSubShapeGetSelected(const TopoDS_Shape& ShapeTopo, const char* ShapeTopoIOR, const int SubShapeType,
|
||||||
Standard_Integer& aLocalContextId, bool& myUseLocalContext);
|
Standard_Integer& aLocalContextId, bool& myUseLocalContext);
|
||||||
|
|
||||||
|
/* AIS shape used only during topo/geom simulations */
|
||||||
|
Handle(AIS_Shape) mySimulationShape1;
|
||||||
|
Handle(AIS_Shape) mySimulationShape2;
|
||||||
|
|
||||||
GEOMBase* myGeomBase;
|
GEOMBase* myGeomBase;
|
||||||
GEOMContext* myGeomGUI;
|
GEOMContext* myGeomGUI;
|
||||||
GEOM::GEOM_Gen_var myGeom; /* Current Geom Component */
|
GEOM::GEOM_Gen_var myGeom; /* Current Geom Component */
|
||||||
|
94
src/EntityGUI/EntityGUI_1Sel_QTD.cxx
Normal file
94
src/EntityGUI/EntityGUI_1Sel_QTD.cxx
Normal file
@ -0,0 +1,94 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
** Form implementation generated from reading ui file 'EntityGUI_1Sel_QTD.ui'
|
||||||
|
**
|
||||||
|
** Created: Fri Apr 30 11:23:36 2004
|
||||||
|
** by: The User Interface Compiler (uic)
|
||||||
|
**
|
||||||
|
** WARNING! All changes made in this file will be lost!
|
||||||
|
****************************************************************************/
|
||||||
|
#include "EntityGUI_1Sel_QTD.h"
|
||||||
|
|
||||||
|
#include <qvariant.h>
|
||||||
|
#include <qgroupbox.h>
|
||||||
|
#include <qlabel.h>
|
||||||
|
#include <qlineedit.h>
|
||||||
|
#include <qpushbutton.h>
|
||||||
|
#include <qlayout.h>
|
||||||
|
#include <qtooltip.h>
|
||||||
|
#include <qwhatsthis.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Constructs a EntityGUI_1Sel_QTD which is a child of 'parent', with the
|
||||||
|
* name 'name' and widget flags set to 'f'.
|
||||||
|
*/
|
||||||
|
EntityGUI_1Sel_QTD::EntityGUI_1Sel_QTD( QWidget* parent, const char* name, WFlags fl )
|
||||||
|
: QWidget( parent, name, fl )
|
||||||
|
{
|
||||||
|
if ( !name )
|
||||||
|
setName( "EntityGUI_1Sel_QTD" );
|
||||||
|
resize( 245, 110 );
|
||||||
|
setCaption( trUtf8( "EntityGUI_1Sel_QTD" ) );
|
||||||
|
EntityGUI_1Sel_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_1Sel_QTDLayout");
|
||||||
|
|
||||||
|
GroupBox1 = new QGroupBox( this, "GroupBox1" );
|
||||||
|
GroupBox1->setTitle( trUtf8( "Values" ) );
|
||||||
|
GroupBox1->setColumnLayout(0, Qt::Vertical );
|
||||||
|
GroupBox1->layout()->setSpacing( 6 );
|
||||||
|
GroupBox1->layout()->setMargin( 11 );
|
||||||
|
GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
|
||||||
|
GroupBox1Layout->setAlignment( Qt::AlignTop );
|
||||||
|
|
||||||
|
Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3");
|
||||||
|
|
||||||
|
Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2");
|
||||||
|
|
||||||
|
buttonUndo = new QPushButton( GroupBox1, "buttonUndo" );
|
||||||
|
buttonUndo->setText( trUtf8( "Undo" ) );
|
||||||
|
|
||||||
|
Layout2->addWidget( buttonUndo, 1, 0 );
|
||||||
|
|
||||||
|
buttonApply = new QPushButton( GroupBox1, "buttonApply" );
|
||||||
|
buttonApply->setText( trUtf8( "Create" ) );
|
||||||
|
|
||||||
|
Layout2->addWidget( buttonApply, 0, 0 );
|
||||||
|
QSpacerItem* spacer = new QSpacerItem( 0, 51, QSizePolicy::Minimum, QSizePolicy::Expanding );
|
||||||
|
Layout2->addItem( spacer, 2, 0 );
|
||||||
|
|
||||||
|
Layout3->addLayout( Layout2, 0, 1 );
|
||||||
|
|
||||||
|
Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1");
|
||||||
|
|
||||||
|
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 );
|
||||||
|
QSpacerItem* spacer_2 = new QSpacerItem( 0, 180, QSizePolicy::Minimum, QSizePolicy::Expanding );
|
||||||
|
Layout1->addItem( spacer_2, 1, 2 );
|
||||||
|
|
||||||
|
PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
|
||||||
|
PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
PushButton1->setText( trUtf8( "" ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( PushButton1, 0, 1 );
|
||||||
|
|
||||||
|
LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
|
||||||
|
LineEdit1->setFocusPolicy( QLineEdit::NoFocus );
|
||||||
|
|
||||||
|
Layout1->addWidget( LineEdit1, 0, 2 );
|
||||||
|
|
||||||
|
Layout3->addLayout( Layout1, 0, 0 );
|
||||||
|
|
||||||
|
GroupBox1Layout->addLayout( Layout3, 0, 0 );
|
||||||
|
|
||||||
|
EntityGUI_1Sel_QTDLayout->addWidget( GroupBox1, 0, 0 );
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Destroys the object and frees any allocated resources
|
||||||
|
*/
|
||||||
|
EntityGUI_1Sel_QTD::~EntityGUI_1Sel_QTD()
|
||||||
|
{
|
||||||
|
// no need to delete child widgets, Qt does it all for us
|
||||||
|
}
|
||||||
|
|
46
src/EntityGUI/EntityGUI_1Sel_QTD.h
Normal file
46
src/EntityGUI/EntityGUI_1Sel_QTD.h
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
** Form interface generated from reading ui file 'EntityGUI_1Sel_QTD.ui'
|
||||||
|
**
|
||||||
|
** Created: Fri Apr 30 11:23:32 2004
|
||||||
|
** by: The User Interface Compiler (uic)
|
||||||
|
**
|
||||||
|
** WARNING! All changes made in this file will be lost!
|
||||||
|
****************************************************************************/
|
||||||
|
#ifndef ENTITYGUI_1SEL_QTD_H
|
||||||
|
#define ENTITYGUI_1SEL_QTD_H
|
||||||
|
|
||||||
|
#include <qvariant.h>
|
||||||
|
#include <qwidget.h>
|
||||||
|
class QVBoxLayout;
|
||||||
|
class QHBoxLayout;
|
||||||
|
class QGridLayout;
|
||||||
|
class QGroupBox;
|
||||||
|
class QLabel;
|
||||||
|
class QLineEdit;
|
||||||
|
class QPushButton;
|
||||||
|
|
||||||
|
class EntityGUI_1Sel_QTD : public QWidget
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
EntityGUI_1Sel_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
|
||||||
|
~EntityGUI_1Sel_QTD();
|
||||||
|
|
||||||
|
QGroupBox* GroupBox1;
|
||||||
|
QPushButton* buttonUndo;
|
||||||
|
QPushButton* buttonApply;
|
||||||
|
QLabel* TextLabel1;
|
||||||
|
QPushButton* PushButton1;
|
||||||
|
QLineEdit* LineEdit1;
|
||||||
|
|
||||||
|
|
||||||
|
protected:
|
||||||
|
QGridLayout* EntityGUI_1Sel_QTDLayout;
|
||||||
|
QGridLayout* GroupBox1Layout;
|
||||||
|
QGridLayout* Layout3;
|
||||||
|
QGridLayout* Layout2;
|
||||||
|
QGridLayout* Layout1;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // ENTITYGUI_1SEL_QTD_H
|
56
src/EntityGUI/EntityGUI_1Spin.cxx
Normal file
56
src/EntityGUI/EntityGUI_1Spin.cxx
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
// GEOM GEOMGUI : GUI for Geometry component
|
||||||
|
//
|
||||||
|
// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||||
|
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||||
|
//
|
||||||
|
// This library is free software; you can redistribute it and/or
|
||||||
|
// modify it under the terms of the GNU Lesser General Public
|
||||||
|
// License as published by the Free Software Foundation; either
|
||||||
|
// version 2.1 of the License.
|
||||||
|
//
|
||||||
|
// This library is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
// Lesser General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Lesser General Public
|
||||||
|
// License along with this library; if not, write to the Free Software
|
||||||
|
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
//
|
||||||
|
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// File : EntityGUI_1Spin.cxx
|
||||||
|
// Author : Damien COQUERET
|
||||||
|
// Module : GEOM
|
||||||
|
// $Header:
|
||||||
|
|
||||||
|
#include "EntityGUI_1Spin.h"
|
||||||
|
|
||||||
|
#include <qlayout.h>
|
||||||
|
#include <qspinbox.h>
|
||||||
|
#include <qgroupbox.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Constructs a EntityGUI_1Spin which is a child of 'parent', with the
|
||||||
|
* name 'name' and widget flags set to 'f'
|
||||||
|
*/
|
||||||
|
EntityGUI_1Spin::EntityGUI_1Spin(QWidget* parent, const char* name, WFlags fl)
|
||||||
|
:EntityGUI_1Spin_QTD(parent, name, fl)
|
||||||
|
{
|
||||||
|
SpinBox1->close(TRUE);
|
||||||
|
|
||||||
|
SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
|
||||||
|
Layout1->addWidget(SpinBox_DX, 0, 1);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Destroys the object and frees any allocated resources
|
||||||
|
*/
|
||||||
|
EntityGUI_1Spin::~EntityGUI_1Spin()
|
||||||
|
{
|
||||||
|
// no need to delete child widgets, Qt does it all for us
|
||||||
|
}
|
47
src/EntityGUI/EntityGUI_1Spin.h
Normal file
47
src/EntityGUI/EntityGUI_1Spin.h
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
// GEOM GEOMGUI : GUI for Geometry component
|
||||||
|
//
|
||||||
|
// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||||
|
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||||
|
//
|
||||||
|
// This library is free software; you can redistribute it and/or
|
||||||
|
// modify it under the terms of the GNU Lesser General Public
|
||||||
|
// License as published by the Free Software Foundation; either
|
||||||
|
// version 2.1 of the License.
|
||||||
|
//
|
||||||
|
// This library is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
// Lesser General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Lesser General Public
|
||||||
|
// License along with this library; if not, write to the Free Software
|
||||||
|
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
//
|
||||||
|
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// File : EntityGUI_1Spin.h
|
||||||
|
// Author : Damien COQUERET
|
||||||
|
// Module : GEOM
|
||||||
|
// $Header:
|
||||||
|
|
||||||
|
#ifndef ENTITYGUI_1SPIN_H
|
||||||
|
#define ENTITYGUI_1SPIN_H
|
||||||
|
|
||||||
|
#include "EntityGUI_1Spin_QTD.h"
|
||||||
|
#include "DlgRef_SpinBox.h"
|
||||||
|
|
||||||
|
class EntityGUI_1Spin : public EntityGUI_1Spin_QTD
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
EntityGUI_1Spin(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
|
||||||
|
~EntityGUI_1Spin();
|
||||||
|
|
||||||
|
DlgRef_SpinBox* SpinBox_DX;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // ENTITYGUI_1SPIN_H
|
88
src/EntityGUI/EntityGUI_1Spin_QTD.cxx
Normal file
88
src/EntityGUI/EntityGUI_1Spin_QTD.cxx
Normal file
@ -0,0 +1,88 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
** Form implementation generated from reading ui file 'EntityGUI_1Spin_QTD.ui'
|
||||||
|
**
|
||||||
|
** Created: ven déc 12 11:17:10 2003
|
||||||
|
** by: The User Interface Compiler (uic)
|
||||||
|
**
|
||||||
|
** WARNING! All changes made in this file will be lost!
|
||||||
|
****************************************************************************/
|
||||||
|
#include "EntityGUI_1Spin_QTD.h"
|
||||||
|
|
||||||
|
#include <qvariant.h>
|
||||||
|
#include <qgroupbox.h>
|
||||||
|
#include <qlabel.h>
|
||||||
|
#include <qpushbutton.h>
|
||||||
|
#include <qspinbox.h>
|
||||||
|
#include <qlayout.h>
|
||||||
|
#include <qtooltip.h>
|
||||||
|
#include <qwhatsthis.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Constructs a EntityGUI_1Spin_QTD which is a child of 'parent', with the
|
||||||
|
* name 'name' and widget flags set to 'f'.
|
||||||
|
*/
|
||||||
|
EntityGUI_1Spin_QTD::EntityGUI_1Spin_QTD( QWidget* parent, const char* name, WFlags fl )
|
||||||
|
: QWidget( parent, name, fl )
|
||||||
|
{
|
||||||
|
if ( !name )
|
||||||
|
setName( "EntityGUI_1Spin_QTD" );
|
||||||
|
resize( 154, 96 );
|
||||||
|
setCaption( trUtf8( "EntityGUI_1Spin_QTD" ) );
|
||||||
|
EntityGUI_1Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_1Spin_QTDLayout");
|
||||||
|
|
||||||
|
GroupBox1 = new QGroupBox( this, "GroupBox1" );
|
||||||
|
GroupBox1->setTitle( trUtf8( "Values" ) );
|
||||||
|
GroupBox1->setColumnLayout(0, Qt::Vertical );
|
||||||
|
GroupBox1->layout()->setSpacing( 6 );
|
||||||
|
GroupBox1->layout()->setMargin( 11 );
|
||||||
|
GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
|
||||||
|
GroupBox1Layout->setAlignment( Qt::AlignTop );
|
||||||
|
|
||||||
|
Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3");
|
||||||
|
|
||||||
|
Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2");
|
||||||
|
|
||||||
|
buttonUndo = new QPushButton( GroupBox1, "buttonUndo" );
|
||||||
|
buttonUndo->setText( trUtf8( "Undo" ) );
|
||||||
|
|
||||||
|
Layout2->addWidget( buttonUndo, 1, 0 );
|
||||||
|
|
||||||
|
buttonApply = new QPushButton( GroupBox1, "buttonApply" );
|
||||||
|
buttonApply->setText( trUtf8( "Create" ) );
|
||||||
|
|
||||||
|
Layout2->addWidget( buttonApply, 0, 0 );
|
||||||
|
QSpacerItem* spacer = new QSpacerItem( 0, 51, QSizePolicy::Minimum, QSizePolicy::Expanding );
|
||||||
|
Layout2->addItem( spacer, 2, 0 );
|
||||||
|
|
||||||
|
Layout3->addLayout( Layout2, 0, 1 );
|
||||||
|
|
||||||
|
Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1");
|
||||||
|
|
||||||
|
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 );
|
||||||
|
|
||||||
|
SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
|
||||||
|
SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( SpinBox1, 0, 1 );
|
||||||
|
QSpacerItem* spacer_2 = new QSpacerItem( 0, 82, QSizePolicy::Minimum, QSizePolicy::Expanding );
|
||||||
|
Layout1->addItem( spacer_2, 3, 1 );
|
||||||
|
|
||||||
|
Layout3->addLayout( Layout1, 0, 0 );
|
||||||
|
|
||||||
|
GroupBox1Layout->addLayout( Layout3, 0, 0 );
|
||||||
|
|
||||||
|
EntityGUI_1Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Destroys the object and frees any allocated resources
|
||||||
|
*/
|
||||||
|
EntityGUI_1Spin_QTD::~EntityGUI_1Spin_QTD()
|
||||||
|
{
|
||||||
|
// no need to delete child widgets, Qt does it all for us
|
||||||
|
}
|
||||||
|
|
45
src/EntityGUI/EntityGUI_1Spin_QTD.h
Normal file
45
src/EntityGUI/EntityGUI_1Spin_QTD.h
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
** Form interface generated from reading ui file 'EntityGUI_1Spin_QTD.ui'
|
||||||
|
**
|
||||||
|
** Created: ven déc 12 11:17:10 2003
|
||||||
|
** by: The User Interface Compiler (uic)
|
||||||
|
**
|
||||||
|
** WARNING! All changes made in this file will be lost!
|
||||||
|
****************************************************************************/
|
||||||
|
#ifndef ENTITYGUI_1SPIN_QTD_H
|
||||||
|
#define ENTITYGUI_1SPIN_QTD_H
|
||||||
|
|
||||||
|
#include <qvariant.h>
|
||||||
|
#include <qwidget.h>
|
||||||
|
class QVBoxLayout;
|
||||||
|
class QHBoxLayout;
|
||||||
|
class QGridLayout;
|
||||||
|
class QGroupBox;
|
||||||
|
class QLabel;
|
||||||
|
class QPushButton;
|
||||||
|
class QSpinBox;
|
||||||
|
|
||||||
|
class EntityGUI_1Spin_QTD : public QWidget
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
EntityGUI_1Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
|
||||||
|
~EntityGUI_1Spin_QTD();
|
||||||
|
|
||||||
|
QGroupBox* GroupBox1;
|
||||||
|
QPushButton* buttonUndo;
|
||||||
|
QPushButton* buttonApply;
|
||||||
|
QLabel* TextLabel1;
|
||||||
|
QSpinBox* SpinBox1;
|
||||||
|
|
||||||
|
|
||||||
|
protected:
|
||||||
|
QGridLayout* EntityGUI_1Spin_QTDLayout;
|
||||||
|
QGridLayout* GroupBox1Layout;
|
||||||
|
QGridLayout* Layout3;
|
||||||
|
QGridLayout* Layout2;
|
||||||
|
QGridLayout* Layout1;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // ENTITYGUI_1SPIN_QTD_H
|
60
src/EntityGUI/EntityGUI_2Spin.cxx
Normal file
60
src/EntityGUI/EntityGUI_2Spin.cxx
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
// GEOM GEOMGUI : GUI for Geometry component
|
||||||
|
//
|
||||||
|
// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||||
|
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||||
|
//
|
||||||
|
// This library is free software; you can redistribute it and/or
|
||||||
|
// modify it under the terms of the GNU Lesser General Public
|
||||||
|
// License as published by the Free Software Foundation; either
|
||||||
|
// version 2.1 of the License.
|
||||||
|
//
|
||||||
|
// This library is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
// Lesser General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Lesser General Public
|
||||||
|
// License along with this library; if not, write to the Free Software
|
||||||
|
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
//
|
||||||
|
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// File : EntityGUI_2Spin.cxx
|
||||||
|
// Author : Damien COQUERET
|
||||||
|
// Module : GEOM
|
||||||
|
// $Header:
|
||||||
|
|
||||||
|
#include "EntityGUI_2Spin.h"
|
||||||
|
|
||||||
|
#include <qlayout.h>
|
||||||
|
#include <qspinbox.h>
|
||||||
|
#include <qgroupbox.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Constructs a EntityGUI_2Spin which is a child of 'parent', with the
|
||||||
|
* name 'name' and widget flags set to 'f'
|
||||||
|
*/
|
||||||
|
EntityGUI_2Spin::EntityGUI_2Spin(QWidget* parent, const char* name, WFlags fl)
|
||||||
|
:EntityGUI_2Spin_QTD(parent, name, fl)
|
||||||
|
{
|
||||||
|
SpinBox1->close(TRUE);
|
||||||
|
SpinBox2->close(TRUE);
|
||||||
|
|
||||||
|
SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
|
||||||
|
Layout1->addWidget(SpinBox_DX, 0, 1);
|
||||||
|
|
||||||
|
SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY");
|
||||||
|
Layout1->addWidget(SpinBox_DY, 1, 1);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Destroys the object and frees any allocated resources
|
||||||
|
*/
|
||||||
|
EntityGUI_2Spin::~EntityGUI_2Spin()
|
||||||
|
{
|
||||||
|
// no need to delete child widgets, Qt does it all for us
|
||||||
|
}
|
48
src/EntityGUI/EntityGUI_2Spin.h
Normal file
48
src/EntityGUI/EntityGUI_2Spin.h
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
// GEOM GEOMGUI : GUI for Geometry component
|
||||||
|
//
|
||||||
|
// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||||
|
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||||
|
//
|
||||||
|
// This library is free software; you can redistribute it and/or
|
||||||
|
// modify it under the terms of the GNU Lesser General Public
|
||||||
|
// License as published by the Free Software Foundation; either
|
||||||
|
// version 2.1 of the License.
|
||||||
|
//
|
||||||
|
// This library is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
// Lesser General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Lesser General Public
|
||||||
|
// License along with this library; if not, write to the Free Software
|
||||||
|
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
//
|
||||||
|
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// File : EntityGUI_2Spin.h
|
||||||
|
// Author : Damien COQUERET
|
||||||
|
// Module : GEOM
|
||||||
|
// $Header:
|
||||||
|
|
||||||
|
#ifndef ENTITYGUI_2SPIN_H
|
||||||
|
#define ENTITYGUI_2SPIN_H
|
||||||
|
|
||||||
|
#include "EntityGUI_2Spin_QTD.h"
|
||||||
|
#include "DlgRef_SpinBox.h"
|
||||||
|
|
||||||
|
class EntityGUI_2Spin : public EntityGUI_2Spin_QTD
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
EntityGUI_2Spin(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
|
||||||
|
~EntityGUI_2Spin();
|
||||||
|
|
||||||
|
DlgRef_SpinBox* SpinBox_DX;
|
||||||
|
DlgRef_SpinBox* SpinBox_DY;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // ENTITYGUI_2SPIN_H
|
99
src/EntityGUI/EntityGUI_2Spin_QTD.cxx
Normal file
99
src/EntityGUI/EntityGUI_2Spin_QTD.cxx
Normal file
@ -0,0 +1,99 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
** Form implementation generated from reading ui file 'EntityGUI_2Spin_QTD.ui'
|
||||||
|
**
|
||||||
|
** Created: ven déc 12 11:17:11 2003
|
||||||
|
** by: The User Interface Compiler (uic)
|
||||||
|
**
|
||||||
|
** WARNING! All changes made in this file will be lost!
|
||||||
|
****************************************************************************/
|
||||||
|
#include "EntityGUI_2Spin_QTD.h"
|
||||||
|
|
||||||
|
#include <qvariant.h>
|
||||||
|
#include <qgroupbox.h>
|
||||||
|
#include <qlabel.h>
|
||||||
|
#include <qpushbutton.h>
|
||||||
|
#include <qspinbox.h>
|
||||||
|
#include <qlayout.h>
|
||||||
|
#include <qtooltip.h>
|
||||||
|
#include <qwhatsthis.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Constructs a EntityGUI_2Spin_QTD which is a child of 'parent', with the
|
||||||
|
* name 'name' and widget flags set to 'f'.
|
||||||
|
*/
|
||||||
|
EntityGUI_2Spin_QTD::EntityGUI_2Spin_QTD( QWidget* parent, const char* name, WFlags fl )
|
||||||
|
: QWidget( parent, name, fl )
|
||||||
|
{
|
||||||
|
if ( !name )
|
||||||
|
setName( "EntityGUI_2Spin_QTD" );
|
||||||
|
resize( 154, 96 );
|
||||||
|
setCaption( trUtf8( "EntityGUI_2Spin_QTD" ) );
|
||||||
|
EntityGUI_2Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_2Spin_QTDLayout");
|
||||||
|
|
||||||
|
GroupBox1 = new QGroupBox( this, "GroupBox1" );
|
||||||
|
GroupBox1->setTitle( trUtf8( "Values" ) );
|
||||||
|
GroupBox1->setColumnLayout(0, Qt::Vertical );
|
||||||
|
GroupBox1->layout()->setSpacing( 6 );
|
||||||
|
GroupBox1->layout()->setMargin( 11 );
|
||||||
|
GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
|
||||||
|
GroupBox1Layout->setAlignment( Qt::AlignTop );
|
||||||
|
|
||||||
|
Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3");
|
||||||
|
|
||||||
|
Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2");
|
||||||
|
|
||||||
|
buttonUndo = new QPushButton( GroupBox1, "buttonUndo" );
|
||||||
|
buttonUndo->setText( trUtf8( "Undo" ) );
|
||||||
|
|
||||||
|
Layout2->addWidget( buttonUndo, 1, 0 );
|
||||||
|
|
||||||
|
buttonApply = new QPushButton( GroupBox1, "buttonApply" );
|
||||||
|
buttonApply->setText( trUtf8( "Create" ) );
|
||||||
|
|
||||||
|
Layout2->addWidget( buttonApply, 0, 0 );
|
||||||
|
QSpacerItem* spacer = new QSpacerItem( 0, 51, QSizePolicy::Minimum, QSizePolicy::Expanding );
|
||||||
|
Layout2->addItem( spacer, 2, 0 );
|
||||||
|
|
||||||
|
Layout3->addLayout( Layout2, 0, 1 );
|
||||||
|
|
||||||
|
Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1");
|
||||||
|
|
||||||
|
TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
|
||||||
|
TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
TextLabel2->setText( trUtf8( "TL2" ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( TextLabel2, 1, 0 );
|
||||||
|
|
||||||
|
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 );
|
||||||
|
|
||||||
|
SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
|
||||||
|
SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( SpinBox1, 0, 1 );
|
||||||
|
|
||||||
|
SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
|
||||||
|
SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( SpinBox2, 1, 1 );
|
||||||
|
QSpacerItem* spacer_2 = new QSpacerItem( 0, 82, QSizePolicy::Minimum, QSizePolicy::Expanding );
|
||||||
|
Layout1->addItem( spacer_2, 3, 1 );
|
||||||
|
|
||||||
|
Layout3->addLayout( Layout1, 0, 0 );
|
||||||
|
|
||||||
|
GroupBox1Layout->addLayout( Layout3, 0, 0 );
|
||||||
|
|
||||||
|
EntityGUI_2Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Destroys the object and frees any allocated resources
|
||||||
|
*/
|
||||||
|
EntityGUI_2Spin_QTD::~EntityGUI_2Spin_QTD()
|
||||||
|
{
|
||||||
|
// no need to delete child widgets, Qt does it all for us
|
||||||
|
}
|
||||||
|
|
47
src/EntityGUI/EntityGUI_2Spin_QTD.h
Normal file
47
src/EntityGUI/EntityGUI_2Spin_QTD.h
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
** Form interface generated from reading ui file 'EntityGUI_2Spin_QTD.ui'
|
||||||
|
**
|
||||||
|
** Created: ven déc 12 11:17:10 2003
|
||||||
|
** by: The User Interface Compiler (uic)
|
||||||
|
**
|
||||||
|
** WARNING! All changes made in this file will be lost!
|
||||||
|
****************************************************************************/
|
||||||
|
#ifndef ENTITYGUI_2SPIN_QTD_H
|
||||||
|
#define ENTITYGUI_2SPIN_QTD_H
|
||||||
|
|
||||||
|
#include <qvariant.h>
|
||||||
|
#include <qwidget.h>
|
||||||
|
class QVBoxLayout;
|
||||||
|
class QHBoxLayout;
|
||||||
|
class QGridLayout;
|
||||||
|
class QGroupBox;
|
||||||
|
class QLabel;
|
||||||
|
class QPushButton;
|
||||||
|
class QSpinBox;
|
||||||
|
|
||||||
|
class EntityGUI_2Spin_QTD : public QWidget
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
EntityGUI_2Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
|
||||||
|
~EntityGUI_2Spin_QTD();
|
||||||
|
|
||||||
|
QGroupBox* GroupBox1;
|
||||||
|
QPushButton* buttonUndo;
|
||||||
|
QPushButton* buttonApply;
|
||||||
|
QLabel* TextLabel2;
|
||||||
|
QLabel* TextLabel1;
|
||||||
|
QSpinBox* SpinBox1;
|
||||||
|
QSpinBox* SpinBox2;
|
||||||
|
|
||||||
|
|
||||||
|
protected:
|
||||||
|
QGridLayout* EntityGUI_2Spin_QTDLayout;
|
||||||
|
QGridLayout* GroupBox1Layout;
|
||||||
|
QGridLayout* Layout3;
|
||||||
|
QGridLayout* Layout2;
|
||||||
|
QGridLayout* Layout1;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // ENTITYGUI_2SPIN_QTD_H
|
63
src/EntityGUI/EntityGUI_3Spin.cxx
Normal file
63
src/EntityGUI/EntityGUI_3Spin.cxx
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
// GEOM GEOMGUI : GUI for Geometry component
|
||||||
|
//
|
||||||
|
// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||||
|
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||||
|
//
|
||||||
|
// This library is free software; you can redistribute it and/or
|
||||||
|
// modify it under the terms of the GNU Lesser General Public
|
||||||
|
// License as published by the Free Software Foundation; either
|
||||||
|
// version 2.1 of the License.
|
||||||
|
//
|
||||||
|
// This library is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
// Lesser General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Lesser General Public
|
||||||
|
// License along with this library; if not, write to the Free Software
|
||||||
|
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
//
|
||||||
|
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// File : EntityGUI_3Spin.cxx
|
||||||
|
// Author : Damien COQUERET
|
||||||
|
// Module : GEOM
|
||||||
|
// $Header:
|
||||||
|
|
||||||
|
#include "EntityGUI_3Spin.h"
|
||||||
|
|
||||||
|
#include <qlayout.h>
|
||||||
|
#include <qspinbox.h>
|
||||||
|
#include <qgroupbox.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Constructs a EntityGUI_3Spin which is a child of 'parent', with the
|
||||||
|
* name 'name' and widget flags set to 'f'
|
||||||
|
*/
|
||||||
|
EntityGUI_3Spin::EntityGUI_3Spin(QWidget* parent, const char* name, WFlags fl)
|
||||||
|
:EntityGUI_3Spin_QTD(parent, name, fl)
|
||||||
|
{
|
||||||
|
SpinBox1->close(TRUE);
|
||||||
|
SpinBox2->close(TRUE);
|
||||||
|
SpinBox3->close(TRUE);
|
||||||
|
|
||||||
|
SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
|
||||||
|
Layout1->addWidget(SpinBox_DX, 0, 1);
|
||||||
|
|
||||||
|
SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY");
|
||||||
|
Layout1->addWidget(SpinBox_DY, 1, 1);
|
||||||
|
|
||||||
|
SpinBox_DZ = new DlgRef_SpinBox(GroupBox1, "SpinBox_DZ");
|
||||||
|
Layout1->addWidget(SpinBox_DZ, 2, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Destroys the object and frees any allocated resources
|
||||||
|
*/
|
||||||
|
EntityGUI_3Spin::~EntityGUI_3Spin()
|
||||||
|
{
|
||||||
|
// no need to delete child widgets, Qt does it all for us
|
||||||
|
}
|
49
src/EntityGUI/EntityGUI_3Spin.h
Normal file
49
src/EntityGUI/EntityGUI_3Spin.h
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
// GEOM GEOMGUI : GUI for Geometry component
|
||||||
|
//
|
||||||
|
// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||||
|
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||||
|
//
|
||||||
|
// This library is free software; you can redistribute it and/or
|
||||||
|
// modify it under the terms of the GNU Lesser General Public
|
||||||
|
// License as published by the Free Software Foundation; either
|
||||||
|
// version 2.1 of the License.
|
||||||
|
//
|
||||||
|
// This library is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
// Lesser General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Lesser General Public
|
||||||
|
// License along with this library; if not, write to the Free Software
|
||||||
|
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
//
|
||||||
|
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// File : EntityGUI_3Spin.h
|
||||||
|
// Author : Damien COQUERET
|
||||||
|
// Module : GEOM
|
||||||
|
// $Header:
|
||||||
|
|
||||||
|
#ifndef ENTITYGUI_3SPIN_H
|
||||||
|
#define ENTITYGUI_3SPIN_H
|
||||||
|
|
||||||
|
#include "EntityGUI_3Spin_QTD.h"
|
||||||
|
#include "DlgRef_SpinBox.h"
|
||||||
|
|
||||||
|
class EntityGUI_3Spin : public EntityGUI_3Spin_QTD
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
EntityGUI_3Spin( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
|
||||||
|
~EntityGUI_3Spin();
|
||||||
|
|
||||||
|
DlgRef_SpinBox* SpinBox_DX;
|
||||||
|
DlgRef_SpinBox* SpinBox_DY;
|
||||||
|
DlgRef_SpinBox* SpinBox_DZ;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // ENTITYGUI_3SPIN_H
|
110
src/EntityGUI/EntityGUI_3Spin_QTD.cxx
Normal file
110
src/EntityGUI/EntityGUI_3Spin_QTD.cxx
Normal file
@ -0,0 +1,110 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
** Form implementation generated from reading ui file 'EntityGUI_3Spin_QTD.ui'
|
||||||
|
**
|
||||||
|
** Created: ven déc 12 11:17:11 2003
|
||||||
|
** by: The User Interface Compiler (uic)
|
||||||
|
**
|
||||||
|
** WARNING! All changes made in this file will be lost!
|
||||||
|
****************************************************************************/
|
||||||
|
#include "EntityGUI_3Spin_QTD.h"
|
||||||
|
|
||||||
|
#include <qvariant.h>
|
||||||
|
#include <qgroupbox.h>
|
||||||
|
#include <qlabel.h>
|
||||||
|
#include <qpushbutton.h>
|
||||||
|
#include <qspinbox.h>
|
||||||
|
#include <qlayout.h>
|
||||||
|
#include <qtooltip.h>
|
||||||
|
#include <qwhatsthis.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Constructs a EntityGUI_3Spin_QTD which is a child of 'parent', with the
|
||||||
|
* name 'name' and widget flags set to 'f'.
|
||||||
|
*/
|
||||||
|
EntityGUI_3Spin_QTD::EntityGUI_3Spin_QTD( QWidget* parent, const char* name, WFlags fl )
|
||||||
|
: QWidget( parent, name, fl )
|
||||||
|
{
|
||||||
|
if ( !name )
|
||||||
|
setName( "EntityGUI_3Spin_QTD" );
|
||||||
|
resize( 154, 120 );
|
||||||
|
setCaption( trUtf8( "EntityGUI_3Spin_QTD" ) );
|
||||||
|
EntityGUI_3Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_3Spin_QTDLayout");
|
||||||
|
|
||||||
|
GroupBox1 = new QGroupBox( this, "GroupBox1" );
|
||||||
|
GroupBox1->setTitle( trUtf8( "Values" ) );
|
||||||
|
GroupBox1->setColumnLayout(0, Qt::Vertical );
|
||||||
|
GroupBox1->layout()->setSpacing( 6 );
|
||||||
|
GroupBox1->layout()->setMargin( 11 );
|
||||||
|
GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
|
||||||
|
GroupBox1Layout->setAlignment( Qt::AlignTop );
|
||||||
|
|
||||||
|
Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3");
|
||||||
|
|
||||||
|
Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2");
|
||||||
|
|
||||||
|
buttonUndo = new QPushButton( GroupBox1, "buttonUndo" );
|
||||||
|
buttonUndo->setText( trUtf8( "Undo" ) );
|
||||||
|
|
||||||
|
Layout2->addWidget( buttonUndo, 1, 0 );
|
||||||
|
|
||||||
|
buttonApply = new QPushButton( GroupBox1, "buttonApply" );
|
||||||
|
buttonApply->setText( trUtf8( "Create" ) );
|
||||||
|
|
||||||
|
Layout2->addWidget( buttonApply, 0, 0 );
|
||||||
|
QSpacerItem* spacer = new QSpacerItem( 0, 51, QSizePolicy::Minimum, QSizePolicy::Expanding );
|
||||||
|
Layout2->addItem( spacer, 2, 0 );
|
||||||
|
|
||||||
|
Layout3->addLayout( Layout2, 0, 1 );
|
||||||
|
|
||||||
|
Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1");
|
||||||
|
|
||||||
|
TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
|
||||||
|
TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
TextLabel2->setText( trUtf8( "TL2" ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( TextLabel2, 1, 0 );
|
||||||
|
|
||||||
|
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 );
|
||||||
|
|
||||||
|
SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
|
||||||
|
SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( SpinBox1, 0, 1 );
|
||||||
|
|
||||||
|
SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
|
||||||
|
SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( SpinBox2, 1, 1 );
|
||||||
|
|
||||||
|
TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
|
||||||
|
TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
TextLabel3->setText( trUtf8( "TL3" ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( TextLabel3, 2, 0 );
|
||||||
|
QSpacerItem* spacer_2 = new QSpacerItem( 0, 82, QSizePolicy::Minimum, QSizePolicy::Expanding );
|
||||||
|
Layout1->addItem( spacer_2, 3, 1 );
|
||||||
|
|
||||||
|
SpinBox3 = new QSpinBox( GroupBox1, "SpinBox3" );
|
||||||
|
SpinBox3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox3->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( SpinBox3, 2, 1 );
|
||||||
|
|
||||||
|
Layout3->addLayout( Layout1, 0, 0 );
|
||||||
|
|
||||||
|
GroupBox1Layout->addLayout( Layout3, 0, 0 );
|
||||||
|
|
||||||
|
EntityGUI_3Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Destroys the object and frees any allocated resources
|
||||||
|
*/
|
||||||
|
EntityGUI_3Spin_QTD::~EntityGUI_3Spin_QTD()
|
||||||
|
{
|
||||||
|
// no need to delete child widgets, Qt does it all for us
|
||||||
|
}
|
||||||
|
|
49
src/EntityGUI/EntityGUI_3Spin_QTD.h
Normal file
49
src/EntityGUI/EntityGUI_3Spin_QTD.h
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
** Form interface generated from reading ui file 'EntityGUI_3Spin_QTD.ui'
|
||||||
|
**
|
||||||
|
** Created: ven déc 12 11:17:11 2003
|
||||||
|
** by: The User Interface Compiler (uic)
|
||||||
|
**
|
||||||
|
** WARNING! All changes made in this file will be lost!
|
||||||
|
****************************************************************************/
|
||||||
|
#ifndef ENTITYGUI_3SPIN_QTD_H
|
||||||
|
#define ENTITYGUI_3SPIN_QTD_H
|
||||||
|
|
||||||
|
#include <qvariant.h>
|
||||||
|
#include <qwidget.h>
|
||||||
|
class QVBoxLayout;
|
||||||
|
class QHBoxLayout;
|
||||||
|
class QGridLayout;
|
||||||
|
class QGroupBox;
|
||||||
|
class QLabel;
|
||||||
|
class QPushButton;
|
||||||
|
class QSpinBox;
|
||||||
|
|
||||||
|
class EntityGUI_3Spin_QTD : public QWidget
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
EntityGUI_3Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
|
||||||
|
~EntityGUI_3Spin_QTD();
|
||||||
|
|
||||||
|
QGroupBox* GroupBox1;
|
||||||
|
QPushButton* buttonUndo;
|
||||||
|
QPushButton* buttonApply;
|
||||||
|
QLabel* TextLabel2;
|
||||||
|
QLabel* TextLabel1;
|
||||||
|
QSpinBox* SpinBox1;
|
||||||
|
QSpinBox* SpinBox2;
|
||||||
|
QLabel* TextLabel3;
|
||||||
|
QSpinBox* SpinBox3;
|
||||||
|
|
||||||
|
|
||||||
|
protected:
|
||||||
|
QGridLayout* EntityGUI_3Spin_QTDLayout;
|
||||||
|
QGridLayout* GroupBox1Layout;
|
||||||
|
QGridLayout* Layout3;
|
||||||
|
QGridLayout* Layout2;
|
||||||
|
QGridLayout* Layout1;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // ENTITYGUI_3SPIN_QTD_H
|
67
src/EntityGUI/EntityGUI_4Spin.cxx
Normal file
67
src/EntityGUI/EntityGUI_4Spin.cxx
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
// GEOM GEOMGUI : GUI for Geometry component
|
||||||
|
//
|
||||||
|
// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||||
|
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||||
|
//
|
||||||
|
// This library is free software; you can redistribute it and/or
|
||||||
|
// modify it under the terms of the GNU Lesser General Public
|
||||||
|
// License as published by the Free Software Foundation; either
|
||||||
|
// version 2.1 of the License.
|
||||||
|
//
|
||||||
|
// This library is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
// Lesser General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Lesser General Public
|
||||||
|
// License along with this library; if not, write to the Free Software
|
||||||
|
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
//
|
||||||
|
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// File : EntityGUI_4Spin.cxx
|
||||||
|
// Author : Damien COQUERET
|
||||||
|
// Module : GEOM
|
||||||
|
// $Header:
|
||||||
|
|
||||||
|
#include "EntityGUI_4Spin.h"
|
||||||
|
|
||||||
|
#include <qlayout.h>
|
||||||
|
#include <qspinbox.h>
|
||||||
|
#include <qgroupbox.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Constructs a EntityGUI_4Spin which is a child of 'parent', with the
|
||||||
|
* name 'name' and widget flags set to 'f'
|
||||||
|
*/
|
||||||
|
EntityGUI_4Spin::EntityGUI_4Spin(QWidget* parent, const char* name, WFlags fl)
|
||||||
|
:EntityGUI_4Spin_QTD(parent, name, fl)
|
||||||
|
{
|
||||||
|
SpinBox1->close(TRUE);
|
||||||
|
SpinBox2->close(TRUE);
|
||||||
|
SpinBox3->close(TRUE);
|
||||||
|
SpinBox4->close(TRUE);
|
||||||
|
|
||||||
|
SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
|
||||||
|
Layout1->addWidget(SpinBox_DX, 0, 1);
|
||||||
|
|
||||||
|
SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY");
|
||||||
|
Layout1->addWidget(SpinBox_DY, 1, 1);
|
||||||
|
|
||||||
|
SpinBox_DZ = new DlgRef_SpinBox(GroupBox1, "SpinBox_DZ");
|
||||||
|
Layout1->addWidget(SpinBox_DZ, 2, 1);
|
||||||
|
|
||||||
|
SpinBox_DS = new DlgRef_SpinBox(GroupBox1, "SpinBox_DS");
|
||||||
|
Layout1->addWidget(SpinBox_DS, 3, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Destroys the object and frees any allocated resources
|
||||||
|
*/
|
||||||
|
EntityGUI_4Spin::~EntityGUI_4Spin()
|
||||||
|
{
|
||||||
|
// no need to delete child widgets, Qt does it all for us
|
||||||
|
}
|
50
src/EntityGUI/EntityGUI_4Spin.h
Normal file
50
src/EntityGUI/EntityGUI_4Spin.h
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
// GEOM GEOMGUI : GUI for Geometry component
|
||||||
|
//
|
||||||
|
// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||||
|
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||||
|
//
|
||||||
|
// This library is free software; you can redistribute it and/or
|
||||||
|
// modify it under the terms of the GNU Lesser General Public
|
||||||
|
// License as published by the Free Software Foundation; either
|
||||||
|
// version 2.1 of the License.
|
||||||
|
//
|
||||||
|
// This library is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
// Lesser General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Lesser General Public
|
||||||
|
// License along with this library; if not, write to the Free Software
|
||||||
|
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
//
|
||||||
|
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// File : EntityGUI_4Spin.h
|
||||||
|
// Author : Damien COQUERET
|
||||||
|
// Module : GEOM
|
||||||
|
// $Header:
|
||||||
|
|
||||||
|
#ifndef ENTITYGUI_4SPIN_H
|
||||||
|
#define ENTITYGUI_4SPIN_H
|
||||||
|
|
||||||
|
#include "EntityGUI_4Spin_QTD.h"
|
||||||
|
#include "DlgRef_SpinBox.h"
|
||||||
|
|
||||||
|
class EntityGUI_4Spin : public EntityGUI_4Spin_QTD
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
EntityGUI_4Spin( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
|
||||||
|
~EntityGUI_4Spin();
|
||||||
|
|
||||||
|
DlgRef_SpinBox* SpinBox_DX;
|
||||||
|
DlgRef_SpinBox* SpinBox_DY;
|
||||||
|
DlgRef_SpinBox* SpinBox_DZ;
|
||||||
|
DlgRef_SpinBox* SpinBox_DS;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // ENTITYGUI_4SPIN_H
|
128
src/EntityGUI/EntityGUI_4Spin_QTD.cxx
Normal file
128
src/EntityGUI/EntityGUI_4Spin_QTD.cxx
Normal file
@ -0,0 +1,128 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
** Form implementation generated from reading ui file 'EntityGUI_4Spin_QTD.ui'
|
||||||
|
**
|
||||||
|
** Created: Fri Apr 30 10:56:21 2004
|
||||||
|
** by: The User Interface Compiler (uic)
|
||||||
|
**
|
||||||
|
** WARNING! All changes made in this file will be lost!
|
||||||
|
****************************************************************************/
|
||||||
|
#include "EntityGUI_4Spin_QTD.h"
|
||||||
|
|
||||||
|
#include <qvariant.h>
|
||||||
|
#include <qgroupbox.h>
|
||||||
|
#include <qlabel.h>
|
||||||
|
#include <qpushbutton.h>
|
||||||
|
#include <qspinbox.h>
|
||||||
|
#include <qlayout.h>
|
||||||
|
#include <qtooltip.h>
|
||||||
|
#include <qwhatsthis.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Constructs a EntityGUI_4Spin_QTD which is a child of 'parent', with the
|
||||||
|
* name 'name' and widget flags set to 'f'.
|
||||||
|
*/
|
||||||
|
EntityGUI_4Spin_QTD::EntityGUI_4Spin_QTD( QWidget* parent, const char* name, WFlags fl )
|
||||||
|
: QWidget( parent, name, fl )
|
||||||
|
{
|
||||||
|
if ( !name )
|
||||||
|
setName( "EntityGUI_4Spin_QTD" );
|
||||||
|
resize( 176, 154 );
|
||||||
|
setCaption( trUtf8( "EntityGUI_4Spin_QTD" ) );
|
||||||
|
EntityGUI_4Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_4Spin_QTDLayout");
|
||||||
|
|
||||||
|
GroupBox1 = new QGroupBox( this, "GroupBox1" );
|
||||||
|
GroupBox1->setTitle( trUtf8( "Values" ) );
|
||||||
|
GroupBox1->setColumnLayout(0, Qt::Vertical );
|
||||||
|
GroupBox1->layout()->setSpacing( 6 );
|
||||||
|
GroupBox1->layout()->setMargin( 11 );
|
||||||
|
GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
|
||||||
|
GroupBox1Layout->setAlignment( Qt::AlignTop );
|
||||||
|
|
||||||
|
Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3");
|
||||||
|
|
||||||
|
Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2");
|
||||||
|
|
||||||
|
buttonUndo = new QPushButton( GroupBox1, "buttonUndo" );
|
||||||
|
buttonUndo->setText( trUtf8( "Undo" ) );
|
||||||
|
|
||||||
|
Layout2->addWidget( buttonUndo, 1, 0 );
|
||||||
|
|
||||||
|
buttonApply = new QPushButton( GroupBox1, "buttonApply" );
|
||||||
|
buttonApply->setText( trUtf8( "Create" ) );
|
||||||
|
|
||||||
|
Layout2->addWidget( buttonApply, 0, 0 );
|
||||||
|
QSpacerItem* spacer = new QSpacerItem( 0, 51, QSizePolicy::Minimum, QSizePolicy::Expanding );
|
||||||
|
Layout2->addItem( spacer, 2, 0 );
|
||||||
|
|
||||||
|
Layout3->addLayout( Layout2, 0, 1 );
|
||||||
|
|
||||||
|
Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1");
|
||||||
|
|
||||||
|
SpinBox3 = new QSpinBox( GroupBox1, "SpinBox3" );
|
||||||
|
SpinBox3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox3->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( SpinBox3, 2, 1 );
|
||||||
|
|
||||||
|
SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
|
||||||
|
SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( SpinBox2, 1, 1 );
|
||||||
|
|
||||||
|
TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
|
||||||
|
TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
TextLabel2->setText( trUtf8( "TL2" ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( TextLabel2, 1, 0 );
|
||||||
|
QSpacerItem* spacer_2 = new QSpacerItem( 0, 70, QSizePolicy::Minimum, QSizePolicy::Expanding );
|
||||||
|
Layout1->addItem( spacer_2, 4, 1 );
|
||||||
|
|
||||||
|
SpinBox4 = new QSpinBox( GroupBox1, "SpinBox4" );
|
||||||
|
SpinBox4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox4->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( SpinBox4, 3, 1 );
|
||||||
|
|
||||||
|
TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
|
||||||
|
TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
TextLabel3->setText( trUtf8( "TL3" ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( TextLabel3, 2, 0 );
|
||||||
|
|
||||||
|
SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
|
||||||
|
SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( SpinBox1, 0, 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 );
|
||||||
|
|
||||||
|
Layout3->addLayout( Layout1, 0, 0 );
|
||||||
|
|
||||||
|
GroupBox1Layout->addLayout( Layout3, 0, 0 );
|
||||||
|
|
||||||
|
EntityGUI_4Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
|
||||||
|
|
||||||
|
// tab order
|
||||||
|
setTabOrder( buttonUndo, buttonApply );
|
||||||
|
setTabOrder( buttonApply, SpinBox1 );
|
||||||
|
setTabOrder( SpinBox1, SpinBox2 );
|
||||||
|
setTabOrder( SpinBox2, SpinBox3 );
|
||||||
|
setTabOrder( SpinBox3, SpinBox4 );
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Destroys the object and frees any allocated resources
|
||||||
|
*/
|
||||||
|
EntityGUI_4Spin_QTD::~EntityGUI_4Spin_QTD()
|
||||||
|
{
|
||||||
|
// no need to delete child widgets, Qt does it all for us
|
||||||
|
}
|
||||||
|
|
51
src/EntityGUI/EntityGUI_4Spin_QTD.h
Normal file
51
src/EntityGUI/EntityGUI_4Spin_QTD.h
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
** Form interface generated from reading ui file 'EntityGUI_4Spin_QTD.ui'
|
||||||
|
**
|
||||||
|
** Created: Fri Apr 30 10:56:17 2004
|
||||||
|
** by: The User Interface Compiler (uic)
|
||||||
|
**
|
||||||
|
** WARNING! All changes made in this file will be lost!
|
||||||
|
****************************************************************************/
|
||||||
|
#ifndef ENTITYGUI_4SPIN_QTD_H
|
||||||
|
#define ENTITYGUI_4SPIN_QTD_H
|
||||||
|
|
||||||
|
#include <qvariant.h>
|
||||||
|
#include <qwidget.h>
|
||||||
|
class QVBoxLayout;
|
||||||
|
class QHBoxLayout;
|
||||||
|
class QGridLayout;
|
||||||
|
class QGroupBox;
|
||||||
|
class QLabel;
|
||||||
|
class QPushButton;
|
||||||
|
class QSpinBox;
|
||||||
|
|
||||||
|
class EntityGUI_4Spin_QTD : public QWidget
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
EntityGUI_4Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
|
||||||
|
~EntityGUI_4Spin_QTD();
|
||||||
|
|
||||||
|
QGroupBox* GroupBox1;
|
||||||
|
QPushButton* buttonUndo;
|
||||||
|
QPushButton* buttonApply;
|
||||||
|
QSpinBox* SpinBox3;
|
||||||
|
QSpinBox* SpinBox2;
|
||||||
|
QLabel* TextLabel2;
|
||||||
|
QSpinBox* SpinBox4;
|
||||||
|
QLabel* TextLabel3;
|
||||||
|
QSpinBox* SpinBox1;
|
||||||
|
QLabel* TextLabel1;
|
||||||
|
QLabel* TextLabel4;
|
||||||
|
|
||||||
|
|
||||||
|
protected:
|
||||||
|
QGridLayout* EntityGUI_4Spin_QTDLayout;
|
||||||
|
QGridLayout* GroupBox1Layout;
|
||||||
|
QGridLayout* Layout3;
|
||||||
|
QGridLayout* Layout2;
|
||||||
|
QGridLayout* Layout1;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // ENTITYGUI_4SPIN_QTD_H
|
80
src/EntityGUI/EntityGUI_Dir1_QTD.cxx
Normal file
80
src/EntityGUI/EntityGUI_Dir1_QTD.cxx
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
** Form implementation generated from reading ui file 'EntityGUI_Dir1_QTD.ui'
|
||||||
|
**
|
||||||
|
** Created: ven déc 12 11:17:09 2003
|
||||||
|
** by: The User Interface Compiler (uic)
|
||||||
|
**
|
||||||
|
** WARNING! All changes made in this file will be lost!
|
||||||
|
****************************************************************************/
|
||||||
|
#include "EntityGUI_Dir1_QTD.h"
|
||||||
|
|
||||||
|
#include <qvariant.h>
|
||||||
|
#include <qbuttongroup.h>
|
||||||
|
#include <qpushbutton.h>
|
||||||
|
#include <qradiobutton.h>
|
||||||
|
#include <qlayout.h>
|
||||||
|
#include <qtooltip.h>
|
||||||
|
#include <qwhatsthis.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Constructs a EntityGUI_Dir1_QTD which is a child of 'parent', with the
|
||||||
|
* name 'name' and widget flags set to 'f'.
|
||||||
|
*/
|
||||||
|
EntityGUI_Dir1_QTD::EntityGUI_Dir1_QTD( QWidget* parent, const char* name, WFlags fl )
|
||||||
|
: QWidget( parent, name, fl )
|
||||||
|
{
|
||||||
|
if ( !name )
|
||||||
|
setName( "EntityGUI_Dir1_QTD" );
|
||||||
|
resize( 131, 123 );
|
||||||
|
setCaption( trUtf8( "EntityGUI_Dir1_QTD" ) );
|
||||||
|
EntityGUI_Dir1_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_Dir1_QTDLayout");
|
||||||
|
|
||||||
|
GroupDir1 = new QButtonGroup( this, "GroupDir1" );
|
||||||
|
GroupDir1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupDir1->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
GroupDir1->setTitle( trUtf8( "Direction" ) );
|
||||||
|
GroupDir1->setColumnLayout(0, Qt::Vertical );
|
||||||
|
GroupDir1->layout()->setSpacing( 6 );
|
||||||
|
GroupDir1->layout()->setMargin( 11 );
|
||||||
|
GroupDir1Layout = new QGridLayout( GroupDir1->layout() );
|
||||||
|
GroupDir1Layout->setAlignment( Qt::AlignTop );
|
||||||
|
|
||||||
|
Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1");
|
||||||
|
|
||||||
|
RB_Dir12 = new QRadioButton( GroupDir1, "RB_Dir12" );
|
||||||
|
RB_Dir12->setText( trUtf8( "Perpendicular" ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( RB_Dir12, 1, 0 );
|
||||||
|
|
||||||
|
RB_Dir13 = new QRadioButton( GroupDir1, "RB_Dir13" );
|
||||||
|
RB_Dir13->setText( trUtf8( "Tangent" ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( RB_Dir13, 2, 0 );
|
||||||
|
|
||||||
|
RB_Dir11 = new QRadioButton( GroupDir1, "RB_Dir11" );
|
||||||
|
RB_Dir11->setText( trUtf8( "Angle" ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( RB_Dir11, 0, 0 );
|
||||||
|
|
||||||
|
RB_Dir14 = new QRadioButton( GroupDir1, "RB_Dir14" );
|
||||||
|
RB_Dir14->setText( trUtf8( "VX-VY" ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( RB_Dir14, 3, 0 );
|
||||||
|
|
||||||
|
GroupDir1Layout->addLayout( Layout1, 0, 0 );
|
||||||
|
|
||||||
|
EntityGUI_Dir1_QTDLayout->addWidget( GroupDir1, 0, 0 );
|
||||||
|
|
||||||
|
// tab order
|
||||||
|
setTabOrder( RB_Dir11, RB_Dir12 );
|
||||||
|
setTabOrder( RB_Dir12, RB_Dir13 );
|
||||||
|
setTabOrder( RB_Dir13, RB_Dir14 );
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Destroys the object and frees any allocated resources
|
||||||
|
*/
|
||||||
|
EntityGUI_Dir1_QTD::~EntityGUI_Dir1_QTD()
|
||||||
|
{
|
||||||
|
// no need to delete child widgets, Qt does it all for us
|
||||||
|
}
|
||||||
|
|
41
src/EntityGUI/EntityGUI_Dir1_QTD.h
Normal file
41
src/EntityGUI/EntityGUI_Dir1_QTD.h
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
** Form interface generated from reading ui file 'EntityGUI_Dir1_QTD.ui'
|
||||||
|
**
|
||||||
|
** Created: ven déc 12 11:17:09 2003
|
||||||
|
** by: The User Interface Compiler (uic)
|
||||||
|
**
|
||||||
|
** WARNING! All changes made in this file will be lost!
|
||||||
|
****************************************************************************/
|
||||||
|
#ifndef ENTITYGUI_DIR1_QTD_H
|
||||||
|
#define ENTITYGUI_DIR1_QTD_H
|
||||||
|
|
||||||
|
#include <qvariant.h>
|
||||||
|
#include <qwidget.h>
|
||||||
|
class QVBoxLayout;
|
||||||
|
class QHBoxLayout;
|
||||||
|
class QGridLayout;
|
||||||
|
class QButtonGroup;
|
||||||
|
class QRadioButton;
|
||||||
|
|
||||||
|
class EntityGUI_Dir1_QTD : public QWidget
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
EntityGUI_Dir1_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
|
||||||
|
~EntityGUI_Dir1_QTD();
|
||||||
|
|
||||||
|
QButtonGroup* GroupDir1;
|
||||||
|
QRadioButton* RB_Dir12;
|
||||||
|
QRadioButton* RB_Dir13;
|
||||||
|
QRadioButton* RB_Dir11;
|
||||||
|
QRadioButton* RB_Dir14;
|
||||||
|
|
||||||
|
|
||||||
|
protected:
|
||||||
|
QGridLayout* EntityGUI_Dir1_QTDLayout;
|
||||||
|
QGridLayout* GroupDir1Layout;
|
||||||
|
QGridLayout* Layout1;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // ENTITYGUI_DIR1_QTD_H
|
76
src/EntityGUI/EntityGUI_Dir2_QTD.cxx
Normal file
76
src/EntityGUI/EntityGUI_Dir2_QTD.cxx
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
** Form implementation generated from reading ui file 'EntityGUI_Dir2_QTD.ui'
|
||||||
|
**
|
||||||
|
** Created: ven déc 12 11:17:10 2003
|
||||||
|
** by: The User Interface Compiler (uic)
|
||||||
|
**
|
||||||
|
** WARNING! All changes made in this file will be lost!
|
||||||
|
****************************************************************************/
|
||||||
|
#include "EntityGUI_Dir2_QTD.h"
|
||||||
|
|
||||||
|
#include <qvariant.h>
|
||||||
|
#include <qbuttongroup.h>
|
||||||
|
#include <qpushbutton.h>
|
||||||
|
#include <qradiobutton.h>
|
||||||
|
#include <qlayout.h>
|
||||||
|
#include <qtooltip.h>
|
||||||
|
#include <qwhatsthis.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Constructs a EntityGUI_Dir2_QTD which is a child of 'parent', with the
|
||||||
|
* name 'name' and widget flags set to 'f'.
|
||||||
|
*/
|
||||||
|
EntityGUI_Dir2_QTD::EntityGUI_Dir2_QTD( QWidget* parent, const char* name, WFlags fl )
|
||||||
|
: QWidget( parent, name, fl )
|
||||||
|
{
|
||||||
|
if ( !name )
|
||||||
|
setName( "EntityGUI_Dir2_QTD" );
|
||||||
|
resize( 124, 106 );
|
||||||
|
setCaption( trUtf8( "EntityGUI_Dir2_QTD" ) );
|
||||||
|
EntityGUI_Dir2_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_Dir2_QTDLayout");
|
||||||
|
|
||||||
|
GroupDir2 = new QButtonGroup( this, "GroupDir2" );
|
||||||
|
GroupDir2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupDir2->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
GroupDir2->setTitle( trUtf8( "Direction" ) );
|
||||||
|
GroupDir2->setColumnLayout(0, Qt::Vertical );
|
||||||
|
GroupDir2->layout()->setSpacing( 6 );
|
||||||
|
GroupDir2->layout()->setMargin( 11 );
|
||||||
|
GroupDir2Layout = new QGridLayout( GroupDir2->layout() );
|
||||||
|
GroupDir2Layout->setAlignment( Qt::AlignTop );
|
||||||
|
|
||||||
|
Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1");
|
||||||
|
|
||||||
|
RB_Dir22 = new QRadioButton( GroupDir2, "RB_Dir22" );
|
||||||
|
RB_Dir22->setText( trUtf8( "X" ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( RB_Dir22, 1, 0 );
|
||||||
|
|
||||||
|
RB_Dir23 = new QRadioButton( GroupDir2, "RB_Dir23" );
|
||||||
|
RB_Dir23->setText( trUtf8( "Y" ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( RB_Dir23, 2, 0 );
|
||||||
|
QSpacerItem* spacer = new QSpacerItem( 0, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
|
||||||
|
Layout1->addItem( spacer, 3, 0 );
|
||||||
|
|
||||||
|
RB_Dir21 = new QRadioButton( GroupDir2, "RB_Dir21" );
|
||||||
|
RB_Dir21->setText( trUtf8( "Length" ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( RB_Dir21, 0, 0 );
|
||||||
|
|
||||||
|
GroupDir2Layout->addLayout( Layout1, 0, 0 );
|
||||||
|
|
||||||
|
EntityGUI_Dir2_QTDLayout->addWidget( GroupDir2, 0, 0 );
|
||||||
|
|
||||||
|
// tab order
|
||||||
|
setTabOrder( RB_Dir21, RB_Dir22 );
|
||||||
|
setTabOrder( RB_Dir22, RB_Dir23 );
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Destroys the object and frees any allocated resources
|
||||||
|
*/
|
||||||
|
EntityGUI_Dir2_QTD::~EntityGUI_Dir2_QTD()
|
||||||
|
{
|
||||||
|
// no need to delete child widgets, Qt does it all for us
|
||||||
|
}
|
||||||
|
|
40
src/EntityGUI/EntityGUI_Dir2_QTD.h
Normal file
40
src/EntityGUI/EntityGUI_Dir2_QTD.h
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
** Form interface generated from reading ui file 'EntityGUI_Dir2_QTD.ui'
|
||||||
|
**
|
||||||
|
** Created: ven déc 12 11:17:09 2003
|
||||||
|
** by: The User Interface Compiler (uic)
|
||||||
|
**
|
||||||
|
** WARNING! All changes made in this file will be lost!
|
||||||
|
****************************************************************************/
|
||||||
|
#ifndef ENTITYGUI_DIR2_QTD_H
|
||||||
|
#define ENTITYGUI_DIR2_QTD_H
|
||||||
|
|
||||||
|
#include <qvariant.h>
|
||||||
|
#include <qwidget.h>
|
||||||
|
class QVBoxLayout;
|
||||||
|
class QHBoxLayout;
|
||||||
|
class QGridLayout;
|
||||||
|
class QButtonGroup;
|
||||||
|
class QRadioButton;
|
||||||
|
|
||||||
|
class EntityGUI_Dir2_QTD : public QWidget
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
EntityGUI_Dir2_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
|
||||||
|
~EntityGUI_Dir2_QTD();
|
||||||
|
|
||||||
|
QButtonGroup* GroupDir2;
|
||||||
|
QRadioButton* RB_Dir22;
|
||||||
|
QRadioButton* RB_Dir23;
|
||||||
|
QRadioButton* RB_Dir21;
|
||||||
|
|
||||||
|
|
||||||
|
protected:
|
||||||
|
QGridLayout* EntityGUI_Dir2_QTDLayout;
|
||||||
|
QGridLayout* GroupDir2Layout;
|
||||||
|
QGridLayout* Layout1;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // ENTITYGUI_DIR2_QTD_H
|
74
src/EntityGUI/EntityGUI_Point_QTD.cxx
Normal file
74
src/EntityGUI/EntityGUI_Point_QTD.cxx
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
** Form implementation generated from reading ui file 'EntityGUI_Point_QTD.ui'
|
||||||
|
**
|
||||||
|
** Created: ven déc 12 11:17:08 2003
|
||||||
|
** by: The User Interface Compiler (uic)
|
||||||
|
**
|
||||||
|
** WARNING! All changes made in this file will be lost!
|
||||||
|
****************************************************************************/
|
||||||
|
#include "EntityGUI_Point_QTD.h"
|
||||||
|
|
||||||
|
#include <qvariant.h>
|
||||||
|
#include <qbuttongroup.h>
|
||||||
|
#include <qpushbutton.h>
|
||||||
|
#include <qradiobutton.h>
|
||||||
|
#include <qlayout.h>
|
||||||
|
#include <qtooltip.h>
|
||||||
|
#include <qwhatsthis.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Constructs a EntityGUI_Point_QTD which is a child of 'parent', with the
|
||||||
|
* name 'name' and widget flags set to 'f'.
|
||||||
|
*/
|
||||||
|
EntityGUI_Point_QTD::EntityGUI_Point_QTD( QWidget* parent, const char* name, WFlags fl )
|
||||||
|
: QWidget( parent, name, fl )
|
||||||
|
{
|
||||||
|
if ( !name )
|
||||||
|
setName( "EntityGUI_Point_QTD" );
|
||||||
|
resize( 124, 106 );
|
||||||
|
setCaption( trUtf8( "EntityGUI_Point_QTD" ) );
|
||||||
|
EntityGUI_Point_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_Point_QTDLayout");
|
||||||
|
|
||||||
|
GroupPoint = new QButtonGroup( this, "GroupPoint" );
|
||||||
|
GroupPoint->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupPoint->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
GroupPoint->setTitle( trUtf8( "Point" ) );
|
||||||
|
GroupPoint->setColumnLayout(0, Qt::Vertical );
|
||||||
|
GroupPoint->layout()->setSpacing( 6 );
|
||||||
|
GroupPoint->layout()->setMargin( 11 );
|
||||||
|
GroupPointLayout = new QGridLayout( GroupPoint->layout() );
|
||||||
|
GroupPointLayout->setAlignment( Qt::AlignTop );
|
||||||
|
|
||||||
|
Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1");
|
||||||
|
|
||||||
|
RB_Point2 = new QRadioButton( GroupPoint, "RB_Point2" );
|
||||||
|
RB_Point2->setText( trUtf8( "Relative" ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( RB_Point2, 1, 0 );
|
||||||
|
|
||||||
|
RB_Point1 = new QRadioButton( GroupPoint, "RB_Point1" );
|
||||||
|
RB_Point1->setText( trUtf8( "Absolute" ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( RB_Point1, 0, 0 );
|
||||||
|
|
||||||
|
RB_Point3 = new QRadioButton( GroupPoint, "RB_Point3" );
|
||||||
|
RB_Point3->setText( trUtf8( "Selection" ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( RB_Point3, 2, 0 );
|
||||||
|
|
||||||
|
GroupPointLayout->addLayout( Layout1, 0, 0 );
|
||||||
|
|
||||||
|
EntityGUI_Point_QTDLayout->addWidget( GroupPoint, 0, 0 );
|
||||||
|
|
||||||
|
// tab order
|
||||||
|
setTabOrder( RB_Point1, RB_Point2 );
|
||||||
|
setTabOrder( RB_Point2, RB_Point3 );
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Destroys the object and frees any allocated resources
|
||||||
|
*/
|
||||||
|
EntityGUI_Point_QTD::~EntityGUI_Point_QTD()
|
||||||
|
{
|
||||||
|
// no need to delete child widgets, Qt does it all for us
|
||||||
|
}
|
||||||
|
|
40
src/EntityGUI/EntityGUI_Point_QTD.h
Normal file
40
src/EntityGUI/EntityGUI_Point_QTD.h
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
** Form interface generated from reading ui file 'EntityGUI_Point_QTD.ui'
|
||||||
|
**
|
||||||
|
** Created: ven déc 12 11:17:08 2003
|
||||||
|
** by: The User Interface Compiler (uic)
|
||||||
|
**
|
||||||
|
** WARNING! All changes made in this file will be lost!
|
||||||
|
****************************************************************************/
|
||||||
|
#ifndef ENTITYGUI_POINT_QTD_H
|
||||||
|
#define ENTITYGUI_POINT_QTD_H
|
||||||
|
|
||||||
|
#include <qvariant.h>
|
||||||
|
#include <qwidget.h>
|
||||||
|
class QVBoxLayout;
|
||||||
|
class QHBoxLayout;
|
||||||
|
class QGridLayout;
|
||||||
|
class QButtonGroup;
|
||||||
|
class QRadioButton;
|
||||||
|
|
||||||
|
class EntityGUI_Point_QTD : public QWidget
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
EntityGUI_Point_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
|
||||||
|
~EntityGUI_Point_QTD();
|
||||||
|
|
||||||
|
QButtonGroup* GroupPoint;
|
||||||
|
QRadioButton* RB_Point2;
|
||||||
|
QRadioButton* RB_Point1;
|
||||||
|
QRadioButton* RB_Point3;
|
||||||
|
|
||||||
|
|
||||||
|
protected:
|
||||||
|
QGridLayout* EntityGUI_Point_QTDLayout;
|
||||||
|
QGridLayout* GroupPointLayout;
|
||||||
|
QGridLayout* Layout1;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // ENTITYGUI_POINT_QTD_H
|
176
src/EntityGUI/EntityGUI_Skeleton_QTD.cxx
Normal file
176
src/EntityGUI/EntityGUI_Skeleton_QTD.cxx
Normal file
@ -0,0 +1,176 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
** Form implementation generated from reading ui file 'EntityGUI_Skeleton_QTD.ui'
|
||||||
|
**
|
||||||
|
** Created: ven déc 12 11:17:08 2003
|
||||||
|
** by: The User Interface Compiler (uic)
|
||||||
|
**
|
||||||
|
** WARNING! All changes made in this file will be lost!
|
||||||
|
****************************************************************************/
|
||||||
|
#include "EntityGUI_Skeleton_QTD.h"
|
||||||
|
|
||||||
|
#include <qvariant.h>
|
||||||
|
#include <qbuttongroup.h>
|
||||||
|
#include <qgroupbox.h>
|
||||||
|
#include <qpushbutton.h>
|
||||||
|
#include <qradiobutton.h>
|
||||||
|
#include <qlayout.h>
|
||||||
|
#include <qtooltip.h>
|
||||||
|
#include <qwhatsthis.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Constructs a EntityGUI_Skeleton_QTD which is a child of 'parent', with the
|
||||||
|
* name 'name' and widget flags set to 'f'.
|
||||||
|
*
|
||||||
|
* The dialog will by default be modeless, unless you set 'modal' to
|
||||||
|
* TRUE to construct a modal dialog.
|
||||||
|
*/
|
||||||
|
EntityGUI_Skeleton_QTD::EntityGUI_Skeleton_QTD( QWidget* parent, const char* name, bool modal, WFlags fl )
|
||||||
|
: QDialog( parent, name, modal, fl )
|
||||||
|
{
|
||||||
|
if ( !name )
|
||||||
|
setName( "EntityGUI_Skeleton_QTD" );
|
||||||
|
resize( 317, 276 );
|
||||||
|
setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) );
|
||||||
|
setCaption( trUtf8( "EntityGUI_Skeleton_QTD" ) );
|
||||||
|
EntityGUI_Skeleton_QTDLayout = new QGridLayout( this, 1, 1, 11, 6, "EntityGUI_Skeleton_QTDLayout");
|
||||||
|
|
||||||
|
Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1");
|
||||||
|
|
||||||
|
GroupVal = new QGroupBox( this, "GroupVal" );
|
||||||
|
GroupVal->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupVal->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
GroupVal->setTitle( trUtf8( "" ) );
|
||||||
|
|
||||||
|
Layout1->addWidget( GroupVal, 2, 0 );
|
||||||
|
|
||||||
|
GroupConstructors = new QButtonGroup( this, "GroupConstructors" );
|
||||||
|
GroupConstructors->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, GroupConstructors->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
GroupConstructors->setTitle( trUtf8( "Element Type" ) );
|
||||||
|
GroupConstructors->setColumnLayout(0, Qt::Vertical );
|
||||||
|
GroupConstructors->layout()->setSpacing( 6 );
|
||||||
|
GroupConstructors->layout()->setMargin( 11 );
|
||||||
|
GroupConstructorsLayout = new QGridLayout( GroupConstructors->layout() );
|
||||||
|
GroupConstructorsLayout->setAlignment( Qt::AlignTop );
|
||||||
|
|
||||||
|
Layout2 = new QHBoxLayout( 0, 0, 6, "Layout2");
|
||||||
|
|
||||||
|
RadioButton1 = new QRadioButton( GroupConstructors, "RadioButton1" );
|
||||||
|
RadioButton1->setText( trUtf8( "Segment" ) );
|
||||||
|
Layout2->addWidget( RadioButton1 );
|
||||||
|
|
||||||
|
RadioButton2 = new QRadioButton( GroupConstructors, "RadioButton2" );
|
||||||
|
RadioButton2->setText( trUtf8( "Arc" ) );
|
||||||
|
Layout2->addWidget( RadioButton2 );
|
||||||
|
|
||||||
|
GroupConstructorsLayout->addLayout( Layout2, 0, 0 );
|
||||||
|
|
||||||
|
Layout1->addWidget( GroupConstructors, 0, 0 );
|
||||||
|
|
||||||
|
GroupDest = new QGroupBox( this, "GroupDest" );
|
||||||
|
GroupDest->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupDest->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
GroupDest->setTitle( trUtf8( "Destination" ) );
|
||||||
|
GroupDest->setColumnLayout(0, Qt::Vertical );
|
||||||
|
GroupDest->layout()->setSpacing( 6 );
|
||||||
|
GroupDest->layout()->setMargin( 11 );
|
||||||
|
GroupDestLayout = new QGridLayout( GroupDest->layout() );
|
||||||
|
GroupDestLayout->setAlignment( Qt::AlignTop );
|
||||||
|
|
||||||
|
Layout5 = new QGridLayout( 0, 1, 1, 0, 6, "Layout5");
|
||||||
|
|
||||||
|
GroupDest1 = new QButtonGroup( GroupDest, "GroupDest1" );
|
||||||
|
GroupDest1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupDest1->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
GroupDest1->setTitle( trUtf8( "Type" ) );
|
||||||
|
GroupDest1->setColumnLayout(0, Qt::Vertical );
|
||||||
|
GroupDest1->layout()->setSpacing( 6 );
|
||||||
|
GroupDest1->layout()->setMargin( 11 );
|
||||||
|
GroupDest1Layout = new QGridLayout( GroupDest1->layout() );
|
||||||
|
GroupDest1Layout->setAlignment( Qt::AlignTop );
|
||||||
|
|
||||||
|
Layout4 = new QGridLayout( 0, 1, 1, 0, 6, "Layout4");
|
||||||
|
|
||||||
|
RB_Dest2 = new QRadioButton( GroupDest1, "RB_Dest2" );
|
||||||
|
RB_Dest2->setText( trUtf8( "Direction" ) );
|
||||||
|
|
||||||
|
Layout4->addWidget( RB_Dest2, 0, 1 );
|
||||||
|
|
||||||
|
RB_Dest1 = new QRadioButton( GroupDest1, "RB_Dest1" );
|
||||||
|
RB_Dest1->setText( trUtf8( "Point" ) );
|
||||||
|
|
||||||
|
Layout4->addWidget( RB_Dest1, 0, 0 );
|
||||||
|
|
||||||
|
GroupDest1Layout->addLayout( Layout4, 0, 0 );
|
||||||
|
|
||||||
|
Layout5->addMultiCellWidget( GroupDest1, 0, 0, 0, 1 );
|
||||||
|
|
||||||
|
GroupDest2 = new QButtonGroup( GroupDest, "GroupDest2" );
|
||||||
|
GroupDest2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupDest2->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
GroupDest2->setTitle( trUtf8( "" ) );
|
||||||
|
GroupDest2->setColumnLayout(0, Qt::Vertical );
|
||||||
|
GroupDest2->layout()->setSpacing( 6 );
|
||||||
|
GroupDest2->layout()->setMargin( 11 );
|
||||||
|
GroupDest2Layout = new QGridLayout( GroupDest2->layout() );
|
||||||
|
GroupDest2Layout->setAlignment( Qt::AlignTop );
|
||||||
|
|
||||||
|
Layout5->addWidget( GroupDest2, 1, 0 );
|
||||||
|
|
||||||
|
GroupDest3 = new QButtonGroup( GroupDest, "GroupDest3" );
|
||||||
|
GroupDest3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupDest3->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
GroupDest3->setTitle( trUtf8( "" ) );
|
||||||
|
GroupDest3->setColumnLayout(0, Qt::Vertical );
|
||||||
|
GroupDest3->layout()->setSpacing( 6 );
|
||||||
|
GroupDest3->layout()->setMargin( 11 );
|
||||||
|
GroupDest3Layout = new QGridLayout( GroupDest3->layout() );
|
||||||
|
GroupDest3Layout->setAlignment( Qt::AlignTop );
|
||||||
|
|
||||||
|
Layout5->addWidget( GroupDest3, 1, 1 );
|
||||||
|
|
||||||
|
GroupDestLayout->addLayout( Layout5, 0, 0 );
|
||||||
|
|
||||||
|
Layout1->addWidget( GroupDest, 1, 0 );
|
||||||
|
|
||||||
|
GroupButtons = new QGroupBox( this, "GroupButtons" );
|
||||||
|
GroupButtons->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupButtons->sizePolicy().hasHeightForWidth() ) );
|
||||||
|
GroupButtons->setTitle( trUtf8( "" ) );
|
||||||
|
GroupButtons->setColumnLayout(0, Qt::Vertical );
|
||||||
|
GroupButtons->layout()->setSpacing( 6 );
|
||||||
|
GroupButtons->layout()->setMargin( 11 );
|
||||||
|
GroupButtonsLayout = new QHBoxLayout( GroupButtons->layout() );
|
||||||
|
GroupButtonsLayout->setAlignment( Qt::AlignTop );
|
||||||
|
|
||||||
|
Layout3 = new QHBoxLayout( 0, 0, 6, "Layout3");
|
||||||
|
|
||||||
|
buttonEnd = new QPushButton( GroupButtons, "buttonEnd" );
|
||||||
|
buttonEnd->setText( trUtf8( "End Sketch" ) );
|
||||||
|
Layout3->addWidget( buttonEnd );
|
||||||
|
|
||||||
|
buttonClose = new QPushButton( GroupButtons, "buttonClose" );
|
||||||
|
buttonClose->setText( trUtf8( "Close Sketch" ) );
|
||||||
|
Layout3->addWidget( buttonClose );
|
||||||
|
QSpacerItem* spacer = new QSpacerItem( 91, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
|
||||||
|
Layout3->addItem( spacer );
|
||||||
|
|
||||||
|
buttonCancel = new QPushButton( GroupButtons, "buttonCancel" );
|
||||||
|
buttonCancel->setText( trUtf8( "&Cancel" ) );
|
||||||
|
Layout3->addWidget( buttonCancel );
|
||||||
|
GroupButtonsLayout->addLayout( Layout3 );
|
||||||
|
|
||||||
|
Layout1->addWidget( GroupButtons, 3, 0 );
|
||||||
|
|
||||||
|
EntityGUI_Skeleton_QTDLayout->addLayout( Layout1, 0, 0 );
|
||||||
|
|
||||||
|
// tab order
|
||||||
|
setTabOrder( RadioButton1, RadioButton2 );
|
||||||
|
setTabOrder( RadioButton2, RB_Dest1 );
|
||||||
|
setTabOrder( RB_Dest1, RB_Dest2 );
|
||||||
|
setTabOrder( RB_Dest2, buttonEnd );
|
||||||
|
setTabOrder( buttonEnd, buttonClose );
|
||||||
|
setTabOrder( buttonClose, buttonCancel );
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Destroys the object and frees any allocated resources
|
||||||
|
*/
|
||||||
|
EntityGUI_Skeleton_QTD::~EntityGUI_Skeleton_QTD()
|
||||||
|
{
|
||||||
|
// no need to delete child widgets, Qt does it all for us
|
||||||
|
}
|
||||||
|
|
61
src/EntityGUI/EntityGUI_Skeleton_QTD.h
Normal file
61
src/EntityGUI/EntityGUI_Skeleton_QTD.h
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
** Form interface generated from reading ui file 'EntityGUI_Skeleton_QTD.ui'
|
||||||
|
**
|
||||||
|
** Created: ven déc 12 11:17:07 2003
|
||||||
|
** by: The User Interface Compiler (uic)
|
||||||
|
**
|
||||||
|
** WARNING! All changes made in this file will be lost!
|
||||||
|
****************************************************************************/
|
||||||
|
#ifndef ENTITYGUI_SKELETON_QTD_H
|
||||||
|
#define ENTITYGUI_SKELETON_QTD_H
|
||||||
|
|
||||||
|
#include <qvariant.h>
|
||||||
|
#include <qdialog.h>
|
||||||
|
class QVBoxLayout;
|
||||||
|
class QHBoxLayout;
|
||||||
|
class QGridLayout;
|
||||||
|
class QButtonGroup;
|
||||||
|
class QGroupBox;
|
||||||
|
class QPushButton;
|
||||||
|
class QRadioButton;
|
||||||
|
|
||||||
|
class EntityGUI_Skeleton_QTD : public QDialog
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
EntityGUI_Skeleton_QTD( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
|
||||||
|
~EntityGUI_Skeleton_QTD();
|
||||||
|
|
||||||
|
QGroupBox* GroupVal;
|
||||||
|
QButtonGroup* GroupConstructors;
|
||||||
|
QRadioButton* RadioButton1;
|
||||||
|
QRadioButton* RadioButton2;
|
||||||
|
QGroupBox* GroupDest;
|
||||||
|
QButtonGroup* GroupDest1;
|
||||||
|
QRadioButton* RB_Dest2;
|
||||||
|
QRadioButton* RB_Dest1;
|
||||||
|
QButtonGroup* GroupDest2;
|
||||||
|
QButtonGroup* GroupDest3;
|
||||||
|
QGroupBox* GroupButtons;
|
||||||
|
QPushButton* buttonEnd;
|
||||||
|
QPushButton* buttonClose;
|
||||||
|
QPushButton* buttonCancel;
|
||||||
|
|
||||||
|
|
||||||
|
protected:
|
||||||
|
QGridLayout* EntityGUI_Skeleton_QTDLayout;
|
||||||
|
QGridLayout* Layout1;
|
||||||
|
QGridLayout* GroupConstructorsLayout;
|
||||||
|
QHBoxLayout* Layout2;
|
||||||
|
QGridLayout* GroupDestLayout;
|
||||||
|
QGridLayout* Layout5;
|
||||||
|
QGridLayout* GroupDest1Layout;
|
||||||
|
QGridLayout* Layout4;
|
||||||
|
QGridLayout* GroupDest2Layout;
|
||||||
|
QGridLayout* GroupDest3Layout;
|
||||||
|
QHBoxLayout* GroupButtonsLayout;
|
||||||
|
QHBoxLayout* Layout3;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // ENTITYGUI_SKELETON_QTD_H
|
1168
src/EntityGUI/EntityGUI_SketcherDlg.cxx
Normal file
1168
src/EntityGUI/EntityGUI_SketcherDlg.cxx
Normal file
File diff suppressed because it is too large
Load Diff
149
src/EntityGUI/EntityGUI_SketcherDlg.h
Normal file
149
src/EntityGUI/EntityGUI_SketcherDlg.h
Normal file
@ -0,0 +1,149 @@
|
|||||||
|
// GEOM GEOMGUI : GUI for Geometry component
|
||||||
|
//
|
||||||
|
// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||||
|
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||||
|
//
|
||||||
|
// This library is free software; you can redistribute it and/or
|
||||||
|
// modify it under the terms of the GNU Lesser General Public
|
||||||
|
// License as published by the Free Software Foundation; either
|
||||||
|
// version 2.1 of the License.
|
||||||
|
//
|
||||||
|
// This library is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
// Lesser General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Lesser General Public
|
||||||
|
// License along with this library; if not, write to the Free Software
|
||||||
|
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
//
|
||||||
|
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// File : EntityGUI_SketcherDlg.h
|
||||||
|
// Author : Damine COQUERET
|
||||||
|
// Module : GEOM
|
||||||
|
// $Header:
|
||||||
|
|
||||||
|
#ifndef ENTITYGUI_SKETCHERDLG_H
|
||||||
|
#define ENTITYGUI_SKETCHERDLG_H
|
||||||
|
|
||||||
|
#include "EntityGUI_Skeleton_QTD.h"
|
||||||
|
#include "EntityGUI_Point_QTD.h"
|
||||||
|
#include "EntityGUI_Dir1_QTD.h"
|
||||||
|
#include "EntityGUI_Dir2_QTD.h"
|
||||||
|
|
||||||
|
#include "EntityGUI_1Sel_QTD.h"
|
||||||
|
#include "EntityGUI_1Spin.h"
|
||||||
|
#include "EntityGUI_2Spin.h"
|
||||||
|
#include "EntityGUI_3Spin.h"
|
||||||
|
#include "EntityGUI_4Spin.h"
|
||||||
|
|
||||||
|
#include "EntityGUI.h"
|
||||||
|
|
||||||
|
#include "GEOM_ShapeTypeFilter.hxx"
|
||||||
|
|
||||||
|
#include <gp_Dir.hxx>
|
||||||
|
|
||||||
|
#include <qwidget.h>
|
||||||
|
#include <qgroupbox.h>
|
||||||
|
#include <qlineedit.h>
|
||||||
|
#include <qlayout.h>
|
||||||
|
#include <qradiobutton.h>
|
||||||
|
#include <qbuttongroup.h>
|
||||||
|
|
||||||
|
//=================================================================================
|
||||||
|
// class : EntityGUI_Dlg
|
||||||
|
// purpose :
|
||||||
|
//=================================================================================
|
||||||
|
class EntityGUI_SketcherDlg : public EntityGUI_Skeleton_QTD
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
EntityGUI_SketcherDlg(QWidget* parent = 0, const char* name = 0, EntityGUI* theEntityGUI = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0);
|
||||||
|
~EntityGUI_SketcherDlg();
|
||||||
|
|
||||||
|
private :
|
||||||
|
void Init();
|
||||||
|
void enterEvent(QEvent* e);
|
||||||
|
void closeEvent(QCloseEvent* e);
|
||||||
|
void InitClick();
|
||||||
|
void MakeSimulationAndDisplay();
|
||||||
|
QString GetNewCommand();
|
||||||
|
|
||||||
|
EntityGUI* myEntityGUI;
|
||||||
|
|
||||||
|
double step;
|
||||||
|
int myConstructorId;
|
||||||
|
int myConstructorDirId;
|
||||||
|
int mySketchType;
|
||||||
|
int mySketchState;
|
||||||
|
Handle(GEOM_ShapeTypeFilter) myVertexFilter;
|
||||||
|
|
||||||
|
TopoDS_Shape mySimulationTopoDs1; /* Shape used for simulation display */
|
||||||
|
TopoDS_Shape mySimulationTopoDs2; /* Shape used for simulation display */
|
||||||
|
QLineEdit* myEditCurrentArgument; /* Current LineEdit */
|
||||||
|
SALOME_Selection* mySelection; /* User shape selection */
|
||||||
|
GEOM::GEOM_Gen_var myGeom; /* Current GeomI object */
|
||||||
|
GEOMBase* myGeomBase;
|
||||||
|
GEOMContext* myGeomGUI; /* Current GeomGUI object */
|
||||||
|
|
||||||
|
int myLastOp;
|
||||||
|
QString myCommand;
|
||||||
|
QString myLastCommand;
|
||||||
|
TopoDS_Shape myShape;
|
||||||
|
gp_Dir myLastDir;
|
||||||
|
|
||||||
|
Standard_Real myX;
|
||||||
|
Standard_Real myY;
|
||||||
|
Standard_Real myDX;
|
||||||
|
Standard_Real myDY;
|
||||||
|
Standard_Real myLastX1;
|
||||||
|
Standard_Real myLastY1;
|
||||||
|
Standard_Real myLastX2;
|
||||||
|
Standard_Real myLastY2;
|
||||||
|
Standard_Real myLength;
|
||||||
|
Standard_Real myAngle;
|
||||||
|
Standard_Real myRadius;
|
||||||
|
|
||||||
|
EntityGUI_Point_QTD* GroupPt;
|
||||||
|
EntityGUI_Dir1_QTD* GroupD1;
|
||||||
|
EntityGUI_Dir2_QTD* GroupD2;
|
||||||
|
|
||||||
|
EntityGUI_1Sel_QTD* Group1Sel;
|
||||||
|
EntityGUI_1Spin* Group1Spin;
|
||||||
|
EntityGUI_2Spin* Group2Spin;
|
||||||
|
EntityGUI_3Spin* Group3Spin;
|
||||||
|
EntityGUI_4Spin* Group4Spin;
|
||||||
|
|
||||||
|
enum SketchState {FIRST_POINT, SECOND_POINT, NEXT_POINT};
|
||||||
|
|
||||||
|
enum SketchType {PT_ABS, PT_RELATIVE, PT_SEL,
|
||||||
|
DIR_ANGLE_LENGTH, DIR_ANGLE_X, DIR_ANGLE_Y,
|
||||||
|
DIR_PER_LENGTH, DIR_PER_X, DIR_PER_Y,
|
||||||
|
DIR_TAN_LENGTH, DIR_TAN_X, DIR_TAN_Y,
|
||||||
|
DIR_DXDY_LENGTH, DIR_DXDY_X, DIR_DXDY_Y};
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void ClickOnEnd();
|
||||||
|
void ClickOnClose();
|
||||||
|
void ClickOnCancel();
|
||||||
|
void ClickOnApply();
|
||||||
|
void ClickOnUndo();
|
||||||
|
void LineEditReturnPressed();
|
||||||
|
void SelectionIntoArgument();
|
||||||
|
void SetEditCurrentArgument();
|
||||||
|
void DeactivateActiveDialog();
|
||||||
|
void ActivateThisDialog();
|
||||||
|
void TypeClicked(int constructorId);
|
||||||
|
void DestClicked(int constructorId);
|
||||||
|
void PointClicked(int constructorId);
|
||||||
|
void Dir1Clicked(int constructorId);
|
||||||
|
void Dir2Clicked(int constructorId);
|
||||||
|
void ValueChangedInSpinBox(double newValue);
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // ENTITYGUI_SKETCHERDLG_H
|
@ -41,10 +41,38 @@ LIB = libEntityGUI.la
|
|||||||
EXPORT_HEADERS=
|
EXPORT_HEADERS=
|
||||||
|
|
||||||
LIB_SRC = EntityGUI.cxx \
|
LIB_SRC = EntityGUI.cxx \
|
||||||
|
EntityGUI_Skeleton_QTD.cxx \
|
||||||
|
EntityGUI_Point_QTD.cxx \
|
||||||
|
EntityGUI_Dir1_QTD.cxx \
|
||||||
|
EntityGUI_Dir2_QTD.cxx \
|
||||||
|
EntityGUI_1Sel_QTD.cxx \
|
||||||
|
EntityGUI_1Spin_QTD.cxx \
|
||||||
|
EntityGUI_2Spin_QTD.cxx \
|
||||||
|
EntityGUI_3Spin_QTD.cxx \
|
||||||
|
EntityGUI_4Spin_QTD.cxx \
|
||||||
|
EntityGUI_1Spin.cxx \
|
||||||
|
EntityGUI_2Spin.cxx \
|
||||||
|
EntityGUI_3Spin.cxx \
|
||||||
|
EntityGUI_4Spin.cxx \
|
||||||
|
EntityGUI_SketcherDlg.cxx \
|
||||||
EntityGUI_SubShapeDlg.cxx
|
EntityGUI_SubShapeDlg.cxx
|
||||||
|
|
||||||
LIB_MOC = \
|
LIB_MOC = \
|
||||||
EntityGUI.h \
|
EntityGUI.h \
|
||||||
|
EntityGUI_Skeleton_QTD.h \
|
||||||
|
EntityGUI_Point_QTD.h \
|
||||||
|
EntityGUI_Dir1_QTD.h \
|
||||||
|
EntityGUI_Dir2_QTD.h \
|
||||||
|
EntityGUI_1Sel_QTD.h \
|
||||||
|
EntityGUI_1Spin_QTD.h \
|
||||||
|
EntityGUI_2Spin_QTD.h \
|
||||||
|
EntityGUI_3Spin_QTD.h \
|
||||||
|
EntityGUI_4Spin_QTD.h \
|
||||||
|
EntityGUI_1Spin.h \
|
||||||
|
EntityGUI_2Spin.h \
|
||||||
|
EntityGUI_3Spin.h \
|
||||||
|
EntityGUI_4Spin.h \
|
||||||
|
EntityGUI_SketcherDlg.h \
|
||||||
EntityGUI_SubShapeDlg.h
|
EntityGUI_SubShapeDlg.h
|
||||||
|
|
||||||
LIB_CLIENT_IDL =
|
LIB_CLIENT_IDL =
|
||||||
@ -56,6 +84,6 @@ LIB_SERVER_IDL =
|
|||||||
CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
|
CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
|
||||||
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome
|
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome
|
||||||
|
|
||||||
LDFLAGS += -lGEOMFiltersSelection -lDisplayGUI
|
LDFLAGS += -lGEOMFiltersSelection -lDisplayGUI -lGEOMSketcher
|
||||||
|
|
||||||
@CONCLUDE@
|
@CONCLUDE@
|
||||||
|
@ -31,6 +31,7 @@ using namespace std;
|
|||||||
|
|
||||||
#include "Partition_Spliter.hxx"
|
#include "Partition_Spliter.hxx"
|
||||||
#include "Archimede_VolumeSection.hxx"
|
#include "Archimede_VolumeSection.hxx"
|
||||||
|
#include "Sketcher_Profile.hxx"
|
||||||
|
|
||||||
#include "Utils_CorbaException.hxx"
|
#include "Utils_CorbaException.hxx"
|
||||||
#include "utilities.h"
|
#include "utilities.h"
|
||||||
@ -159,6 +160,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);
|
||||||
@ -209,7 +212,7 @@ char* GEOM_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject,
|
|||||||
{
|
{
|
||||||
GEOM::GEOM_Shape_var aShape = GEOM::GEOM_Shape::_narrow(_orb->string_to_object(IORString));
|
GEOM::GEOM_Shape_var aShape = GEOM::GEOM_Shape::_narrow(_orb->string_to_object(IORString));
|
||||||
if (!CORBA::is_nil(aShape)) {
|
if (!CORBA::is_nil(aShape)) {
|
||||||
return strdup(aShape->ShapeId());
|
return CORBA::string_dup(aShape->ShapeId());
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -236,6 +239,12 @@ char* GEOM_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject,
|
|||||||
TDF_Label Lab;
|
TDF_Label Lab;
|
||||||
TDF_Tool::Label(aDoc->GetData(), aPersRefString, Lab );
|
TDF_Tool::Label(aDoc->GetData(), aPersRefString, Lab );
|
||||||
|
|
||||||
|
if (Lab.IsNull()) {
|
||||||
|
MESSAGE("Can not find label "<<aPersRefString<<" for study "<<myStudy->StudyId());
|
||||||
|
THROW_SALOME_CORBA_EXCEPTION("Incorrect GEOM data loaded",SALOME::BAD_PARAM);
|
||||||
|
//return ""; empty IORs raise new problem: "display" in popup crashes
|
||||||
|
}
|
||||||
|
|
||||||
Handle(TNaming_NamedShape) NS;
|
Handle(TNaming_NamedShape) NS;
|
||||||
Lab.FindAttribute( TNaming_NamedShape::GetID(), NS );
|
Lab.FindAttribute( TNaming_NamedShape::GetID(), NS );
|
||||||
TopoDS_Shape S = TNaming_Tool::GetShape(NS);
|
TopoDS_Shape S = TNaming_Tool::GetShape(NS);
|
||||||
@ -259,7 +268,7 @@ char* GEOM_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject,
|
|||||||
|
|
||||||
TCollection_AsciiString entry;
|
TCollection_AsciiString entry;
|
||||||
TDF_Tool::Entry(mainLabel,entry);
|
TDF_Tool::Entry(mainLabel,entry);
|
||||||
CORBA::String_var ent = strdup(entry.ToCString());
|
CORBA::String_var ent = CORBA::string_dup(entry.ToCString());
|
||||||
|
|
||||||
/* Create the main object recursively */
|
/* Create the main object recursively */
|
||||||
MainIOR = LocalPersistentIDToIOR(theSObject, ent, isMultiFile, isASCII) ;
|
MainIOR = LocalPersistentIDToIOR(theSObject, ent, isMultiFile, isASCII) ;
|
||||||
@ -363,6 +372,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;
|
||||||
|
|
||||||
@ -426,7 +436,7 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy,
|
|||||||
aShapeName = "Vertex_";
|
aShapeName = "Vertex_";
|
||||||
}
|
}
|
||||||
if (strlen(theName) == 0) aShapeName += TCollection_AsciiString(aResultSO->Tag());
|
if (strlen(theName) == 0) aShapeName += TCollection_AsciiString(aResultSO->Tag());
|
||||||
else aShapeName = TCollection_AsciiString(strdup(theName));
|
else aShapeName = TCollection_AsciiString((char*)theName);
|
||||||
|
|
||||||
//Set a name of the added shape
|
//Set a name of the added shape
|
||||||
anAttr = aStudyBuilder->FindOrCreateAttribute(aResultSO, "AttributeName");
|
anAttr = aStudyBuilder->FindOrCreateAttribute(aResultSO, "AttributeName");
|
||||||
@ -509,7 +519,7 @@ CORBA::Boolean GEOM_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
|
|||||||
if (!isMultiFile) SALOMEDS_Tool::RemoveTemporaryFiles(aTmpDir.ToCString(), aSeq.in(), true);
|
if (!isMultiFile) SALOMEDS_Tool::RemoveTemporaryFiles(aTmpDir.ToCString(), aSeq.in(), true);
|
||||||
|
|
||||||
SALOMEDS::Study_var Study = theComponent->GetStudy();
|
SALOMEDS::Study_var Study = theComponent->GetStudy();
|
||||||
TCollection_AsciiString name( strdup(Study->Name()) );
|
TCollection_AsciiString name( Study->Name() );
|
||||||
|
|
||||||
int StudyID = Study->StudyId();
|
int StudyID = Study->StudyId();
|
||||||
myStudyIDToDoc.Bind( StudyID, myCurrentOCAFDoc );
|
myStudyIDToDoc.Bind( StudyID, myCurrentOCAFDoc );
|
||||||
@ -537,7 +547,7 @@ CORBA::Boolean GEOM_Gen_i::LoadASCII(SALOMEDS::SComponent_ptr theComponent,
|
|||||||
// void GEOM_Gen_i::Save(const char *IORSComponent, const char *aUrlOfFile)
|
// void GEOM_Gen_i::Save(const char *IORSComponent, const char *aUrlOfFile)
|
||||||
// {
|
// {
|
||||||
|
|
||||||
// TCollection_ExtendedString path(strdup(aUrlOfFile));
|
// TCollection_ExtendedString path((char*)aUrlOfFile);
|
||||||
// TCollection_ExtendedString pathWithExt = path + TCollection_ExtendedString(".sgd");
|
// TCollection_ExtendedString pathWithExt = path + TCollection_ExtendedString(".sgd");
|
||||||
// myOCAFApp->SaveAs(myCurrentOCAFDoc,pathWithExt);
|
// myOCAFApp->SaveAs(myCurrentOCAFDoc,pathWithExt);
|
||||||
// }
|
// }
|
||||||
@ -550,14 +560,14 @@ CORBA::Boolean GEOM_Gen_i::LoadASCII(SALOMEDS::SComponent_ptr theComponent,
|
|||||||
// void GEOM_Gen_i::Load(const char *IORSComponent, const char *aUrlOfFile)
|
// void GEOM_Gen_i::Load(const char *IORSComponent, const char *aUrlOfFile)
|
||||||
// {
|
// {
|
||||||
|
|
||||||
// TCollection_ExtendedString path(strdup(aUrlOfFile));
|
// TCollection_ExtendedString path((char*)aUrlOfFile);
|
||||||
// TCollection_ExtendedString pathWithExt = path + TCollection_ExtendedString(".sgd");
|
// TCollection_ExtendedString pathWithExt = path + TCollection_ExtendedString(".sgd");
|
||||||
|
|
||||||
// myOCAFApp->Open(pathWithExt,myCurrentOCAFDoc);
|
// myOCAFApp->Open(pathWithExt,myCurrentOCAFDoc);
|
||||||
|
|
||||||
// SALOMEDS::SComponent_var SC = SALOMEDS::SComponent::_narrow(_orb->string_to_object(IORSComponent));
|
// SALOMEDS::SComponent_var SC = SALOMEDS::SComponent::_narrow(_orb->string_to_object(IORSComponent));
|
||||||
// SALOMEDS::Study_var Study = SC->GetStudy();
|
// SALOMEDS::Study_var Study = SC->GetStudy();
|
||||||
// TCollection_AsciiString name( strdup(Study->Name()) );
|
// TCollection_AsciiString name( Study->Name() );
|
||||||
|
|
||||||
// int StudyID = Study->StudyId();
|
// int StudyID = Study->StudyId();
|
||||||
// myStudyIDToDoc.Bind( StudyID, myCurrentOCAFDoc );
|
// myStudyIDToDoc.Bind( StudyID, myCurrentOCAFDoc );
|
||||||
@ -614,7 +624,7 @@ CORBA::Boolean GEOM_Gen_i::CanCopy(SALOMEDS::SObject_ptr theObject) {
|
|||||||
//============================================================================
|
//============================================================================
|
||||||
SALOMEDS::TMPFile* GEOM_Gen_i::CopyFrom(SALOMEDS::SObject_ptr theObject, CORBA::Long& theObjectID) {
|
SALOMEDS::TMPFile* GEOM_Gen_i::CopyFrom(SALOMEDS::SObject_ptr theObject, CORBA::Long& theObjectID) {
|
||||||
// Declare a sequence of the byte to store the copied object
|
// Declare a sequence of the byte to store the copied object
|
||||||
SALOMEDS::TMPFile_var aStreamFile;
|
SALOMEDS::TMPFile_var aStreamFile = new SALOMEDS::TMPFile;
|
||||||
|
|
||||||
// Try to get GEOM_Shape object by given SObject
|
// Try to get GEOM_Shape object by given SObject
|
||||||
SALOMEDS::GenericAttribute_var anAttr;
|
SALOMEDS::GenericAttribute_var anAttr;
|
||||||
@ -704,7 +714,7 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PasteInto(const SALOMEDS::TMPFile& theStream,
|
|||||||
//============================================================================
|
//============================================================================
|
||||||
char* GEOM_Gen_i::ComponentDataType()
|
char* GEOM_Gen_i::ComponentDataType()
|
||||||
{
|
{
|
||||||
return strdup("GEOM");
|
return CORBA::string_dup("GEOM");
|
||||||
}
|
}
|
||||||
|
|
||||||
//============================================================================
|
//============================================================================
|
||||||
@ -714,7 +724,7 @@ char* GEOM_Gen_i::ComponentDataType()
|
|||||||
void GEOM_Gen_i::register_name(char * name)
|
void GEOM_Gen_i::register_name(char * name)
|
||||||
{
|
{
|
||||||
GEOM::GEOM_Gen_ptr g = GEOM::GEOM_Gen::_narrow(POA_GEOM::GEOM_Gen::_this());
|
GEOM::GEOM_Gen_ptr g = GEOM::GEOM_Gen::_narrow(POA_GEOM::GEOM_Gen::_this());
|
||||||
name_service->Register(g, strdup(name));
|
name_service->Register(g, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -753,7 +763,7 @@ TopoDS_Shape GEOM_Gen_i::GetTopoShape(GEOM::GEOM_Shape_ptr shape_ptr)
|
|||||||
|
|
||||||
TDF_Label lab ;
|
TDF_Label lab ;
|
||||||
Handle(TDF_Data) D = myCurrentOCAFDoc->GetData() ;
|
Handle(TDF_Data) D = myCurrentOCAFDoc->GetData() ;
|
||||||
TDF_Tool::Label( D, strdup(shape_ptr->ShapeId()), lab, true ) ;
|
TDF_Tool::Label( D, shape_ptr->ShapeId(), lab, true ) ;
|
||||||
Handle(TNaming_NamedShape) NamedShape ;
|
Handle(TNaming_NamedShape) NamedShape ;
|
||||||
bool res = lab.FindAttribute(TNaming_NamedShape::GetID(), NamedShape) ;
|
bool res = lab.FindAttribute(TNaming_NamedShape::GetID(), NamedShape) ;
|
||||||
|
|
||||||
@ -803,7 +813,7 @@ const char * GEOM_Gen_i::InsertInLabel(TopoDS_Shape S, const char *mystr, Handle
|
|||||||
{
|
{
|
||||||
GEOMDS_Commands GC(OCAFDoc->Main());
|
GEOMDS_Commands GC(OCAFDoc->Main());
|
||||||
/* add attributs S and mystr in a new label */
|
/* add attributs S and mystr in a new label */
|
||||||
TDF_Label Lab = GC.AddShape (S, strdup(mystr));
|
TDF_Label Lab = GC.AddShape (S, (char*)mystr);
|
||||||
|
|
||||||
TCollection_AsciiString entry;
|
TCollection_AsciiString entry;
|
||||||
TDF_Tool::Entry(Lab,entry);
|
TDF_Tool::Entry(Lab,entry);
|
||||||
@ -831,7 +841,7 @@ const char * GEOM_Gen_i::InsertInLabelDependentShape( TopoDS_Shape S,
|
|||||||
TDF_Tool::Label(OCAFDoc->GetData(), mainshape_ptr->ShapeId(), mainRefLab);
|
TDF_Tool::Label(OCAFDoc->GetData(), mainshape_ptr->ShapeId(), mainRefLab);
|
||||||
|
|
||||||
/* add attributs : S, nameIor and ref to main */
|
/* add attributs : S, nameIor and ref to main */
|
||||||
TDF_Label Lab = GC.AddDependentShape(S, strdup(nameIor), mainRefLab);
|
TDF_Label Lab = GC.AddDependentShape(S, (char*)nameIor, mainRefLab);
|
||||||
|
|
||||||
TCollection_AsciiString entry;
|
TCollection_AsciiString entry;
|
||||||
TDF_Tool::Entry(Lab, entry);
|
TDF_Tool::Entry(Lab, entry);
|
||||||
@ -911,7 +921,15 @@ void GEOM_Gen_i::InsertInLabelMoreArguments(TopoDS_Shape main_topo,
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
CORBA::Short GEOM_Gen_i::NbLabels()
|
CORBA::Short GEOM_Gen_i::NbLabels()
|
||||||
{
|
{
|
||||||
return TDF_Tool::NbLabels( myCurrentOCAFDoc->Main() );
|
TDF_ChildIterator ChildIterator(myCurrentOCAFDoc->Main());
|
||||||
|
unsigned int i = 1;
|
||||||
|
|
||||||
|
while (ChildIterator.More()) {
|
||||||
|
i++;
|
||||||
|
ChildIterator.Next();
|
||||||
|
}
|
||||||
|
return i;
|
||||||
|
// return TDF_Tool::NbLabels( myCurrentOCAFDoc->Main() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -1015,6 +1033,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() ;
|
||||||
|
|
||||||
@ -1103,6 +1122,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 ) {
|
||||||
@ -1219,6 +1239,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) ;
|
||||||
|
|
||||||
@ -1367,6 +1388,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 */
|
||||||
@ -1467,6 +1489,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 )
|
||||||
@ -1629,6 +1652,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 ;
|
||||||
@ -1918,6 +1942,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 ;
|
||||||
@ -1976,6 +2001,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 ;
|
||||||
@ -2115,6 +2141,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);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2128,6 +2155,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);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2142,6 +2170,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);
|
||||||
@ -2222,6 +2251,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);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2234,6 +2264,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);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2248,6 +2279,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) ;
|
||||||
|
|
||||||
@ -2334,7 +2366,6 @@ GEOM::GEOM_Gen::ListOfGeomShapes* GEOM_Gen_i::SubShapesAll(GEOM::GEOM_Shape_ptr
|
|||||||
return listOfGeomShapes._retn() ;
|
return listOfGeomShapes._retn() ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// function : MakeBoolean()
|
// function : MakeBoolean()
|
||||||
// purpose : Boolean operation according to the type 'operation'
|
// purpose : Boolean operation according to the type 'operation'
|
||||||
@ -2344,6 +2375,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 ;
|
||||||
@ -2420,6 +2452,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) ;
|
||||||
@ -2508,7 +2541,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()
|
||||||
@ -2522,6 +2555,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 ;
|
||||||
@ -2554,6 +2588,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) ;
|
||||||
@ -2586,6 +2621,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 {
|
||||||
@ -2614,6 +2650,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) ;
|
||||||
@ -2648,6 +2685,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) ;
|
||||||
@ -2686,6 +2724,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;
|
||||||
@ -2696,8 +2735,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();
|
||||||
@ -2727,6 +2769,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;
|
||||||
@ -2802,6 +2845,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");
|
||||||
@ -2833,7 +2877,6 @@ throw (SALOME::SALOME_Exception)
|
|||||||
GEOM::GEOM_Shape_var aShape = GetIORFromString( ListTools[ind] );
|
GEOM::GEOM_Shape_var aShape = GetIORFromString( ListTools[ind] );
|
||||||
TopoDS_Shape Shape = GetTopoShape(aShape);
|
TopoDS_Shape Shape = GetTopoShape(aShape);
|
||||||
if(Shape.IsNull() ) {
|
if(Shape.IsNull() ) {
|
||||||
//MESSAGE ( "In Partition a tool shape is null" );
|
|
||||||
THROW_SALOME_CORBA_EXCEPTION("In Partition a shape is null", SALOME::BAD_PARAM);
|
THROW_SALOME_CORBA_EXCEPTION("In Partition a shape is null", SALOME::BAD_PARAM);
|
||||||
}
|
}
|
||||||
if ( !ShapesMap.Contains( Shape ) && ToolsMap.Add( Shape ))
|
if ( !ShapesMap.Contains( Shape ) && ToolsMap.Add( Shape ))
|
||||||
@ -2868,7 +2911,9 @@ throw (SALOME::SALOME_Exception)
|
|||||||
PS.AddShape(Shape);
|
PS.AddShape(Shape);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//MESSAGE ( "Partition::Compute() " );
|
||||||
PS.Compute ((TopAbs_ShapeEnum) Limit);
|
PS.Compute ((TopAbs_ShapeEnum) Limit);
|
||||||
|
//MESSAGE ( "Partition::Compute() - END" );
|
||||||
|
|
||||||
// suppress result outside of shapes in KInsideMap
|
// suppress result outside of shapes in KInsideMap
|
||||||
for (ind = 0; ind < ListKeepInside.length(); ind++) {
|
for (ind = 0; ind < ListKeepInside.length(); ind++) {
|
||||||
@ -2971,6 +3016,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) ;
|
||||||
@ -2993,6 +3039,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeFilling(GEOM::GEOM_Shape_ptr myShape,
|
|||||||
THROW_SALOME_CORBA_EXCEPTION("Initial shape doesn't contain only edges !", SALOME::BAD_PARAM);
|
THROW_SALOME_CORBA_EXCEPTION("Initial shape doesn't contain only edges !", SALOME::BAD_PARAM);
|
||||||
}
|
}
|
||||||
C = BRep_Tool::Curve(TopoDS::Edge(Scurrent), First, Last);
|
C = BRep_Tool::Curve(TopoDS::Edge(Scurrent), First, Last);
|
||||||
|
if (C.IsNull()) continue;
|
||||||
C = new Geom_TrimmedCurve(C, First, Last);
|
C = new Geom_TrimmedCurve(C, First, Last);
|
||||||
Section.AddCurve(C) ;
|
Section.AddCurve(C) ;
|
||||||
i++ ;
|
i++ ;
|
||||||
@ -3167,6 +3214,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) ;
|
||||||
@ -3305,6 +3353,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 ;
|
||||||
@ -3343,6 +3392,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 ;
|
||||||
@ -3386,6 +3436,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;
|
||||||
|
|
||||||
@ -3462,7 +3513,7 @@ GEOM::GEOM_Gen::ListOfIOR* GEOM_Gen_i::GetReferencedObjects(GEOM::GEOM_Shape_ptr
|
|||||||
Handle(TDataStd_Name) Att;
|
Handle(TDataStd_Name) Att;
|
||||||
L.FindAttribute(TDataStd_Name::GetID(),Att);
|
L.FindAttribute(TDataStd_Name::GetID(),Att);
|
||||||
TCollection_AsciiString nameIOR (Att->Get()) ;
|
TCollection_AsciiString nameIOR (Att->Get()) ;
|
||||||
aList[i] = strdup( nameIOR.ToCString() );
|
aList[i] = CORBA::string_dup( nameIOR.ToCString() );
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3512,7 +3563,7 @@ GEOM::GEOM_Gen::ListOfIOR* GEOM_Gen_i::GetObjects(GEOM::GEOM_Shape_ptr shape)
|
|||||||
|
|
||||||
if (!Att->Get().IsEqual(TCollection_ExtendedString("Arguments")) ) {
|
if (!Att->Get().IsEqual(TCollection_ExtendedString("Arguments")) ) {
|
||||||
TCollection_AsciiString nameIOR (Att->Get());
|
TCollection_AsciiString nameIOR (Att->Get());
|
||||||
aList[i] = strdup( nameIOR.ToCString() );
|
aList[i] = CORBA::string_dup( nameIOR.ToCString() );
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
ChildIterator1.Next();
|
ChildIterator1.Next();
|
||||||
@ -3528,12 +3579,15 @@ 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 ;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
BRep_Builder aBuilder;
|
BRep_Builder aBuilder;
|
||||||
BRepTools::Read(tds, strdup(filename), aBuilder) ;
|
char* aCopyfilename = strdup(filename);
|
||||||
|
BRepTools::Read(tds, aCopyfilename, aBuilder) ;
|
||||||
|
free(aCopyfilename);
|
||||||
if (tds.IsNull()) {
|
if (tds.IsNull()) {
|
||||||
THROW_SALOME_CORBA_EXCEPTION("Import BRep aborted", SALOME::BAD_PARAM);
|
THROW_SALOME_CORBA_EXCEPTION("Import BRep aborted", SALOME::BAD_PARAM);
|
||||||
}
|
}
|
||||||
@ -3558,6 +3612,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 ;
|
||||||
|
|
||||||
@ -3591,13 +3646,14 @@ 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();
|
||||||
if (tds.IsNull()) {
|
if (tds.IsNull()) {
|
||||||
THROW_SALOME_CORBA_EXCEPTION("Make Vertex/Point aborted", SALOME::BAD_PARAM);
|
THROW_SALOME_CORBA_EXCEPTION("Make Vertex/Point aborted", SALOME::BAD_PARAM);
|
||||||
}
|
}
|
||||||
|
tds.Infinite(true);
|
||||||
result = CreateObject(tds) ;
|
result = CreateObject(tds) ;
|
||||||
const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
|
const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
|
||||||
result->ShapeId(entry);
|
result->ShapeId(entry);
|
||||||
@ -3613,6 +3669,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;
|
||||||
@ -3684,13 +3741,24 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeFaces(const GEOM::GEOM_Gen::ListOfIOR& List
|
|||||||
FR.Perform();
|
FR.Perform();
|
||||||
|
|
||||||
if(FR.IsDone()) {
|
if(FR.IsDone()) {
|
||||||
for(; FR.More(); FR.Next())
|
int k = 0;
|
||||||
aBuilder.Add(C, FR.Current().Oriented(OriF));
|
TopoDS_Shape aFace;
|
||||||
|
for(; FR.More(); FR.Next()) {
|
||||||
|
aFace = FR.Current().Oriented(OriF);
|
||||||
|
aBuilder.Add(C, aFace);
|
||||||
|
k++;
|
||||||
|
}
|
||||||
|
if(k == 1) {
|
||||||
|
result = CreateObject(aFace);
|
||||||
|
InsertInLabelMoreArguments(aFace, result, ListShapes, myCurrentOCAFDoc);
|
||||||
|
}
|
||||||
|
else {
|
||||||
result = CreateObject(C);
|
result = CreateObject(C);
|
||||||
InsertInLabelMoreArguments(C, result, ListShapes, myCurrentOCAFDoc);
|
InsertInLabelMoreArguments(C, result, ListShapes, myCurrentOCAFDoc);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else {
|
else {
|
||||||
THROW_SALOME_CORBA_EXCEPTION("Null result in GEOM_Gen_i::MakeFace", SALOME::BAD_PARAM);
|
THROW_SALOME_CORBA_EXCEPTION("Null result in GEOM_Gen_i::MakeFace", SALOME::BAD_PARAM);
|
||||||
}
|
}
|
||||||
@ -3709,6 +3777,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;
|
||||||
@ -3750,6 +3819,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;
|
||||||
@ -3798,6 +3868,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) ;
|
||||||
@ -3814,6 +3885,7 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeLine(const GEOM::PointStruct& pstruct,
|
|||||||
THROW_SALOME_CORBA_EXCEPTION("Make Line aborted : null shape", SALOME::BAD_PARAM);
|
THROW_SALOME_CORBA_EXCEPTION("Make Line aborted : null shape", SALOME::BAD_PARAM);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
tds.Infinite(true);
|
||||||
result = CreateObject(tds) ;
|
result = CreateObject(tds) ;
|
||||||
const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
|
const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
|
||||||
result->ShapeId(entry);
|
result->ShapeId(entry);
|
||||||
@ -3830,6 +3902,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 ;
|
||||||
|
|
||||||
@ -3863,6 +3936,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 ;
|
||||||
|
|
||||||
@ -3896,6 +3970,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 ;
|
||||||
|
|
||||||
@ -3930,6 +4005,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) ;
|
||||||
@ -3957,7 +4033,34 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeArc(const GEOM::PointStruct& pInit,
|
|||||||
return result ;
|
return result ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//=================================================================================
|
||||||
|
// function : MakeSketcher()
|
||||||
|
// purpose : Make a wire from a list containing many points
|
||||||
|
//=================================================================================
|
||||||
|
GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeSketcher( const char *Cmd )
|
||||||
|
throw (SALOME::SALOME_Exception)
|
||||||
|
{
|
||||||
|
GEOM::GEOM_Shape_var result ;
|
||||||
|
TopoDS_Shape tds ;
|
||||||
|
try {
|
||||||
|
Sketcher_Profile aProfile (Cmd);
|
||||||
|
if(aProfile.IsDone())
|
||||||
|
tds = aProfile.GetShape();
|
||||||
|
}
|
||||||
|
catch(Standard_Failure) {
|
||||||
|
THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeSketcher", SALOME::BAD_PARAM);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tds.IsNull()) {
|
||||||
|
THROW_SALOME_CORBA_EXCEPTION("MakeSketcher aborted : null shape", SALOME::BAD_PARAM);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
result = CreateObject(tds);
|
||||||
|
const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
|
||||||
|
result->ShapeId(entry) ;
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// function : MakeTranslation()
|
// function : MakeTranslation()
|
||||||
@ -3969,6 +4072,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() ) {
|
||||||
@ -3999,6 +4103,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 ;
|
||||||
|
|
||||||
@ -4054,6 +4159,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 ;
|
||||||
|
|
||||||
@ -4111,6 +4217,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) ;
|
||||||
@ -4164,6 +4271,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) ;
|
||||||
@ -4248,6 +4356,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) ;
|
||||||
@ -4273,6 +4382,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) ;
|
||||||
@ -4325,6 +4435,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) ;
|
||||||
@ -4363,6 +4474,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) ;
|
||||||
@ -4396,6 +4508,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;
|
||||||
@ -4429,6 +4542,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 ;
|
||||||
|
|
||||||
@ -4459,6 +4573,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 ;
|
||||||
@ -4502,6 +4617,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) ;
|
||||||
@ -4535,6 +4651,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 ;
|
||||||
@ -4591,6 +4708,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) ;
|
||||||
@ -4624,6 +4742,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) ;
|
||||||
@ -4678,6 +4797,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;
|
||||||
@ -4751,6 +4871,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 ;
|
||||||
|
|
||||||
@ -4770,7 +4891,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();
|
||||||
|
|
||||||
@ -4785,7 +4906,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();
|
||||||
}
|
}
|
||||||
@ -4815,6 +4936,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 ;
|
||||||
|
|
||||||
@ -4873,6 +4995,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);
|
||||||
@ -4893,6 +5016,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 ;
|
||||||
|
|
||||||
@ -4932,6 +5056,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) ;
|
||||||
@ -4979,10 +5104,10 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakePanel(GEOM::GEOM_Shape_ptr shape,
|
|||||||
|
|
||||||
GEOM::GEOM_Gen::ListOfIOR_var aList = new GEOM::GEOM_Gen::ListOfIOR;
|
GEOM::GEOM_Gen::ListOfIOR_var aList = new GEOM::GEOM_Gen::ListOfIOR;
|
||||||
aList->length(4);
|
aList->length(4);
|
||||||
aList[0]=strdup(Edge1->Name());
|
aList[0]=CORBA::string_dup(Edge1->Name());
|
||||||
aList[1]=strdup(Edge2->Name());
|
aList[1]=CORBA::string_dup(Edge2->Name());
|
||||||
aList[2]=strdup(Edge3->Name());
|
aList[2]=CORBA::string_dup(Edge3->Name());
|
||||||
aList[3]=strdup(Edge4->Name());
|
aList[3]=CORBA::string_dup(Edge4->Name());
|
||||||
|
|
||||||
GEOM::GEOM_Shape_ptr aWire = MakeWire( aList );
|
GEOM::GEOM_Shape_ptr aWire = MakeWire( aList );
|
||||||
GEOM::GEOM_Shape_ptr aFace = MakeFace( aWire, true ) ;
|
GEOM::GEOM_Shape_ptr aFace = MakeFace( aWire, true ) ;
|
||||||
@ -5008,6 +5133,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);
|
||||||
@ -5040,6 +5166,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);
|
||||||
@ -5064,6 +5191,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);
|
||||||
|
@ -388,6 +388,7 @@ class GEOM_Gen_i: public POA_GEOM::GEOM_Gen,
|
|||||||
GEOM::GEOM_Shape_ptr MakePlacedBox(CORBA::Double x1, CORBA::Double y1, CORBA::Double z1,
|
GEOM::GEOM_Shape_ptr MakePlacedBox(CORBA::Double x1, CORBA::Double y1, CORBA::Double z1,
|
||||||
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) ;
|
||||||
|
|
||||||
GEOM::GEOM_Shape_ptr MakePanel(GEOM::GEOM_Shape_ptr shape,
|
GEOM::GEOM_Shape_ptr MakePanel(GEOM::GEOM_Shape_ptr shape,
|
||||||
CORBA::Short directiontype,
|
CORBA::Short directiontype,
|
||||||
CORBA::Double delta)
|
CORBA::Double delta)
|
||||||
@ -576,6 +577,14 @@ class GEOM_Gen_i: public POA_GEOM::GEOM_Gen,
|
|||||||
const GEOM::PointStruct& pEnd)
|
const GEOM::PointStruct& pEnd)
|
||||||
throw (SALOME::SALOME_Exception) ;
|
throw (SALOME::SALOME_Exception) ;
|
||||||
|
|
||||||
|
//-------------------------------------------------------------------//
|
||||||
|
// Specific method Sketcher //
|
||||||
|
//-------------------------------------------------------------------//
|
||||||
|
GEOM::GEOM_Shape_ptr MakeSketcher (const char* Cmd)
|
||||||
|
throw (SALOME::SALOME_Exception) ;
|
||||||
|
|
||||||
|
//-------------------------------------------------------------------//
|
||||||
|
|
||||||
GEOM::GEOM_Shape_ptr MakeCompound (const GEOM::GEOM_Gen::ListOfIOR& ListShapes)
|
GEOM::GEOM_Shape_ptr MakeCompound (const GEOM::GEOM_Gen::ListOfIOR& ListShapes)
|
||||||
throw (SALOME::SALOME_Exception) ;
|
throw (SALOME::SALOME_Exception) ;
|
||||||
GEOM::GEOM_Shape_ptr MakeWire (const GEOM::GEOM_Gen::ListOfIOR& ListShapes)
|
GEOM::GEOM_Shape_ptr MakeWire (const GEOM::GEOM_Gen::ListOfIOR& ListShapes)
|
||||||
|
@ -26,13 +26,16 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include <BRepTools_ShapeSet.hxx>
|
|
||||||
#include "GEOM_Shape_i.hh"
|
|
||||||
#include "SALOME_NamingService.hxx"
|
|
||||||
#include <fstream.h>
|
#include <fstream.h>
|
||||||
|
#include <strstream>
|
||||||
|
|
||||||
|
#include <BRepTools_ShapeSet.hxx>
|
||||||
#include <BRepTools.hxx>
|
#include <BRepTools.hxx>
|
||||||
|
|
||||||
|
#include "GEOM_Shape_i.hh"
|
||||||
|
#include "SALOME_NamingService.hxx"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
@ -84,7 +87,7 @@ GEOM_Shape_i::~GEOM_Shape_i() { delete &_geom; }
|
|||||||
// : WARNING : Register to naming service actually removed !
|
// : WARNING : Register to naming service actually removed !
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
void GEOM_Shape_i::Name(const char* name) {
|
void GEOM_Shape_i::Name(const char* name) {
|
||||||
_name = strdup(name);
|
_name = CORBA::string_dup(name);
|
||||||
GEOM::GEOM_Shape_ptr g = GEOM::GEOM_Shape::_narrow(_this());
|
GEOM::GEOM_Shape_ptr g = GEOM::GEOM_Shape::_narrow(_this());
|
||||||
|
|
||||||
// Removed declaration of shapes to naming service
|
// Removed declaration of shapes to naming service
|
||||||
@ -97,14 +100,14 @@ void GEOM_Shape_i::Name(const char* name) {
|
|||||||
// function : Name (get method)
|
// function : Name (get method)
|
||||||
// purpose : to get the attribute 'name' of this shape
|
// purpose : to get the attribute 'name' of this shape
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
char* GEOM_Shape_i::Name() { return strdup(_name); }
|
char* GEOM_Shape_i::Name() { return CORBA::string_dup(_name); }
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// function : MainName (set method)
|
// function : MainName (set method)
|
||||||
// purpose : to set the attribute 'name' of this mainshape.
|
// purpose : to set the attribute 'name' of this mainshape.
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
void GEOM_Shape_i::MainName(const char* name) {
|
void GEOM_Shape_i::MainName(const char* name) {
|
||||||
_mainname = strdup(name);
|
_mainname = CORBA::string_dup(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -112,7 +115,7 @@ void GEOM_Shape_i::MainName(const char* name) {
|
|||||||
// function : MainName (get method)
|
// function : MainName (get method)
|
||||||
// purpose : to get the attribute 'name' of this shape
|
// purpose : to get the attribute 'name' of this shape
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
char* GEOM_Shape_i::MainName() { return strdup(_mainname); }
|
char* GEOM_Shape_i::MainName() { return CORBA::string_dup(_mainname); }
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// function : IsMainShape (get method)
|
// function : IsMainShape (get method)
|
||||||
@ -132,14 +135,14 @@ void GEOM_Shape_i::IsMainShape(const bool abool) { _ismain = abool ; }
|
|||||||
// function : ShapeId
|
// function : ShapeId
|
||||||
// purpose : to get the id of this shape from GEOM (OCAF entry)
|
// purpose : to get the id of this shape from GEOM (OCAF entry)
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
char* GEOM_Shape_i::ShapeId() { return strdup(_shapeid) ; }
|
char* GEOM_Shape_i::ShapeId() { return CORBA::string_dup(_shapeid) ; }
|
||||||
|
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// function : ShapeId (set method)
|
// function : ShapeId (set method)
|
||||||
// purpose : to set the id of this shape in GEOM/OCAF doc
|
// purpose : to set the id of this shape in GEOM/OCAF doc
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
void GEOM_Shape_i::ShapeId(const char * shapeid) { _shapeid = strdup(shapeid) ; }
|
void GEOM_Shape_i::ShapeId(const char * shapeid) { _shapeid = CORBA::string_dup(shapeid) ; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -147,7 +150,7 @@ void GEOM_Shape_i::ShapeId(const char * shapeid) { _shapeid = strdup(shapeid) ;
|
|||||||
// function : StudyShapeId (get method)
|
// function : StudyShapeId (get method)
|
||||||
// purpose : to get the id of this shape from the study document (OCAF entry)
|
// purpose : to get the id of this shape from the study document (OCAF entry)
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
char* GEOM_Shape_i::StudyShapeId() { return strdup(_studyshapeid) ; }
|
char* GEOM_Shape_i::StudyShapeId() { return CORBA::string_dup(_studyshapeid) ; }
|
||||||
|
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
@ -155,7 +158,7 @@ char* GEOM_Shape_i::StudyShapeId() { return strdup(_studyshapeid) ; }
|
|||||||
// purpose : to set the id of this shape in the Study document (OCAF entry)
|
// purpose : to set the id of this shape in the Study document (OCAF entry)
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
void GEOM_Shape_i::StudyShapeId(const char * studyshapeid)
|
void GEOM_Shape_i::StudyShapeId(const char * studyshapeid)
|
||||||
{ _studyshapeid = strdup(studyshapeid) ; }
|
{ _studyshapeid = CORBA::string_dup(studyshapeid) ; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -209,7 +212,7 @@ void GEOM_Shape_i::NameType(const char* name) {
|
|||||||
// function : NameType (get method)
|
// function : NameType (get method)
|
||||||
// purpose : to get the attribute 'nametype' of this shape
|
// purpose : to get the attribute 'nametype' of this shape
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
char* GEOM_Shape_i::NameType() { return strdup(_nametype); }
|
char* GEOM_Shape_i::NameType() { return CORBA::string_dup(_nametype); }
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// function : GetShapeStream
|
// function : GetShapeStream
|
||||||
|
@ -51,7 +51,7 @@ EXPORT_HEADERS =
|
|||||||
# additionnal information to compil and link file
|
# additionnal information to compil and link file
|
||||||
CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
|
CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
|
||||||
CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
|
CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
|
||||||
LDFLAGS += -lGEOMDS -lTOOLSDS -lSalomeNS -lSalomeContainer -lGEOMPartition -lGEOMArchimede $(CAS_LDPATH) -lTKIGES -lTKSTEP -lTKFillet -lTKOffset -L${KERNEL_ROOT_DIR}/lib/salome
|
LDFLAGS += -lGEOMDS -lTOOLSDS -lSalomeNS -lSalomeContainer -lGEOMPartition -lGEOMArchimede $(CAS_LDPATH) -lTKIGES -lTKSTEP -lTKFillet -lTKOffset -lGEOMSketcher -L${KERNEL_ROOT_DIR}/lib/salome
|
||||||
|
|
||||||
# additional file to be cleaned
|
# additional file to be cleaned
|
||||||
MOSTLYCLEAN =
|
MOSTLYCLEAN =
|
||||||
|
@ -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();
|
||||||
@ -506,10 +508,10 @@ bool GEOMBase::Display(GEOM::GEOM_Shape_ptr aShape, Standard_CString name)
|
|||||||
Standard_CString type;
|
Standard_CString type;
|
||||||
GetShapeTypeString(shape,type);
|
GetShapeTypeString(shape,type);
|
||||||
aShape->NameType(type);
|
aShape->NameType(type);
|
||||||
nameG += TCollection_AsciiString(type) + TCollection_AsciiString("_") + TCollection_AsciiString(myGeomGUI->GetNbGeom()++) + TCollection_AsciiString("\0");
|
nameG += TCollection_AsciiString(type) + TCollection_AsciiString("_") + TCollection_AsciiString(myGeomGUI->myNbGeom++) + TCollection_AsciiString("\0");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
nameG += TCollection_AsciiString(aShape->NameType()) + TCollection_AsciiString("_") + TCollection_AsciiString(myGeomGUI->GetNbGeom()++) + TCollection_AsciiString("\0");
|
nameG += TCollection_AsciiString(aShape->NameType()) + TCollection_AsciiString("_") + TCollection_AsciiString(myGeomGUI->myNbGeom++) + TCollection_AsciiString("\0");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
nameG = TCollection_AsciiString(name);
|
nameG = TCollection_AsciiString(name);
|
||||||
@ -673,11 +675,17 @@ bool GEOMBase::AddInStudy(bool selection, const Handle(SALOME_InteractiveObject)
|
|||||||
QString Name = SALOMEGUI_NameDlg::getName(QAD_Application::getDesktop(), anIO->getName());
|
QString Name = SALOMEGUI_NameDlg::getName(QAD_Application::getDesktop(), anIO->getName());
|
||||||
if(!Name.isEmpty()) {
|
if(!Name.isEmpty()) {
|
||||||
// VTK
|
// VTK
|
||||||
if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK)
|
if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
|
||||||
GActor->setName(strdup(Name.latin1()));
|
char* aCopy = CORBA::string_dup(Name.latin1());
|
||||||
|
GActor->setName(aCopy);
|
||||||
|
delete(aCopy);
|
||||||
|
}
|
||||||
// OCC
|
// OCC
|
||||||
else if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC)
|
else if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) {
|
||||||
GAISShape->setName(strdup(Name.latin1()));
|
char* aCopy = CORBA::string_dup(Name.latin1());
|
||||||
|
GAISShape->setName(aCopy);
|
||||||
|
delete(aCopy);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
return false;
|
return false;
|
||||||
@ -914,55 +922,55 @@ bool GEOMBase::GetShapeTypeString(const TopoDS_Shape& aShape, Standard_CString&
|
|||||||
{
|
{
|
||||||
case TopAbs_COMPOUND:
|
case TopAbs_COMPOUND:
|
||||||
{
|
{
|
||||||
aTypeString = strdup(tr("GEOM_COMPOUND"));
|
aTypeString = CORBA::string_dup(tr("GEOM_COMPOUND"));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
case TopAbs_COMPSOLID:
|
case TopAbs_COMPSOLID:
|
||||||
{
|
{
|
||||||
aTypeString = strdup(tr("GEOM_COMPOUNDSOLID")) ;
|
aTypeString = CORBA::string_dup(tr("GEOM_COMPOUNDSOLID")) ;
|
||||||
return true ;
|
return true ;
|
||||||
}
|
}
|
||||||
case TopAbs_SOLID:
|
case TopAbs_SOLID:
|
||||||
{
|
{
|
||||||
aTypeString = strdup(tr("GEOM_SOLID")) ;
|
aTypeString = CORBA::string_dup(tr("GEOM_SOLID")) ;
|
||||||
return true ;
|
return true ;
|
||||||
}
|
}
|
||||||
case TopAbs_SHELL:
|
case TopAbs_SHELL:
|
||||||
{
|
{
|
||||||
aTypeString = strdup(tr("GEOM_SHELL")) ;
|
aTypeString = CORBA::string_dup(tr("GEOM_SHELL")) ;
|
||||||
return true ;
|
return true ;
|
||||||
}
|
}
|
||||||
case TopAbs_FACE:
|
case TopAbs_FACE:
|
||||||
{
|
{
|
||||||
BRepAdaptor_Surface surf(TopoDS::Face(aShape));
|
BRepAdaptor_Surface surf(TopoDS::Face(aShape));
|
||||||
if(surf.GetType() == GeomAbs_Plane) {
|
if(surf.GetType() == GeomAbs_Plane) {
|
||||||
aTypeString = strdup(tr("GEOM_PLANE"));
|
aTypeString = CORBA::string_dup(tr("GEOM_PLANE"));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else if(surf.GetType() == GeomAbs_Cylinder) {
|
else if(surf.GetType() == GeomAbs_Cylinder) {
|
||||||
aTypeString = strdup(tr("GEOM_SURFCYLINDER"));
|
aTypeString = CORBA::string_dup(tr("GEOM_SURFCYLINDER"));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else if(surf.GetType() == GeomAbs_Sphere) {
|
else if(surf.GetType() == GeomAbs_Sphere) {
|
||||||
aTypeString = strdup(tr("GEOM_SURFSPHERE"));
|
aTypeString = CORBA::string_dup(tr("GEOM_SURFSPHERE"));
|
||||||
return true ;
|
return true ;
|
||||||
}
|
}
|
||||||
else if(surf.GetType() == GeomAbs_Torus) {
|
else if(surf.GetType() == GeomAbs_Torus) {
|
||||||
aTypeString = strdup(tr("GEOM_SURFTORUS"));
|
aTypeString = CORBA::string_dup(tr("GEOM_SURFTORUS"));
|
||||||
return true ;
|
return true ;
|
||||||
}
|
}
|
||||||
else if(surf.GetType() == GeomAbs_Cone) {
|
else if(surf.GetType() == GeomAbs_Cone) {
|
||||||
aTypeString = strdup(tr("GEOM_SURFCONE"));
|
aTypeString = CORBA::string_dup(tr("GEOM_SURFCONE"));
|
||||||
return true ;
|
return true ;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
aTypeString = strdup(tr("GEOM_FACE"));
|
aTypeString = CORBA::string_dup(tr("GEOM_FACE"));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
case TopAbs_WIRE:
|
case TopAbs_WIRE:
|
||||||
{
|
{
|
||||||
aTypeString = strdup(tr("GEOM_WIRE"));
|
aTypeString = CORBA::string_dup(tr("GEOM_WIRE"));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
case TopAbs_EDGE:
|
case TopAbs_EDGE:
|
||||||
@ -970,31 +978,31 @@ bool GEOMBase::GetShapeTypeString(const TopoDS_Shape& aShape, Standard_CString&
|
|||||||
BRepAdaptor_Curve curv(TopoDS::Edge(aShape));
|
BRepAdaptor_Curve curv(TopoDS::Edge(aShape));
|
||||||
if(curv.GetType() == GeomAbs_Line) {
|
if(curv.GetType() == GeomAbs_Line) {
|
||||||
if((Abs(curv.FirstParameter()) >= 1E6) || (Abs(curv.LastParameter()) >= 1E6))
|
if((Abs(curv.FirstParameter()) >= 1E6) || (Abs(curv.LastParameter()) >= 1E6))
|
||||||
aTypeString = strdup(tr("GEOM_LINE"));
|
aTypeString = CORBA::string_dup(tr("GEOM_LINE"));
|
||||||
else
|
else
|
||||||
aTypeString = strdup(tr("GEOM_EDGE"));
|
aTypeString = CORBA::string_dup(tr("GEOM_EDGE"));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else if(curv.GetType() == GeomAbs_Circle) {
|
else if(curv.GetType() == GeomAbs_Circle) {
|
||||||
if(curv.IsClosed())
|
if(curv.IsClosed())
|
||||||
aTypeString = strdup(tr("GEOM_CIRCLE"));
|
aTypeString = CORBA::string_dup(tr("GEOM_CIRCLE"));
|
||||||
else
|
else
|
||||||
aTypeString = strdup(tr("GEOM_ARC"));
|
aTypeString = CORBA::string_dup(tr("GEOM_ARC"));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
aTypeString = strdup(tr("GEOM_EDGE"));
|
aTypeString = CORBA::string_dup(tr("GEOM_EDGE"));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
case TopAbs_VERTEX:
|
case TopAbs_VERTEX:
|
||||||
{
|
{
|
||||||
aTypeString = strdup(tr("GEOM_VERTEX"));
|
aTypeString = CORBA::string_dup(tr("GEOM_VERTEX"));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
case TopAbs_SHAPE:
|
case TopAbs_SHAPE:
|
||||||
{
|
{
|
||||||
aTypeString = strdup(tr("GEOM_SHAPE"));
|
aTypeString = CORBA::string_dup(tr("GEOM_SHAPE"));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1209,7 +1217,7 @@ void GEOMBase::ConvertListOfIOInListOfIOR(const SALOME_ListIO& aList, GEOM::GEOM
|
|||||||
CORBA::String_var theValue = anIOR->Value();
|
CORBA::String_var theValue = anIOR->Value();
|
||||||
CORBA::Object_var theObj = _orb->string_to_object(theValue);
|
CORBA::Object_var theObj = _orb->string_to_object(theValue);
|
||||||
if(theObj->_is_a("IDL:GEOM/GEOM_Shape:1.0")) {
|
if(theObj->_is_a("IDL:GEOM/GEOM_Shape:1.0")) {
|
||||||
listIOR[j] = strdup(theValue);
|
listIOR[j] = CORBA::string_dup(theValue);
|
||||||
j++;
|
j++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1217,7 +1225,7 @@ void GEOMBase::ConvertListOfIOInListOfIOR(const SALOME_ListIO& aList, GEOM::GEOM
|
|||||||
else if(IObject->IsInstance(STANDARD_TYPE(GEOM_InteractiveObject))) {
|
else if(IObject->IsInstance(STANDARD_TYPE(GEOM_InteractiveObject))) {
|
||||||
Handle(GEOM_InteractiveObject) GIObject = Handle(GEOM_InteractiveObject)::DownCast(IObject);
|
Handle(GEOM_InteractiveObject) GIObject = Handle(GEOM_InteractiveObject)::DownCast(IObject);
|
||||||
Standard_CString ior = GIObject->getIOR();
|
Standard_CString ior = GIObject->getIOR();
|
||||||
listIOR[j] = strdup(ior);
|
listIOR[j] = CORBA::string_dup(ior);
|
||||||
j++;
|
j++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1453,7 +1461,9 @@ bool GEOMBase::SelectionByNameInDialogs(QWidget* aWidget, const QString& objectU
|
|||||||
SALOMEDS::SObject_var theObj = listSO[0];
|
SALOMEDS::SObject_var theObj = listSO[0];
|
||||||
/* Create a SALOME_InteractiveObject with a SALOME::SObject */
|
/* Create a SALOME_InteractiveObject with a SALOME::SObject */
|
||||||
Standard_CString anEntry = theObj->GetID();
|
Standard_CString anEntry = theObj->GetID();
|
||||||
Handle(SALOME_InteractiveObject) SI = new SALOME_InteractiveObject(anEntry, "GEOM", strdup(objectUserName));
|
char* aCopyobjectUserName = CORBA::string_dup(objectUserName);
|
||||||
|
Handle(SALOME_InteractiveObject) SI = new SALOME_InteractiveObject(anEntry, "GEOM", aCopyobjectUserName);
|
||||||
|
delete(aCopyobjectUserName);
|
||||||
|
|
||||||
/* Add as a selected object */
|
/* Add as a selected object */
|
||||||
/* Clear any previous selection : */
|
/* Clear any previous selection : */
|
||||||
@ -1477,6 +1487,23 @@ bool GEOMBase::DefineDlgPosition(QWidget* aDlg, int& x, int& y)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QString GEOMBase::GetDefaultName(const QString& theOperation)
|
||||||
|
{
|
||||||
|
SALOMEDS::Study_var aStudy = QAD_Application::getDesktop()->getActiveStudy()->getStudyDocument();
|
||||||
|
int aNumber = 0;
|
||||||
|
QString aName;
|
||||||
|
SALOMEDS::SObject_var obj;
|
||||||
|
|
||||||
|
do
|
||||||
|
{
|
||||||
|
aName = theOperation+"_"+QString::number(++aNumber);
|
||||||
|
obj = aStudy->FindObject(aName);
|
||||||
|
}
|
||||||
|
while (!obj->_is_nil());
|
||||||
|
|
||||||
|
return aName;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
//=====================================================================================
|
//=====================================================================================
|
||||||
// EXPORTED METHODS
|
// EXPORTED METHODS
|
||||||
|
@ -110,6 +110,9 @@ public :
|
|||||||
bool SelectionByNameInDialogs(QWidget* aWidget, const QString& userObjectName, SALOME_Selection *Sel);
|
bool SelectionByNameInDialogs(QWidget* aWidget, const QString& userObjectName, SALOME_Selection *Sel);
|
||||||
bool DefineDlgPosition(QWidget* aDlg, int& x, int& y);
|
bool DefineDlgPosition(QWidget* aDlg, int& x, int& y);
|
||||||
|
|
||||||
|
/* This method generates default names for results of geometrical operations */
|
||||||
|
static QString GetDefaultName(const QString& theOperation);
|
||||||
|
|
||||||
GEOMContext* myGeomGUI;
|
GEOMContext* myGeomGUI;
|
||||||
GEOM::GEOM_Gen_var myGeom; /* Current Geom Component */
|
GEOM::GEOM_Gen_var myGeom; /* Current Geom Component */
|
||||||
|
|
||||||
|
@ -39,6 +39,7 @@
|
|||||||
#include <qlayout.h>
|
#include <qlayout.h>
|
||||||
#include <qradiobutton.h>
|
#include <qradiobutton.h>
|
||||||
#include <qbuttongroup.h>
|
#include <qbuttongroup.h>
|
||||||
|
#include <qpushbutton.h>
|
||||||
|
|
||||||
class GEOMBase_Skeleton : public DlgRef_Skeleton_QTD
|
class GEOMBase_Skeleton : public DlgRef_Skeleton_QTD
|
||||||
{
|
{
|
||||||
|
@ -81,9 +81,16 @@ GEOMContext* GEOMContext::GetOrCreateGeomGUI(QAD_Desktop* desktop)
|
|||||||
/* GetCurrentStudy */
|
/* GetCurrentStudy */
|
||||||
int studyId = desktop->getActiveStudy()->getStudyId();
|
int studyId = desktop->getActiveStudy()->getStudyId();
|
||||||
GeomGUI->myComponentGeom->GetCurrentStudy(studyId);
|
GeomGUI->myComponentGeom->GetCurrentStudy(studyId);
|
||||||
|
|
||||||
GeomGUI->myNbGeom = GeomGUI->myComponentGeom->NbLabels();
|
GeomGUI->myNbGeom = GeomGUI->myComponentGeom->NbLabels();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* GetCurrentStudy */
|
||||||
|
int studyId = desktop->getActiveStudy()->getStudyId();
|
||||||
|
GeomGUI->myComponentGeom->GetCurrentStudy(studyId);
|
||||||
|
|
||||||
|
GeomGUI->myNbGeom = GeomGUI->myComponentGeom->NbLabels();
|
||||||
|
|
||||||
return GeomGUI;
|
return GeomGUI;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -31,7 +31,6 @@
|
|||||||
|
|
||||||
#include "QAD_Desktop.h"
|
#include "QAD_Desktop.h"
|
||||||
#include "GEOM_Client.hxx"
|
#include "GEOM_Client.hxx"
|
||||||
#include "GEOM_Sketcher.h"
|
|
||||||
#include <OSD_SharedLibrary.hxx>
|
#include <OSD_SharedLibrary.hxx>
|
||||||
#include <qapplication.h>
|
#include <qapplication.h>
|
||||||
|
|
||||||
@ -49,12 +48,12 @@ public :
|
|||||||
|
|
||||||
private :
|
private :
|
||||||
QDialog* myActiveDialogBox; /* Unique active dialog box */
|
QDialog* myActiveDialogBox; /* Unique active dialog box */
|
||||||
int myNbGeom; /* Unique name for a geom entity */
|
|
||||||
GEOM_Client myShapeReader;
|
GEOM_Client myShapeReader;
|
||||||
Standard_CString myFatherior;
|
Standard_CString myFatherior;
|
||||||
Sketch mySketcher;
|
|
||||||
|
|
||||||
public :
|
public :
|
||||||
|
int myNbGeom; /* Unique name for a geom entity */
|
||||||
|
|
||||||
static GEOMContext* GetOrCreateGeomGUI(QAD_Desktop* desktop);
|
static GEOMContext* GetOrCreateGeomGUI(QAD_Desktop* desktop);
|
||||||
static GEOMContext* GetGeomGUI();
|
static GEOMContext* GetGeomGUI();
|
||||||
|
|
||||||
@ -67,7 +66,6 @@ public :
|
|||||||
int& GetNbGeom(){return myNbGeom;};
|
int& GetNbGeom(){return myNbGeom;};
|
||||||
GEOM_Client& GetShapeReader(){return myShapeReader;};
|
GEOM_Client& GetShapeReader(){return myShapeReader;};
|
||||||
Standard_CString& GetFatherior(){return myFatherior;};
|
Standard_CString& GetFatherior(){return myFatherior;};
|
||||||
Sketch& GetSketcher(){return mySketcher;};
|
|
||||||
|
|
||||||
bool LoadLibrary(QString GUILibrary);
|
bool LoadLibrary(QString GUILibrary);
|
||||||
|
|
||||||
|
@ -662,6 +662,10 @@ msgstr "Vertex"
|
|||||||
msgid "GEOM_WIRE"
|
msgid "GEOM_WIRE"
|
||||||
msgstr "Wire"
|
msgstr "Wire"
|
||||||
|
|
||||||
|
#Wire(s)
|
||||||
|
msgid "GEOM_WIRES"
|
||||||
|
msgstr "Wire(s)"
|
||||||
|
|
||||||
#Parameter
|
#Parameter
|
||||||
msgid "GEOM_PARAMETER"
|
msgid "GEOM_PARAMETER"
|
||||||
msgstr "Parameter :"
|
msgstr "Parameter :"
|
||||||
@ -937,6 +941,10 @@ msgstr "Keep Object"
|
|||||||
msgid "GEOM_PARTITION_ORIENTATION"
|
msgid "GEOM_PARTITION_ORIENTATION"
|
||||||
msgstr "Change Orientation"
|
msgstr "Change Orientation"
|
||||||
|
|
||||||
|
#: GeometryGUI_PartitionDlg.cxx:45
|
||||||
|
msgid "SUPPRESS_RESULT"
|
||||||
|
msgstr "Suppress Result"
|
||||||
|
|
||||||
#: GeometryGUI_PipeDlg.cxx:47
|
#: GeometryGUI_PipeDlg.cxx:47
|
||||||
msgid "GEOM_PIPE_TITLE"
|
msgid "GEOM_PIPE_TITLE"
|
||||||
msgstr "Pipe Construction"
|
msgstr "Pipe Construction"
|
||||||
@ -1199,13 +1207,13 @@ msgid "GEOM_SKETCHER_EL"
|
|||||||
msgstr "Element Type"
|
msgstr "Element Type"
|
||||||
|
|
||||||
msgid "GEOM_BUT_CLOSE_SKETCH"
|
msgid "GEOM_BUT_CLOSE_SKETCH"
|
||||||
msgstr "Close Sketcher"
|
msgstr "Close Sketch"
|
||||||
|
|
||||||
msgid "GEOM_BUT_END_SKETCH"
|
msgid "GEOM_BUT_END_SKETCH"
|
||||||
msgstr "End Sketcher"
|
msgstr "End Sketch"
|
||||||
|
|
||||||
msgid "GEOM_SKETCHER_TITLE"
|
msgid "GEOM_SKETCHER_TITLE"
|
||||||
msgstr "Spline Construction"
|
msgstr "Sketch Construction"
|
||||||
|
|
||||||
msgid "GEOM_SKETCHER_POINT"
|
msgid "GEOM_SKETCHER_POINT"
|
||||||
msgstr "Point"
|
msgstr "Point"
|
||||||
@ -1299,3 +1307,10 @@ msgstr "Values"
|
|||||||
|
|
||||||
msgid "GEOM_SKETCHER_TYPE"
|
msgid "GEOM_SKETCHER_TYPE"
|
||||||
msgstr "Type"
|
msgstr "Type"
|
||||||
|
|
||||||
|
msgid "GEOM_FILLET_ABORT"
|
||||||
|
msgstr "Fillet can't be computed with radius %1"
|
||||||
|
|
||||||
|
msgid "GEOM_CHAMFER_ABORT"
|
||||||
|
msgstr "Chamfer can't be computed with %1 and %2"
|
||||||
|
|
||||||
|
@ -34,6 +34,10 @@ msgstr "&Ok"
|
|||||||
msgid "GEOM_BUT_YES"
|
msgid "GEOM_BUT_YES"
|
||||||
msgstr "&Oui"
|
msgstr "&Oui"
|
||||||
|
|
||||||
|
#Button No
|
||||||
|
msgid "GEOM_BUT_NO"
|
||||||
|
msgstr "&Non"
|
||||||
|
|
||||||
#Button Help
|
#Button Help
|
||||||
msgid "GEOM_BUT_HELP"
|
msgid "GEOM_BUT_HELP"
|
||||||
msgstr "&Aide"
|
msgstr "&Aide"
|
||||||
@ -49,7 +53,7 @@ msgstr "&Exploser"
|
|||||||
|
|
||||||
#: GeometryGUI.cxx:563
|
#: GeometryGUI.cxx:563
|
||||||
msgid "GEOM_INF_LOADED"
|
msgid "GEOM_INF_LOADED"
|
||||||
msgstr "Le fichier %1 est chargé."
|
msgstr "Le fichier %1 est chargé."
|
||||||
|
|
||||||
#
|
#
|
||||||
#==============================================================================
|
#==============================================================================
|
||||||
@ -57,15 +61,15 @@ msgstr "Le fichier %1 est charg
|
|||||||
|
|
||||||
#: GeometryGUI.cxx:3069
|
#: GeometryGUI.cxx:3069
|
||||||
msgid "GEOM_PRP_COMMAND"
|
msgid "GEOM_PRP_COMMAND"
|
||||||
msgstr "Pas de commande associée à l'id = %1."
|
msgstr "Pas de commande associée à l'id = %1."
|
||||||
|
|
||||||
#: GeometryGUI.cxx:4977
|
#: GeometryGUI.cxx:4977
|
||||||
msgid "GEOM_PRP_ABORT"
|
msgid "GEOM_PRP_ABORT"
|
||||||
msgstr "L'opération a echoué"
|
msgstr "L'opération a echoué"
|
||||||
|
|
||||||
#: GeometryGUI.cxx:5058
|
#: GeometryGUI.cxx:5058
|
||||||
msgid "GEOM_PRP_DONE"
|
msgid "GEOM_PRP_DONE"
|
||||||
msgstr "Opération effectuée"
|
msgstr "Opération effectuée"
|
||||||
|
|
||||||
#: GeometryGUI.cxx:3717
|
#: GeometryGUI.cxx:3717
|
||||||
msgid "GEOM_PRP_LOADING"
|
msgid "GEOM_PRP_LOADING"
|
||||||
@ -73,11 +77,11 @@ msgstr "Chargement de %1 ..."
|
|||||||
|
|
||||||
#: GeometryGUI.cxx:1412
|
#: GeometryGUI.cxx:1412
|
||||||
msgid "GEOM_PRP_NULLSHAPE"
|
msgid "GEOM_PRP_NULLSHAPE"
|
||||||
msgstr "Erreur, objet inconsistant ou inapproprié !"
|
msgstr "Erreur, objet inconsistant ou inapproprié !"
|
||||||
|
|
||||||
#: GeometryGUI.cxx:5072
|
#: GeometryGUI.cxx:5072
|
||||||
msgid "GEOM_PRP_READY"
|
msgid "GEOM_PRP_READY"
|
||||||
msgstr "Prêt..."
|
msgstr "Prêt..."
|
||||||
|
|
||||||
#: GeometryGUI.cxx:1690
|
#: GeometryGUI.cxx:1690
|
||||||
msgid "GEOM_PRP_SELECT_SUBSHAPES"
|
msgid "GEOM_PRP_SELECT_SUBSHAPES"
|
||||||
@ -127,11 +131,11 @@ msgstr "Angle :"
|
|||||||
|
|
||||||
#: GeometryGUI.cxx:3941
|
#: GeometryGUI.cxx:3941
|
||||||
msgid "GEOM_MEN_COMPONENT"
|
msgid "GEOM_MEN_COMPONENT"
|
||||||
msgstr "Géometrie"
|
msgstr "Géometrie"
|
||||||
|
|
||||||
#: GeometryGUI.cxx:4389
|
#: GeometryGUI.cxx:4389
|
||||||
msgid "GEOM_MEN_ENTER_ANGLE"
|
msgid "GEOM_MEN_ENTER_ANGLE"
|
||||||
msgstr "Saisir un angle en degrés"
|
msgstr "Saisir un angle en degrés"
|
||||||
|
|
||||||
#: GeometryGUI.cxx:3758
|
#: GeometryGUI.cxx:3758
|
||||||
msgid "GEOM_MEN_EXPORT"
|
msgid "GEOM_MEN_EXPORT"
|
||||||
@ -153,6 +157,10 @@ msgstr "Fichiers IGES ( *.iges *.igs )"
|
|||||||
msgid "GEOM_MEN_IMPORT_STEP"
|
msgid "GEOM_MEN_IMPORT_STEP"
|
||||||
msgstr "Fichiers STEP ( *.step *.stp )"
|
msgstr "Fichiers STEP ( *.step *.stp )"
|
||||||
|
|
||||||
|
#: GeometryGUI.cxx:3763
|
||||||
|
msgid "GEOM_MEN_LOAD_SCRIPT"
|
||||||
|
msgstr "Fichiers PYTHON ( *.py )"
|
||||||
|
|
||||||
#: GeometryGUI.cxx:2931
|
#: GeometryGUI.cxx:2931
|
||||||
msgid "GEOM_MEN_ISOS"
|
msgid "GEOM_MEN_ISOS"
|
||||||
msgstr "Choisir un nombre d'isos"
|
msgstr "Choisir un nombre d'isos"
|
||||||
@ -216,6 +224,10 @@ msgstr "Le rayon est nul"
|
|||||||
msgid "GEOM_WRN_WARNING"
|
msgid "GEOM_WRN_WARNING"
|
||||||
msgstr "Avertissement"
|
msgstr "Avertissement"
|
||||||
|
|
||||||
|
#: GeometryGUI.cxx:3854
|
||||||
|
msgid "GEOM_REALLY_DELETE"
|
||||||
|
msgstr "Voulez-vous supprimer l'object(s) ?"
|
||||||
|
|
||||||
#
|
#
|
||||||
#==============================================================================
|
#==============================================================================
|
||||||
#
|
#
|
||||||
@ -250,7 +262,7 @@ msgstr "Objet %1"
|
|||||||
|
|
||||||
#Object and result
|
#Object and result
|
||||||
msgid "GEOM_OBJECT_RESULT"
|
msgid "GEOM_OBJECT_RESULT"
|
||||||
msgstr "Objet Et Résultat"
|
msgstr "Objet Et Résultat"
|
||||||
|
|
||||||
#Point
|
#Point
|
||||||
msgid "GEOM_POINT"
|
msgid "GEOM_POINT"
|
||||||
@ -265,7 +277,7 @@ msgid "GEOM_CENTER_POINT"
|
|||||||
msgstr "Point Centre"
|
msgstr "Point Centre"
|
||||||
|
|
||||||
#Diagonal Points
|
#Diagonal Points
|
||||||
msgid "GEOM__DIAGONAL_POINTS"
|
msgid "GEOM_DIAGONAL_POINTS"
|
||||||
msgstr "Points Diagonaux"
|
msgstr "Points Diagonaux"
|
||||||
|
|
||||||
#Central Point
|
#Central Point
|
||||||
@ -310,7 +322,7 @@ msgstr "poids"
|
|||||||
|
|
||||||
#Coordinates
|
#Coordinates
|
||||||
msgid "GEOM_COORDINATES"
|
msgid "GEOM_COORDINATES"
|
||||||
msgstr "Coordonnées"
|
msgstr "Coordonnées"
|
||||||
|
|
||||||
#Coor.
|
#Coor.
|
||||||
msgid "GEOM_COOR"
|
msgid "GEOM_COOR"
|
||||||
@ -362,11 +374,11 @@ msgstr "Base"
|
|||||||
|
|
||||||
#Water Density
|
#Water Density
|
||||||
msgid "GEOM_WATER_DENSITY"
|
msgid "GEOM_WATER_DENSITY"
|
||||||
msgstr "Densité de l'eau :"
|
msgstr "Densité de l'eau :"
|
||||||
|
|
||||||
#Meshing Deflection
|
#Meshing Deflection
|
||||||
msgid "GEOM_MESHING_DEFLECTION"
|
msgid "GEOM_MESHING_DEFLECTION"
|
||||||
msgstr "Déflection Du Maillage :"
|
msgstr "Déflection Du Maillage :"
|
||||||
|
|
||||||
#Dimensions
|
#Dimensions
|
||||||
msgid "GEOM_DIMENSIONS"
|
msgid "GEOM_DIMENSIONS"
|
||||||
@ -374,11 +386,11 @@ msgstr "Dimensions"
|
|||||||
|
|
||||||
#Precision
|
#Precision
|
||||||
msgid "GEOM_PRECISION"
|
msgid "GEOM_PRECISION"
|
||||||
msgstr "Précision :"
|
msgstr "Précision :"
|
||||||
|
|
||||||
#Selection
|
#Selection
|
||||||
msgid "GEOM_SELECTION"
|
msgid "GEOM_SELECTION"
|
||||||
msgstr "Sélection"
|
msgstr "Sélection"
|
||||||
|
|
||||||
#Nb. Times
|
#Nb. Times
|
||||||
msgid "GEOM_NB_TIMES"
|
msgid "GEOM_NB_TIMES"
|
||||||
@ -414,7 +426,7 @@ msgstr "Partition"
|
|||||||
|
|
||||||
#Tolerance
|
#Tolerance
|
||||||
msgid "GEOM_TOLERANCE"
|
msgid "GEOM_TOLERANCE"
|
||||||
msgstr "Tolérance"
|
msgstr "Tolérance"
|
||||||
|
|
||||||
#Orientation
|
#Orientation
|
||||||
msgid "GEOM_ORIENTATION"
|
msgid "GEOM_ORIENTATION"
|
||||||
@ -426,7 +438,7 @@ msgstr "Pipe"
|
|||||||
|
|
||||||
#Revolution
|
#Revolution
|
||||||
msgid "GEOM_REVOLUTION"
|
msgid "GEOM_REVOLUTION"
|
||||||
msgstr "Révolution"
|
msgstr "Révolution"
|
||||||
|
|
||||||
#Rotation
|
#Rotation
|
||||||
msgid "GEOM_ROTATION"
|
msgid "GEOM_ROTATION"
|
||||||
@ -434,7 +446,7 @@ msgstr "Rotation"
|
|||||||
|
|
||||||
#Archimede
|
#Archimede
|
||||||
msgid "GEOM_ARCHIMEDE"
|
msgid "GEOM_ARCHIMEDE"
|
||||||
msgstr "Archimède"
|
msgstr "Archimède"
|
||||||
|
|
||||||
#Common
|
#Common
|
||||||
msgid "GEOM_COMMON"
|
msgid "GEOM_COMMON"
|
||||||
@ -544,6 +556,21 @@ msgstr "Boite"
|
|||||||
msgid "GEOM_CIRCLE"
|
msgid "GEOM_CIRCLE"
|
||||||
msgstr "Cercle"
|
msgstr "Cercle"
|
||||||
|
|
||||||
|
#Ellipse
|
||||||
|
msgid "GEOM_ELLIPSE"
|
||||||
|
msgstr "Ellipse"
|
||||||
|
|
||||||
|
msgid "GEOM_ELLIPSE_TITLE"
|
||||||
|
msgstr "Construction d'Ellipses"
|
||||||
|
|
||||||
|
#Radius major
|
||||||
|
msgid "GEOM_RADIUS_MAJOR"
|
||||||
|
msgstr "Rayon max. :"
|
||||||
|
|
||||||
|
#Radius minor
|
||||||
|
msgid "GEOM_RADIUS_MINOR"
|
||||||
|
msgstr "Rayon min. :"
|
||||||
|
|
||||||
#Compound
|
#Compound
|
||||||
msgid "GEOM_COMPOUND"
|
msgid "GEOM_COMPOUND"
|
||||||
msgstr "Compound"
|
msgstr "Compound"
|
||||||
@ -594,7 +621,7 @@ msgstr "Solide"
|
|||||||
|
|
||||||
#Sphere
|
#Sphere
|
||||||
msgid "GEOM_SPHERE"
|
msgid "GEOM_SPHERE"
|
||||||
msgstr "Sphère"
|
msgstr "Sphère"
|
||||||
|
|
||||||
#Conical Face
|
#Conical Face
|
||||||
msgid "GEOM_SURFCONE"
|
msgid "GEOM_SURFCONE"
|
||||||
@ -606,7 +633,7 @@ msgstr "Face Cylindrique"
|
|||||||
|
|
||||||
#Spherical Face
|
#Spherical Face
|
||||||
msgid "GEOM_SURFSPHERE"
|
msgid "GEOM_SURFSPHERE"
|
||||||
msgstr "Face Sphèrique"
|
msgstr "Face Sphèrique"
|
||||||
|
|
||||||
#Toroidal Face
|
#Toroidal Face
|
||||||
msgid "GEOM_SURFTORUS"
|
msgid "GEOM_SURFTORUS"
|
||||||
@ -636,9 +663,13 @@ msgstr "Vertex"
|
|||||||
msgid "GEOM_WIRE"
|
msgid "GEOM_WIRE"
|
||||||
msgstr "Wire"
|
msgstr "Wire"
|
||||||
|
|
||||||
|
#Wire(s)
|
||||||
|
msgid "GEOM_WIRES"
|
||||||
|
msgstr "Wire(s)"
|
||||||
|
|
||||||
#Parameter
|
#Parameter
|
||||||
msgid "GEOM_PARAMETER"
|
msgid "GEOM_PARAMETER"
|
||||||
msgstr "Paramètre :"
|
msgstr "Paramètre :"
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -691,7 +722,7 @@ msgstr "D2 :"
|
|||||||
|
|
||||||
#: GeometryGUI.cxx
|
#: GeometryGUI.cxx
|
||||||
msgid "GEOM_STEP_TITLE"
|
msgid "GEOM_STEP_TITLE"
|
||||||
msgstr "Increment par défaut lors des constructions"
|
msgstr "Increment par défaut lors des constructions"
|
||||||
|
|
||||||
#: GeometryGUI_ArcDlg.cxx:45
|
#: GeometryGUI_ArcDlg.cxx:45
|
||||||
msgid "GEOM_ARC_TITLE"
|
msgid "GEOM_ARC_TITLE"
|
||||||
@ -699,7 +730,7 @@ msgstr "Construction d'un Arc"
|
|||||||
|
|
||||||
#: GeometryGUI_ArchimedeDlg.cxx:55
|
#: GeometryGUI_ArchimedeDlg.cxx:55
|
||||||
msgid "GEOM_ARCHIMEDE_TITLE"
|
msgid "GEOM_ARCHIMEDE_TITLE"
|
||||||
msgstr "Construction d'Archimède"
|
msgstr "Construction d'Archimède"
|
||||||
|
|
||||||
#: GeometryGUI_BndBoxDlg.cxx:59
|
#: GeometryGUI_BndBoxDlg.cxx:59
|
||||||
msgid "GEOM_BNDBOX_TITLE"
|
msgid "GEOM_BNDBOX_TITLE"
|
||||||
@ -739,7 +770,7 @@ msgstr "Construction d'un Cercle"
|
|||||||
|
|
||||||
#: GeometryGUI_CenterMassDlg.cxx:77
|
#: GeometryGUI_CenterMassDlg.cxx:77
|
||||||
msgid "GEOM_CMASS_TITLE"
|
msgid "GEOM_CMASS_TITLE"
|
||||||
msgstr "Centre De Gravité"
|
msgstr "Centre De Gravité"
|
||||||
|
|
||||||
msgid "GEOM_PLANE_SIZE"
|
msgid "GEOM_PLANE_SIZE"
|
||||||
msgstr "Taille du plan :"
|
msgstr "Taille du plan :"
|
||||||
@ -750,7 +781,7 @@ msgstr "BOOLEEN : Jonction De Deux Objets"
|
|||||||
|
|
||||||
#: GeometryGUI_CompoundDlg.cxx:44
|
#: GeometryGUI_CompoundDlg.cxx:44
|
||||||
msgid "GEOM_COMPOUND_TITLE"
|
msgid "GEOM_COMPOUND_TITLE"
|
||||||
msgstr "Création d'un Compound"
|
msgstr "Création d'un Compound"
|
||||||
|
|
||||||
#: GeometryGUI_ConeDlg.cxx:49
|
#: GeometryGUI_ConeDlg.cxx:49
|
||||||
msgid "GEOM_CONE_TITLE"
|
msgid "GEOM_CONE_TITLE"
|
||||||
@ -782,27 +813,27 @@ msgstr "Objets Et Resultats"
|
|||||||
|
|
||||||
#: GeometryGUI_EdgeDlg.cxx:47
|
#: GeometryGUI_EdgeDlg.cxx:47
|
||||||
msgid "GEOM_EDGE_TITLE"
|
msgid "GEOM_EDGE_TITLE"
|
||||||
msgstr "Création d'un Edge"
|
msgstr "Création d'un Edge"
|
||||||
|
|
||||||
#: GeometryGUI_FilletDlg.cxx:58
|
#: GeometryGUI_FilletDlg.cxx:58
|
||||||
msgid "GEOM_FILLET_TITLE"
|
msgid "GEOM_FILLET_TITLE"
|
||||||
msgstr "Construction d'un Congé"
|
msgstr "Construction d'un Congé"
|
||||||
|
|
||||||
#: GeometryGUI_FilletDlg.cxx:58
|
#: GeometryGUI_FilletDlg.cxx:58
|
||||||
msgid "GEOM_FILLET_ALL"
|
msgid "GEOM_FILLET_ALL"
|
||||||
msgstr "Congé sur toute la Shape"
|
msgstr "Congé sur toute la Shape"
|
||||||
|
|
||||||
#: GeometryGUI_FilletDlg.cxx:58
|
#: GeometryGUI_FilletDlg.cxx:58
|
||||||
msgid "GEOM_FILLET_EDGES"
|
msgid "GEOM_FILLET_EDGES"
|
||||||
msgstr "Congé sur Edges de la Shape"
|
msgstr "Congé sur Edges de la Shape"
|
||||||
|
|
||||||
#: GeometryGUI_FilletDlg.cxx:58
|
#: GeometryGUI_FilletDlg.cxx:58
|
||||||
msgid "GEOM_FILLET_FACES"
|
msgid "GEOM_FILLET_FACES"
|
||||||
msgstr "Congé sur Faces de la Shape"
|
msgstr "Congé sur Faces de la Shape"
|
||||||
|
|
||||||
#: GeometryGUI_FaceDlg.cxx:49
|
#: GeometryGUI_FaceDlg.cxx:49
|
||||||
msgid "GEOM_FACE_TITLE"
|
msgid "GEOM_FACE_TITLE"
|
||||||
msgstr "Création d'une Face"
|
msgstr "Création d'une Face"
|
||||||
|
|
||||||
#: GeometryGUI_FaceDlg.cxx:78
|
#: GeometryGUI_FaceDlg.cxx:78
|
||||||
msgid "GEOM_FACE_FFW"
|
msgid "GEOM_FACE_FFW"
|
||||||
@ -810,7 +841,7 @@ msgstr "Face a partir d'un wire"
|
|||||||
|
|
||||||
#: GeometryGUI_FaceDlg.cxx:103
|
#: GeometryGUI_FaceDlg.cxx:103
|
||||||
msgid "GEOM_FACE_OPT"
|
msgid "GEOM_FACE_OPT"
|
||||||
msgstr "Création d'une Face plane"
|
msgstr "Création d'une Face plane"
|
||||||
|
|
||||||
#: GeometryGUI_FillingDlg.cxx:53
|
#: GeometryGUI_FillingDlg.cxx:53
|
||||||
msgid "GEOM_FILLING_TITLE"
|
msgid "GEOM_FILLING_TITLE"
|
||||||
@ -912,6 +943,10 @@ msgstr "Objet garde"
|
|||||||
msgid "GEOM_PARTITION_ORIENTATION"
|
msgid "GEOM_PARTITION_ORIENTATION"
|
||||||
msgstr "Change l'orientation"
|
msgstr "Change l'orientation"
|
||||||
|
|
||||||
|
#: GeometryGUI_PartitionDlg.cxx:45
|
||||||
|
msgid "SUPPRESS_RESULT"
|
||||||
|
msgstr "Suppress Result"
|
||||||
|
|
||||||
#: GeometryGUI_PipeDlg.cxx:47
|
#: GeometryGUI_PipeDlg.cxx:47
|
||||||
msgid "GEOM_PIPE_TITLE"
|
msgid "GEOM_PIPE_TITLE"
|
||||||
msgstr "Construction d'une Pipe"
|
msgstr "Construction d'une Pipe"
|
||||||
@ -984,9 +1019,9 @@ msgstr "Coudre des Topologies"
|
|||||||
msgid "GEOM_SHELL_TITLE"
|
msgid "GEOM_SHELL_TITLE"
|
||||||
msgstr "Construction d'une Shell"
|
msgstr "Construction d'une Shell"
|
||||||
|
|
||||||
#: GeometryGUI_ShellDlg.cxx:74
|
#: GeometryGUI_SolidDlg.cxx:74
|
||||||
msgid "GEOM_SHELL_LIST"
|
msgid "GEOM_SOLID_TITLE"
|
||||||
msgstr "List de Faces Connectees"
|
msgstr "Construction d'un Solid"
|
||||||
|
|
||||||
#: GeometryGUI_SphereDlg.cxx:50
|
#: GeometryGUI_SphereDlg.cxx:50
|
||||||
msgid "GEOM_SPHERE_TITLE"
|
msgid "GEOM_SPHERE_TITLE"
|
||||||
@ -1083,11 +1118,11 @@ msgid "GEOM_WIRE_CONNECT"
|
|||||||
msgstr "Creation d'un Wire a partir de wires/edges connectes"
|
msgstr "Creation d'un Wire a partir de wires/edges connectes"
|
||||||
|
|
||||||
#: GeometryGUI_WorkingPlaneDlg.cxx:50
|
#: GeometryGUI_WorkingPlaneDlg.cxx:50
|
||||||
msgid "GEOM_WPALNE_TITLE"
|
msgid "GEOM_WPLANE_TITLE"
|
||||||
msgstr "plan de travail"
|
msgstr "plan de travail"
|
||||||
|
|
||||||
#: GeometryGUI_WorkingPlaneDlg.cxx:107
|
#: GeometryGUI_WorkingPlaneDlg.cxx:107
|
||||||
msgid "GEOM_WPALNE_FACE"
|
msgid "GEOM_WPLANE_FACE"
|
||||||
msgstr "Plan Ou Face plane"
|
msgstr "Plan Ou Face plane"
|
||||||
|
|
||||||
#: GeometryGUI_multiTranslationDlg.cxx:107
|
#: GeometryGUI_multiTranslationDlg.cxx:107
|
||||||
@ -1115,7 +1150,7 @@ msgid "GEOM_MULTIROTATION_DOUBLE"
|
|||||||
msgstr "Multi Rotation Double"
|
msgstr "Multi Rotation Double"
|
||||||
|
|
||||||
msgid "GEOM_PARAM_POINT"
|
msgid "GEOM_PARAM_POINT"
|
||||||
msgstr "Point paramétrique"
|
msgstr "Point paramétrique"
|
||||||
|
|
||||||
#
|
#
|
||||||
#==============================================================================
|
#==============================================================================
|
||||||
@ -1127,4 +1162,155 @@ msgstr "Filaire"
|
|||||||
|
|
||||||
#: GeometryGUI.cxx:4613
|
#: GeometryGUI.cxx:4613
|
||||||
msgid "GEOM_MEN_SHADING"
|
msgid "GEOM_MEN_SHADING"
|
||||||
msgstr "Ombré"
|
msgstr "Ombré"
|
||||||
|
|
||||||
|
msgid "GEOM_RECONSTRUCTION_LIMIT"
|
||||||
|
msgstr "Limite de Reconstruction"
|
||||||
|
|
||||||
|
msgid "GEOM_SUPPRESS_RESULT"
|
||||||
|
msgstr "Supprimer le Resultat"
|
||||||
|
|
||||||
|
msgid "GEOM_SUPPRESS_RESULT_INSIDE"
|
||||||
|
msgstr "Intérieur"
|
||||||
|
|
||||||
|
msgid "GEOM_SUPPRESS_RESULT_OUTSIDE"
|
||||||
|
msgstr "Extérieur"
|
||||||
|
|
||||||
|
msgid "GEOM_RECONSTRUCTION_LIMIT_SHAPE"
|
||||||
|
msgstr "Shape"
|
||||||
|
msgid "GEOM_RECONSTRUCTION_LIMIT_SOLID"
|
||||||
|
msgstr "Solid"
|
||||||
|
msgid "GEOM_RECONSTRUCTION_LIMIT_SHELL"
|
||||||
|
msgstr "Shell"
|
||||||
|
msgid "GEOM_RECONSTRUCTION_LIMIT_FACE"
|
||||||
|
msgstr "Face"
|
||||||
|
msgid "GEOM_RECONSTRUCTION_LIMIT_WIRE"
|
||||||
|
msgstr "Wire"
|
||||||
|
msgid "GEOM_RECONSTRUCTION_LIMIT_EDGE"
|
||||||
|
msgstr "Edge"
|
||||||
|
msgid "GEOM_RECONSTRUCTION_LIMIT_VERTEX"
|
||||||
|
msgstr "Vertex"
|
||||||
|
|
||||||
|
msgid "GEOM_SPLINE_TITLE"
|
||||||
|
msgstr "Construction de Splines"
|
||||||
|
msgid "GEOM_SPLINE"
|
||||||
|
msgstr "Spline"
|
||||||
|
msgid "GEOM_BEZIER"
|
||||||
|
msgstr "Bezier"
|
||||||
|
msgid "GEOM_INTERPOL"
|
||||||
|
msgstr "Interpolation"
|
||||||
|
|
||||||
|
#
|
||||||
|
#==============================================================================
|
||||||
|
#
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_EL"
|
||||||
|
msgstr "Type d'Element"
|
||||||
|
|
||||||
|
msgid "GEOM_BUT_CLOSE_SKETCH"
|
||||||
|
msgstr "Fermer Sketch"
|
||||||
|
|
||||||
|
msgid "GEOM_BUT_END_SKETCH"
|
||||||
|
msgstr "Terminer Sketch"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_TITLE"
|
||||||
|
msgstr "Construction de Sketch"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_POINT"
|
||||||
|
msgstr "Point"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_SEGMENT"
|
||||||
|
msgstr "Sègment"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_ARC"
|
||||||
|
msgstr "Arc"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_DIR"
|
||||||
|
msgstr "Direction"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_POINT2"
|
||||||
|
msgstr "Point :"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_DEST"
|
||||||
|
msgstr "Destination"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_ABS"
|
||||||
|
msgstr "Absolu"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_REL"
|
||||||
|
msgstr "Relative"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_SEL"
|
||||||
|
msgstr "Sélection"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_ANGLE"
|
||||||
|
msgstr "Angle"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_PER"
|
||||||
|
msgstr "Perpendiculaire"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_TAN"
|
||||||
|
msgstr "Tangent"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_VXVY"
|
||||||
|
msgstr "VX-VY"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_LENGTH"
|
||||||
|
msgstr "Longueur"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_X"
|
||||||
|
msgstr "X"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_Y"
|
||||||
|
msgstr "Y"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_X2"
|
||||||
|
msgstr "X :"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_Y2"
|
||||||
|
msgstr "Y :"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_X3"
|
||||||
|
msgstr "Abs. X :"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_Y3"
|
||||||
|
msgstr "Abs. Y :"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_DX2"
|
||||||
|
msgstr "DX :"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_DY2"
|
||||||
|
msgstr "DY :"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_VX2"
|
||||||
|
msgstr "VX :"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_VY2"
|
||||||
|
msgstr "VY :"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_LENGTH2"
|
||||||
|
msgstr "Longueur :"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_ANGLE2"
|
||||||
|
msgstr "Angle :"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_RADIUS2"
|
||||||
|
msgstr "Radius :"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_UNDO"
|
||||||
|
msgstr "Undo"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_APPLY"
|
||||||
|
msgstr "Appliquer"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_VALUES"
|
||||||
|
msgstr "Valeurs"
|
||||||
|
|
||||||
|
msgid "GEOM_SKETCHER_TYPE"
|
||||||
|
msgstr "Type"
|
||||||
|
|
||||||
|
msgid "GEOM_FILLET_ABORT"
|
||||||
|
msgstr "Le congé ne peut-être realisé avec un rayon de %1 "
|
||||||
|
|
||||||
|
msgid "GEOM_CHAMFER_ABORT"
|
||||||
|
msgstr "Le chanfrein ne peut-être realisé avec %1 et %2 "
|
||||||
|
@ -60,6 +60,6 @@ LIB_SERVER_IDL =
|
|||||||
CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
|
CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
|
||||||
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome
|
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome
|
||||||
|
|
||||||
LDFLAGS += -lOCCViewer -lVTKViewer -lSalomeObject -lSalomeGUI -lGEOMClient -lGEOMObject -lGEOMSketcher -L${KERNEL_ROOT_DIR}/lib/salome
|
LDFLAGS += -lOCCViewer -lVTKViewer -lSalomeObject -lSalomeGUI -lGEOMClient -lGEOMObject -L${KERNEL_ROOT_DIR}/lib/salome
|
||||||
|
|
||||||
@CONCLUDE@
|
@CONCLUDE@
|
||||||
|
@ -264,9 +264,10 @@ Standard_Boolean GEOMDS_Commands::ClearAllIOR(const TDF_Label& aLabel)
|
|||||||
TDF_Label L = it.Value() ;
|
TDF_Label L = it.Value() ;
|
||||||
if( L.FindAttribute(TDataStd_Name::GetID(), anAttName) ) {
|
if( L.FindAttribute(TDataStd_Name::GetID(), anAttName) ) {
|
||||||
notTested = L.ForgetAttribute(TDataStd_Name::GetID()) ;
|
notTested = L.ForgetAttribute(TDataStd_Name::GetID()) ;
|
||||||
}
|
|
||||||
if(notTested)
|
if(notTested)
|
||||||
MESSAGE("in GEOMDS_Commands::ClearAllIOR : IOR CLEARED" )
|
MESSAGE("in GEOMDS_Commands::ClearAllIOR : IOR CLEARED" )
|
||||||
|
ClearAllIOR(L);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return true ;
|
return true ;
|
||||||
}
|
}
|
||||||
|
@ -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;
|
||||||
|
|
||||||
@ -56,10 +58,9 @@ typedef bool CP(QAD_Desktop*, QPopupMenu*, const QString&,
|
|||||||
// function : GeometryGUI()
|
// function : GeometryGUI()
|
||||||
// purpose : Constructor
|
// purpose : Constructor
|
||||||
//=======================================================================
|
//=======================================================================
|
||||||
GeometryGUI::GeometryGUI() :
|
GeometryGUI::GeometryGUI( const QString& theName, QObject* theParent ) :
|
||||||
QObject()
|
SALOMEGUI( theName, theParent )
|
||||||
{
|
{}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//=======================================================================
|
//=======================================================================
|
||||||
@ -102,7 +103,6 @@ bool GeometryGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
Mb->setItemEnabled(404, ViewOCC);//SKETCHER
|
Mb->setItemEnabled(404, ViewOCC);//SKETCHER
|
||||||
Mb->setItemEnabled(406, ViewOCC);//SKETCHER
|
|
||||||
|
|
||||||
Mb->setItemEnabled(603, ViewOCC);//SuppressFace
|
Mb->setItemEnabled(603, ViewOCC);//SuppressFace
|
||||||
Mb->setItemEnabled(604, ViewOCC);//SuppressHole
|
Mb->setItemEnabled(604, ViewOCC);//SuppressHole
|
||||||
@ -110,32 +110,6 @@ bool GeometryGUI::OnGUIEvent(int theCommandID, 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
|
||||||
|
|
||||||
if(theCommandID == 4041 || // SKETCHER - POPUP VIEWER - SEGMENT
|
|
||||||
theCommandID == 4042 || // SKETCHER - POPUP VIEWER - ARC
|
|
||||||
theCommandID == 4043 || // SKETCHER - POPUP VIEWER - SET ANGLE
|
|
||||||
theCommandID == 4044 || // SKETCHER - POPUP VIEWER - SET X
|
|
||||||
theCommandID == 4045 || // SKETCHER - POPUP VIEWER - SET Y
|
|
||||||
theCommandID == 4046 || // SKETCHER - POPUP VIEWER - DELETE
|
|
||||||
theCommandID == 4047 || // SKETCHER - POPUP VIEWER - END
|
|
||||||
theCommandID == 4048 || // SKETCHER - POPUP VIEWER - CLOSE
|
|
||||||
theCommandID == 4051 || // SKETCHER - MENU - SET PLANE
|
|
||||||
theCommandID == 4052 || // SKETCHER - MENU - TANGENT
|
|
||||||
theCommandID == 4053 || // SKETCHER - MENU - PERPENDICULAR
|
|
||||||
theCommandID == 4061 || // SKETCHER - MENU - LENGTH
|
|
||||||
theCommandID == 4062 || // SKETCHER - MENU - ANGLE
|
|
||||||
theCommandID == 4063 || // SKETCHER - MENU - RADIUS
|
|
||||||
theCommandID == 4064 || // SKETCHER - MENU - X
|
|
||||||
theCommandID == 4065) { // SKETCHER - MENU - Y
|
|
||||||
if(!GeomGUI->LoadLibrary("libEntityGUI.so"))
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if(GeomGUI->myState == 2) {
|
|
||||||
Mb->setItemEnabled(405, false);//SKETCHER
|
|
||||||
GeomGUI->GetSketcher().Clear();
|
|
||||||
GeomGUI->myState = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(theCommandID == 111 || // MENU FILE - IMPORT BREP
|
if(theCommandID == 111 || // MENU FILE - IMPORT BREP
|
||||||
theCommandID == 112 || // MENU FILE - IMPORT IGES
|
theCommandID == 112 || // MENU FILE - IMPORT IGES
|
||||||
theCommandID == 113 || // MENU FILE - IMPORT STEP
|
theCommandID == 113 || // MENU FILE - IMPORT STEP
|
||||||
@ -194,7 +168,7 @@ bool GeometryGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
|
|||||||
if(!GeomGUI->LoadLibrary("libGenerationGUI.so"))
|
if(!GeomGUI->LoadLibrary("libGenerationGUI.so"))
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else if(theCommandID == 404 || // SKETCHER
|
else if(theCommandID == 404 || // MENU ENTITY - SKETCHER
|
||||||
theCommandID == 407) { // MENU ENTITY - EXPLODE
|
theCommandID == 407) { // MENU ENTITY - EXPLODE
|
||||||
if(!GeomGUI->LoadLibrary("libEntityGUI.so"))
|
if(!GeomGUI->LoadLibrary("libEntityGUI.so"))
|
||||||
return false;
|
return false;
|
||||||
@ -251,7 +225,6 @@ bool GeometryGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
return false;
|
return false;
|
||||||
}
|
|
||||||
|
|
||||||
//Load Function OnGUIEvent
|
//Load Function OnGUIEvent
|
||||||
OSD_Function osdF = GeomGUI->myGUILibrary.DlSymb("OnGUIEvent");
|
OSD_Function osdF = GeomGUI->myGUILibrary.DlSymb("OnGUIEvent");
|
||||||
@ -292,12 +265,7 @@ bool GeometryGUI::OnMouseMove(QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFra
|
|||||||
|
|
||||||
if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() > VIEW_OCC)
|
if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() > VIEW_OCC)
|
||||||
return false;
|
return false;
|
||||||
|
else
|
||||||
if(GeomGUI->myState == 2) {
|
|
||||||
OCCViewer_ViewPort* vp = ((OCCViewer_ViewFrame*)studyFrame->getRightFrame()->getViewFrame())->getViewPort();
|
|
||||||
GeomGUI->GetSketcher().MakeCurrentEdge(pe->x(), pe->y(), ((OCCViewer_ViewPort3d*)vp)->getView());
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -313,14 +281,7 @@ bool GeometryGUI::OnMousePress(QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFr
|
|||||||
if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() > VIEW_OCC)
|
if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() > VIEW_OCC)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if(GeomGUI->myState == 2) {
|
if(GeomGUI->myState == 0) {
|
||||||
GeomGUI->GetSketcher().ValidateEdge();
|
|
||||||
if(GeomGUI->GetSketcher().GetmyEdgesNumber() == 1) {
|
|
||||||
QMenuBar* Mb = QAD_Application::getDesktop()->getMainMenuBar();
|
|
||||||
Mb->setItemEnabled(405, true); // SKETCH CONTRAINTS
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if(GeomGUI->myState == 0) {
|
|
||||||
if(!GeomGUI->LoadLibrary("libBasicGUI.so"))
|
if(!GeomGUI->LoadLibrary("libBasicGUI.so"))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@ -336,6 +297,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()
|
||||||
@ -400,8 +385,6 @@ bool GeometryGUI::SetSettings(QAD_Desktop* parent)
|
|||||||
}
|
}
|
||||||
|
|
||||||
Mb->setItemEnabled(404, ViewOCC);//SKETCHER
|
Mb->setItemEnabled(404, ViewOCC);//SKETCHER
|
||||||
Mb->setItemEnabled(405, false);//SKETCHER
|
|
||||||
Mb->setItemEnabled(406, ViewOCC);//SKETCHER
|
|
||||||
|
|
||||||
Mb->setItemEnabled(603, ViewOCC);//SuppressFace
|
Mb->setItemEnabled(603, ViewOCC);//SuppressFace
|
||||||
Mb->setItemEnabled(604, ViewOCC);//SuppressHole
|
Mb->setItemEnabled(604, ViewOCC);//SuppressHole
|
||||||
@ -409,6 +392,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -426,11 +412,8 @@ void GeometryGUI::DefinePopup(QString & theContext, QString & theParent, QString
|
|||||||
theObject = "";
|
theObject = "";
|
||||||
theContext = "";
|
theContext = "";
|
||||||
|
|
||||||
|
|
||||||
if((theParent.compare("Viewer") == 0)) {
|
if((theParent.compare("Viewer") == 0)) {
|
||||||
if(GeomGUI->myState == 2)
|
if(Sel->IObjectCount() == 0)
|
||||||
theContext = "Sketch";
|
|
||||||
else if(Sel->IObjectCount() == 0)
|
|
||||||
theContext = "NothingSelected";
|
theContext = "NothingSelected";
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -461,24 +444,6 @@ bool GeometryGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QStr
|
|||||||
{
|
{
|
||||||
GeometryGUI::GetOrCreateGeometryGUI(parent);
|
GeometryGUI::GetOrCreateGeometryGUI(parent);
|
||||||
|
|
||||||
if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) {
|
|
||||||
if(theParent.compare("Viewer") == 0) {
|
|
||||||
if(theContext.compare("Sketch") == 0) {
|
|
||||||
SketchStatus myCS = GeomGUI->GetSketcher().GetCurrentStatus();
|
|
||||||
popup->setCheckable(TRUE);
|
|
||||||
if(myCS == SEGMENT) {
|
|
||||||
popup->setItemChecked(4041, true); //Sketch Segment Menu
|
|
||||||
popup->setItemChecked(4042, false); //Sketch Arc Menu
|
|
||||||
}
|
|
||||||
else if(myCS == ARC_CHORD) {
|
|
||||||
popup->setItemChecked(4041, false); //Sketch Segment Menu
|
|
||||||
popup->setItemChecked(4042, true); //Sketch Arc Menu
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!GeomGUI->LoadLibrary("libGEOMBase.so"))
|
if(!GeomGUI->LoadLibrary("libGEOMBase.so"))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@ -501,24 +466,17 @@ bool GeometryGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QStr
|
|||||||
// function : activeStudyChanged()
|
// function : activeStudyChanged()
|
||||||
// purpose : static
|
// purpose : static
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
void GeometryGUI::activeStudyChanged(QAD_Desktop* parent)
|
bool GeometryGUI::ActiveStudyChanged(QAD_Desktop* parent)
|
||||||
{
|
{
|
||||||
GeometryGUI::GetOrCreateGeometryGUI(parent);
|
GeometryGUI::GetOrCreateGeometryGUI(parent);
|
||||||
|
|
||||||
if(GeomGUI != 0) {
|
if(GeomGUI != 0) {
|
||||||
QMenuBar* Mb = QAD_Application::getDesktop()->getMainMenuBar();
|
QMenuBar* Mb = QAD_Application::getDesktop()->getMainMenuBar();
|
||||||
if(GeomGUI->myState == 2) {
|
|
||||||
Mb->setItemEnabled(405, false);//SKETCHER
|
|
||||||
GeomGUI->GetSketcher().Clear();
|
|
||||||
GeomGUI->myState = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ViewOCC = false;
|
bool ViewOCC = false;
|
||||||
if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC)
|
if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC)
|
||||||
ViewOCC = true;
|
ViewOCC = true;
|
||||||
|
|
||||||
Mb->setItemEnabled(404, ViewOCC);//SKETCHER
|
Mb->setItemEnabled(404, ViewOCC);//SKETCHER
|
||||||
Mb->setItemEnabled(406, ViewOCC);//SKETCHER
|
|
||||||
|
|
||||||
Mb->setItemEnabled(603, ViewOCC);//SuppressFace
|
Mb->setItemEnabled(603, ViewOCC);//SuppressFace
|
||||||
Mb->setItemEnabled(604, ViewOCC);//SuppressHole
|
Mb->setItemEnabled(604, ViewOCC);//SuppressHole
|
||||||
@ -529,7 +487,11 @@ void GeometryGUI::activeStudyChanged(QAD_Desktop* parent)
|
|||||||
GeomGUI->EmitSignalCloseAllDialogs();
|
GeomGUI->EmitSignalCloseAllDialogs();
|
||||||
GeomGUI = 0;
|
GeomGUI = 0;
|
||||||
}
|
}
|
||||||
return;
|
|
||||||
|
// PAL5356: update VTK selection
|
||||||
|
::UpdateVtkSelection(parent);
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -555,43 +517,23 @@ void GeometryGUI::BuildPresentation(const Handle(SALOME_InteractiveObject)& theI
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//=================================================================================
|
void GeometryGUI::SupportedViewType(int* buffer, int bufferSize)
|
||||||
// EXPORTED METHODS
|
|
||||||
//=================================================================================
|
|
||||||
extern "C"
|
|
||||||
{
|
{
|
||||||
bool OnGUIEvent(int theCommandID, QAD_Desktop* parent)
|
|
||||||
{return GeometryGUI::OnGUIEvent(theCommandID, parent);}
|
|
||||||
|
|
||||||
bool OnKeyPress(QKeyEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame)
|
|
||||||
{return GeometryGUI::OnKeyPress(pe, parent, studyFrame);}
|
|
||||||
|
|
||||||
bool OnMousePress(QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame)
|
|
||||||
{return GeometryGUI::OnMousePress(pe, parent, studyFrame);}
|
|
||||||
|
|
||||||
bool OnMouseMove(QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame)
|
|
||||||
{return GeometryGUI::OnMouseMove(pe, parent, studyFrame);}
|
|
||||||
|
|
||||||
bool SetSettings(QAD_Desktop* parent)
|
|
||||||
{return GeometryGUI::SetSettings(parent);}
|
|
||||||
|
|
||||||
bool customPopup(QAD_Desktop* parent, QPopupMenu* popup, const QString & theContext,
|
|
||||||
const QString & theParent, const QString & theObject)
|
|
||||||
{return GeometryGUI::CustomPopup(parent, popup, theContext, theParent, theObject);}
|
|
||||||
|
|
||||||
void definePopup(QString & theContext, QString & parent, QString & theObject)
|
|
||||||
{GeometryGUI::DefinePopup(theContext, parent, theObject);}
|
|
||||||
|
|
||||||
bool activeStudyChanged(QAD_Desktop* parent)
|
|
||||||
{GeometryGUI::activeStudyChanged(parent);}
|
|
||||||
|
|
||||||
void buildPresentation(const Handle(SALOME_InteractiveObject)& theIO)
|
|
||||||
{GeometryGUI::BuildPresentation(theIO);}
|
|
||||||
|
|
||||||
void supportedViewType(int* buffer, int bufferSize)
|
|
||||||
{
|
|
||||||
if(!buffer || !bufferSize) return;
|
if(!buffer || !bufferSize) return;
|
||||||
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 GeometryGUI::Deactivate()
|
||||||
|
{
|
||||||
|
if ( GeomGUI )
|
||||||
|
GeomGUI->EmitSignalCloseAllDialogs();
|
||||||
|
}
|
||||||
|
|
||||||
|
static GeometryGUI aGUI("");
|
||||||
|
extern "C"
|
||||||
|
{
|
||||||
|
Standard_EXPORT SALOMEGUI* GetComponentGUI() {
|
||||||
|
return &aGUI;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -29,34 +29,36 @@
|
|||||||
#ifndef GEOMETRYGUI_H
|
#ifndef GEOMETRYGUI_H
|
||||||
#define GEOMETRYGUI_H
|
#define GEOMETRYGUI_H
|
||||||
|
|
||||||
|
#include "SALOMEGUI.h"
|
||||||
#include "GEOMContext.h"
|
#include "GEOMContext.h"
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : GeometryGUI
|
// class : GeometryGUI
|
||||||
// purpose :
|
// purpose :
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
class GeometryGUI : public QObject
|
class GeometryGUI : public SALOMEGUI
|
||||||
{
|
{
|
||||||
Q_OBJECT /* for QT compatibility */
|
Q_OBJECT /* for QT compatibility */
|
||||||
|
|
||||||
public :
|
public :
|
||||||
GeometryGUI();
|
GeometryGUI( const QString& name = "", QObject* parent = 0 );
|
||||||
~GeometryGUI();
|
~GeometryGUI();
|
||||||
|
|
||||||
static GEOMContext* GetOrCreateGeometryGUI(QAD_Desktop* desktop);
|
static GEOMContext* GetOrCreateGeometryGUI(QAD_Desktop* desktop);
|
||||||
|
|
||||||
/* Managed by IAPP */
|
/* Managed by IAPP */
|
||||||
Standard_EXPORT static bool OnGUIEvent(int theCommandID, QAD_Desktop* parent);
|
virtual bool OnGUIEvent(int theCommandID, QAD_Desktop* parent);
|
||||||
Standard_EXPORT static bool OnMousePress(QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame);
|
virtual bool OnMousePress(QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame);
|
||||||
Standard_EXPORT static bool OnMouseMove(QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame);
|
virtual bool OnMouseMove(QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame);
|
||||||
Standard_EXPORT static bool OnKeyPress(QKeyEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame);
|
virtual bool OnKeyPress(QKeyEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame);
|
||||||
Standard_EXPORT static bool SetSettings(QAD_Desktop* parent);
|
virtual bool SetSettings(QAD_Desktop* parent);
|
||||||
Standard_EXPORT static void activeStudyChanged(QAD_Desktop* parent);
|
virtual bool ActiveStudyChanged(QAD_Desktop* parent);
|
||||||
Standard_EXPORT static void BuildPresentation(const Handle(SALOME_InteractiveObject)&);
|
virtual void BuildPresentation(const Handle(SALOME_InteractiveObject)&);
|
||||||
Standard_EXPORT static void DefinePopup(QString & theContext, QString & theParent, QString & theObject);
|
virtual void DefinePopup(QString & theContext, QString & theParent, QString & theObject);
|
||||||
Standard_EXPORT static bool CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QString& theContext,
|
virtual bool CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QString& theContext,
|
||||||
const QString& theParent, const QString& theObject);
|
const QString& theParent, const QString& theObject);
|
||||||
|
virtual void SupportedViewType (int* buffer, int bufferSize);
|
||||||
|
virtual void Deactivate ();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -40,6 +40,8 @@ using namespace std;
|
|||||||
#include "OCCViewer_Viewer3d.h"
|
#include "OCCViewer_Viewer3d.h"
|
||||||
#include <TopExp_Explorer.hxx>
|
#include <TopExp_Explorer.hxx>
|
||||||
#include <TopTools_MapOfShape.hxx>
|
#include <TopTools_MapOfShape.hxx>
|
||||||
|
#include <TopTools_ListOfShape.hxx>
|
||||||
|
#include <TopTools_ListIteratorOfListOfShape.hxx>
|
||||||
#include <BRepAdaptor_Surface.hxx>
|
#include <BRepAdaptor_Surface.hxx>
|
||||||
#include <BRepAdaptor_Curve.hxx>
|
#include <BRepAdaptor_Curve.hxx>
|
||||||
#include <GeomAbs_CurveType.hxx>
|
#include <GeomAbs_CurveType.hxx>
|
||||||
@ -47,6 +49,7 @@ using namespace std;
|
|||||||
#include <TopoDS.hxx>
|
#include <TopoDS.hxx>
|
||||||
#include <TopoDS_Edge.hxx>
|
#include <TopoDS_Edge.hxx>
|
||||||
#include <TopoDS_Face.hxx>
|
#include <TopoDS_Face.hxx>
|
||||||
|
#include <TopoDS_Iterator.hxx>
|
||||||
|
|
||||||
#include "VTKViewer_RenderWindowInteractor.h"
|
#include "VTKViewer_RenderWindowInteractor.h"
|
||||||
#include "VTKViewer_ViewFrame.h"
|
#include "VTKViewer_ViewFrame.h"
|
||||||
@ -164,17 +167,36 @@ int GEOM_Swig::getIndexTopology(const char* SubIOR, const char* IOR)
|
|||||||
GEOM::GEOM_Shape_var aSubShape = Geom->GetIORFromString(SubIOR);
|
GEOM::GEOM_Shape_var aSubShape = Geom->GetIORFromString(SubIOR);
|
||||||
TopoDS_Shape subshape = ShapeReader.GetShape(Geom, aSubShape);
|
TopoDS_Shape subshape = ShapeReader.GetShape(Geom, aSubShape);
|
||||||
|
|
||||||
TopExp_Explorer Exp ( shape, subshape.ShapeType() );
|
|
||||||
int index = 1;
|
int index = 1;
|
||||||
|
if(subshape.ShapeType() == TopAbs_COMPOUND) {
|
||||||
|
TopoDS_Iterator it;
|
||||||
|
TopTools_ListOfShape CL;
|
||||||
|
CL.Append(shape);
|
||||||
|
TopTools_ListIteratorOfListOfShape itC;
|
||||||
|
for(itC.Initialize(CL); itC.More(); itC.Next()) {
|
||||||
|
for(it.Initialize(itC.Value()); it.More(); it.Next()) {
|
||||||
|
if (it.Value().ShapeType() == TopAbs_COMPOUND) {
|
||||||
|
if (it.Value().IsSame(subshape))
|
||||||
|
return index;
|
||||||
|
else
|
||||||
|
index++;
|
||||||
|
CL.Append(it.Value());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
TopExp_Explorer Exp(shape, subshape.ShapeType());
|
||||||
TopTools_MapOfShape M;
|
TopTools_MapOfShape M;
|
||||||
while ( Exp.More() ) {
|
while(Exp.More()) {
|
||||||
if ( M.Add(Exp.Current()) ) {
|
if(M.Add(Exp.Current())) {
|
||||||
if ( Exp.Current().IsSame(subshape) )
|
if(Exp.Current().IsSame(subshape))
|
||||||
return index;
|
return index;
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
Exp.Next();
|
Exp.Next();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -242,6 +264,7 @@ const char* GEOM_Swig::getShapeTypeString(const char* IOR)
|
|||||||
case TopAbs_SHAPE:
|
case TopAbs_SHAPE:
|
||||||
{ return "Shape" ;}
|
{ return "Shape" ;}
|
||||||
}
|
}
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -21,12 +21,11 @@
|
|||||||
//
|
//
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
// File : GEOMBase_Tools.cxx
|
// File : GEOMToolsGUI.cxx
|
||||||
// Author : Damien COQUERET
|
// Author : Damien COQUERET
|
||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header:
|
// $Header:
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "GEOMToolsGUI.h"
|
#include "GEOMToolsGUI.h"
|
||||||
|
|
||||||
#include "QAD_Config.h"
|
#include "QAD_Config.h"
|
||||||
@ -34,6 +33,7 @@ using namespace std;
|
|||||||
#include "QAD_Tools.h"
|
#include "QAD_Tools.h"
|
||||||
#include "QAD_MessageBox.h"
|
#include "QAD_MessageBox.h"
|
||||||
#include "QAD_RightFrame.h"
|
#include "QAD_RightFrame.h"
|
||||||
|
#include "QAD_PyEditor.h"
|
||||||
|
|
||||||
#include "OCCViewer_Viewer3d.h"
|
#include "OCCViewer_Viewer3d.h"
|
||||||
#include "VTKViewer_ViewFrame.h"
|
#include "VTKViewer_ViewFrame.h"
|
||||||
@ -60,6 +60,10 @@ using namespace std;
|
|||||||
#include "GEOMToolsGUI_NbIsosDlg.h" // Method ISOS adjustement
|
#include "GEOMToolsGUI_NbIsosDlg.h" // Method ISOS adjustement
|
||||||
#include "GEOMToolsGUI_TransparencyDlg.h" // Method TRANSPARENCY adjustement
|
#include "GEOMToolsGUI_TransparencyDlg.h" // Method TRANSPARENCY adjustement
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=======================================================================
|
//=======================================================================
|
||||||
// function : GEOMToolsGUI()
|
// function : GEOMToolsGUI()
|
||||||
// purpose : Constructor
|
// purpose : Constructor
|
||||||
@ -163,7 +167,7 @@ bool GEOMToolsGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Quantity_Color Default = Quantity_Color();
|
Quantity_Color Default = Quantity_Color();
|
||||||
color = QColor ((int)Default.Red() * 255.0, (int)Default.Green()* 255.0, (int)Default.Blue() * 255.0);
|
color = QColor ((int)( Default.Red() * 255.0 ), (int)( Default.Green() * 255.0 ), (int)( Default.Blue() * 255.0 ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
QColor c = QColorDialog::getColor(color, QAD_Application::getDesktop());
|
QColor c = QColorDialog::getColor(color, QAD_Application::getDesktop());
|
||||||
@ -213,7 +217,7 @@ bool GEOMToolsGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
|
|||||||
else
|
else
|
||||||
IsoV = "1";
|
IsoV = "1";
|
||||||
|
|
||||||
GEOMBase_NbIsosDlg* NbIsosDlg = new GEOMBase_NbIsosDlg(QAD_Application::getDesktop(), tr("GEOM_MEN_ISOS"), TRUE);
|
GEOMToolsGUI_NbIsosDlg* NbIsosDlg = new GEOMToolsGUI_NbIsosDlg(QAD_Application::getDesktop(), tr("GEOM_MEN_ISOS"), TRUE);
|
||||||
int UIso = IsoU.toInt();
|
int UIso = IsoU.toInt();
|
||||||
int VIso = IsoV.toInt();
|
int VIso = IsoV.toInt();
|
||||||
|
|
||||||
@ -372,7 +376,7 @@ bool GEOMToolsGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
|
|||||||
Quantity_Color CSFColor;
|
Quantity_Color CSFColor;
|
||||||
Shape->Color(CSFColor);
|
Shape->Color(CSFColor);
|
||||||
|
|
||||||
QColor c = QColorDialog::getColor(QColor(CSFColor.Red() * 255.0, CSFColor.Green()* 255.0, CSFColor.Blue() * 255.0), QAD_Application::getDesktop());
|
QColor c = QColorDialog::getColor(QColor((int)(CSFColor.Red() * 255.0), (int)(CSFColor.Green() * 255.0), (int)(CSFColor.Blue() * 255.0)), QAD_Application::getDesktop());
|
||||||
|
|
||||||
if(c.isValid()) {
|
if(c.isValid()) {
|
||||||
CSFColor = Quantity_Color (c.red()/255., c.green()/255., c.blue()/255., Quantity_TOC_RGB);
|
CSFColor = Quantity_Color (c.red()/255., c.green()/255., c.blue()/255., Quantity_TOC_RGB);
|
||||||
@ -401,7 +405,7 @@ bool GEOMToolsGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
|
|||||||
OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer();
|
OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer();
|
||||||
ic = v3d->getAISContext();
|
ic = v3d->getAISContext();
|
||||||
}
|
}
|
||||||
GEOMBase_TransparencyDlg *aDlg = new GEOMBase_TransparencyDlg(parent, "", Sel, ic);
|
GEOMToolsGUI_TransparencyDlg *aDlg = new GEOMToolsGUI_TransparencyDlg(parent, "", Sel, ic);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 8034: // ISOS - POPUP VIEWER
|
case 8034: // ISOS - POPUP VIEWER
|
||||||
@ -427,8 +431,8 @@ bool GEOMToolsGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
|
|||||||
else
|
else
|
||||||
IsoV = "1";
|
IsoV = "1";
|
||||||
|
|
||||||
GEOMBase_NbIsosDlg * NbIsosDlg =
|
GEOMToolsGUI_NbIsosDlg * NbIsosDlg =
|
||||||
new GEOMBase_NbIsosDlg(QAD_Application::getDesktop(), tr("GEOM_MEN_ISOS"), TRUE);
|
new GEOMToolsGUI_NbIsosDlg(QAD_Application::getDesktop(), tr("GEOM_MEN_ISOS"), TRUE);
|
||||||
|
|
||||||
NbIsosDlg->SpinBoxU->setValue(IsoU.toInt());
|
NbIsosDlg->SpinBoxU->setValue(IsoU.toInt());
|
||||||
NbIsosDlg->SpinBoxV->setValue(IsoV.toInt());
|
NbIsosDlg->SpinBoxV->setValue(IsoV.toInt());
|
||||||
@ -478,12 +482,49 @@ bool GEOMToolsGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
|
|||||||
while(useSubItems?anIter->More():!anAttr->_is_nil()) {
|
while(useSubItems?anIter->More():!anAttr->_is_nil()) {
|
||||||
if(!obj->FindAttribute(anAttr, "AttributeIOR") &&
|
if(!obj->FindAttribute(anAttr, "AttributeIOR") &&
|
||||||
obj->FindAttribute(anAttr, "AttributePersistentRef")) {
|
obj->FindAttribute(anAttr, "AttributePersistentRef")) {
|
||||||
// load
|
|
||||||
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer","GEOM");
|
SALOMEDS::SComponent_var FComp = obj->GetFatherComponent();
|
||||||
|
if (!CORBA::is_nil(FComp)) {
|
||||||
|
if (FComp->FindAttribute(anAttr, "AttributeName")) {
|
||||||
|
SALOMEDS::AttributeName_var aName = SALOMEDS::AttributeName::_narrow(anAttr);
|
||||||
|
QString compName = parent->getComponentName(aName->Value());
|
||||||
|
// parent->loadComponentData(parent->getComponentName(aName->Value()));
|
||||||
|
Engines::Component_var comp ;
|
||||||
|
if ( compName.compare("SUPERV") == 0 ) {
|
||||||
|
comp = parent->getEngine( "SuperVisionContainer", compName) ;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
comp = parent->getEngine( "FactoryServer", compName);
|
||||||
|
if ( comp->_is_nil() )
|
||||||
|
comp = parent->getEngine( "FactoryServerPy", compName);
|
||||||
|
}
|
||||||
|
|
||||||
if (!CORBA::is_nil(comp)) {
|
if (!CORBA::is_nil(comp)) {
|
||||||
SALOMEDS::Driver_var driver = SALOMEDS::Driver::_narrow(comp);
|
SALOMEDS::Driver_var driver = SALOMEDS::Driver::_narrow(comp);
|
||||||
SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
|
if (!CORBA::is_nil(driver)) {
|
||||||
aStudyBuilder->LoadWith(aStudy->FindComponent("GEOM"),driver);
|
SALOMEDS::StudyBuilder_var B = aStudy->NewBuilder();
|
||||||
|
if (!CORBA::is_nil(B)) {
|
||||||
|
B->LoadWith(FComp,driver);
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
MESSAGE("loadComponentData(): Driver is null");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
MESSAGE("loadComponentData(): Engine is null");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
// // load
|
||||||
|
// Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer","GEOM");
|
||||||
|
// if (!CORBA::is_nil(comp)) {
|
||||||
|
// SALOMEDS::Driver_var driver = SALOMEDS::Driver::_narrow(comp);
|
||||||
|
// SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
|
||||||
|
// SALOMEDS::SComponent_var SC = aStudy->FindComponent("GEOM");
|
||||||
|
// if (!CORBA::is_nil(SC))
|
||||||
|
// aStudyBuilder->LoadWith(SC,driver);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
MESSAGE("Component is null");
|
MESSAGE("Component is null");
|
||||||
@ -752,9 +793,9 @@ bool GEOMToolsGUI::Import(int aState)
|
|||||||
// if (aLocked) return false;
|
// if (aLocked) return false;
|
||||||
father->ComponentIOR(myGeomGUI->GetFatherior());
|
father->ComponentIOR(myGeomGUI->GetFatherior());
|
||||||
|
|
||||||
QString nameShape = QAD_Tools::getFileNameFromPath(file,false) + QString("_%1").arg(myGeomGUI->GetNbGeom()++);
|
QString nameShape = QAD_Tools::getFileNameFromPath(file,false) + QString("_%1").arg(myGeomGUI->myNbGeom++);
|
||||||
|
|
||||||
if(myGeomBase->Display(aShape, strdup(nameShape.latin1()))) {
|
if(myGeomBase->Display(aShape, (char*)nameShape.latin1())) {
|
||||||
QAD_Application::getDesktop()->getActiveStudy()->setMessage( tr("GEOM_INF_LOADED").arg(QAD_Tools::getFileNameFromPath( file )) );
|
QAD_Application::getDesktop()->getActiveStudy()->setMessage( tr("GEOM_INF_LOADED").arg(QAD_Tools::getFileNameFromPath( file )) );
|
||||||
QAD_Application::getDesktop()->putInfo( tr("GEOM_PRP_READY"));
|
QAD_Application::getDesktop()->putInfo( tr("GEOM_PRP_READY"));
|
||||||
}
|
}
|
||||||
@ -802,7 +843,7 @@ bool GEOMToolsGUI::Export(int aState)
|
|||||||
QApplication::setOverrideCursor( Qt::waitCursor );
|
QApplication::setOverrideCursor( Qt::waitCursor );
|
||||||
// Standard_Boolean result = BRepTools::Write(Shape->Shape(), strdup(file.latin1()) );
|
// Standard_Boolean result = BRepTools::Write(Shape->Shape(), strdup(file.latin1()) );
|
||||||
try {
|
try {
|
||||||
myGeom->ExportBREP(strdup( file.latin1()), aShape);
|
myGeom->ExportBREP((char*)file.latin1(), aShape);
|
||||||
}
|
}
|
||||||
catch (const SALOME::SALOME_Exception& S_ex) {
|
catch (const SALOME::SALOME_Exception& S_ex) {
|
||||||
QtCatchCorbaException(S_ex);
|
QtCatchCorbaException(S_ex);
|
||||||
@ -829,7 +870,7 @@ bool GEOMToolsGUI::Export(int aState)
|
|||||||
if ( !file.isEmpty() && !aShape->_is_nil() ) {
|
if ( !file.isEmpty() && !aShape->_is_nil() ) {
|
||||||
QApplication::setOverrideCursor( Qt::waitCursor );
|
QApplication::setOverrideCursor( Qt::waitCursor );
|
||||||
try {
|
try {
|
||||||
myGeom->ExportIGES(strdup( file.latin1()), aShape);
|
myGeom->ExportIGES((char*)file.latin1(), aShape);
|
||||||
}
|
}
|
||||||
catch (const SALOME::SALOME_Exception& S_ex) {
|
catch (const SALOME::SALOME_Exception& S_ex) {
|
||||||
QtCatchCorbaException(S_ex);
|
QtCatchCorbaException(S_ex);
|
||||||
@ -875,7 +916,7 @@ bool GEOMToolsGUI::Export(int aState)
|
|||||||
|
|
||||||
QApplication::setOverrideCursor( Qt::waitCursor ) ;
|
QApplication::setOverrideCursor( Qt::waitCursor ) ;
|
||||||
try {
|
try {
|
||||||
myGeom->ExportSTEP(strdup( file.latin1()), aShape);
|
myGeom->ExportSTEP((char*)file.latin1(), aShape);
|
||||||
}
|
}
|
||||||
catch (const SALOME::SALOME_Exception& S_ex) {
|
catch (const SALOME::SALOME_Exception& S_ex) {
|
||||||
QtCatchCorbaException(S_ex);
|
QtCatchCorbaException(S_ex);
|
||||||
@ -901,6 +942,7 @@ bool GEOMToolsGUI::Export(int aState)
|
|||||||
|
|
||||||
}
|
}
|
||||||
QApplication::restoreOverrideCursor() ;
|
QApplication::restoreOverrideCursor() ;
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
//
|
//
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
// File : GEOMBase_NbIsosDlg.cxx
|
// File : GEOMToolsGUI_NbIsosDlg.cxx
|
||||||
// Author :
|
// Author :
|
||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header:
|
// $Header:
|
||||||
@ -37,17 +37,17 @@ using namespace std;
|
|||||||
#include <qspinbox.h>
|
#include <qspinbox.h>
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : GEOMBase_NbIsosDlg()
|
// class : GEOMToolsGUI_NbIsosDlg()
|
||||||
// purpose : Constructs a GEOMBase_NbIsosDlg which is a child of 'parent', with the
|
// purpose : Constructs a GEOMToolsGUI_NbIsosDlg which is a child of 'parent', with the
|
||||||
// name 'name' and widget flags set to 'f'.
|
// name 'name' and widget flags set to 'f'.
|
||||||
// The dialog will by default be modeless, unless you set 'modal' to
|
// The dialog will by default be modeless, unless you set 'modal' to
|
||||||
// TRUE to construct a modal dialog.
|
// TRUE to construct a modal dialog.
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
GEOMBase_NbIsosDlg::GEOMBase_NbIsosDlg(QWidget* parent, const char* name, bool modal, WFlags fl)
|
GEOMToolsGUI_NbIsosDlg::GEOMToolsGUI_NbIsosDlg(QWidget* parent, const char* name, bool modal, WFlags fl)
|
||||||
:QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
|
:QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
|
||||||
{
|
{
|
||||||
if( !name )
|
if( !name )
|
||||||
setName("GEOMBase_NbIsosDlg");
|
setName("GEOMToolsGUI_NbIsosDlg");
|
||||||
setCaption(name);
|
setCaption(name);
|
||||||
setSizeGripEnabled(TRUE);
|
setSizeGripEnabled(TRUE);
|
||||||
QGridLayout* MyDialogLayout = new QGridLayout(this);
|
QGridLayout* MyDialogLayout = new QGridLayout(this);
|
||||||
@ -122,10 +122,10 @@ GEOMBase_NbIsosDlg::GEOMBase_NbIsosDlg(QWidget* parent, const char* name, bool m
|
|||||||
|
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// function : ~GEOMBase_NbIsosDlg()
|
// function : ~GEOMToolsGUI_NbIsosDlg()
|
||||||
// purpose : Destroys the object and frees any allocated resources
|
// purpose : Destroys the object and frees any allocated resources
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
GEOMBase_NbIsosDlg::~GEOMBase_NbIsosDlg()
|
GEOMToolsGUI_NbIsosDlg::~GEOMToolsGUI_NbIsosDlg()
|
||||||
{
|
{
|
||||||
// no need to delete child widgets, Qt does it all for us
|
// no need to delete child widgets, Qt does it all for us
|
||||||
}
|
}
|
||||||
|
@ -21,13 +21,13 @@
|
|||||||
//
|
//
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
// File : GEOMBase_NbIsosDlg.h
|
// File : GEOMToolsGUI_NbIsosDlg.h
|
||||||
// Author :
|
// Author :
|
||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header:
|
// $Header:
|
||||||
|
|
||||||
#ifndef GEOMBASE_NBISOSDLG_H
|
#ifndef GEOMTOOLSGUI_NBISOSDLG_H
|
||||||
#define GEOMBASE_NBISOSDLG_H
|
#define GEOMTOOLSGUI_NBISOSDLG_H
|
||||||
|
|
||||||
#include <qdialog.h>
|
#include <qdialog.h>
|
||||||
|
|
||||||
@ -36,16 +36,16 @@ class QSpinBox;
|
|||||||
class QPushButton;
|
class QPushButton;
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : GEOMBase_NbIsosDlg
|
// class : GEOMToolsGUI_NbIsosDlg
|
||||||
// purpose :
|
// purpose :
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
class GEOMBase_NbIsosDlg : public QDialog
|
class GEOMToolsGUI_NbIsosDlg : public QDialog
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
GEOMBase_NbIsosDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
|
GEOMToolsGUI_NbIsosDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
|
||||||
~GEOMBase_NbIsosDlg();
|
~GEOMToolsGUI_NbIsosDlg();
|
||||||
|
|
||||||
QPushButton* buttonOk;
|
QPushButton* buttonOk;
|
||||||
QPushButton* buttonCancel;
|
QPushButton* buttonCancel;
|
||||||
@ -56,4 +56,4 @@ public:
|
|||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // GEOMETRYGUI_NBISOSDLG_H
|
#endif // GEOMTOOLSGUI_NBISOSDLG_H
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
//
|
//
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
// File : GEOMBase_TransparencyDlg.cxx
|
// File : GEOMToolsGUI_TransparencyDlg.cxx
|
||||||
// Author : Lucien PIGNOLONI
|
// Author : Lucien PIGNOLONI
|
||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
|
|
||||||
@ -48,24 +48,24 @@ using namespace std;
|
|||||||
#include "VTKViewer_RenderWindowInteractor.h"
|
#include "VTKViewer_RenderWindowInteractor.h"
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : GEOMBase_TransparencyDlg()
|
// class : GEOMToolsGUI_TransparencyDlg()
|
||||||
// purpose : Constructs a GEOMBase_SUBSHAPE which is a child of 'parent', with the
|
// purpose : Constructs a GEOMBase_SUBSHAPE which is a child of 'parent', with the
|
||||||
// name 'name' and widget flags set to 'f'.
|
// name 'name' and widget flags set to 'f'.
|
||||||
//
|
//
|
||||||
// : WARNING : this dialog is modal !
|
// : WARNING : this dialog is modal !
|
||||||
//
|
//
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
GEOMBase_TransparencyDlg::GEOMBase_TransparencyDlg(QWidget* parent, const char* name, SALOME_Selection* Sel, const Handle(AIS_InteractiveContext)& ic, bool modal, WFlags fl)
|
GEOMToolsGUI_TransparencyDlg::GEOMToolsGUI_TransparencyDlg(QWidget* parent, const char* name, SALOME_Selection* Sel, const Handle(AIS_InteractiveContext)& ic, bool modal, WFlags fl)
|
||||||
:QDialog(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
|
:QDialog(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
|
||||||
{
|
{
|
||||||
if(!name)
|
if(!name)
|
||||||
setName("GEOMBase_TransparencyDlg");
|
setName("GEOMToolsGUI_TransparencyDlg");
|
||||||
resize(152, 107);
|
resize(152, 107);
|
||||||
setCaption(tr("GEOM_TRANSPARENCY_TITLE"));
|
setCaption(tr("GEOM_TRANSPARENCY_TITLE"));
|
||||||
setSizeGripEnabled(TRUE);
|
setSizeGripEnabled(TRUE);
|
||||||
GEOMBase_TransparencyDlgLayout = new QGridLayout(this);
|
GEOMToolsGUI_TransparencyDlgLayout = new QGridLayout(this);
|
||||||
GEOMBase_TransparencyDlgLayout->setSpacing(6);
|
GEOMToolsGUI_TransparencyDlgLayout->setSpacing(6);
|
||||||
GEOMBase_TransparencyDlgLayout->setMargin(11);
|
GEOMToolsGUI_TransparencyDlgLayout->setMargin(11);
|
||||||
|
|
||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
QGroupBox* GroupButtons = new QGroupBox( this, "GroupButtons" );
|
QGroupBox* GroupButtons = new QGroupBox( this, "GroupButtons" );
|
||||||
@ -112,8 +112,8 @@ GEOMBase_TransparencyDlg::GEOMBase_TransparencyDlg(QWidget* parent, const char*
|
|||||||
GroupC1Layout->addMultiCellWidget( Slider1, 1, 1, 0, 2 );
|
GroupC1Layout->addMultiCellWidget( Slider1, 1, 1, 0, 2 );
|
||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
|
|
||||||
GEOMBase_TransparencyDlgLayout->addWidget(GroupC1, 0, 0);
|
GEOMToolsGUI_TransparencyDlgLayout->addWidget(GroupC1, 0, 0);
|
||||||
GEOMBase_TransparencyDlgLayout->addWidget(GroupButtons, 1, 0);
|
GEOMToolsGUI_TransparencyDlgLayout->addWidget(GroupButtons, 1, 0);
|
||||||
|
|
||||||
/* Initialisations */
|
/* Initialisations */
|
||||||
this->myGeomGUI = GEOMContext::GetGeomGUI();
|
this->myGeomGUI = GEOMContext::GetGeomGUI();
|
||||||
@ -133,18 +133,18 @@ GEOMBase_TransparencyDlg::GEOMBase_TransparencyDlg(QWidget* parent, const char*
|
|||||||
connect(Slider1, SIGNAL(valueChanged(int)), this, SLOT(ValueHasChanged(int)));
|
connect(Slider1, SIGNAL(valueChanged(int)), this, SLOT(ValueHasChanged(int)));
|
||||||
|
|
||||||
/* Move widget on the botton right corner of main widget */
|
/* Move widget on the botton right corner of main widget */
|
||||||
int x, y ;
|
// int x, y ;
|
||||||
myGeomBase->DefineDlgPosition(this, x, y);
|
// myGeomBase->DefineDlgPosition(this, x, y);
|
||||||
this->move(x, y) ;
|
// this->move(x, y) ;
|
||||||
this->show() ; /* Displays this Dialog */
|
this->show() ; /* Displays this Dialog */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// function : ~GEOMBase_TransparencyDlg()
|
// function : ~GEOMToolsGUI_TransparencyDlg()
|
||||||
// purpose :
|
// purpose :
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
GEOMBase_TransparencyDlg::~GEOMBase_TransparencyDlg()
|
GEOMToolsGUI_TransparencyDlg::~GEOMToolsGUI_TransparencyDlg()
|
||||||
{
|
{
|
||||||
// no need to delete child widgets, Qt does it all for us
|
// no need to delete child widgets, Qt does it all for us
|
||||||
}
|
}
|
||||||
@ -154,7 +154,7 @@ GEOMBase_TransparencyDlg::~GEOMBase_TransparencyDlg()
|
|||||||
// function : ClickOnOk()
|
// function : ClickOnOk()
|
||||||
// purpose :
|
// purpose :
|
||||||
//=======================================================================
|
//=======================================================================
|
||||||
void GEOMBase_TransparencyDlg::ClickOnOk()
|
void GEOMToolsGUI_TransparencyDlg::ClickOnOk()
|
||||||
{
|
{
|
||||||
accept();
|
accept();
|
||||||
return;
|
return;
|
||||||
@ -165,7 +165,7 @@ void GEOMBase_TransparencyDlg::ClickOnOk()
|
|||||||
// function : ClickOnClose()
|
// function : ClickOnClose()
|
||||||
// purpose :
|
// purpose :
|
||||||
//=======================================================================
|
//=======================================================================
|
||||||
void GEOMBase_TransparencyDlg::ClickOnClose()
|
void GEOMToolsGUI_TransparencyDlg::ClickOnClose()
|
||||||
{
|
{
|
||||||
accept();
|
accept();
|
||||||
return;
|
return;
|
||||||
@ -177,7 +177,7 @@ void GEOMBase_TransparencyDlg::ClickOnClose()
|
|||||||
// purpose : Called when value of slider change
|
// purpose : Called when value of slider change
|
||||||
// : or the first time as initilisation
|
// : or the first time as initilisation
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
void GEOMBase_TransparencyDlg::ValueHasChanged(int newValue)
|
void GEOMToolsGUI_TransparencyDlg::ValueHasChanged(int newValue)
|
||||||
{
|
{
|
||||||
if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
|
if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
|
||||||
// VTK
|
// VTK
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
//
|
//
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
// File : GEOMBase_TransparencyDlg.h
|
// File : GEOMToolsGUI_TransparencyDlg.h
|
||||||
// Author : Lucien PIGNOLONI
|
// Author : Lucien PIGNOLONI
|
||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header$
|
// $Header$
|
||||||
@ -51,23 +51,23 @@ class QSlider;
|
|||||||
|
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : GEOMBase_TransparencyDlg
|
// class : GEOMToolsGUI_TransparencyDlg
|
||||||
// purpose :
|
// purpose :
|
||||||
// : WARNING : that is a MODAL dialog.
|
// : WARNING : that is a MODAL dialog.
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
class GEOMBase_TransparencyDlg : public QDialog
|
class GEOMToolsGUI_TransparencyDlg : public QDialog
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
GEOMBase_TransparencyDlg( QWidget* parent = 0,
|
GEOMToolsGUI_TransparencyDlg( QWidget* parent = 0,
|
||||||
const char* name = 0,
|
const char* name = 0,
|
||||||
SALOME_Selection* Sel = 0,
|
SALOME_Selection* Sel = 0,
|
||||||
const Handle(AIS_InteractiveContext)& ic = 0,
|
const Handle(AIS_InteractiveContext)& ic = 0,
|
||||||
bool modal = TRUE,
|
bool modal = TRUE,
|
||||||
WFlags fl = 0 );
|
WFlags fl = 0 );
|
||||||
|
|
||||||
~GEOMBase_TransparencyDlg();
|
~GEOMToolsGUI_TransparencyDlg();
|
||||||
|
|
||||||
private :
|
private :
|
||||||
|
|
||||||
@ -89,7 +89,7 @@ public slots:
|
|||||||
void ValueHasChanged( int newValue ) ;
|
void ValueHasChanged( int newValue ) ;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
QGridLayout* GEOMBase_TransparencyDlgLayout;
|
QGridLayout* GEOMToolsGUI_TransparencyDlgLayout;
|
||||||
QHBoxLayout* Layout1;
|
QHBoxLayout* Layout1;
|
||||||
QHBoxLayout* Layout2;
|
QHBoxLayout* Layout2;
|
||||||
};
|
};
|
||||||
|
58
src/GEOM_SWIG/GEOM_Sketcher.py
Normal file
58
src/GEOM_SWIG/GEOM_Sketcher.py
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
# GEOM GEOM_SWIG : binding of C++ omplementaion with Python
|
||||||
|
#
|
||||||
|
# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||||
|
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||||
|
#
|
||||||
|
# This library is free software; you can redistribute it and/or
|
||||||
|
# modify it under the terms of the GNU Lesser General Public
|
||||||
|
# License as published by the Free Software Foundation; either
|
||||||
|
# version 2.1 of the License.
|
||||||
|
#
|
||||||
|
# This library is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
# Lesser General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Lesser General Public
|
||||||
|
# License along with this library; if not, write to the Free Software
|
||||||
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
#
|
||||||
|
# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
|
||||||
|
#
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# File : GEOM_Sketcher.py
|
||||||
|
# Author : Damien COQUERET, Open CASCADE
|
||||||
|
# Module : GEOM
|
||||||
|
# $Header$
|
||||||
|
|
||||||
|
import geompy
|
||||||
|
|
||||||
|
#SKETCHER INFOS
|
||||||
|
#Init Sketcher
|
||||||
|
#Create a string beginning by :"Sketcher:"
|
||||||
|
#Each command must be separated by ":"
|
||||||
|
#"F x y" : Create first point at X & Y
|
||||||
|
|
||||||
|
#To Make Segment
|
||||||
|
#"R angle" : Set the direction by angle
|
||||||
|
#"D dx dy" : Set the direction by DX & DY
|
||||||
|
|
||||||
|
#"TT x y" : Create by point at X & Y
|
||||||
|
#"T dx dy" : Create by point with DX & DY
|
||||||
|
#"L length" : Create by direction & Length
|
||||||
|
#"IX x" : Create by direction & Intersect. X
|
||||||
|
#"IY y" : Create by direction & Intersect. Y
|
||||||
|
|
||||||
|
#To Make Arc
|
||||||
|
#"C radius length" : Create by direction, radius and length(in degree)
|
||||||
|
|
||||||
|
#To finish
|
||||||
|
#"WW" : Close Wire
|
||||||
|
|
||||||
|
#Create Sketcher
|
||||||
|
Cmd = "Sketch:F 0 0:TT 0 100:C 100 180:WW"
|
||||||
|
Sketcher = geompy.MakeSketcher(Cmd) #(string)->GEOM_Shape_ptr
|
||||||
|
|
||||||
|
#Add In Study
|
||||||
|
id_Sketcher = geompy.addToStudy(Sketcher, "Sketcher")
|
@ -51,7 +51,8 @@ EXPORT_PYSCRIPTS = libGEOM_Swig.py geompy.py batchmode_geompy.py \
|
|||||||
GEOM_Partition2.py \
|
GEOM_Partition2.py \
|
||||||
GEOM_Partition3.py \
|
GEOM_Partition3.py \
|
||||||
GEOM_Partition4.py \
|
GEOM_Partition4.py \
|
||||||
GEOM_Partition5.py
|
GEOM_Partition5.py \
|
||||||
|
GEOM_Sketcher.py
|
||||||
|
|
||||||
LIB_CLIENT_IDL = SALOMEDS.idl \
|
LIB_CLIENT_IDL = SALOMEDS.idl \
|
||||||
SALOMEDS_Attributes.idl \
|
SALOMEDS_Attributes.idl \
|
||||||
|
@ -152,12 +152,24 @@ def MakeCircle(p1,d1,radius):
|
|||||||
anObj._set_Name(ior)
|
anObj._set_Name(ior)
|
||||||
return anObj
|
return anObj
|
||||||
|
|
||||||
|
def MakeEllipse(p1,d1,radiusMaj,radiusMin):
|
||||||
|
anObj = geom.MakeEllipse(p1,d1,radiusMaj, radiusMin)
|
||||||
|
ior = orb.object_to_string(anObj)
|
||||||
|
anObj._set_Name(ior)
|
||||||
|
return anObj
|
||||||
|
|
||||||
def MakePlane(p1,d1,trimsize):
|
def MakePlane(p1,d1,trimsize):
|
||||||
anObj = geom.MakePlane(p1,d1,trimsize)
|
anObj = geom.MakePlane(p1,d1,trimsize)
|
||||||
ior = orb.object_to_string(anObj)
|
ior = orb.object_to_string(anObj)
|
||||||
anObj._set_Name(ior)
|
anObj._set_Name(ior)
|
||||||
return anObj
|
return anObj
|
||||||
|
|
||||||
|
def MakeSketcher(Cmd):
|
||||||
|
anObj = geom.MakeSketcher(Cmd)
|
||||||
|
ior = orb.object_to_string(anObj)
|
||||||
|
anObj._set_Name(ior)
|
||||||
|
return anObj
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
# Create Geometry 3D
|
# Create Geometry 3D
|
||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
@ -214,6 +226,12 @@ def MakeFace(aShapeWire,WantPlanarFace):
|
|||||||
anObj._set_Name(ior)
|
anObj._set_Name(ior)
|
||||||
return anObj
|
return anObj
|
||||||
|
|
||||||
|
def MakeFaces(ListShape,WantPlanarFace):
|
||||||
|
anObj = geom.MakeFaces(ListShape,WantPlanarFace)
|
||||||
|
ior = orb.object_to_string(anObj)
|
||||||
|
anObj._set_Name(ior)
|
||||||
|
return anObj
|
||||||
|
|
||||||
def MakeCompound(ListShape):
|
def MakeCompound(ListShape):
|
||||||
anObj = geom.MakeCompound(ListShape)
|
anObj = geom.MakeCompound(ListShape)
|
||||||
ior = orb.object_to_string(anObj)
|
ior = orb.object_to_string(anObj)
|
||||||
@ -356,10 +374,11 @@ def Partition(ListShapes, ListTools=[], ListKeepInside=[], ListRemoveInside=[],
|
|||||||
return anObj
|
return anObj
|
||||||
|
|
||||||
def SuppressFaces(aShape,ListOfId):
|
def SuppressFaces(aShape,ListOfId):
|
||||||
anObj = geom.SuppressFaces(aShape,ListOfId)
|
ListObj = geom.SuppressFaces(aShape,ListOfId)
|
||||||
|
for anObj in ListObj :
|
||||||
ior = orb.object_to_string(anObj)
|
ior = orb.object_to_string(anObj)
|
||||||
anObj._set_Name(ior)
|
anObj._set_Name(ior)
|
||||||
return anObj
|
return ListObj
|
||||||
|
|
||||||
def SuppressHole(aShape,ListOfFace,ListOfWire,ListOfEndFace):
|
def SuppressHole(aShape,ListOfFace,ListOfWire,ListOfEndFace):
|
||||||
anObj = geom.SuppressHole(aShape,ListOfFace,ListOfWire,ListOfEndFace)
|
anObj = geom.SuppressHole(aShape,ListOfFace,ListOfWire,ListOfEndFace)
|
||||||
|
@ -178,12 +178,24 @@ def MakeCircle(p1,d1,radius):
|
|||||||
anObj._set_Name(ior)
|
anObj._set_Name(ior)
|
||||||
return anObj
|
return anObj
|
||||||
|
|
||||||
|
def MakeEllipse(p1,d1,radiusMaj,radiusMin):
|
||||||
|
anObj = geom.MakeEllipse(p1,d1,radiusMaj, radiusMin)
|
||||||
|
ior = salome.orb.object_to_string(anObj)
|
||||||
|
anObj._set_Name(ior)
|
||||||
|
return anObj
|
||||||
|
|
||||||
def MakePlane(p1,d1,trimsize):
|
def MakePlane(p1,d1,trimsize):
|
||||||
anObj = geom.MakePlane(p1,d1,trimsize)
|
anObj = geom.MakePlane(p1,d1,trimsize)
|
||||||
ior = salome.orb.object_to_string(anObj)
|
ior = salome.orb.object_to_string(anObj)
|
||||||
anObj._set_Name(ior)
|
anObj._set_Name(ior)
|
||||||
return anObj
|
return anObj
|
||||||
|
|
||||||
|
def MakeSketcher(Cmd):
|
||||||
|
anObj = geom.MakeSketcher(Cmd)
|
||||||
|
ior = salome.orb.object_to_string(anObj)
|
||||||
|
anObj._set_Name(ior)
|
||||||
|
return anObj
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
# Create Geometry 3D
|
# Create Geometry 3D
|
||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
@ -388,10 +400,11 @@ def Partition(ListShapes, ListTools=[], ListKeepInside=[], ListRemoveInside=[],
|
|||||||
return anObj
|
return anObj
|
||||||
|
|
||||||
def SuppressFaces(aShape,ListOfId):
|
def SuppressFaces(aShape,ListOfId):
|
||||||
anObj = geom.SuppressFaces(aShape,ListOfId)
|
ListObj = geom.SuppressFaces(aShape,ListOfId)
|
||||||
|
for anObj in ListObj :
|
||||||
ior = salome.orb.object_to_string(anObj)
|
ior = salome.orb.object_to_string(anObj)
|
||||||
anObj._set_Name(ior)
|
anObj._set_Name(ior)
|
||||||
return anObj
|
return ListObj
|
||||||
|
|
||||||
def SuppressHole(aShape,ListOfFace,ListOfWire,ListOfEndFace):
|
def SuppressHole(aShape,ListOfFace,ListOfWire,ListOfEndFace):
|
||||||
anObj = geom.SuppressHole(aShape,ListOfFace,ListOfWire,ListOfEndFace)
|
anObj = geom.SuppressHole(aShape,ListOfFace,ListOfWire,ListOfEndFace)
|
||||||
|
@ -26,9 +26,9 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "GenerationGUI_FillingDlg.h"
|
#include "GenerationGUI_FillingDlg.h"
|
||||||
|
|
||||||
|
#include "QAD_WaitCursor.h"
|
||||||
#include "QAD_Config.h"
|
#include "QAD_Config.h"
|
||||||
|
|
||||||
#include <GeomFill_SectionGenerator.hxx>
|
#include <GeomFill_SectionGenerator.hxx>
|
||||||
@ -38,8 +38,14 @@ using namespace std;
|
|||||||
#include <Geom_TrimmedCurve.hxx>
|
#include <Geom_TrimmedCurve.hxx>
|
||||||
#include <BRepBuilderAPI_MakeFace.hxx>
|
#include <BRepBuilderAPI_MakeFace.hxx>
|
||||||
#include <TopExp_Explorer.hxx>
|
#include <TopExp_Explorer.hxx>
|
||||||
|
#include <TopoDS_Iterator.hxx>
|
||||||
#include <BRep_Tool.hxx>
|
#include <BRep_Tool.hxx>
|
||||||
#include <Precision.hxx>
|
#include <Precision.hxx>
|
||||||
|
#include <Standard_ErrorHandler.hxx>
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : GenerationGUI_FillingDlg()
|
// class : GenerationGUI_FillingDlg()
|
||||||
@ -172,6 +178,7 @@ void GenerationGUI_FillingDlg::ClickOnOk()
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void GenerationGUI_FillingDlg::ClickOnApply()
|
void GenerationGUI_FillingDlg::ClickOnApply()
|
||||||
{
|
{
|
||||||
|
buttonApply->setFocus();
|
||||||
QAD_Application::getDesktop()->putInfo(tr(""));
|
QAD_Application::getDesktop()->putInfo(tr(""));
|
||||||
if (mySimulationTopoDs.IsNull())
|
if (mySimulationTopoDs.IsNull())
|
||||||
return;
|
return;
|
||||||
@ -209,10 +216,14 @@ void GenerationGUI_FillingDlg::SelectionIntoArgument()
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
if(myEditCurrentArgument == GroupPoints->LineEdit1 && mySectionShape.ShapeType() == TopAbs_COMPOUND) {
|
if(myEditCurrentArgument == GroupPoints->LineEdit1 && mySectionShape.ShapeType() == TopAbs_COMPOUND) {
|
||||||
myEditCurrentArgument->setText(aString);
|
|
||||||
myGeomShape = myGeomBase->ConvertIOinGEOMShape(IO, testResult);
|
myGeomShape = myGeomBase->ConvertIOinGEOMShape(IO, testResult);
|
||||||
if(!testResult)
|
if(!testResult)
|
||||||
return;
|
return;
|
||||||
|
// mySectionShape should be a compound of edges
|
||||||
|
for ( TopoDS_Iterator it( mySectionShape ); it.More(); it.Next() )
|
||||||
|
if ( it.Value().ShapeType() != TopAbs_EDGE )
|
||||||
|
return;
|
||||||
|
myEditCurrentArgument->setText(aString);
|
||||||
myOkSectionShape = true;
|
myOkSectionShape = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -318,6 +329,8 @@ void GenerationGUI_FillingDlg::ValueChangedInSpinBox(double newValue)
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void GenerationGUI_FillingDlg::MakeFillingSimulationAndDisplay()
|
void GenerationGUI_FillingDlg::MakeFillingSimulationAndDisplay()
|
||||||
{
|
{
|
||||||
|
QAD_WaitCursor wc;
|
||||||
|
|
||||||
myGeomBase->EraseSimulationShape();
|
myGeomBase->EraseSimulationShape();
|
||||||
mySimulationTopoDs.Nullify();
|
mySimulationTopoDs.Nullify();
|
||||||
|
|
||||||
@ -335,6 +348,7 @@ void GenerationGUI_FillingDlg::MakeFillingSimulationAndDisplay()
|
|||||||
if( Scurrent.IsNull() || Scurrent.ShapeType() != TopAbs_EDGE)
|
if( Scurrent.IsNull() || Scurrent.ShapeType() != TopAbs_EDGE)
|
||||||
return;
|
return;
|
||||||
C = BRep_Tool::Curve(TopoDS::Edge(Scurrent), First, Last);
|
C = BRep_Tool::Curve(TopoDS::Edge(Scurrent), First, Last);
|
||||||
|
if (C.IsNull()) continue;
|
||||||
C = new Geom_TrimmedCurve(C, First, Last);
|
C = new Geom_TrimmedCurve(C, First, Last);
|
||||||
Section.AddCurve(C) ;
|
Section.AddCurve(C) ;
|
||||||
i++ ;
|
i++ ;
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "GenerationGUI_PipeDlg.h"
|
#include "GenerationGUI_PipeDlg.h"
|
||||||
|
|
||||||
#include <TopoDS_Edge.hxx>
|
#include <TopoDS_Edge.hxx>
|
||||||
@ -38,6 +37,10 @@ using namespace std;
|
|||||||
#include <BRepAlgoAPI.hxx>
|
#include <BRepAlgoAPI.hxx>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : GenerationGUI_PipeDlg()
|
// class : GenerationGUI_PipeDlg()
|
||||||
// purpose : Constructs a GenerationGUI_PipeDlg which is a child of 'parent', with the
|
// purpose : Constructs a GenerationGUI_PipeDlg which is a child of 'parent', with the
|
||||||
@ -187,7 +190,7 @@ void GenerationGUI_PipeDlg::SelectionIntoArgument()
|
|||||||
}
|
}
|
||||||
else if(myEditCurrentArgument == GroupPoints->LineEdit2) {
|
else if(myEditCurrentArgument == GroupPoints->LineEdit2) {
|
||||||
myOkShape2 = false;
|
myOkShape2 = false;
|
||||||
if(S.ShapeType() != TopAbs_COMPSOLID && S.ShapeType() != TopAbs_COMPOUND && S.ShapeType() != TopAbs_SOLID && S.ShapeType() != TopAbs_SHAPE && S.ShapeType() != TopAbs_VERTEX) {
|
if(S.ShapeType() == TopAbs_WIRE || S.ShapeType() == TopAbs_EDGE ) {
|
||||||
myGeomShape2 = myGeomBase->ConvertIOinGEOMShape(IO, testResult);
|
myGeomShape2 = myGeomBase->ConvertIOinGEOMShape(IO, testResult);
|
||||||
if(!testResult)
|
if(!testResult)
|
||||||
return;
|
return;
|
||||||
|
@ -26,12 +26,15 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "GenerationGUI_PrismDlg.h"
|
#include "GenerationGUI_PrismDlg.h"
|
||||||
|
|
||||||
#include <BRepPrimAPI_MakePrism.hxx>
|
#include <BRepPrimAPI_MakePrism.hxx>
|
||||||
#include "QAD_Config.h"
|
#include "QAD_Config.h"
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : GenerationGUI_PrismDlg()
|
// class : GenerationGUI_PrismDlg()
|
||||||
// purpose : Constructs a GenerationGUI_PrismDlg which is a child of 'parent', with the
|
// purpose : Constructs a GenerationGUI_PrismDlg which is a child of 'parent', with the
|
||||||
@ -146,6 +149,7 @@ void GenerationGUI_PrismDlg::ClickOnOk()
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void GenerationGUI_PrismDlg::ClickOnApply()
|
void GenerationGUI_PrismDlg::ClickOnApply()
|
||||||
{
|
{
|
||||||
|
buttonApply->setFocus();
|
||||||
QAD_Application::getDesktop()->putInfo(tr(""));
|
QAD_Application::getDesktop()->putInfo(tr(""));
|
||||||
if (mySimulationTopoDs.IsNull())
|
if (mySimulationTopoDs.IsNull())
|
||||||
return;
|
return;
|
||||||
|
@ -26,13 +26,18 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "GenerationGUI_RevolDlg.h"
|
#include "GenerationGUI_RevolDlg.h"
|
||||||
|
|
||||||
#include <gp_Lin.hxx>
|
#include <gp_Lin.hxx>
|
||||||
#include <BRepAdaptor_Curve.hxx>
|
#include <BRepAdaptor_Curve.hxx>
|
||||||
#include <BRepPrimAPI_MakeRevol.hxx>
|
#include <BRepPrimAPI_MakeRevol.hxx>
|
||||||
#include "QAD_Config.h"
|
#include "QAD_Config.h"
|
||||||
|
#include <TopExp_Explorer.hxx>
|
||||||
|
#include <Standard_ErrorHandler.hxx>
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : GenerationGUI_RevolDlg()
|
// class : GenerationGUI_RevolDlg()
|
||||||
@ -145,6 +150,7 @@ void GenerationGUI_RevolDlg::ClickOnOk()
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void GenerationGUI_RevolDlg::ClickOnApply()
|
void GenerationGUI_RevolDlg::ClickOnApply()
|
||||||
{
|
{
|
||||||
|
buttonApply->setFocus();
|
||||||
QAD_Application::getDesktop()->putInfo(tr(""));
|
QAD_Application::getDesktop()->putInfo(tr(""));
|
||||||
if (mySimulationTopoDs.IsNull())
|
if (mySimulationTopoDs.IsNull())
|
||||||
return;
|
return;
|
||||||
@ -156,6 +162,32 @@ void GenerationGUI_RevolDlg::ClickOnApply()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//=======================================================================
|
||||||
|
//function : isAcceptableBase
|
||||||
|
//purpose : return true if theBase can be used as algo argument
|
||||||
|
//=======================================================================
|
||||||
|
|
||||||
|
static bool isAcceptableBase(const TopoDS_Shape& theBase)
|
||||||
|
{
|
||||||
|
switch ( theBase.ShapeType() ) {
|
||||||
|
case TopAbs_VERTEX:
|
||||||
|
case TopAbs_EDGE:
|
||||||
|
case TopAbs_WIRE:
|
||||||
|
case TopAbs_FACE:
|
||||||
|
case TopAbs_SHELL:
|
||||||
|
return true;
|
||||||
|
case TopAbs_SOLID:
|
||||||
|
case TopAbs_COMPSOLID:
|
||||||
|
return false;
|
||||||
|
case TopAbs_COMPOUND: {
|
||||||
|
TopExp_Explorer exp( theBase, TopAbs_SOLID);
|
||||||
|
return !exp.More();
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// function : SelectionIntoArgument()
|
// function : SelectionIntoArgument()
|
||||||
@ -188,8 +220,7 @@ void GenerationGUI_RevolDlg::SelectionIntoArgument()
|
|||||||
myGeomShape = myGeomBase->ConvertIOinGEOMShape(IO, testResult);
|
myGeomShape = myGeomBase->ConvertIOinGEOMShape(IO, testResult);
|
||||||
if(!testResult)
|
if(!testResult)
|
||||||
return;
|
return;
|
||||||
TopAbs_ShapeEnum aType = S.ShapeType();
|
if( !isAcceptableBase( S ))
|
||||||
if(aType != TopAbs_VERTEX && aType != TopAbs_EDGE && aType != TopAbs_WIRE && aType != TopAbs_FACE && aType != TopAbs_SHELL && aType != TopAbs_COMPOUND)
|
|
||||||
return;
|
return;
|
||||||
myEditCurrentArgument->setText(aString);
|
myEditCurrentArgument->setText(aString);
|
||||||
myOkBase = true;
|
myOkBase = true;
|
||||||
@ -317,8 +348,7 @@ void GenerationGUI_RevolDlg::MakeRevolutionSimulationAndDisplay()
|
|||||||
myGeomBase->EraseSimulationShape();
|
myGeomBase->EraseSimulationShape();
|
||||||
mySimulationTopoDs.Nullify();
|
mySimulationTopoDs.Nullify();
|
||||||
|
|
||||||
TopAbs_ShapeEnum aType = myBase.ShapeType();
|
if (!isAcceptableBase( myBase ))
|
||||||
if(aType != TopAbs_VERTEX && aType != TopAbs_EDGE && aType != TopAbs_WIRE && aType != TopAbs_FACE && aType != TopAbs_SHELL && aType !=TopAbs_COMPOUND)
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
@ -26,12 +26,15 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "MeasureGUI_BndBoxDlg.h"
|
#include "MeasureGUI_BndBoxDlg.h"
|
||||||
|
|
||||||
#include <BRepPrimAPI_MakeBox.hxx>
|
#include <BRepPrimAPI_MakeBox.hxx>
|
||||||
#include <BRepBndLib.hxx>
|
#include <BRepBndLib.hxx>
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : MeasureGUI_BndBoxDlg()
|
// class : MeasureGUI_BndBoxDlg()
|
||||||
// purpose : Constructs a MeasureGUI_BndBoxDlg which is a child of 'parent', with the
|
// purpose : Constructs a MeasureGUI_BndBoxDlg which is a child of 'parent', with the
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "MeasureGUI_CenterMassDlg.h"
|
#include "MeasureGUI_CenterMassDlg.h"
|
||||||
|
|
||||||
#include <BRepBuilderAPI_MakeVertex.hxx>
|
#include <BRepBuilderAPI_MakeVertex.hxx>
|
||||||
@ -34,6 +33,10 @@ using namespace std;
|
|||||||
#include <GProp_GProps.hxx>
|
#include <GProp_GProps.hxx>
|
||||||
#include <GProp_PrincipalProps.hxx>
|
#include <GProp_PrincipalProps.hxx>
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : MeasureGUI_CenterMassDlg()
|
// class : MeasureGUI_CenterMassDlg()
|
||||||
// purpose : Constructs a MeasureGUI_CenterMassDlg which is a child of 'parent', with the
|
// purpose : Constructs a MeasureGUI_CenterMassDlg which is a child of 'parent', with the
|
||||||
|
@ -26,13 +26,16 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "MeasureGUI_CheckShapeDlg.h"
|
#include "MeasureGUI_CheckShapeDlg.h"
|
||||||
|
|
||||||
#include <BRepCheck_Analyzer.hxx>
|
#include <BRepCheck_Analyzer.hxx>
|
||||||
|
|
||||||
#include <qtextedit.h>
|
#include <qtextedit.h>
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : MeasureGUI_CheckShapeDlg()
|
// class : MeasureGUI_CheckShapeDlg()
|
||||||
// purpose : Constructs a MeasureGUI_CheckShapeDlg which is a child of 'parent', with the
|
// purpose : Constructs a MeasureGUI_CheckShapeDlg which is a child of 'parent', with the
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user