From 8048622048a1cb1a725aec69fd5e50b84599cb68 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 13 Apr 2015 20:29:40 +0000
Subject: [PATCH]
---
Common/DefaultOptions.h | 4 ++--
Geo/GModelIO_OCC.cpp | 2 +-
doc/texinfo/opt_geometry.texi | 5 +++++
doc/texinfo/opt_plugin.texi | 12 ++++++------
4 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 6b5396199e..92cd79977e 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -826,8 +826,8 @@ StringXNumber GeometryOptions_Number[] = {
"Sew faces in STEP, IGES and BRep models" },
{ F|O, "OCCConnectFaces" , opt_geometry_occ_connect_faces , 0. ,
"Cut and connect faces in STEP, IGES and BRep models (0=no, 1=internal, 2=Salome)" },
- { F|O, "OCCScaling" , opt_geometry_occ_scaling , -1. ,
- "Scale STEP, IGES and BRep model by given factor (if > 0)" },
+ { F|O, "OCCScaling" , opt_geometry_occ_scaling , 1. ,
+ "Scale STEP, IGES and BRep model by given factor" },
{ F, "OffsetX" , opt_geometry_offset0 , 0. ,
"Model display offset along X-axis (in model coordinates)" },
{ F, "OffsetY" , opt_geometry_offset1 , 0. ,
diff --git a/Geo/GModelIO_OCC.cpp b/Geo/GModelIO_OCC.cpp
index 9be34fbfdb..77c07b6bb3 100644
--- a/Geo/GModelIO_OCC.cpp
+++ b/Geo/GModelIO_OCC.cpp
@@ -246,7 +246,7 @@ void OCC_Internals::healGeometry(double tolerance, bool fixdegenerated,
bool sewfaces, bool makesolids, int connect,
double scaling)
{
- if(scaling > 0.){
+ if(scaling != 1.0){
Msg::Info("Scaling geometry by factor %g", scaling);
gp_Trsf t;
t.SetScaleFactor(scaling);
diff --git a/doc/texinfo/opt_geometry.texi b/doc/texinfo/opt_geometry.texi
index 5a0379dd78..2a5fa0f138 100644
--- a/doc/texinfo/opt_geometry.texi
+++ b/doc/texinfo/opt_geometry.texi
@@ -129,6 +129,11 @@ Cut and connect faces in STEP, IGES and BRep models (0=no, 1=internal, 2=Salome)
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
+@item Geometry.OCCScaling
+Scale STEP, IGES and BRep model by given factor@*
+Default value: @code{1}@*
+Saved in: @code{General.OptionsFileName}
+
@item Geometry.OffsetX
Model display offset along X-axis (in model coordinates)@*
Default value: @code{0}@*
diff --git a/doc/texinfo/opt_plugin.texi b/doc/texinfo/opt_plugin.texi
index f04a99c77d..496a66ff76 100644
--- a/doc/texinfo/opt_plugin.texi
+++ b/doc/texinfo/opt_plugin.texi
@@ -584,7 +584,7 @@ Plugin(Integrate) integrates a scalar field over all the elements of the view `V
@*
If `View' < 0, the plugin is run on the current view.@*
@*
-If `OverTime' = 1 , the plugin integrates the scalar view over time instead of over space.@*
+If `OverTime' = i > -1 , the plugin integrates the scalar view over time instead of over space, starting at iteration i.If `Visible' = 1, the plugin only integrates overvisible entities.@*
@*
Plugin(Integrate) creates one new view.
Numeric options:
@@ -595,6 +595,8 @@ Default value: @code{-1}
Default value: @code{-1}
@item Dimension
Default value: @code{-1}
+@item Visible
+Default value: @code{1}
@end table
@item Plugin(Isosurface)
@@ -741,11 +743,7 @@ Default value: @code{2000}
@item Plugin(MinMax)
Plugin(MinMax) computes the min/max of a view.@*
@*
-If `View' < 0, the plugin is run on the current view.@*
-@*
-If `OverTime' = 1, calculates the min/max over space AND time@*
-@*
-If `Argument' = 1, calculates the min/max AND the argmin/argmax@*
+If `View' < 0, the plugin is run on the current view. If `OverTime' = 1, the plugin calculates the min/max over space and time. If `Argument' = 1, the plugin calculates the min/max and the argmin/argmax. If `Visible' = 1, the plugin is only applied to visible entities.@*
@*
Plugin(MinMax) creates two new views.
Numeric options:
@@ -756,6 +754,8 @@ Default value: @code{-1}
Default value: @code{0}
@item Argument
Default value: @code{0}
+@item Visible
+Default value: @code{1}
@end table
@item Plugin(ModifyComponent)
--
GitLab