From bd1de0f164df898942af2a2847674191453b0d70 Mon Sep 17 00:00:00 2001 From: gzy Date: Tue, 25 Sep 2018 11:13:00 +0300 Subject: [PATCH] correction of introduction and primitives --- doc/gui/Introduction.rst | 112 +++++++++---------- src/FeaturesPlugin/doc/recoverFeature.rst | 1 - src/PrimitivesPlugin/doc/boxFeature.rst | 36 +++--- src/PrimitivesPlugin/doc/coneFeature.rst | 17 +-- src/PrimitivesPlugin/doc/cylinderFeature.rst | 23 ++-- src/PrimitivesPlugin/doc/sphereFeature.rst | 13 +-- src/PrimitivesPlugin/doc/torusFeature.rst | 15 +-- 7 files changed, 88 insertions(+), 129 deletions(-) diff --git a/doc/gui/Introduction.rst b/doc/gui/Introduction.rst index 0ed5cc2ab..00c3a2c31 100644 --- a/doc/gui/Introduction.rst +++ b/doc/gui/Introduction.rst @@ -8,18 +8,18 @@ Introduction to SHAPER SHAPER module of SALOME is destined for: - import and export of geometrical models in IGES, BREP, STEP and XAO formats; -- parametrical construction of geometrical objects using a wide range of functions; +- parametric construction of geometrical objects using a wide range of functions; - - creation of complex 2D sections using :ref:`sketchPlugin` with consequent extrusion or revolution :ref:`featuresPlugin`; - - construction of model using primitives defined in :ref:`primitivesPlugin`; - - usage of Boolean operations :ref:`featuresPlugin`; + - creation of complex 2D sections using :ref:`sketchPlugin` with consequent extrusion or revolution (see :ref:`featuresPlugin`); + - construction of model using primitives defined in :ref:`primitivesPlugin`; + - usage of Boolean operations (see :ref:`featuresPlugin`); - viewing geometrical objects in the OCC viewer; - transformation of geometrical objects using various algorithms. It is possible to easily set :ref:`parameter_usage` predefined to be used as arguments when objects are created. -SHAPER module preferences are described in the SHAPER :ref:`preferences` section of SALOME Help. +SHAPER module preferences are described in the :ref:`preferences` section of SALOME Help. Almost all SHAPER module functionalities are accessible via Python Interface. @@ -30,13 +30,13 @@ SHAPER module works with one study containing several documents: Only one document can be active. -New study contains only Partset with 7 default constructions which cannot be deleted: +New study contains only partset with 7 default constructions which cannot be deleted: -- one point **Origin** coincing with origin of coordinate system; +- one point **Origin** coinciding with origin of coordinate system; - three axes **OX**, **OY**, **OZ** coinciding with coordinate axes; - three planes **YOZ**, **XOZ**, **XOY** coinciding with coordinate planes. -Only points, axis and plane (see :ref:`constructionPlugin`) and sketches (see :ref:`sketchPlugin`) can be added in Partset to be used in any part later. +Only points, axis and planes (see :ref:`constructionPlugin`) and sketches (see :ref:`sketchPlugin`) can be added into Partset to be used in any part later. :ref:`parameter_usage` can be used both in Partset and any Part. @@ -104,7 +104,7 @@ SHAPER toolbar Application toolbar contains: - standard toolbar; -- modukles toolbar; +- modules toolbar; - SHAPER toolbar. .. image:: images/toolbar.png @@ -160,13 +160,13 @@ The Property Panel is shown on operation start at left dock area of the main win If Object Browser is shown at the same side then they will be tabbed. -Each dock window can be closed using **Cross** window button and opened again using a corresponding command from **View - Windows** :ref:`main_menu` or alternatively using pop-up menu. +Each dock window can be closed using **Cross** window button and opened again using a corresponding command from *View - Windows* :ref:`main_menu` or alternatively using pop-up menu. .. image:: images/popup_menu.png :align: center .. centered:: - Pop-up menu for visibilty of windows and toolbars + Pop-up menu for visibility of windows and toolbars .. _object_browser: @@ -210,11 +210,16 @@ New part contains only 3 empty branches: Features are placed one after another in the active document with default names and their results are placed into the corresponding branch. -Not defaullt branch is added into Tree View when the first feature of this type is created. +Example of default names assigned automatically for :ref:`box_feature` are: + +* **Box_1**, **Box_2**, ... to Feature; +* **Box_1_1**, **Box_2_1**, ... to Result. + +Not default branch is added into Tree View when the first feature of this type is created. -Note, that result used in feature as argument is removed from Tree View. +Note, that result used in feature as argument is removed. -This child result can be restored using Recover Feature. +This child result can be restored using **Recover** feature. Each feature, result, construction, group, field, parameter can be renamed using *Rename* pop-up menu command. @@ -236,7 +241,7 @@ Each feature, result, construction, group, field, parameter can be renamed using .. centered:: Construction pop-up menu -Order of featurs can be changed using *Move to the end* pop-up menu command. Selected feature will be moved to the end of feture list. +Order of features can be changed using *Move to the end* pop-up menu command. Selected feature will be moved to the end of feature list. Folders can be used to arrange long Tree View for features. @@ -270,9 +275,9 @@ Features can be removed from folder back using *Move out before the folder* / *M Feature together with its result can be deleted using *Delete* pop-up menu command. -Note that all features using removed feature and their results will be removed simulteneously. +Note that all features using removed feature and their results will be removed simultaneously. -**Delete feature** dialog box shows list of feature to be removed. After confirmation by click **Yes** button all these features are removed. +**Delete feature** dialog box shows list of features to be removed. After confirmation by click **Yes** button all these features are removed. .. image:: images/delete_feature.png @@ -286,38 +291,23 @@ Note that all features using removed feature and their results will be removed s Property panel ^^^^^^^^^^^^^^ -By default Property Panel is hidden. - -The Property Panel is shown on operation start at left side of the main window by default. - -If Object Browser is shown at the same side then it will be tabbed with Property Panel. - Property panel consists of two parts: - controls container for input of parameters for the current operation; - buttons panel containing standard buttons: - - - **Ok/Apply** executes operation with defined parameters, - - **Cancel/Close** calls **Abort operation** dialog box to confirm operation abort, - - **Help** calls User's guide opened on page describing the current operation. - -.. image:: images/button_ok.png - :align: center - -.. centered:: - **OK/Apply** button + + .. image:: images/button_ok.png + :align: left + **Ok/Apply** executes operation with defined parameters, -.. image:: images/button_cancel.png - :align: center -.. centered:: - **Cancel/Close** button - -.. image:: images/button_help.png - :align: center + .. image:: images/button_cancel.png + :align: left + **Cancel/Close** calls **Abort operation** dialog box to confirm operation abort, -.. centered:: - **Help** button + .. image:: images/button_help.png + :align: left + **Help** calls User's guide opened on page describing the current operation. .. image:: images/abort_operation.png :align: center @@ -326,6 +316,8 @@ Property panel consists of two parts: **Abort operation** dialog box +.. image:: images/button_ok.png + :align: left **OK/Apply** button is disabled if not all input parameters are defined or some errors are found. Error is shown as tooltip and in status bar. .. _inspection_panel: @@ -333,7 +325,7 @@ Property panel consists of two parts: Inspection panel ^^^^^^^^^^^^^^^^ -Inspection panel provides the list of types and quantities of all topological entities, composing the selected result, consruction or feature. +Inspection panel provides the list of types and quantities of all topological entities, composing the selected result, construction or feature. .. image:: images/inspection_panel.png :align: center @@ -341,7 +333,7 @@ Inspection panel provides the list of types and quantities of all topological en .. centered:: Inspection panel for default Box -**Object** displays name of the selected result, consruction or feature. +**Object** displays name of the selected result, construction or feature. **Type** characterizes the whole shape. @@ -356,14 +348,12 @@ The information about Point, Axis or Edge additionally shows coordinates of poi The information about Plane, Face additionally shows coordinates of center point and direction of normal. -.. image:: images/inspection_panel_line.png +.. image:: images/inspection_panel_face.png :align: center .. centered:: Inspection panel for Face - - .. _python console: Python console @@ -371,7 +361,7 @@ Python console Python console interpreters Python commands entered manually. -In particular, it is possble to load python script: +In particular, it is possible to load python script: *execfile(r"/dn48/newgeom/data/example.py")* @@ -415,8 +405,8 @@ Description of OCC 3D Viewer architecture and functionality is provided in GUI m .. _parameter_usage: -Parameter usage ---------------- +Parameters +---------- Model parametrization can be done using parameters. @@ -440,7 +430,7 @@ If parameter value is changed, then all features where it is used are rebuilt. Parameter name should be unique in the active document. -However, partset and part can have parameters with the same name. If parameter name in Partset and Part are identical, then Part parameter has higher prority and its value will be used in the features of this part. +However, partset and part can have parameters with the same name. If parameter name in Partset and Part are identical, then Part parameter has higher priority and its value will be used in the features of this part. In contrast to features (see :ref:`object_browser`), there is an additional option when Delete parameters. @@ -484,7 +474,7 @@ SHAPER preferences include 4 tabs: Visualization tab is activated by default when **Preferences** dialog box is opened in active SHAPER module. -Other tabs are activated by clck on tab header. +Other tabs are activated by click on tab header. .. _visualization_preferences: @@ -502,17 +492,17 @@ This tab defines presentation of objects displayed in OCC 3D viewer. **Input fields**: - **Result color** selects default shading color for objects from **Results** branch; -- **Group color** selects default color for objects from **Group** branch; +- **Group color** selects default color for objects from **Groups** branch; - **Construction color** selects default color for objects from **Constructions** branch; - **Part color** selects default color for parts shown in Partset; -- **Field color** selects default color for objects from **Field** branch; +- **Field color** selects default color for objects from **Fields** branch; - **Body deflection coefficient** defines default deflection coefficient for objects from **Results** branch. A smaller coefficient provides better quality of a shape in the viewer; -- **Construction deflection coefficient** defines default deflection coefficient for objects from **Construction** branch. A smaller coefficient provides better quality of a shape in the viewer; +- **Construction deflection coefficient** defines default deflection coefficient for objects from **Constructions** branch. A smaller coefficient provides better quality of a shape in the viewer; - **Reference shape wireframe color in operation** selects default color used for wireframe visualization of objects used in active operation; - **Result shape wireframe color in operation** selects default color used for wireframe visualization of result in active operation. Click **See preview** button to show result; -- **Multi selector item color in operation** selects default color used for wireframe visualization of objects selected in propertry panel to distiguish them among all objects used in active operation; -- **Color of removed feature in operation** selects default color used for visualization of sketch entities to be removed during Trim/Split operations; -- **Color of sketch plane** selects default shading color for objects from **Results** branch; +- **Multi selector item color in operation** selects default color used for visualization of objects selected in property panel to distinguish them among all objects used in active operation; +- **Color of removed feature in operation** selects default color used for visualization of sketch entities to be removed during **Trim/Split** operations; +- **Color of sketch plane** selects default shading color for sketch plane; - **Hidden faces transparency** defines default transparency value for hidden faces; - **Dimension arrow size** defines default size of arrows for extension line showing dimensional constraint; - **Dimension font** defines font used for value of dimensional constraint; @@ -523,9 +513,9 @@ This tab defines presentation of objects displayed in OCC 3D viewer. - **Sketch external entity color** selects default color for external objects selected as reference during sketch creation/edition; - **Sketch auxiliary entity color** selects default color for sketch auxiliary objects; - **Sketch overconsrtaint color** selects default color for sketch with redundant constraints; -- **Sketch fully consrtaint color** selects default color for sketch with zero degrees of freedom. +- **Sketch fully constraint color** selects default color for sketch with zero degrees of freedom. -To redefine any color click on the corrersponding line to acccsess **Select color** dialog box +To redefine any color click on the corresponding line to access **Select color** dialog box .. image:: images/select_color.png :align: center @@ -571,7 +561,7 @@ Plugins tab defines folders where plugins and resources are located. Sketch tab ^^^^^^^^^^ -Sketch tab defines properties of coordinate planes shown for selection of sketch plane when no convinient objects are shown in OCC 3D viewer. +Sketch tab defines properties of coordinate planes shown for selection of sketch plane when no convenient objects are shown in OCC 3D viewer. .. image:: images/sketch_preferences.png :align: center diff --git a/src/FeaturesPlugin/doc/recoverFeature.rst b/src/FeaturesPlugin/doc/recoverFeature.rst index 7a98e3f7a..8370449c0 100644 --- a/src/FeaturesPlugin/doc/recoverFeature.rst +++ b/src/FeaturesPlugin/doc/recoverFeature.rst @@ -1,4 +1,3 @@ - Recover ======= diff --git a/src/PrimitivesPlugin/doc/boxFeature.rst b/src/PrimitivesPlugin/doc/boxFeature.rst index c9326ca81..b1eb661dd 100644 --- a/src/PrimitivesPlugin/doc/boxFeature.rst +++ b/src/PrimitivesPlugin/doc/boxFeature.rst @@ -1,4 +1,4 @@ - +.. _box_feature: Box === @@ -20,50 +20,50 @@ There are 2 algorithms for creation of a Box: .. image:: images/box_2pt_32x32.png :align: left -**By dimensions** creates a box by dimensions along X, Y, Z axis. +**By dimensions** .. image:: images/box_dxyz_32x32.png :align: left -**By two points** creates a box by two points of the box diagnal. - +**By two points** By dimensions """"""""""""" +Box is created by dimensions along X, Y, Z axis starting from the origin. + .. image:: images/Box_dimensions.png :align: center -In this case it is necessary to specify **DX**, **DY**, **DZ** sizes of the box along corresponding coordinate axes. The box will be created starting from the origin. +Input fields: + +- **DX**, **DY**, **DZ** define sizes of the box along corresponding coordinate axes. **TUI Command**: *model.addBox(Part_doc, DX, DY, DZ)* -**Arguments**: 1 Part + 3 values (dimensions at origin). +**Arguments**: Part + 3 real values (dimensions at origin). By two points """"""""""""" +Box is created by two points of the box diagonal. + .. image:: images/Box_2points.png :align: center -In this case it is necessary to select **Point 1** and **Point 2** to define a diagonal points of the box. +Input fields: + +- **Point 1** and **Point 2** define diagonal points of the box selected in 3D OCC viewer or object browser. -**TUI Command**: *model.addBox(Part_doc, FirstPoint, SecondPoint)* +**TUI Command**: *model.addBox(Part_doc, point1, point2)* -**Arguments**: 1 Part + 2 selected points (opposite vertices of the box) +**Arguments**: Part + 2 selected points (opposite vertices of the box) Result """""" -The Result of operation will be a SOLID. The edges of the box will be parallel to the coordinate axes. - -Name is assigned automatically: - -* **Box_1**, **Box_2**, ... to Feature; -* **Box_1_1**, **Box_2_1**, ... to Result. - -Example is shown below. +The edges of the created boxes are parallel to the coordinate axes. .. image:: images/Boxes.png :align: center @@ -71,4 +71,4 @@ Example is shown below. .. centered:: Boxes created -**See Also** a sample TUI Script of a :ref:`tui_create_box` operation. +**See Also** a sample TUI Script of a :ref:`tui_create_box` operation. \ No newline at end of file diff --git a/src/PrimitivesPlugin/doc/coneFeature.rst b/src/PrimitivesPlugin/doc/coneFeature.rst index 47d33818d..6c8a272fa 100644 --- a/src/PrimitivesPlugin/doc/coneFeature.rst +++ b/src/PrimitivesPlugin/doc/coneFeature.rst @@ -23,10 +23,10 @@ The following property panel appears. .. centered:: Cone property panel -The description of input fields is given below: +Input fields: -- selected **Point** defines center of the cone base; -- selected **Vector** defines the axis of the cone; +- **Point** defines center of the cone base selected in 3D OCC viewer or object browser; +- **Vector** defines the axis of the cone selected in 3D OCC viewer or object browser; - Dimensions: - **Base Radius**; - **Top radius**; @@ -34,24 +34,15 @@ The description of input fields is given below: **TUI Command**: *model.addCone(Part_doc, Point, Axis, Radius1, Radius2, Height)* -**Arguments**: 1 Part + 1 vertex + 1 vector + 3 values (Dimensions: base and top radii, heght). +**Arguments**: Part + 1 vertex + 1 vector + 3 real values (base and top radii, heght). Result """""" -The Result of operation will be a SOLID. - If both radii are non-zero, then the cone will be truncated. If the radii are equal, the Cylinder will be created instead of cone. -Name is assigned automatically: - -* **Cone_1**, **Cone_2**, ... to Feature; -* **Cone_1_1**, **Cone_2_1**, ... to Result. - -Example is shown below. - .. image:: images/Cone_res.png :align: center diff --git a/src/PrimitivesPlugin/doc/cylinderFeature.rst b/src/PrimitivesPlugin/doc/cylinderFeature.rst index 131f3113f..d04badfb8 100644 --- a/src/PrimitivesPlugin/doc/cylinderFeature.rst +++ b/src/PrimitivesPlugin/doc/cylinderFeature.rst @@ -23,7 +23,7 @@ There are 2 algorithms for creation of a Cylinder: .. image:: images/cylinder_portion_32x32.png :align: left -**Portion of cylinder** creates a one segment of cylinder. +**Portion of cylinder** creates one segment of cylinder. Cylinder """""""" @@ -32,12 +32,12 @@ Cylinder :align: center .. centered:: - **Cylinder** + **Cylinder** property panel -The description of input fields for **Cylinder** tab is given below: +Input fields: -- selected **Point** defines center of the cylinder base; -- selected **Vector** defines the axis of the cylinder; +- **Point** defines center of the cylinder base selected in 3D OCC viewer or object browser; +- **Vector** defines the axis of the cylinder selected in 3D OCC viewer or object browser; - Dimensions: - **Radius**; - **Height**. @@ -46,7 +46,7 @@ The description of input fields for **Cylinder** tab is given below: * *model.addCylinder(Part_doc, Point, Axis, Radius, Height)* -**Arguments**: 1 Part + 1 vertex +1 vector + 2 values (dimensions: radius, height). +**Arguments**: Part + 1 vertex +1 vector + 2 real values (radius, height). Portion of cylinder """"""""""""""""""" @@ -55,7 +55,7 @@ Portion of cylinder :align: center .. centered:: - **Portion of cylinder** + **Portion of cylinder** property panel Input fields for ***Portion of cylinder** tab includes in addition **Angle** to create a portion of cylinder. @@ -63,18 +63,11 @@ Input fields for ***Portion of cylinder** tab includes in addition **Angle** to * *model.addCylinder(Part_doc, Point, Axis, Radius, Height,Angle)* -**Arguments**: 1 Part + 1 vertex +1 vector + 3 values (dimensions: radius, height and angle). +**Arguments**: 1 Part + 1 vertex +1 vector + 3 real values (radius, height and angle). Result """""" -The Result of operation will be a SOLID. - -Name is assigned automatically: - -* **Cylinder_1**, **Cylinder_2**, ... to Feature; -* **Cylinder_1_1**, **Cylinder_2_1**, ... to Result. - Example is shown below. .. image:: images/Cylinders.png diff --git a/src/PrimitivesPlugin/doc/sphereFeature.rst b/src/PrimitivesPlugin/doc/sphereFeature.rst index 12e418a4d..a89235d70 100644 --- a/src/PrimitivesPlugin/doc/sphereFeature.rst +++ b/src/PrimitivesPlugin/doc/sphereFeature.rst @@ -23,25 +23,18 @@ The following property panel appears. .. centered:: Sphere property panel -The description of input fields is given below: +Input fields: -- selected **Point** defines center of the sphere; +- **Point** defines center of the sphere selected in 3D OCC viewer or object browser; - **Radius** defines the radius. **TUI Command**: *model.addSphere(Part_doc, Point, Radius)*. -**Arguments**: 1 Part + 1 vertex +1 value (radius). +**Arguments**: Part + 1 vertex + 1 real value (radius). Result """""" -The Result of operation will be a SOLID. - -Name is assigned automatically: - -* **Sphere_1**, **Sphere_2**, ... to Feature; -* **Sphere_1_1**, **Sphere_2_1**, ... to Result. - Example is shown below. .. image:: images/Sphere_res.png diff --git a/src/PrimitivesPlugin/doc/torusFeature.rst b/src/PrimitivesPlugin/doc/torusFeature.rst index b739527d2..9d3e02242 100644 --- a/src/PrimitivesPlugin/doc/torusFeature.rst +++ b/src/PrimitivesPlugin/doc/torusFeature.rst @@ -23,28 +23,21 @@ The following property panel appears. .. centered:: Torus - The description of input fields is given below: +Input fields: -- selected **Point** defines center of the torus; -- selected **Vector** defines the axis of the torus; +- **Point** defines center of the torus base selected in 3D OCC viewer or object browser; +- **Vector** defines the axis of the torus selected in 3D OCC viewer or object browser; - Dimensions: - **Radius**; - **Ring radius**. **TUI Command**: *model.addTorus(Part_doc, Point, Axis, Radius1, Radius2)* -**Arguments**: 1 Part + 1 vertex + 1 vector + 2 values (Dimensions: first and second radii). +**Arguments**: Part + 1 vertex + 1 vector + 2 real values (first and second radii). Result """""" -The Result of operation will be a SOLID. - -Name is assigned automatically: - -* **Torus_1**, **Torus_2**, ... to Feature; -* **Torus_1_1**, **Torus_2_1**, ... to Result. - Example is shown below. .. image:: images/Torus_res.png -- 2.39.2