]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Fix for help pages
authorvsv <vsv@opencascade.com>
Mon, 20 Aug 2018 11:36:33 +0000 (14:36 +0300)
committervsv <vsv@opencascade.com>
Mon, 20 Aug 2018 11:36:33 +0000 (14:36 +0300)
65 files changed:
doc/gui/CMakeLists.txt
doc/gui/Introduction.rst [new file with mode: 0644]
doc/gui/index.rst.in
src/FeaturesPlugin/doc/FeaturesPlugin.rst
src/FeaturesPlugin/doc/TUI_placementFeature.rst [new file with mode: 0644]
src/FeaturesPlugin/doc/angularCopyFeature.rst [new file with mode: 0644]
src/FeaturesPlugin/doc/commonFeature.rst
src/FeaturesPlugin/doc/cutFeature.rst
src/FeaturesPlugin/doc/examples/placement.py [new file with mode: 0644]
src/FeaturesPlugin/doc/fillFeature.rst
src/FeaturesPlugin/doc/fuseFeature.rst
src/FeaturesPlugin/doc/images/AngularCopy.png [new file with mode: 0644]
src/FeaturesPlugin/doc/images/CreatedPlacement.png [new file with mode: 0644]
src/FeaturesPlugin/doc/images/LinearCopy.png [new file with mode: 0644]
src/FeaturesPlugin/doc/images/Measurement1.png [new file with mode: 0644]
src/FeaturesPlugin/doc/images/Measurement2.png [new file with mode: 0644]
src/FeaturesPlugin/doc/images/Measurement3.png [new file with mode: 0644]
src/FeaturesPlugin/doc/images/Measurement4.png [new file with mode: 0644]
src/FeaturesPlugin/doc/images/Measurement5.png [new file with mode: 0644]
src/FeaturesPlugin/doc/images/Placement.png [new file with mode: 0644]
src/FeaturesPlugin/doc/images/Rotation1.png [new file with mode: 0644]
src/FeaturesPlugin/doc/images/Rotation2.png [new file with mode: 0644]
src/FeaturesPlugin/doc/images/Symmetry.png [new file with mode: 0644]
src/FeaturesPlugin/doc/images/Translation1.png [new file with mode: 0644]
src/FeaturesPlugin/doc/images/Translation2.png [new file with mode: 0644]
src/FeaturesPlugin/doc/images/Translation3.png [new file with mode: 0644]
src/FeaturesPlugin/doc/images/placement_btn.png [new file with mode: 0644]
src/FeaturesPlugin/doc/intersectionFeature.rst
src/FeaturesPlugin/doc/linearCopyFeature.rst [new file with mode: 0644]
src/FeaturesPlugin/doc/measurementFeature.rst [new file with mode: 0644]
src/FeaturesPlugin/doc/partitionFeature.rst
src/FeaturesPlugin/doc/placementFeature.rst [new file with mode: 0644]
src/FeaturesPlugin/doc/rotationFeature.rst [new file with mode: 0644]
src/FeaturesPlugin/doc/symmetryFeature.rst [new file with mode: 0644]
src/FeaturesPlugin/doc/translationFeature.rst [new file with mode: 0644]
src/GDMLPlugin/doc/coneFeature.rst
src/GDMLPlugin/doc/ellipsoidFeature.rst
src/IntroductionPlugin/doc/IntroductionPlugin.rst [deleted file]
src/IntroductionPlugin/doc/index.rst_add.in [deleted file]
src/PartSetPlugin/doc/PartSetPlugin.rst
src/PartSetPlugin/doc/TUI_placementFeature.rst [deleted file]
src/PartSetPlugin/doc/angularCopyFeature.rst [deleted file]
src/PartSetPlugin/doc/examples/placement.py [deleted file]
src/PartSetPlugin/doc/images/AngularCopy.png [deleted file]
src/PartSetPlugin/doc/images/CreatedPlacement.png [deleted file]
src/PartSetPlugin/doc/images/LinearCopy.png [deleted file]
src/PartSetPlugin/doc/images/Measurement1.png [deleted file]
src/PartSetPlugin/doc/images/Measurement2.png [deleted file]
src/PartSetPlugin/doc/images/Measurement3.png [deleted file]
src/PartSetPlugin/doc/images/Measurement4.png [deleted file]
src/PartSetPlugin/doc/images/Measurement5.png [deleted file]
src/PartSetPlugin/doc/images/Placement.png [deleted file]
src/PartSetPlugin/doc/images/Rotation1.png [deleted file]
src/PartSetPlugin/doc/images/Rotation2.png [deleted file]
src/PartSetPlugin/doc/images/Symmetry.png [deleted file]
src/PartSetPlugin/doc/images/Translation1.png [deleted file]
src/PartSetPlugin/doc/images/Translation2.png [deleted file]
src/PartSetPlugin/doc/images/Translation3.png [deleted file]
src/PartSetPlugin/doc/images/placement_btn.png [deleted file]
src/PartSetPlugin/doc/linearCopyFeature.rst [deleted file]
src/PartSetPlugin/doc/measurementFeature.rst [deleted file]
src/PartSetPlugin/doc/placementFeature.rst [deleted file]
src/PartSetPlugin/doc/rotationFeature.rst [deleted file]
src/PartSetPlugin/doc/symmetryFeature.rst [deleted file]
src/PartSetPlugin/doc/translationFeature.rst [deleted file]

