mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2024-12-24 16:30:35 +05:00
Merge from V6_3_BR 06/06/2011
This commit is contained in:
vsr
parent
e59741b4b4
commit
7f46e5fa52
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
dnl Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
dnl Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
dnl
|
||||
dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
dnl Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
dnl Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
dnl
|
||||
dnl This library is free software; you can redistribute it and/or
|
||||
dnl modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,3 +1,21 @@
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
#
|
||||
|
||||
def addvars2notebook(filename, vars_and_values):
|
||||
stream = open(filename)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#! /usr/bin/env python
|
||||
# -*- coding: iso-8859-1 -*-
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@REM Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
@REM Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
@REM
|
||||
@REM This library is free software; you can redistribute it and/or
|
||||
@REM modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
@ -24,7 +24,7 @@
|
||||
# Modified by : Alexander BORODIN (OCN) - autotools usage
|
||||
# Created from configure.in.base
|
||||
#
|
||||
AC_INIT([Salome2 Project GEOM module], [6.2.0], [webmaster.salome@opencascade.com], [SalomeGEOM])
|
||||
AC_INIT([Salome2 Project GEOM module], [6.3.0], [webmaster.salome@opencascade.com], [SalomeGEOM])
|
||||
AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
|
||||
AC_CANONICAL_HOST
|
||||
AC_CANONICAL_TARGET
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
@ -30,4 +30,4 @@ usr_docs:
|
||||
docs: usr_docs
|
||||
|
||||
dev_docs:
|
||||
(cd docutils && $(MAKE) $(AM_MAKEFLAGS) dev_docs)
|
||||
(cd salome && $(MAKE) $(AM_MAKEFLAGS) dev_docs)
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# -*- coding: iso-8859-1 -*-
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
@ -19,21 +19,18 @@
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
#
|
||||
|
||||
include $(top_srcdir)/adm_local/unix/make_common_starter.am
|
||||
|
||||
pydocdir = $(docdir)/tui/GEOM/docutils
|
||||
|
||||
.PHONY : latex
|
||||
RSTFILES = \
|
||||
index.rst \
|
||||
overview.rst \
|
||||
docapi.rst
|
||||
|
||||
if SPHINX_IS_OK
|
||||
|
||||
html/index.html:$(RSTFILES)
|
||||
make htm
|
||||
|
||||
endif
|
||||
|
||||
EXTRA_DIST+= images
|
||||
EXTRA_DIST += images $(RSTFILES)
|
||||
|
||||
SPHINXOPTS =
|
||||
SOURCEDIR = $(srcdir)
|
||||
@ -45,7 +42,12 @@ SPHINX_PYTHONPATH = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$
|
||||
|
||||
SPHINX_LD_LIBRARY_PATH = $(KERNEL_ROOT_DIR)/lib/salome:$(OMNIORB_ROOT)/lib
|
||||
|
||||
htm:
|
||||
|
||||
.PHONY: latex
|
||||
|
||||
if SPHINX_IS_OK
|
||||
|
||||
html/index.html:$(RSTFILES)
|
||||
mkdir -p html doctrees
|
||||
PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \
|
||||
LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} \
|
||||
@ -53,6 +55,13 @@ htm:
|
||||
@echo
|
||||
@echo "Build finished. The HTML pages are in html."
|
||||
|
||||
else
|
||||
|
||||
html/index.html:
|
||||
@echo "Documentation for Python package not built. Sphinx was not present at configure time."
|
||||
|
||||
endif
|
||||
|
||||
latex:
|
||||
mkdir -p latex doctrees
|
||||
PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \
|
||||
@ -63,16 +72,6 @@ latex:
|
||||
@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
|
||||
"run these through (pdf)latex."
|
||||
|
||||
html:
|
||||
mkdir -p $@
|
||||
|
||||
RSTFILES= \
|
||||
index.rst \
|
||||
overview.rst \
|
||||
docapi.rst
|
||||
|
||||
EXTRA_DIST+= $(RSTFILES)
|
||||
|
||||
install-data-local: html/index.html
|
||||
test -z $(pydocdir) || mkdir -p $(DESTDIR)$(pydocdir)
|
||||
if test -d "html"; then b=; else b="$(srcdir)/"; fi; \
|
||||
@ -86,5 +85,5 @@ clean-local:
|
||||
-rm -rf html latex doctrees
|
||||
if test -d "html"; then rm -rf html ; fi
|
||||
|
||||
disthook :
|
||||
dist-hook:
|
||||
-test -d html && cp -Rp html $(distdir)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 36 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 36 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 36 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 28 KiB |
BIN
doc/salome/gui/GEOM/images/glue4.png
Normal file
BIN
doc/salome/gui/GEOM/images/glue4.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 22 KiB |
BIN
doc/salome/gui/GEOM/images/glue5.png
Normal file
BIN
doc/salome/gui/GEOM/images/glue5.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
BIN
doc/salome/gui/GEOM/images/projection_dlg.png
Normal file
BIN
doc/salome/gui/GEOM/images/projection_dlg.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
BIN
doc/salome/gui/GEOM/images/projection_preview.png
Normal file
BIN
doc/salome/gui/GEOM/images/projection_preview.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.1 KiB |
@ -10,21 +10,37 @@ time you define it by a list of \b Points through which the curve
|
||||
passes. The three <b>Curve Construction</b> menu choices correspond to three
|
||||
possible types of curves: Polyline, Besier or B-spline (Interpolated).
|
||||
\n The \b Result of each operation will be a GEOM_Object (edge).
|
||||
\n There are two ways to define <b>Points</b>:
|
||||
<ul>
|
||||
<li> <b>By Selection</b> choice of the points manually in the Object Browser or 3D Viewer.
|
||||
<li> <b>Analitical</b> parametric definition of the points through python expressions.
|
||||
</ul>
|
||||
|
||||
\n <b>TUI Commands:</b>
|
||||
<ul>
|
||||
<li><em>geompy.MakePolyline(ListOfShapes,isClosed)</em></li>
|
||||
<li><em>geompy.MakeBezier(ListOfShapes,isClosed)</em></li>
|
||||
<li><em>geompy.MakeInterpol(ListOfShapes,isClosed,doReordering)</em></li>
|
||||
<li><em>geompy.MakeCurveParametric(XExpr, YExpt, ZExpt, tMin, tMax, tStep, curveType)</em></li>
|
||||
</ul>
|
||||
ListOfShape is a list of points through which the curve passes.
|
||||
If isClosed is True, MakeBezier and MakeInterpol builds a closed edge,
|
||||
MakePolyline builds a closed wire. If doReordering is True,
|
||||
MakeInterpol does not follow the order of vertices but searches for the
|
||||
closest vertex.
|
||||
\n XExpr, YExpr, ZExpr python expressions for the X, Y and Z coordinates of the basic points of the curve.
|
||||
\n tMin, tMax minimum and maximun values of the parameter \b t.
|
||||
\n tStep step of the parameter \b t
|
||||
\n curveType type of the curve Polyline, Bezier or Interpolation.
|
||||
|
||||
<b>Arguments:</b>
|
||||
<ul>
|
||||
<li>Name + at least 2 points which will serve as nodes on the curve, or</li>
|
||||
<li>Name + 3 string + 3 values (python expressions for the X, Y and Z coordinates, minimum,
|
||||
maximum and step values of the parameter)</li>
|
||||
</ul>
|
||||
|
||||
|
||||
<b>Arguments:</b> Name + at least 2 points which will serve as nodes
|
||||
on the curve.
|
||||
\n<b>Advanced options</b> \ref preview_anchor "Preview"
|
||||
|
||||
\image html curve.png
|
||||
|
||||
@ -1,38 +1,68 @@
|
||||
/*!
|
||||
|
||||
\page glue_faces_operation_page Glue Faces
|
||||
\page glue_faces_operation_page Glue Faces / Edges
|
||||
|
||||
\n To <b>Glue Faces</b> in the <b>Main Menu</b> select <b>Repair - > Glue Faces</b>.
|
||||
\n To <b>Glue Edges</b> in the <b>Main Menu</b> select <b>Repair - > Glue Edges</b>.
|
||||
|
||||
\n This operation glues faces that are coincident with respect to the
|
||||
\n This operation glues faces/edges that are coincident with respect to the
|
||||
given tolerance value.
|
||||
|
||||
\n The \b Result will be a \b GEOM_Object.
|
||||
|
||||
\n <b>TUI Command:</b>
|
||||
<em>geompy.MakeGlueFaces(theShape,theTolerance)</em>,
|
||||
where \em theShape is a compound of solids to be glued, \em
|
||||
theTolerance is a maximum distance between two faces, which can be
|
||||
considered as coincident.
|
||||
\n <b>Arguments:</b> Name + Compound of solids + Tolerance value.
|
||||
\n <b>Arguments:</b> Name + Compound of shapes + Tolerance value.
|
||||
\n <b>Advanced option:</b>
|
||||
\ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
|
||||
\n The \b Result will be a \b GEOM_Object.
|
||||
|
||||
\image html glue1.png
|
||||
\n \image html glue4.png
|
||||
|
||||
\n It is also possible to manually select the faces that will be
|
||||
\n <b>TUI Commands:</b>
|
||||
<em>geompy.MakeGlueFaces(theShape,theTolerance,doKeepNonSolids)</em> and
|
||||
<em>geompy.MakeGlueEdges(theShape,theTolerance)</em>,
|
||||
where \em theShape is a compound of shapes to be glued, \em
|
||||
theTolerance is a maximum distance between two faces/edges, which can
|
||||
be considered as coincident. The \em doKeepNonSolids flag allows to
|
||||
throw away non-solids from the result, if false. The \b Result will
|
||||
be a new \b GEOM_Object.
|
||||
|
||||
\n It is also possible to manually select the faces/edges that will be
|
||||
glued - select the shape, specify the tolerance and press \b Detect button.
|
||||
|
||||
\image html glue2.png
|
||||
\n \image html glue5.png
|
||||
|
||||
\n \b Geometry module detects the faces where gluing can be performed and
|
||||
displays a notification.
|
||||
\n \b Geometry module detects the faces/edges where gluing can be
|
||||
performed and displays a notification.
|
||||
|
||||
\image html glue3.png
|
||||
|
||||
\n The faces that can be glued are colored in red. It is possible to
|
||||
select the faces for gluing in the 3D viewer. The selected faces will
|
||||
be marked in white.
|
||||
\n The faces/edges that can be glued are colored in red. It is
|
||||
possible to select the faces/edges for gluing in the 3D viewer.
|
||||
The selected faces/edges will be marked in white.
|
||||
|
||||
\n For faces gluing their edges are also glued. By default, other
|
||||
edges are not glued (this concerns only Glue Faces, of course).
|
||||
To force all edges gluing, check the "Glue all coincident edges"
|
||||
checkbox.
|
||||
|
||||
\n <b>TUI Commands:</b>
|
||||
<em>geompy.GetGlueFaces(theShape,theTolerance)</em> and
|
||||
<em>geompy.GetGlueEdges(theShape,theTolerance)</em>,
|
||||
where \em theShape is a compound of shapes to be glued, \em
|
||||
theTolerance is a maximum distance between two faces/edges, which can
|
||||
be considered as coincident. The \b Result will be a list of \b
|
||||
GEOM_Objects, containing one sub shape per each detected set of
|
||||
coincident sub shapes.
|
||||
|
||||
\n <em>geompy.MakeGlueFacesByList(theShape,theTolerance,theFaces,doKeepNonSolids,doGlueAllEdges)</em>
|
||||
and <em>geompy.MakeGlueEdgesByList(theShape,theTolerance,theEdges)</em>,
|
||||
where \em theShape is a compound of shapes to be glued, \em
|
||||
theTolerance is a maximum distance between two faces/edges, which can
|
||||
be considered as coincident, \em theFaces/theEdges is a list of
|
||||
subshapes to be glued. The \em doKeepNonSolids flag allows to throw
|
||||
away non-solids from the result, if false. The \em doGlueAllEdges
|
||||
allows to glue all edges, not only owned by glued faces. The \b
|
||||
Result will be a new \b GEOM_Object.
|
||||
|
||||
\n <b>Example:</b>
|
||||
|
||||
@ -46,6 +76,7 @@ be marked in white.
|
||||
<center><em>Manual selection of faces for gluing</em></center>
|
||||
|
||||
Our <b>TUI Scripts</b> provide you with useful examples of the use of
|
||||
\ref tui_glue_faces "Repairing Operations".
|
||||
<b>Repairing Operations</b> \ref tui_glue_faces "Glue Faces" and \ref
|
||||
tui_glue_edges "Glue Edges".
|
||||
|
||||
*/
|
||||
|
||||
27
doc/salome/gui/GEOM/input/projection_operation.doc
Normal file
27
doc/salome/gui/GEOM/input/projection_operation.doc
Normal file
@ -0,0 +1,27 @@
|
||||
/*!
|
||||
|
||||
\page projection_operation_page Projection on a Face
|
||||
|
||||
\n To produce a <b>Projection</b> in the <b>Main Menu</b> select
|
||||
<b>Operations - > Transformation - > Projection</b>
|
||||
|
||||
\n This operation makes normal projection of a <b>Source vertex, edge
|
||||
or wire</b> on a given <b>Target face</b>.
|
||||
\n <b>Arguments:</b> Name + 2 Objects.
|
||||
\n The \b Result will be an \b Object.
|
||||
|
||||
\image html projection_dlg.png
|
||||
|
||||
\n <b>Example:</b>
|
||||
|
||||
\image html projection_preview.png "The curve (in red) and its projection on the cylindric surface"
|
||||
|
||||
\n <b>TUI Command:</b> <em>geompy.MakeProjection(Source, Target),</em>
|
||||
where \em Source is a shape which has to be projected, \em Target
|
||||
is a face, on which the \em Source shape will be projected. The \em
|
||||
Result will be a \em GEOM_Object.
|
||||
|
||||
Our <b>TUI Scripts</b> provide you with useful examples of the use of
|
||||
\ref tui_projection "Transformation Operations".
|
||||
|
||||
*/
|
||||
@ -9,22 +9,21 @@ which allow to:
|
||||
<ul>
|
||||
<li>\subpage translation_operation_page "Translate" an object by a certain vector.</li>
|
||||
<li>\subpage rotation_operation_page "Rotate" an object around a
|
||||
certain axis by a certain angle.</li>
|
||||
certain axis by a certain angle.</li>
|
||||
<li>\subpage modify_location_operation_page "Move" an object to a new location.</li>
|
||||
<li>\subpage mirror_operation_page "Mirror" an object through a point
|
||||
an axis or a plane of symmetry.</li>
|
||||
<li>\subpage scale_operation_page "Scale" an object by one or several scale
|
||||
factors.</li>
|
||||
<li>Create an \subpage offset_operation_page "Offset" of the object.</li>
|
||||
an axis or a plane of symmetry.</li>
|
||||
<li>\subpage scale_operation_page "Scale" an object by one or several scale factors.</li>
|
||||
<li>Create an \subpage offset_operation_page "Offset" of an object.</li>
|
||||
<li>Create a \subpage projection_operation_page "Projection" of an object on a face.</li>
|
||||
<li>Create a simultaneous \subpage multi_translation_operation_page "Translation in several directions".</li>
|
||||
<li>Create a simultaneous \subpage multi_rotation_operation_page</li> "Rotation in several directions".</li>
|
||||
<li>Produce a \subpage fillet_operation_page "Fillet" on the selected
|
||||
edges of the object.</li>
|
||||
edges of an object.</li>
|
||||
<li>Produce a \subpage fillet1d_operation_page "1D Fillet" on the
|
||||
corners of a Wire with Planar Edges.</li>
|
||||
corners of a Wire with Planar Edges.</li>
|
||||
<li>Produce a \subpage fillet2d_operation_page "2D Fillet" on the corners of a Planar Face.</li>
|
||||
<li>Produce a \subpage chamfer_operation_page "Chamfer" on the
|
||||
selected edges of the object.</li>
|
||||
<li>Produce a \subpage chamfer_operation_page "Chamfer" on the selected edges of an object.</li>
|
||||
</ul>
|
||||
|
||||
*/
|
||||
|
||||
@ -229,6 +229,17 @@ bezier = geompy.MakeBezier([p0, p1, p2, p3, p4])
|
||||
#create a b-spline curve from a list of points
|
||||
interpol = geompy.MakeInterpol([p0, p1, p2, p3, p4], False)
|
||||
|
||||
#create a polyline using parametric definition of the basic points
|
||||
param_polyline = geompy.MakeCurveParametric("t", "sin(t)", "cos(t)", 0., 100., 5., geompy.GEOM.Polyline)
|
||||
|
||||
# create a bezier curve using parametric definition of the basic points
|
||||
param_bezier = geompy.MakeCurveParametric("t", "sin(t)", "cos(t)", 0., 100., 5., geompy.GEOM.Bezier)
|
||||
|
||||
#create a b-spline curve using parametric definition of the basic points
|
||||
param_interpol = geompy.MakeCurveParametric("t", "sin(t)", "cos(t)", 0., 100., 5., geompy.GEOM.Interpolation)
|
||||
|
||||
|
||||
|
||||
# add objects in the study
|
||||
id_p0 = geompy.addToStudy(p0, "Point1")
|
||||
id_p1 = geompy.addToStudy(p1, "Point2")
|
||||
@ -238,6 +249,11 @@ id_p4 = geompy.addToStudy(p4, "Point5")
|
||||
id_polyline = geompy.addToStudy(polyline, "Polyline")
|
||||
id_bezier = geompy.addToStudy(bezier, "Bezier")
|
||||
id_interpol = geompy.addToStudy(interpol, "Interpol")
|
||||
id_param_polyline = geompy.addToStudy(param_polyline, "Polyline Parametric")
|
||||
id_param_bezier = geompy.addToStudy(param_bezier, "Bezier Parametric")
|
||||
id_param_interpol = geompy.addToStudy(param_interpol, "Interpol Parametric")
|
||||
|
||||
|
||||
|
||||
# display the points and the curves
|
||||
gg.createAndDisplayGO(id_p0)
|
||||
@ -248,6 +264,10 @@ gg.createAndDisplayGO(id_p4)
|
||||
gg.createAndDisplayGO(id_polyline)
|
||||
gg.createAndDisplayGO(id_bezier)
|
||||
gg.createAndDisplayGO(id_interpol)
|
||||
gg.createAndDisplayGO(id_param_polyline)
|
||||
gg.createAndDisplayGO(id_param_bezier)
|
||||
gg.createAndDisplayGO(id_param_interpol)
|
||||
|
||||
\endcode
|
||||
|
||||
\anchor tui_creation_vector
|
||||
|
||||
@ -289,6 +289,40 @@ gg.createAndDisplayGO(id_glue)
|
||||
gg.setDisplayMode(id_glue,1)
|
||||
\endcode
|
||||
|
||||
\anchor tui_glue_edges
|
||||
<br><h2>Glue Edges</h2>
|
||||
|
||||
\code
|
||||
import geompy
|
||||
import salome
|
||||
gg = salome.ImportComponentGUI("GEOM")
|
||||
|
||||
# create boxes
|
||||
box1 = geompy.MakeBox(0,0,0,100,50,100)
|
||||
box2 = geompy.MakeBox(100,0,0,250,50,100)
|
||||
|
||||
# make compound
|
||||
compound = geompy.MakeCompound([box1, box2])
|
||||
|
||||
# glue all compound's edges
|
||||
tolerance = 1e-5
|
||||
glue1 = geompy.MakeGlueEdges(compound, tolerance)
|
||||
|
||||
# glue some compound's edges
|
||||
list_edges = geompy.GetGlueEdges(compound, tolerance)
|
||||
glue2 = geompy.MakeGlueEdgesByList(compound, tolerance, [list_edges[0], list_edges[2]])
|
||||
|
||||
# add objects in study
|
||||
geompy.addToStudy(box1, "Box1")
|
||||
geompy.addToStudy(box2, "Box2")
|
||||
geompy.addToStudy(compound, "Compound")
|
||||
geompy.addToStudy(glue1, "Glue all edges")
|
||||
geompy.addToStudy(glue2, "Glue two edges")
|
||||
|
||||
if salome.sg.hasDesktop():
|
||||
salome.sg.updateObjBrowser(1)
|
||||
\endcode
|
||||
|
||||
\anchor tui_limit_tolerance
|
||||
<br><h2>Limit Tolerance</h2>
|
||||
|
||||
|
||||
@ -246,6 +246,41 @@ gg.setDisplayMode(id_box,1)
|
||||
gg.createAndDisplayGO(id_offset)
|
||||
\endcode
|
||||
|
||||
\anchor tui_projection
|
||||
<br><h2>Projection</h2>
|
||||
|
||||
\code
|
||||
import geompy
|
||||
import salome
|
||||
|
||||
# create a cylindric face and a curve(edge)
|
||||
cylinder = geompy.MakeCylinderRH(100, 300)
|
||||
[face_cyl] = geompy.SubShapes(cylinder, [3])
|
||||
|
||||
p1 = geompy.MakeVertex(200, 0, 100)
|
||||
p2 = geompy.MakeVertex(200, 80, 100)
|
||||
p3 = geompy.MakeVertex(200, 80, 180)
|
||||
p4 = geompy.MakeVertex(130, 80, 180)
|
||||
p5 = geompy.MakeVertex(90, 80, 240)
|
||||
|
||||
curve = geompy.MakeInterpol([p1, p2, p3, p4, p5], False, False)
|
||||
|
||||
# create a new object as projection of the
|
||||
# given curve on the given cylindric face
|
||||
projection = geompy.MakeProjection(curve, face_cyl)
|
||||
|
||||
# add objects in the study
|
||||
geompy.addToStudy(cylinder, "cylinder")
|
||||
geompy.addToStudyInFather(cylinder, face_cyl, "face_cyl")
|
||||
geompy.addToStudy(p1, "p1")
|
||||
geompy.addToStudy(p2, "p2")
|
||||
geompy.addToStudy(p3, "p3")
|
||||
geompy.addToStudy(p4, "p4")
|
||||
geompy.addToStudy(p5, "p5")
|
||||
geompy.addToStudy(curve, "curve")
|
||||
geompy.addToStudy(projection, "projection")
|
||||
\endcode
|
||||
|
||||
\anchor tui_multi_translation
|
||||
<br><h2>Multi Translation</h2>
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
</div>
|
||||
<div class="footer1">
|
||||
<div style="text-align: center;">
|
||||
Copyright © 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE<br>
|
||||
Copyright © 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE<br>
|
||||
Copyright © 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS<br>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<div class="footer1">
|
||||
<!--hr style="width: 100%; height: 2px;"-->
|
||||
<div style="text-align: center;">
|
||||
Copyright © 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE<br>
|
||||
Copyright © 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE<br>
|
||||
Copyright © 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS<br>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
@ -135,6 +135,21 @@ module GEOM
|
||||
FOM_AutoCorrect
|
||||
};
|
||||
|
||||
/*!
|
||||
* Kind of the curves.
|
||||
* Used in the function GEOM_Gen.MakeCurveParametric()
|
||||
*/
|
||||
enum curve_type {
|
||||
/*! Polyline curve */
|
||||
Polyline,
|
||||
|
||||
/*! Bezier curve */
|
||||
Bezier,
|
||||
|
||||
/*! Interpolation, curve */
|
||||
Interpolation
|
||||
};
|
||||
|
||||
|
||||
typedef sequence<string> string_array;
|
||||
typedef sequence<short> short_array;
|
||||
@ -906,6 +921,14 @@ module GEOM
|
||||
*/
|
||||
GEOM_Object OffsetShapeCopy (in GEOM_Object theObject, in double theOffset);
|
||||
|
||||
/*!
|
||||
* Create new object as projection of the given one on a 2D surface.
|
||||
* \param theSource The source object for the projection. It can be a point, edge or wire.
|
||||
* \param theTarget The target object. It can be planar or cylindrical face.
|
||||
* \return New GEOM_Object, containing the projection.
|
||||
*/
|
||||
GEOM_Object ProjectShapeCopy (in GEOM_Object theSource, in GEOM_Object theTarget);
|
||||
|
||||
/*!
|
||||
* Scale the given object by the factor.
|
||||
* \param theObject The object to be scaled.
|
||||
@ -1486,10 +1509,42 @@ module GEOM
|
||||
* \param theTolerance Maximum distance between faces, which can be considered as coincident.
|
||||
* \param theFaces List of faces for gluing.
|
||||
* \param doKeepNonSolids If FALSE, only solids will present in the result, otherwise all initial shapes.
|
||||
* \param doGlueAllEdges If TRUE, all coincident edges of <VAR>theShape</VAR>
|
||||
* will be glued, otherwise only the edges,
|
||||
* belonging to <VAR>theFaces</VAR>.
|
||||
* \return New GEOM_Object, containing a copy of theShape without some faces.
|
||||
*/
|
||||
GEOM_Object MakeGlueFacesByList (in GEOM_Object theShape, in double theTolerance,
|
||||
in ListOfGO theFaces, in boolean doKeepNonSolids);
|
||||
in ListOfGO theFaces, in boolean doKeepNonSolids,
|
||||
in boolean doGlueAllEdges);
|
||||
|
||||
/*!
|
||||
* Replace coincident edges in theShape by one edge.
|
||||
* \param theShape Initial shape.
|
||||
* \param theTolerance Maximum distance between edges, which can be considered as coincident.
|
||||
* \return New GEOM_Object, containing a copy of theShape without coincident edges.
|
||||
*/
|
||||
GEOM_Object MakeGlueEdges (in GEOM_Object theShape, in double theTolerance);
|
||||
|
||||
/*!
|
||||
* Find coincident edges in theShape for possible gluing.
|
||||
* \param theShape Initial shape.
|
||||
* \param theTolerance Maximum distance between edges, which can be considered as coincident.
|
||||
* \return ListOfGO
|
||||
*/
|
||||
ListOfGO GetGlueEdges (in GEOM_Object theShape, in double theTolerance);
|
||||
|
||||
/*!
|
||||
* Replace coincident edges in theShape by one edge
|
||||
* in compliance with given list of edges
|
||||
* \param theShape Initial shape.
|
||||
* \param theTolerance Maximum distance between edges, which can be considered as coincident.
|
||||
* \param theFaces List of edges for gluing.
|
||||
* \return New GEOM_Object, containing a copy of theShape without some edges.
|
||||
*/
|
||||
GEOM_Object MakeGlueEdgesByList (in GEOM_Object theShape,
|
||||
in double theTolerance,
|
||||
in ListOfGO theEdges);
|
||||
|
||||
/*!
|
||||
* Get all sub-shapes and groups of \a theShape,
|
||||
@ -1558,12 +1613,26 @@ module GEOM
|
||||
|
||||
/*!
|
||||
* Get a sub shape defined by its unique ID inside \a theMainShape
|
||||
* \param theMainShape Main shape.
|
||||
* \param theID Unique ID of sub shape inside \a theMainShape.
|
||||
* \return GEOM_Object, corresponding to found sub shape.
|
||||
* \note The sub shape GEOM_Objects can has ONLY ONE function.
|
||||
* Don't try to apply modification operations on them.
|
||||
* Don't try to apply modification operations (without copy) on them.
|
||||
*/
|
||||
GEOM_Object GetSubShape (in GEOM_Object theMainShape,
|
||||
in long theID);
|
||||
|
||||
/*!
|
||||
* Get a set of sub shapes defined by their unique IDs inside \a theMainShape
|
||||
* \param theMainShape Main shape.
|
||||
* \param theIndices List of unique IDs of sub shapes inside \a theMainShape.
|
||||
* \return List of GEOM_Objects, corresponding to found sub shapes.
|
||||
* \note The sub shape GEOM_Objects can has ONLY ONE function.
|
||||
* Don't try to apply modification operations (without copy) on them.
|
||||
*/
|
||||
ListOfGO MakeSubShapes (in GEOM_Object theMainShape,
|
||||
in ListOfLong theIndices);
|
||||
|
||||
/*!
|
||||
* Get global index of \a theSubShape in \a theMainShape.
|
||||
* \param theMainShape Main shape.
|
||||
@ -2541,6 +2610,25 @@ module GEOM
|
||||
in boolean theIsClosed,
|
||||
in boolean theDoReordering);
|
||||
|
||||
/*!
|
||||
* Creates a curve using the parametric definition of the basic points.
|
||||
* \param thexExpr parametric equation of the coordinates X.
|
||||
* \param theyExpr parametric equation of the coordinates Y.
|
||||
* \param thezExpr parametric equation of the coordinates Z.
|
||||
* \param theParamMin the minimal value of the parameter.
|
||||
* \param theParamMax the maximum value of the parameter.
|
||||
* \param theParamStep the step of the parameter.
|
||||
* \param theCurveType the type of the curve.
|
||||
* \return New GEOM_Object, containing the created curve.
|
||||
*/
|
||||
GEOM_Object MakeCurveParametric(in string thexExpr,
|
||||
in string theyExpr,
|
||||
in string thezExpr,
|
||||
in double theParamMin,
|
||||
in double theParamMax,
|
||||
in double theParamStep,
|
||||
in curve_type theCurveType);
|
||||
|
||||
/*!
|
||||
* Create a sketcher (wire or face), following the textual description,
|
||||
* passed through \a theCommand argument. \n
|
||||
@ -3625,7 +3713,7 @@ module GEOM
|
||||
|
||||
/*!
|
||||
* Add a sub shape defined by indices in \a theIndices
|
||||
* (contains unique IDs of sub shapes inside theMainShape)
|
||||
* (contains unique IDs of sub shapes inside \a theMainShape)
|
||||
* \note The sub shape GEOM_Objects can has ONLY ONE function.
|
||||
* Don't try to apply modification operations on them.
|
||||
* \note Internal method
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
@ -392,7 +392,8 @@ module GEOM
|
||||
GEOM_Object MakeGlueFacesByList (in GEOM_Object theShape,
|
||||
in double theTolerance,
|
||||
in ListOfGO theFaces,
|
||||
in boolean doKeepNonSolids);
|
||||
in boolean doKeepNonSolids,
|
||||
in boolean doGlueAllEdges);
|
||||
GEOM_List MakeExplode (in GEOM_Object theShape,
|
||||
in long theShapeType,
|
||||
in boolean isSorted) ;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<?xml version='1.0' encoding='us-ascii' ?>
|
||||
<!--
|
||||
Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
|
||||
Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version='1.0' encoding='us-ascii'?>
|
||||
<!DOCTYPE application PUBLIC "" "desktop.dtd">
|
||||
<!--
|
||||
Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
|
||||
Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version='1.0' encoding='us-ascii'?>
|
||||
<!DOCTYPE application PUBLIC "" "desktop.dtd">
|
||||
<!--
|
||||
Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
|
||||
Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
@ -112,6 +112,7 @@ multitranslationdouble.png \
|
||||
multitranslationsimple.png \
|
||||
normale.png \
|
||||
offset.png \
|
||||
projection.png \
|
||||
origin_and_vectors.png \
|
||||
partition.png \
|
||||
partitionkeep.png \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<!--
|
||||
Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
|
||||
Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
BIN
resources/projection.png
Normal file
BIN
resources/projection.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 792 B |
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
@ -18,12 +18,14 @@
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
//
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
// GEOM GEOMGUI : GUI for Geometry component
|
||||
// File : BasicGUI_CurveDlg.cxx
|
||||
// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
|
||||
|
||||
#include "BasicGUI_CurveDlg.h"
|
||||
#include "BasicGUI_ParamCurveWidget.h"
|
||||
|
||||
#include <DlgRef.h>
|
||||
#include <GeometryGUI.h>
|
||||
@ -69,6 +71,20 @@ BasicGUI_CurveDlg::BasicGUI_CurveDlg( GeometryGUI* theGeometryGUI, QWidget* pare
|
||||
mainFrame()->RadioButton2->setIcon( image3 );
|
||||
mainFrame()->RadioButton3->setIcon( image2 );
|
||||
|
||||
QGroupBox* creationModeCroup = new QGroupBox(this);
|
||||
QButtonGroup* bg = new QButtonGroup(this);
|
||||
|
||||
creationModeCroup->setTitle( tr( "GEOM_CURVE_CRMODE" ) );
|
||||
QHBoxLayout * creationModeLayout = new QHBoxLayout(creationModeCroup);
|
||||
myBySelectionBtn = new QRadioButton( tr( "GEOM_CURVE_SELECTION" ) ,creationModeCroup );
|
||||
myAnaliticalBtn = new QRadioButton( tr( "GEOM_CURVE_ANALITICAL" ) ,creationModeCroup );
|
||||
|
||||
bg->addButton(myBySelectionBtn);
|
||||
bg->addButton(myAnaliticalBtn);
|
||||
|
||||
creationModeLayout->addWidget(myBySelectionBtn);
|
||||
creationModeLayout->addWidget(myAnaliticalBtn);
|
||||
|
||||
GroupPoints = new DlgRef_1Sel3Check( centralWidget() );
|
||||
|
||||
GroupPoints->GroupBox1->setTitle( tr( "GEOM_NODES" ) );
|
||||
@ -88,9 +104,13 @@ BasicGUI_CurveDlg::BasicGUI_CurveDlg( GeometryGUI* theGeometryGUI, QWidget* pare
|
||||
|
||||
GroupPoints->CheckButton3->hide();
|
||||
|
||||
myParams = new BasicGUI_ParamCurveWidget( centralWidget() );
|
||||
|
||||
QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
|
||||
layout->setMargin( 0 ); layout->setSpacing( 6 );
|
||||
layout->addWidget( creationModeCroup );
|
||||
layout->addWidget( GroupPoints );
|
||||
layout->addWidget( myParams );
|
||||
/***************************************************************/
|
||||
|
||||
setHelpFileName( "create_curve_page.html" );
|
||||
@ -123,6 +143,26 @@ void BasicGUI_CurveDlg::Init()
|
||||
localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
|
||||
|
||||
showOnlyPreviewControl();
|
||||
myBySelectionBtn->setChecked(true);
|
||||
|
||||
/* Get setting of step value from file configuration */
|
||||
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
|
||||
double step = resMgr ? resMgr->doubleValue( "Geometry", "SettingsGeomStep", 10. ) : 10.;
|
||||
|
||||
double aMax( 100. ), aMin( 0.0 );
|
||||
|
||||
/* min, max, step and decimals for spin boxes & initial values */
|
||||
initSpinBox( myParams->myPMin, COORD_MIN, COORD_MAX, step, "length_precision" );
|
||||
initSpinBox( myParams->myPMax, COORD_MIN, COORD_MAX, step, "length_precision" );
|
||||
initSpinBox( myParams->myPStep, COORD_MIN, COORD_MAX, step, "length_precision" );
|
||||
myParams->myPMin->setValue( aMin );
|
||||
myParams->myPMax->setValue( aMax );
|
||||
myParams->myPStep->setValue( step );
|
||||
myParams->myXExpr->setText("t");
|
||||
myParams->myYExpr->setText("t");
|
||||
myParams->myZExpr->setText("t");
|
||||
|
||||
myParams->hide();
|
||||
|
||||
/* signals and slots connections */
|
||||
connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog( ) ) );
|
||||
@ -141,6 +181,17 @@ void BasicGUI_CurveDlg::Init()
|
||||
connect( myGeomGUI->getApp()->selectionMgr(),
|
||||
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
|
||||
|
||||
connect( myBySelectionBtn, SIGNAL( clicked() ), this, SLOT( CreationModeChanged() ) );
|
||||
connect( myAnaliticalBtn, SIGNAL( clicked() ), this, SLOT( CreationModeChanged() ) );
|
||||
|
||||
connect(myParams->myPMin, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
|
||||
connect(myParams->myPMax, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
|
||||
connect(myParams->myPStep, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
|
||||
|
||||
connect(myParams->myXExpr, SIGNAL(editingFinished()), this, SLOT(OnEditingFinished()));
|
||||
connect(myParams->myYExpr, SIGNAL(editingFinished()), this, SLOT(OnEditingFinished()));
|
||||
connect(myParams->myZExpr, SIGNAL(editingFinished()), this, SLOT(OnEditingFinished()));
|
||||
|
||||
initName( tr( "GEOM_CURVE" ) );
|
||||
resize(100,100);
|
||||
ConstructorsClicked( 0 );
|
||||
@ -321,7 +372,17 @@ GEOM::GEOM_IOperations_ptr BasicGUI_CurveDlg::createOperation()
|
||||
//=================================================================================
|
||||
bool BasicGUI_CurveDlg::isValid( QString& msg )
|
||||
{
|
||||
if( myBySelectionBtn->isChecked() )
|
||||
return myPoints.count() > 1;
|
||||
else {
|
||||
bool ok = myParams->myPMin->isValid( msg, !IsPreview() ) &&
|
||||
myParams->myPMax->isValid( msg, !IsPreview() ) &&
|
||||
myParams->myPStep->isValid( msg, !IsPreview() );
|
||||
ok &= !myParams->myXExpr->text().isEmpty();
|
||||
ok &= !myParams->myYExpr->text().isEmpty();
|
||||
ok &= !myParams->myZExpr->text().isEmpty();
|
||||
return ok;
|
||||
}
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
@ -343,22 +404,58 @@ bool BasicGUI_CurveDlg::execute( ObjectList& objects )
|
||||
|
||||
switch ( getConstructorId() ) {
|
||||
case 0 :
|
||||
if( myBySelectionBtn->isChecked() )
|
||||
anObj = anOper->MakePolyline( points.in(), GroupPoints->CheckButton1->isChecked() );
|
||||
else
|
||||
anObj = anOper->MakeCurveParametric(qPrintable(myParams->myXExpr->text()),
|
||||
qPrintable(myParams->myYExpr->text()),
|
||||
qPrintable(myParams->myZExpr->text()),
|
||||
myParams->myPMin->value(),
|
||||
myParams->myPMax->value(),
|
||||
myParams->myPStep->value(),
|
||||
GEOM::Polyline);
|
||||
res = true;
|
||||
break;
|
||||
case 1 :
|
||||
if( myBySelectionBtn->isChecked() )
|
||||
anObj = anOper->MakeSplineBezier( points.in(), GroupPoints->CheckButton1->isChecked() );
|
||||
else
|
||||
anObj = anOper->MakeCurveParametric(qPrintable(myParams->myXExpr->text()),
|
||||
qPrintable(myParams->myYExpr->text()),
|
||||
qPrintable(myParams->myZExpr->text()),
|
||||
myParams->myPMin->value(),
|
||||
myParams->myPMax->value(),
|
||||
myParams->myPStep->value(),
|
||||
GEOM::Bezier);
|
||||
|
||||
res = true;
|
||||
break;
|
||||
case 2 :
|
||||
if( myBySelectionBtn->isChecked() )
|
||||
anObj = anOper->MakeSplineInterpolation( points.in(), GroupPoints->CheckButton1->isChecked(),
|
||||
GroupPoints->CheckButton2->isChecked() );
|
||||
else
|
||||
anObj = anOper->MakeCurveParametric(qPrintable(myParams->myXExpr->text()),
|
||||
qPrintable(myParams->myYExpr->text()),
|
||||
qPrintable(myParams->myZExpr->text()),
|
||||
myParams->myPMin->value(),
|
||||
myParams->myPMax->value(),
|
||||
myParams->myPStep->value(),
|
||||
GEOM::Interpolation);
|
||||
res = true;
|
||||
break;
|
||||
}
|
||||
|
||||
if ( !anObj->_is_nil() )
|
||||
if ( !anObj->_is_nil() ) {
|
||||
if(myAnaliticalBtn->isChecked() && !IsPreview()) {
|
||||
QStringList aParameters;
|
||||
aParameters<<myParams->myPMin->text();
|
||||
aParameters<<myParams->myPMax->text();
|
||||
aParameters<<myParams->myPStep->text();
|
||||
anObj->SetParameters(aParameters.join(":").toLatin1().constData());
|
||||
}
|
||||
objects.push_back( anObj._retn() );
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
@ -372,3 +469,32 @@ void BasicGUI_CurveDlg::addSubshapesToStudy()
|
||||
for ( int i = 0; i < myPoints.count(); i++ )
|
||||
GEOMBase::PublishSubObject( myPoints[i].get() );
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
// function : CreationModeChanged
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
void BasicGUI_CurveDlg::CreationModeChanged() {
|
||||
const QObject* s = sender();
|
||||
GroupPoints->setVisible(myBySelectionBtn == s);
|
||||
myParams->setVisible(myBySelectionBtn != s);
|
||||
|
||||
ConstructorsClicked( getConstructorId() );
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
// function : ValueChangedInSpinBox()
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
void BasicGUI_CurveDlg::ValueChangedInSpinBox(double/*theValue*/)
|
||||
{
|
||||
processPreview();
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
// function : ValueChangedInSpinBox()
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
void BasicGUI_CurveDlg::OnEditingFinished() {
|
||||
processPreview();
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
@ -18,6 +18,7 @@
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
//
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
// GEOM GEOMGUI : GUI for Geometry component
|
||||
// File : BasicGUI_CurveDlg.h
|
||||
@ -32,6 +33,8 @@
|
||||
#include <list>
|
||||
|
||||
class DlgRef_1Sel3Check;
|
||||
class QRadioButton;
|
||||
class BasicGUI_ParamCurveWidget;
|
||||
|
||||
//=================================================================================
|
||||
// class : BasicGUI_CurveDlg
|
||||
@ -59,6 +62,9 @@ private:
|
||||
private:
|
||||
DlgRef_1Sel3Check* GroupPoints;
|
||||
QList<GEOM::GeomObjPtr> myPoints;
|
||||
QRadioButton* myAnaliticalBtn;
|
||||
QRadioButton* myBySelectionBtn;
|
||||
BasicGUI_ParamCurveWidget* myParams;
|
||||
|
||||
private slots:
|
||||
void ClickOnOk();
|
||||
@ -71,6 +77,9 @@ private slots:
|
||||
void CheckButtonToggled();
|
||||
void SelectionIntoArgument();
|
||||
void SetEditCurrentArgument();
|
||||
void CreationModeChanged();
|
||||
void ValueChangedInSpinBox(double/*theValue*/);
|
||||
void OnEditingFinished();
|
||||
};
|
||||
|
||||
#endif // BASICGUI_CURVEDLG_H
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
98
src/BasicGUI/BasicGUI_ParamCurveWidget.cxx
Normal file
98
src/BasicGUI/BasicGUI_ParamCurveWidget.cxx
Normal file
@ -0,0 +1,98 @@
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
// GEOM GEOMGUI : GUI for Geometry component
|
||||
// File : BasicGUI_ParamCurveWidget.h
|
||||
// Author : Roman NIKOLAEV (roman.nikolaev@opencascade.com)
|
||||
|
||||
#include "BasicGUI_ParamCurveWidget.h"
|
||||
|
||||
#include <QLabel>
|
||||
#include <QLineEdit>
|
||||
#include <QGridLayout>
|
||||
#include <QGroupBox>
|
||||
|
||||
#include <SalomeApp_DoubleSpinBox.h>
|
||||
|
||||
|
||||
BasicGUI_ParamCurveWidget::BasicGUI_ParamCurveWidget(QWidget* parent):
|
||||
QWidget(parent) {
|
||||
|
||||
QGridLayout* l = new QGridLayout( this );
|
||||
l->setSpacing( 0 );
|
||||
l->setMargin( 0 );
|
||||
|
||||
QGroupBox* groupBox = new QGroupBox( tr("GEOM_PCURVE_TITLE"), this );
|
||||
|
||||
QGridLayout* gridLayout = new QGridLayout( groupBox );
|
||||
gridLayout->setSpacing( 6 );
|
||||
gridLayout->setMargin( 11 );
|
||||
|
||||
//X Equation
|
||||
QLabel* textLabel1 = new QLabel( tr("GEOM_PCURVE_X"), groupBox );
|
||||
myXExpr = new QLineEdit( groupBox );
|
||||
|
||||
//Y Equation
|
||||
QLabel* textLabel2 = new QLabel(tr("GEOM_PCURVE_Y"), groupBox);
|
||||
myYExpr = new QLineEdit( groupBox );
|
||||
|
||||
//Z Equation
|
||||
QLabel* textLabel3 = new QLabel( tr("GEOM_PCURVE_Z"), groupBox );
|
||||
myZExpr = new QLineEdit( groupBox );
|
||||
|
||||
// Min and Max
|
||||
QLabel* textLabel4 = new QLabel( tr("GEOM_PCURVE_MIN"), groupBox );
|
||||
myPMin = new SalomeApp_DoubleSpinBox( groupBox );
|
||||
|
||||
// Min and Max
|
||||
QLabel* textLabel5 = new QLabel( tr("GEOM_PCURVE_MAX"), groupBox );
|
||||
myPMax = new SalomeApp_DoubleSpinBox( groupBox );
|
||||
|
||||
// Step
|
||||
QLabel* textLabel6 = new QLabel( tr("GEOM_PCURVE_STEP"), groupBox );
|
||||
myPStep = new SalomeApp_DoubleSpinBox( groupBox );
|
||||
|
||||
//Layout
|
||||
gridLayout->addWidget(textLabel1, 0, 0, 1, 1);
|
||||
gridLayout->addWidget(myXExpr, 0, 1, 1, 1);
|
||||
|
||||
gridLayout->addWidget(textLabel2, 1, 0, 1, 1);
|
||||
gridLayout->addWidget(myYExpr, 1, 1, 1, 1);
|
||||
|
||||
gridLayout->addWidget(textLabel3, 2, 0, 1, 1);
|
||||
gridLayout->addWidget(myZExpr, 2, 1, 1, 1);
|
||||
|
||||
gridLayout->addWidget(textLabel4, 3, 0, 1, 1);
|
||||
gridLayout->addWidget(myPMin, 3, 1, 1, 1);
|
||||
|
||||
gridLayout->addWidget(textLabel5, 4, 0, 1, 1);
|
||||
gridLayout->addWidget(myPMax, 4, 1, 1, 1);
|
||||
|
||||
gridLayout->addWidget(textLabel6, 5, 0, 1, 1);
|
||||
gridLayout->addWidget(myPStep, 5, 1, 1, 1);
|
||||
|
||||
l->addWidget(groupBox, 0, 0, 1, 1);
|
||||
}
|
||||
|
||||
|
||||
BasicGUI_ParamCurveWidget::~BasicGUI_ParamCurveWidget(){
|
||||
}
|
||||
52
src/BasicGUI/BasicGUI_ParamCurveWidget.h
Normal file
52
src/BasicGUI/BasicGUI_ParamCurveWidget.h
Normal file
@ -0,0 +1,52 @@
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
// GEOM GEOMGUI : GUI for Geometry component
|
||||
// File : BasicGUI_ParamCurveWidget.h
|
||||
// Author : Roman NIKOLAEV (roman.nikolaev@opencascade.com)
|
||||
|
||||
#ifndef BASICGUI_PARAM_CURVE_WIDGET_H
|
||||
#define BASICGUI_PARAM_CURVE_WIDGET_H
|
||||
#include <QWidget>
|
||||
|
||||
class QLineEdit;
|
||||
class SalomeApp_DoubleSpinBox;
|
||||
|
||||
class BasicGUI_ParamCurveWidget: public QWidget {
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
BasicGUI_ParamCurveWidget(QWidget * parent = 0);
|
||||
~BasicGUI_ParamCurveWidget();
|
||||
|
||||
public:
|
||||
QLineEdit* myXExpr;
|
||||
QLineEdit* myYExpr;
|
||||
QLineEdit* myZExpr;
|
||||
|
||||
SalomeApp_DoubleSpinBox* myPMin;
|
||||
SalomeApp_DoubleSpinBox* myPMax;
|
||||
SalomeApp_DoubleSpinBox* myPStep;
|
||||
|
||||
};
|
||||
|
||||
#endif //BASICGUI_PARAM_CURVE_WIDGET_H
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
@ -18,6 +18,7 @@
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
//
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
// GEOM GEOMGUI : GUI for Geometry component
|
||||
// File : BasicGUI_PointDlg.cxx
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
@ -18,6 +18,7 @@
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
//
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
// GEOM GEOMGUI : GUI for Geometry component
|
||||
// File : BasicGUI_PointDlg.h
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
@ -36,7 +36,8 @@ salomeinclude_HEADERS = \
|
||||
BasicGUI_MarkerDlg.h \
|
||||
BasicGUI_PlaneDlg.h \
|
||||
BasicGUI_PointDlg.h \
|
||||
BasicGUI_VectorDlg.h
|
||||
BasicGUI_VectorDlg.h \
|
||||
BasicGUI_ParamCurveWidget.h
|
||||
#
|
||||
# OBSOLETE: BasicGUI_WorkingPlaneDlg.h
|
||||
#
|
||||
@ -56,7 +57,8 @@ dist_libBasicGUI_la_SOURCES = \
|
||||
BasicGUI_VectorDlg.cxx \
|
||||
BasicGUI_PlaneDlg.cxx \
|
||||
BasicGUI_CurveDlg.cxx \
|
||||
BasicGUI_MarkerDlg.cxx
|
||||
BasicGUI_MarkerDlg.cxx \
|
||||
BasicGUI_ParamCurveWidget.cxx
|
||||
#
|
||||
# OBSOLETE: BasicGUI_WorkingPlaneDlg.cxx
|
||||
#
|
||||
@ -70,7 +72,8 @@ MOC_FILES = \
|
||||
BasicGUI_VectorDlg_moc.cxx \
|
||||
BasicGUI_PlaneDlg_moc.cxx \
|
||||
BasicGUI_CurveDlg_moc.cxx \
|
||||
BasicGUI_MarkerDlg_moc.cxx
|
||||
BasicGUI_MarkerDlg_moc.cxx \
|
||||
BasicGUI_ParamCurveWidget_moc.cxx
|
||||
#
|
||||
# OBSOLETE: BasicGUI_WorkingPlaneDlg_moc.cxx
|
||||
#
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||
//
|
||||
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user