diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h index 6b5396199efd0095cb1efa4b4afacc67b1673b5c..92cd79977e152b53a5e810c20f415e6cea80ebd0 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 9be34fbfdb277c73a7e35fda583a082868ba0b9b..77c07b6bb3d9a8c7cf95be6d1f9d8d6f9c5de9bd 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 5a0379dd78bb004e8750fad39ed18532995316c0..2a5fa0f138bb354266ce86a0977a4fcd0e5d814c 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 f04a99c77dbdbe490ae78e0051b633a386fd8d63..496a66ff76b3f5cd37942b36753f67f10c105bf2 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)