index f66b3e2c81e5269910390b9d6130711c4d726aab..40e5dd6656b92e4498e41420d613b9ce02a1f829 100644 (file)
@@ -22,6 +22,12 @@ SET(input ${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in)
 
 SET(output ${CMAKE_CURRENT_BINARY_DIR}/conf.py)
 
+SET(DOC_FILES
+  Introduction.rst
+  )
+
+FILE( COPY ${DOC_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+
 CONFIGURE_FILE(${input} ${output})
 
 #sphinx-build -b html -c doc -D latex_paper_size=a4 -d doc/doctree /dn23/PPGP/vsv/SALOME730/SOURCES/PPGP_SRC/doc doc/html
diff --git a/doc/gui/Introduction.rst b/doc/gui/Introduction.rst
new file mode 100644 (file)
index 0000000..7ff6e45
--- /dev/null
@@ -0,0 +1,84 @@
+\r
+.. _introduction:\r
+\r
+\r
+Introduction to SHAPER\r
+======================\r
+\r
+Application desktop\r
+-------------------\r
+\r
+The main window of the application consists of the following components:\r
+\r
+- :ref:`main_menu`\r
+- :ref:`doc_windows`\r
+- :ref:`viewer` \r
+\r
+.. _main_menu:\r
+\r
+Main menu \r
+---------\r
+\r
+Main menu provides access to all commands of the application.\r
+\r
+.. _doc_windows:\r
+\r
+Dock windows\r
+------------\r
+\r
+Standard dock windows are: \r
+\r
+- :ref:`object_browser`\r
+- :ref:`inspection_panel`\r
+- :ref:`python console`\r
+- :ref:`property_panel`\r
+\r
+\r
+Dock windows can be placed in three dock areas:\r
+- left, \r
+- right, \r
+- bottom.\r
+\r
+By default object browser window is placed at left area of the main window  and Python console is placed as at bottom area of the main menu. \r
+user can close any dock window. To open it again he can use a corresponded command from pop-up menu on static part of main menu  \r
+\r
+.. _object_browser: \r
+\r
+Object browser \r
+^^^^^^^^^^^^^^\r
+\r
+.. _property_panel:\r
+\r
+Property panel\r
+^^^^^^^^^^^^^^\r
+\r
+By default Property Panel is hidden, and it is shown on operation start.\r
+\r
+By default the Property Panel is shown at left side of the main window.\r
+\r
+If Object Browser is shown at the same side then they will be tabbed\r
+\r
+.. _inspection_panel: \r
+\r
+Inspection panel \r
+^^^^^^^^^^^^^^^^\r
+\r
+.. _python console:\r
+\r
+Python console\r
+^^^^^^^^^^^^^^\r
+\r
+.. _viewer:\r
+\r
+Viewer\r
+------\r
+\r
+The application  supports one OCC viewer and is able to show only one 3D space.\r
+\r
+This 3d space can be represented in several view windows.\r
+\r
+Each of view windows represents its own point of view on the 3d scene.\r
+\r
+This point of view can be modified by user with help of viewer commands like panning, zooming, scaling and so on.\r
+\r
+Architecture and functionality of viewer is very similar to OCCViewer component from SALOME. \r
index fefd5960944a828cc4210bc2cf5598fcccbadf6c..8493bbaca3b143f05bbb8f278d4a48031f949783 100644 (file)
@@ -6,6 +6,8 @@
 Welcome to SHAPER's documentation!
 ==================================
 
+- :ref:`introduction`
+
 .. toctree::
    :titlesonly:
    :maxdepth: 1
index bb1d02b692d3aa12f8ddea49f606aa6e60b8dba4..c9e95313f465966f62395eefef92f847681e458d 100644 (file)
@@ -7,7 +7,8 @@ Features plug-in
 .. toctree::
    :titlesonly:
    :maxdepth: 1
-   
+
+   angularCopyFeature.rst
    commonFeature.rst
    cutFeature.rst
    extrusionCutFeature.rst
@@ -16,14 +17,20 @@ Features plug-in
    fillFeature.rst
    filletFeature.rst
    fuseFeature.rst
-   intersectionFeature.rst  
+   intersectionFeature.rst
+   linearCopyFeature.rst
+   measurementFeature.rst
    partitionFeature.rst
-   pipeFeature.rst  
+   pipeFeature.rst
+   placementFeature.rst
    recoverFeature.rst
    removeSubShapesFeature.rst
    revolutionCutFeature.rst
    revolutionFeature.rst
    revolutionFuseFeature.rst
+   rotationFeature.rst
    smashFeature.rst
-   transformationFeature.rst     
+   symmetryFeature.rst
+   transformationFeature.rst
+   translationFeature.rst
    unionFeature.rst
diff --git a/src/FeaturesPlugin/doc/TUI_placementFeature.rst b/src/FeaturesPlugin/doc/TUI_placementFeature.rst
new file mode 100644 (file)
index 0000000..4f46ec6
--- /dev/null
@@ -0,0 +1,12 @@
+
+  .. _tui_create_placement:
+
+Create Placement
+================
+
+.. literalinclude:: examples/placement.py
+    :linenos:
+    :language: python
+
+:download:`Download this script <examples/placement.py>` 
+   
diff --git a/src/FeaturesPlugin/doc/angularCopyFeature.rst b/src/FeaturesPlugin/doc/angularCopyFeature.rst
new file mode 100644 (file)
index 0000000..3d3fec1
--- /dev/null
@@ -0,0 +1,10 @@
+
+Angular copy
+============
+
+
+.. image:: images/AngularCopy.png
+  :align: center
+
+.. centered::
+  Angular copy definition
index afdbdcda32a01a9dc723ca1fe01859239aac0a3b..d4f4e72faa8b87fdfc63b7a2174b567631bcedbf 100644 (file)
@@ -2,7 +2,7 @@
 Common
 ======
 
-To a create boolean opration Common in the active part:
+To perform a boolean opration Common in the active part:
 
 #. select in the Main Menu *Features - > Common* item  or
 #. click **Common** button in the toolbar
@@ -21,11 +21,9 @@ The following property panel will be opened:
 .. centered::
   **Common operation**
 
-It is necessary to select main objects and tool objects.
-
-**Apply** button creates the common shape.
-  
-**Cancel** button cancels operation.
+- **Main Objects** contains a list of objects selected in the Object Browser or in the Viewer, which will be common with tool objects.
+-  **Tool Objects** contains a list of objects selected in the Object Browser or in the Viewer, which will be common with main objects.
+- **See preview** button shows a result of the operation.
 
 **TUI Command**:  *model.addCommon(Part_doc, mainObjects, toolObjects)*
 
index 947d7affeef00bf13ba0fc4632ccd160412566b1..07f77f07e4df2d2a4dec64fcfc548533bfaad663 100644 (file)
@@ -2,7 +2,7 @@
 Cut
 ===
 
-To a create boolean opration Cut in the active part:
+To perform a boolean opration Cut in the active part:
 
 #. select in the Main Menu *Features - > Cut* item  or
 #. click **Cut** button in the toolbar
@@ -21,11 +21,9 @@ The following property panel will be opened:
 .. centered::
   **Cut operation**
 
-Here it is necessary to select main objects and tool objects.
-
-**Apply** button creates the cut shape.
-  
-**Cancel** button cancels operation.
+- **Main Objects** contains a list of objects selected in the Object Browser or in the Viewer, which will be cut by tool objects.
+-  **Tool Objects** contains a list of objects selected in the Object Browser or in the Viewer, which will be cut main objects.
+- **See preview** button shows a  result of the operation.
 
 **TUI Command**:  *model.addCut(Part_doc, mainObjects, toolObjects)*
 
diff --git a/src/FeaturesPlugin/doc/examples/placement.py b/src/FeaturesPlugin/doc/examples/placement.py
new file mode 100644 (file)
index 0000000..d74ab4d
--- /dev/null
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+
+from salome.shaper import model
+
+model.begin()
+partSet = model.moduleDocument()
+Part_1 = model.addPart(partSet)
+Part_1_doc = Part_1.document()
+Box_1 = model.addBox(Part_1_doc, 10, 10, 10)
+Sketch_1 = model.addSketch(Part_1_doc, model.selection("FACE", "Box_1_1/Front"))
+SketchCircle_1 = Sketch_1.addCircle(20, 6, 3)
+model.do()
+Extrusion_1 = model.addExtrusion(Part_1_doc,
+                                 [model.selection("FACE", "Sketch_1/Face-SketchCircle_1_2f")],
+                                 model.selection(), -10, 0)
+Placement_1 = model.addPlacement(Part_1_doc,
+                                 [model.selection("SOLID", "Extrusion_1_1")],
+                                 model.selection("FACE", "Extrusion_1_1/From_Face_1"),
+                                 model.selection("FACE", "Box_1_1/Front"), False, True)
+model.do()
+model.end()
index 82f68cd6f6d6c8fff9befda1e3b1421573d6bdfa..e5a3c7dc1a7162886910f2a11a080bb4cbdbd895 100644 (file)
@@ -2,7 +2,7 @@
 Fill
 ====
 
-To a create boolean opration Fill in the active part:
+To perform a boolean opration Fill in the active part:
 
 #. select in the Main Menu *Features - > Fill* item  or
 #. click **Fill** button in the toolbar
@@ -21,11 +21,9 @@ The following property panel will be opened:
 .. centered::
    **Fill operation**
 
-Here it is necessary to select main objects and tool objects.
-
-**Apply** button creates the fill shape.
-  
-**Cancel** button cancels operation.
+- **Main Objects** contains a list of objects selected in the Object Browser or in the Viewer, which will be cut and filled by tool objects.
+-  **Tool Objects** contains a list of objects selected in the Object Browser or in the Viewer, which will cut and filled the main objects.
+- **See preview** button shows a result of the operation.
 
 **TUI Command**:  *model.addFill(Part_doc, mainObjects, toolObjects)*
 
index c6131a3360b14ca549165f0e6956fb263b721b16..2508013a6ca8ef340c693cef576bd27351094b7e 100644 (file)
@@ -2,7 +2,7 @@
 Fuse
 ====
 
-To a create boolean opration Fuse in the active part:
+To perform a boolean opration Fuse in the active part:
 
 #. select in the Main Menu *Features - > Fuse* item  or
 #. click **Fuse** button in the toolbar
@@ -21,11 +21,9 @@ The following property panel will be opened:
 .. centered::
   **Fuse operation**
 
-Here it is necessary to select main objects and tool objects.
-
-**Apply** button creates the fuse shape.
-  
-**Cancel** button cancels operation.
+- **Main Objects** contains a list of objects selected in the Object Browser or in the Viewer, which will be fused with tool objects.
+-  **Tool Objects** contains a list of objects selected in the Object Browser or in the Viewer, which will fused with main objects.
+- **See preview** button shows a result of the operation.
 
 **TUI Command**:  *model.addFuse(Part_doc, mainObjects, toolObjects)*
 
diff --git a/src/FeaturesPlugin/doc/images/AngularCopy.png b/src/FeaturesPlugin/doc/images/AngularCopy.png
new file mode 100644 (file)
index 0000000..efa4d6e
Binary files /dev/null and b/src/FeaturesPlugin/doc/images/AngularCopy.png differ
diff --git a/src/FeaturesPlugin/doc/images/CreatedPlacement.png b/src/FeaturesPlugin/doc/images/CreatedPlacement.png
new file mode 100644 (file)
index 0000000..e35e982
Binary files /dev/null and b/src/FeaturesPlugin/doc/images/CreatedPlacement.png differ
diff --git a/src/FeaturesPlugin/doc/images/LinearCopy.png b/src/FeaturesPlugin/doc/images/LinearCopy.png
new file mode 100644 (file)
index 0000000..1daa1ef
Binary files /dev/null and b/src/FeaturesPlugin/doc/images/LinearCopy.png differ
diff --git a/src/FeaturesPlugin/doc/images/Measurement1.png b/src/FeaturesPlugin/doc/images/Measurement1.png
new file mode 100644 (file)
index 0000000..77b426e
Binary files /dev/null and b/src/FeaturesPlugin/doc/images/Measurement1.png differ
diff --git a/src/FeaturesPlugin/doc/images/Measurement2.png b/src/FeaturesPlugin/doc/images/Measurement2.png
new file mode 100644 (file)
index 0000000..5d951ae
Binary files /dev/null and b/src/FeaturesPlugin/doc/images/Measurement2.png differ
diff --git a/src/FeaturesPlugin/doc/images/Measurement3.png b/src/FeaturesPlugin/doc/images/Measurement3.png
new file mode 100644 (file)
index 0000000..b3f64ba
Binary files /dev/null and b/src/FeaturesPlugin/doc/images/Measurement3.png differ
diff --git a/src/FeaturesPlugin/doc/images/Measurement4.png b/src/FeaturesPlugin/doc/images/Measurement4.png
new file mode 100644 (file)
index 0000000..b43c36a
Binary files /dev/null and b/src/FeaturesPlugin/doc/images/Measurement4.png differ
diff --git a/src/FeaturesPlugin/doc/images/Measurement5.png b/src/FeaturesPlugin/doc/images/Measurement5.png
new file mode 100644 (file)
index 0000000..b5d860a
Binary files /dev/null and b/src/FeaturesPlugin/doc/images/Measurement5.png differ
diff --git a/src/FeaturesPlugin/doc/images/Placement.png b/src/FeaturesPlugin/doc/images/Placement.png
new file mode 100644 (file)
index 0000000..da97d83
Binary files /dev/null and b/src/FeaturesPlugin/doc/images/Placement.png differ
diff --git a/src/FeaturesPlugin/doc/images/Rotation1.png b/src/FeaturesPlugin/doc/images/Rotation1.png
new file mode 100644 (file)
index 0000000..9549eea
Binary files /dev/null and b/src/FeaturesPlugin/doc/images/Rotation1.png differ
diff --git a/src/FeaturesPlugin/doc/images/Rotation2.png b/src/FeaturesPlugin/doc/images/Rotation2.png
new file mode 100644 (file)
index 0000000..4b1224b
Binary files /dev/null and b/src/FeaturesPlugin/doc/images/Rotation2.png differ
diff --git a/src/FeaturesPlugin/doc/images/Symmetry.png b/src/FeaturesPlugin/doc/images/Symmetry.png
new file mode 100644 (file)
index 0000000..a369a0f
Binary files /dev/null and b/src/FeaturesPlugin/doc/images/Symmetry.png differ
diff --git a/src/FeaturesPlugin/doc/images/Translation1.png b/src/FeaturesPlugin/doc/images/Translation1.png
new file mode 100644 (file)
index 0000000..3d17295
Binary files /dev/null and b/src/FeaturesPlugin/doc/images/Translation1.png differ
diff --git a/src/FeaturesPlugin/doc/images/Translation2.png b/src/FeaturesPlugin/doc/images/Translation2.png
new file mode 100644 (file)
index 0000000..8b367d1
Binary files /dev/null and b/src/FeaturesPlugin/doc/images/Translation2.png differ
diff --git a/src/FeaturesPlugin/doc/images/Translation3.png b/src/FeaturesPlugin/doc/images/Translation3.png
new file mode 100644 (file)
index 0000000..82cdb8d
Binary files /dev/null and b/src/FeaturesPlugin/doc/images/Translation3.png differ
diff --git a/src/FeaturesPlugin/doc/images/placement_btn.png b/src/FeaturesPlugin/doc/images/placement_btn.png
new file mode 100644 (file)
index 0000000..c100a31
Binary files /dev/null and b/src/FeaturesPlugin/doc/images/placement_btn.png differ
index 52580bc5c221e29d99bb66d2a0b02a98d04881c6..cff31851f9b637d85a4942681e4672e681f627bb 100644 (file)
@@ -2,7 +2,7 @@
 Intersection
 ============
 
-To a create boolean opration Intersection in the active part:
+To perform a boolean opration Intersection in the active part:
 
 #. select in the Main Menu *Features - > Intersection* item  or
 #. click **Intersection** button in the toolbar
@@ -21,11 +21,7 @@ The following property panel will be opened:
 .. centered::
    **Intersection operation**
 
-Here it is necessary to select some objects.
-
-**Apply** button creates the intersection shape.
-  
-**Cancel** button cancels operation.
+**Base Objects** contains a list of objects selected in the Object Browser or in the Viewer, which will be intersected.
 
 **TUI Command**:  *model.addIntersection(Part_doc, Objects)*
 
diff --git a/src/FeaturesPlugin/doc/linearCopyFeature.rst b/src/FeaturesPlugin/doc/linearCopyFeature.rst
new file mode 100644 (file)
index 0000000..38509c3
--- /dev/null
@@ -0,0 +1,10 @@
+
+Linear copy
+===========
+
+
+.. image:: images/LinearCopy.png
+  :align: center
+
+.. centered::
+  Linear copy
diff --git a/src/FeaturesPlugin/doc/measurementFeature.rst b/src/FeaturesPlugin/doc/measurementFeature.rst
new file mode 100644 (file)
index 0000000..9f999a0
--- /dev/null
@@ -0,0 +1,42 @@
+
+Measurement
+===========
+
+
+.. image:: images/Measurement1.png
+  :align: center
+
+.. centered::
+  Edge length
+
+
+
+.. image:: images/Measurement2.png
+  :align: center
+
+.. centered::
+  Distance between objects
+
+
+
+.. image:: images/Measurement3.png
+  :align: center
+
+.. centered::
+  Radius
+
+
+
+.. image:: images/Measurement4.png
+  :align: center
+
+.. centered::
+  Angle between edges
+
+
+
+.. image:: images/Measurement5.png
+  :align: center
+
+.. centered::
+  Angle by 3 points
index 9a1b1e4b2379c1b428683215758ba566dfeaca3c..f03c28eb92fb1df3bfe0d2b6880c9204ae2886d4 100644 (file)
@@ -2,7 +2,7 @@
 Partition
 =========
 
-To a create boolean opration Partition in the active part:
+To perform a boolean opration Partition in the active part:
 
 #. select in the Main Menu *Features - > Partition* item  or
 #. click **Partition** button in the toolbar
@@ -21,11 +21,7 @@ The following property panel will be opened:
 .. centered::
    **Partition operation**
 
-Here it is necessary to select several objects.
-
-**Apply** button creates the partition shape.
-  
-**Cancel** button cancels operation.
+**Base Objects** contains a list of objects selected in the Object Browser or in the Viewer, which will be partitioned.
 
 **TUI Command**:  *model.addPartition(Part_doc, objects)*
 
diff --git a/src/FeaturesPlugin/doc/placementFeature.rst b/src/FeaturesPlugin/doc/placementFeature.rst
new file mode 100644 (file)
index 0000000..e213b9b
--- /dev/null
@@ -0,0 +1,52 @@
+
+Placement
+=========
+
+Placement lets to place a one object relatively to another object. To make a placement:
+
+#. select in the Main Menu *Part - > Placement* item  or
+#. click **Placement** button in the toolbar
+
+.. image:: images/placement_btn.png
+   :align: center
+
+.. centered::
+   **Placement**  button 
+
+The following property panel will be opened:
+
+.. image:: images/Placement.png
+  :align: center
+
+.. centered::
+   **Placement operation**
+
+In this property panel it is necessary:
+
+-  Select objects which will be moved.
+
+-  Select a face, edge or vertex as a start for moving
+
+-  Select a face, edge or vertex as an end of moving
+
+-  Define state of **Reverse** and **Centering** check boxes.
+
+
+
+**Apply** button creates the placement.
+  
+**Cancel** button cancels the operation.
+
+**TUI Command**:  *model.addPlacement(Part_doc, placeObjects, startShape, endShape, isReverse, isCentering)*
+
+**Arguments**:   Part + list of objects to move + start shape + end shape + is reverse flag + is centering flag.
+
+The Result of the operation will be a new placement of selected objects:
+
+.. image:: images/CreatedPlacement.png
+          :align: center
+
+.. centered::
+   **Placement created**
+
+**See Also** a sample TUI Script of a :ref:`tui_create_placement` operation.
diff --git a/src/FeaturesPlugin/doc/rotationFeature.rst b/src/FeaturesPlugin/doc/rotationFeature.rst
new file mode 100644 (file)
index 0000000..ff0380d
--- /dev/null
@@ -0,0 +1,17 @@
+
+Rotation
+========
+
+
+.. image:: images/Rotation1.png
+  :align: center
+
+.. centered::
+  Rotation by axis and angle
+
+
+.. image:: images/Rotation2.png
+  :align: center
+
+.. centered::
+  Rotation by center and points
diff --git a/src/FeaturesPlugin/doc/symmetryFeature.rst b/src/FeaturesPlugin/doc/symmetryFeature.rst
new file mode 100644 (file)
index 0000000..dc8150c
--- /dev/null
@@ -0,0 +1,10 @@
+
+Symmetry
+========
+
+
+.. image:: images/Symmetry.png
+  :align: center
+
+.. centered::
+  Symmetry definition
diff --git a/src/FeaturesPlugin/doc/translationFeature.rst b/src/FeaturesPlugin/doc/translationFeature.rst
new file mode 100644 (file)
index 0000000..99ce5db
--- /dev/null
@@ -0,0 +1,24 @@
+
+Translation
+===========
+
+
+.. image:: images/Translation1.png
+  :align: center
+
+.. centered::
+  Translation by axis and distance
+
+
+.. image:: images/Translation2.png
+  :align: center
+
+.. centered::
+  By vector
+
+
+.. image:: images/Translation3.png
+  :align: center
+
+.. centered::
+  By two points
index 9760c29b99441b632cb5530f0ae1f700b7d2ba41..00597ec1539b3886d0ea6ddcc5e2391ccdaeb728 100644 (file)
@@ -1,8 +1,8 @@
 
-Cone
-====
+Cone segment
+============
 
-To create a Cone in the active part:
+To create a Cone segment in the active part:
 
 #. select in the Main Menu *GDML - > Cone segment* item  or
 #. click **Cone segment** button in the toolbar.
@@ -21,7 +21,15 @@ The following property panel will be opened:
 .. centered::
    **Cone property panel**
 
-**TUI Command**:  *model.addConeSegment(Part_doc, 7, 11, 5, 8, 12, 0 , 270)*
+The property panel contains image which explains meaning of input values:
+
+- **rmin1, rmax1** - minimal and maximal radiuses of a base of the cone.
+- **rmin2, rmax2** - minimal and maximal rediuses of a top of the cone.
+- **z** is a heighth of the cone.
+- **startphi** is a starting angle of the cone segment.
+- **deltaphi** is an angle to end of the cone segment.
+
+**TUI Command**:  *model.addConeSegment(Part_doc, rmin1, rmax1, rmin2, rmax2, z, startphi, deltaphi)*
   
 **Arguments**:    Part + Rmin of base + Rmax of base + Rmin of top + Rmax of top + height + start angle + end angle.
 
index a8bd95158674bc695cadb40939aad05a5f3c46d8..6cb83ae30cede407d441ecc251aac2898758b501 100644 (file)
@@ -21,7 +21,15 @@ The following property panel will be opened:
 .. centered::
    **Ellipsoid property panel**
 
-**TUI Command**:  *model.addEllipsoid(Part_doc, 10, 20, 40)*
+The property panel contains image which explains meaning of input values:
+
+- **ax** is a size of the ellipsoind along X axis.
+- **by** is a size of the ellipsoind along Y axis.
+- **cz** is a size of the ellipsoind along Z axis.
+- **zcut1** is a z coordinate of a lower cut plane.
+- **zcut2** is a z coordinate of a upper cut plane.
+
+**TUI Command**:  *model.addEllipsoid(Part_doc, ax, by, cz)*
   
 **Arguments**:    Part + ax + by + cz.
 
diff --git a/src/IntroductionPlugin/doc/IntroductionPlugin.rst b/src/IntroductionPlugin/doc/IntroductionPlugin.rst
deleted file mode 100755 (executable)
index 30e17a6..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-\r
-Introduction to SHAPER\r
-======================\r
-\r
-Application desktop\r
--------------------\r
-\r
-The main window of the application consists of the following components:\r
-\r
-- :ref:`main_menu`\r
-- :ref:`doc_windows`\r
-- :ref:`viewer` \r
-\r
-.. _main_menu:\r
-\r
-Main menu \r
----------\r
-\r
-Main menu provides access to all commands of the application.\r
-\r
-.. _doc_windows:\r
-\r
-Dock windows\r
-------------\r
-\r
-Standard dock windows are: \r
-\r
-- :ref:`object_browser`\r
-- :ref:`inspection_panel`\r
-- :ref:`python console`\r
-- :ref:`property_panel`\r
-\r
-\r
-Dock windows can be placed in three dock areas:\r
-- left, \r
-- right, \r
-- bottom.\r
-\r
-By default object browser window is placed at left area of the main window  and Python console is placed as at bottom area of the main menu. \r
-user can close any dock window. To open it again he can use a corresponded command from pop-up menu on static part of main menu  \r
-\r
-.. _object_browser: \r
-\r
-Object browser \r
-^^^^^^^^^^^^^^\r
-\r
-.. _property_panel:\r
-\r
-Property panel\r
-^^^^^^^^^^^^^^\r
-\r
-By default Property Panel is hidden, and it is shown on operation start.\r
-\r
-By default the Property Panel is shown at left side of the main window.\r
-\r
-If Object Browser is shown at the same side then they will be tabbed\r
-\r
-.. _inspection_panel: \r
-\r
-Inspection panel \r
-^^^^^^^^^^^^^^^^\r
-\r
-.. _python console:\r
-\r
-Python console\r
-^^^^^^^^^^^^^^\r
-\r
-.. _viewer:\r
-\r
-Viewer\r
-------\r
-\r
-The application  supports one OCC viewer and is able to show only one 3D space.\r
-\r
-This 3d space can be represented in several view windows.\r
-\r
-Each of view windows represents its own point of view on the 3d scene.\r
-\r
-This point of view can be modified by user with help of viewer commands like panning, zooming, scaling and so on.\r
-\r
-Architecture and functionality of viewer is very similar to OCCViewer component from SALOME. \r
diff --git a/src/IntroductionPlugin/doc/index.rst_add.in b/src/IntroductionPlugin/doc/index.rst_add.in
deleted file mode 100755 (executable)
index 15b9bc9..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-The main window of the application consists of the following components:
-
-- :ref:`main_menu`
-
-.. _main_menu:
-
-Main menu 
----------
-
-Main menu provides access to all commands of the application.
-
-
-Dock windows
-------------
-
-Standard dock windows are: 
-
-- :ref:`object_browser`
-- :ref:`inspection_panel`
-- :ref:`python console`
-- :ref:`property_panel`
-
-
-
-Dock windows can be placed in three dock areas:
-- left, 
-- right, 
-- bottom. 
-
-By default object browser window is placed at left area of the main window and Python console is placed as a one tab in main menu (see Figure 2) in order to make them more compact. 
-user can close any dock window. To open it again he can use a corresponded command from pop-up menu on static part of main menu
-.. _object_browser: 
-
-Object browser 
-^^^^^^^^^^^^^^
-
-.. _property_panel:
-
-Property panel
-^^^^^^^^^^^^^^
-
-By default Property Panel is hidden. It can be shown on operation start if XML description of this operation is not empty. By default the Property Panel is shown at left side. If Object Browser is shown at the same side then they will be tabbed 
-
-.. _inspection_panel: 
-
-Inspection panel 
-^^^^^^^^^^^^^^^^
-
-.. _python console:
-
-Python console
-^^^^^^^^^^^^^^
-
-
-It is supposed that the application only a one OCC viewer will support. It means that the application will be able to show only a one 3d space. This 3d space can be represented in several view windows. Each of view windows will represent its own point of view on the 3d scene. This point of view can be modified by user with help of viewer commands like panning, zooming, scaling and so on. 
-Architecture and functionality of viewer will be very similar to OCCViewer component from SALOME with modifications of view window look&feel. 
index 50a5545a624c231ec05d5f2e983bbeb6cd1ad095..9dfd8968849b1a4af14312034199dbf87c181259 100644 (file)
@@ -3,17 +3,3 @@
 
 Part plug-in
 =============
-
-
-.. toctree::
-   :titlesonly:
-   :maxdepth: 1
-
-   angularCopyFeature.rst
-   linearCopyFeature.rst
-   measurementFeature.rst
-   placementFeature.rst    
-   rotationFeature.rst
-   symmetryFeature.rst
-   translationFeature.rst
-   
diff --git a/src/PartSetPlugin/doc/TUI_placementFeature.rst b/src/PartSetPlugin/doc/TUI_placementFeature.rst
deleted file mode 100644 (file)
index 4f46ec6..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-
-  .. _tui_create_placement:
-
-Create Placement
-================
-
-.. literalinclude:: examples/placement.py
-    :linenos:
-    :language: python
-
-:download:`Download this script <examples/placement.py>` 
-   
diff --git a/src/PartSetPlugin/doc/angularCopyFeature.rst b/src/PartSetPlugin/doc/angularCopyFeature.rst
deleted file mode 100644 (file)
index 3d3fec1..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-
-Angular copy
-============
-
-
-.. image:: images/AngularCopy.png
-  :align: center
-
-.. centered::
-  Angular copy definition
diff --git a/src/PartSetPlugin/doc/examples/placement.py b/src/PartSetPlugin/doc/examples/placement.py
deleted file mode 100644 (file)
index d74ab4d..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from salome.shaper import model
-
-model.begin()
-partSet = model.moduleDocument()
-Part_1 = model.addPart(partSet)
-Part_1_doc = Part_1.document()
-Box_1 = model.addBox(Part_1_doc, 10, 10, 10)
-Sketch_1 = model.addSketch(Part_1_doc, model.selection("FACE", "Box_1_1/Front"))
-SketchCircle_1 = Sketch_1.addCircle(20, 6, 3)
-model.do()
-Extrusion_1 = model.addExtrusion(Part_1_doc,
-                                 [model.selection("FACE", "Sketch_1/Face-SketchCircle_1_2f")],
-                                 model.selection(), -10, 0)
-Placement_1 = model.addPlacement(Part_1_doc,
-                                 [model.selection("SOLID", "Extrusion_1_1")],
-                                 model.selection("FACE", "Extrusion_1_1/From_Face_1"),
-                                 model.selection("FACE", "Box_1_1/Front"), False, True)
-model.do()
-model.end()
diff --git a/src/PartSetPlugin/doc/images/AngularCopy.png b/src/PartSetPlugin/doc/images/AngularCopy.png
deleted file mode 100644 (file)
index efa4d6e..0000000
Binary files a/src/PartSetPlugin/doc/images/AngularCopy.png and /dev/null differ
diff --git a/src/PartSetPlugin/doc/images/CreatedPlacement.png b/src/PartSetPlugin/doc/images/CreatedPlacement.png
deleted file mode 100644 (file)
index e35e982..0000000
Binary files a/src/PartSetPlugin/doc/images/CreatedPlacement.png and /dev/null differ
diff --git a/src/PartSetPlugin/doc/images/LinearCopy.png b/src/PartSetPlugin/doc/images/LinearCopy.png
deleted file mode 100644 (file)
index 1daa1ef..0000000
Binary files a/src/PartSetPlugin/doc/images/LinearCopy.png and /dev/null differ
diff --git a/src/PartSetPlugin/doc/images/Measurement1.png b/src/PartSetPlugin/doc/images/Measurement1.png
deleted file mode 100644 (file)
index 77b426e..0000000
Binary files a/src/PartSetPlugin/doc/images/Measurement1.png and /dev/null differ
diff --git a/src/PartSetPlugin/doc/images/Measurement2.png b/src/PartSetPlugin/doc/images/Measurement2.png
deleted file mode 100644 (file)
index 5d951ae..0000000
Binary files a/src/PartSetPlugin/doc/images/Measurement2.png and /dev/null differ
diff --git a/src/PartSetPlugin/doc/images/Measurement3.png b/src/PartSetPlugin/doc/images/Measurement3.png
deleted file mode 100644 (file)
index b3f64ba..0000000
Binary files a/src/PartSetPlugin/doc/images/Measurement3.png and /dev/null differ
diff --git a/src/PartSetPlugin/doc/images/Measurement4.png b/src/PartSetPlugin/doc/images/Measurement4.png
deleted file mode 100644 (file)
index b43c36a..0000000
Binary files a/src/PartSetPlugin/doc/images/Measurement4.png and /dev/null differ
diff --git a/src/PartSetPlugin/doc/images/Measurement5.png b/src/PartSetPlugin/doc/images/Measurement5.png
deleted file mode 100644 (file)
index b5d860a..0000000
Binary files a/src/PartSetPlugin/doc/images/Measurement5.png and /dev/null differ
diff --git a/src/PartSetPlugin/doc/images/Placement.png b/src/PartSetPlugin/doc/images/Placement.png
deleted file mode 100644 (file)
index da97d83..0000000
Binary files a/src/PartSetPlugin/doc/images/Placement.png and /dev/null differ
diff --git a/src/PartSetPlugin/doc/images/Rotation1.png b/src/PartSetPlugin/doc/images/Rotation1.png
deleted file mode 100644 (file)
index 9549eea..0000000
Binary files a/src/PartSetPlugin/doc/images/Rotation1.png and /dev/null differ
diff --git a/src/PartSetPlugin/doc/images/Rotation2.png b/src/PartSetPlugin/doc/images/Rotation2.png
deleted file mode 100644 (file)
index 4b1224b..0000000
Binary files a/src/PartSetPlugin/doc/images/Rotation2.png and /dev/null differ
diff --git a/src/PartSetPlugin/doc/images/Symmetry.png b/src/PartSetPlugin/doc/images/Symmetry.png
deleted file mode 100644 (file)
index a369a0f..0000000
Binary files a/src/PartSetPlugin/doc/images/Symmetry.png and /dev/null differ
diff --git a/src/PartSetPlugin/doc/images/Translation1.png b/src/PartSetPlugin/doc/images/Translation1.png
deleted file mode 100644 (file)
index 3d17295..0000000
Binary files a/src/PartSetPlugin/doc/images/Translation1.png and /dev/null differ
diff --git a/src/PartSetPlugin/doc/images/Translation2.png b/src/PartSetPlugin/doc/images/Translation2.png
deleted file mode 100644 (file)
index 8b367d1..0000000
Binary files a/src/PartSetPlugin/doc/images/Translation2.png and /dev/null differ
diff --git a/src/PartSetPlugin/doc/images/Translation3.png b/src/PartSetPlugin/doc/images/Translation3.png
deleted file mode 100644 (file)
index 82cdb8d..0000000
Binary files a/src/PartSetPlugin/doc/images/Translation3.png and /dev/null differ
diff --git a/src/PartSetPlugin/doc/images/placement_btn.png b/src/PartSetPlugin/doc/images/placement_btn.png
deleted file mode 100644 (file)
index c100a31..0000000
Binary files a/src/PartSetPlugin/doc/images/placement_btn.png and /dev/null differ
diff --git a/src/PartSetPlugin/doc/linearCopyFeature.rst b/src/PartSetPlugin/doc/linearCopyFeature.rst
deleted file mode 100644 (file)
index 38509c3..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-
-Linear copy
-===========
-
-
-.. image:: images/LinearCopy.png
-  :align: center
-
-.. centered::
-  Linear copy
diff --git a/src/PartSetPlugin/doc/measurementFeature.rst b/src/PartSetPlugin/doc/measurementFeature.rst
deleted file mode 100644 (file)
index 9f999a0..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-
-Measurement
-===========
-
-
-.. image:: images/Measurement1.png
-  :align: center
-
-.. centered::
-  Edge length
-
-
-
-.. image:: images/Measurement2.png
-  :align: center
-
-.. centered::
-  Distance between objects
-
-
-
-.. image:: images/Measurement3.png
-  :align: center
-
-.. centered::
-  Radius
-
-
-
-.. image:: images/Measurement4.png
-  :align: center
-
-.. centered::
-  Angle between edges
-
-
-
-.. image:: images/Measurement5.png
-  :align: center
-
-.. centered::
-  Angle by 3 points
diff --git a/src/PartSetPlugin/doc/placementFeature.rst b/src/PartSetPlugin/doc/placementFeature.rst
deleted file mode 100644 (file)
index e213b9b..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-
-Placement
-=========
-
-Placement lets to place a one object relatively to another object. To make a placement:
-
-#. select in the Main Menu *Part - > Placement* item  or
-#. click **Placement** button in the toolbar
-
-.. image:: images/placement_btn.png
-   :align: center
-
-.. centered::
-   **Placement**  button 
-
-The following property panel will be opened:
-
-.. image:: images/Placement.png
-  :align: center
-
-.. centered::
-   **Placement operation**
-
-In this property panel it is necessary:
-
--  Select objects which will be moved.
-
--  Select a face, edge or vertex as a start for moving
-
--  Select a face, edge or vertex as an end of moving
-
--  Define state of **Reverse** and **Centering** check boxes.
-
-
-
-**Apply** button creates the placement.
-  
-**Cancel** button cancels the operation.
-
-**TUI Command**:  *model.addPlacement(Part_doc, placeObjects, startShape, endShape, isReverse, isCentering)*
-
-**Arguments**:   Part + list of objects to move + start shape + end shape + is reverse flag + is centering flag.
-
-The Result of the operation will be a new placement of selected objects:
-
-.. image:: images/CreatedPlacement.png
-          :align: center
-
-.. centered::
-   **Placement created**
-
-**See Also** a sample TUI Script of a :ref:`tui_create_placement` operation.
diff --git a/src/PartSetPlugin/doc/rotationFeature.rst b/src/PartSetPlugin/doc/rotationFeature.rst
deleted file mode 100644 (file)
index ff0380d..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-
-Rotation
-========
-
-
-.. image:: images/Rotation1.png
-  :align: center
-
-.. centered::
-  Rotation by axis and angle
-
-
-.. image:: images/Rotation2.png
-  :align: center
-
-.. centered::
-  Rotation by center and points
diff --git a/src/PartSetPlugin/doc/symmetryFeature.rst b/src/PartSetPlugin/doc/symmetryFeature.rst
deleted file mode 100644 (file)
index dc8150c..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-
-Symmetry
-========
-
-
-.. image:: images/Symmetry.png
-  :align: center
-
-.. centered::
-  Symmetry definition
diff --git a/src/PartSetPlugin/doc/translationFeature.rst b/src/PartSetPlugin/doc/translationFeature.rst
deleted file mode 100644 (file)
index 99ce5db..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-
-Translation
-===========
-
-
-.. image:: images/Translation1.png
-  :align: center
-
-.. centered::
-  Translation by axis and distance
-
-
-.. image:: images/Translation2.png
-  :align: center
-
-.. centered::
-  By vector
-
-
-.. image:: images/Translation3.png
-  :align: center
-
-.. centered::
-  By two points