Provide template for Features plug-in help pages

diff --git a/doc/gui/FeaturesPlugin/angularCopyFeature.rst b/doc/gui/FeaturesPlugin/angularCopyFeature.rst
index f29caa1717db73ff117316b093352090c681b71b..3d3fec12cc63bce0506b0874427d487fdf66a821 100644 (file)
--- a/doc/gui/FeaturesPlugin/angularCopyFeature.rst
+++ b/doc/gui/FeaturesPlugin/angularCopyFeature.rst
@@ -1,3 +1,10 @@
 
 Angular copy
 ============
+
+
+.. image:: images/AngularCopy.png
+  :align: center
+
+.. centered::
+  Angular copy definition

diff --git a/doc/gui/FeaturesPlugin/commonFeature.rst b/doc/gui/FeaturesPlugin/commonFeature.rst
index 249be08215f64cd8c1a00ae672621d6f7d02f941..ff245795bbdb461e44ba11d99bf1abbc4098e341 100644 (file)
--- a/doc/gui/FeaturesPlugin/commonFeature.rst
+++ b/doc/gui/FeaturesPlugin/commonFeature.rst
@@ -1,3 +1,10 @@
 
 Common
 ======
+
+
+.. image:: images/Common.png
+  :align: center
+
+.. centered::
+  Common definition

diff --git a/doc/gui/FeaturesPlugin/cutFeature.rst b/doc/gui/FeaturesPlugin/cutFeature.rst
index 21520755c4b33eb6d08ee31605ecad0751e7ab67..e381c7c984ee0b038d64dde3009fcbb7138746e9 100644 (file)
--- a/doc/gui/FeaturesPlugin/cutFeature.rst
+++ b/doc/gui/FeaturesPlugin/cutFeature.rst
@@ -1,3 +1,10 @@
 
 Cut
 ===
+
+
+.. image:: images/Cut.png
+  :align: center
+
+.. centered::
+  Cut definition

diff --git a/doc/gui/FeaturesPlugin/featuresPlugin.rst b/doc/gui/FeaturesPlugin/featuresPlugin.rst
index c79850dab21de7a20626598bd3c5dd87f1522646..4a1dee01bc3d128c93a3c216508e9c7e99b16c8c 100644 (file)
--- a/doc/gui/FeaturesPlugin/featuresPlugin.rst
+++ b/doc/gui/FeaturesPlugin/featuresPlugin.rst
@@ -2,7 +2,7 @@
 .. _featuresPlugin:
 
 
-Fearures plug-in
+Features plug-in
 ================
 
 

diff --git a/doc/gui/FeaturesPlugin/fillFeature.rst b/doc/gui/FeaturesPlugin/fillFeature.rst
index 86348d65aa8684d2484d715e4c7c8bbd74231185..6e265d85d6ff5ba91ada1b5d82e3b0989a2356c0 100644 (file)
--- a/doc/gui/FeaturesPlugin/fillFeature.rst
+++ b/doc/gui/FeaturesPlugin/fillFeature.rst
@@ -1,3 +1,10 @@
 
 Fill
 ====
+
+
+.. image:: images/Fill.png
+  :align: center
+
+.. centered::
+  Fill definition

diff --git a/doc/gui/FeaturesPlugin/filletFeature.rst b/doc/gui/FeaturesPlugin/filletFeature.rst
index 879ce5953a167ddc713a0db1dabd59fef68d3a8a..85d54e39508edc5991b6b6293bef4e0d1627a259 100644 (file)
--- a/doc/gui/FeaturesPlugin/filletFeature.rst
+++ b/doc/gui/FeaturesPlugin/filletFeature.rst
@@ -1,3 +1,10 @@
 
 Fillet
 ======
+
+
+.. image:: images/Fillet.png
+  :align: center
+
+.. centered::
+  Fillet definition

diff --git a/doc/gui/FeaturesPlugin/fuseFeature.rst b/doc/gui/FeaturesPlugin/fuseFeature.rst
index 13da19446cb7e88c71936543fccee4fd05a93465..9944cfcc40c11cad26f59d626d5c383245a258c5 100644 (file)
--- a/doc/gui/FeaturesPlugin/fuseFeature.rst
+++ b/doc/gui/FeaturesPlugin/fuseFeature.rst
@@ -1,3 +1,10 @@
 
 Fuse
 ====
+
+
+.. image:: images/Fuse.png
+  :align: center
+
+.. centered::
+  Fuse definition

diff --git a/doc/gui/FeaturesPlugin/images/AngularCopy.png b/doc/gui/FeaturesPlugin/images/AngularCopy.png
new file mode 100644 (file)
index 0000000..efa4d6e
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/AngularCopy.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Common.png b/doc/gui/FeaturesPlugin/images/Common.png
new file mode 100644 (file)
index 0000000..a6abdef
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Common.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Cut.png b/doc/gui/FeaturesPlugin/images/Cut.png
new file mode 100644 (file)
index 0000000..7f0f886
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Cut.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Fill.png b/doc/gui/FeaturesPlugin/images/Fill.png
new file mode 100644 (file)
index 0000000..377be10
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Fill.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Fillet.png b/doc/gui/FeaturesPlugin/images/Fillet.png
new file mode 100644 (file)
index 0000000..7f80407
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Fillet.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Fuse.png b/doc/gui/FeaturesPlugin/images/Fuse.png
new file mode 100644 (file)
index 0000000..f1495f2
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Fuse.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Intersection.png b/doc/gui/FeaturesPlugin/images/Intersection.png
new file mode 100644 (file)
index 0000000..6bc0a43
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Intersection.png differ

diff --git a/doc/gui/FeaturesPlugin/images/LinearCopy.png b/doc/gui/FeaturesPlugin/images/LinearCopy.png
new file mode 100644 (file)
index 0000000..1daa1ef
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/LinearCopy.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Measurement1.png b/doc/gui/FeaturesPlugin/images/Measurement1.png
new file mode 100644 (file)
index 0000000..77b426e
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Measurement1.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Measurement2.png b/doc/gui/FeaturesPlugin/images/Measurement2.png
new file mode 100644 (file)
index 0000000..5d951ae
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Measurement2.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Measurement3.png b/doc/gui/FeaturesPlugin/images/Measurement3.png
new file mode 100644 (file)
index 0000000..b3f64ba
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Measurement3.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Measurement4.png b/doc/gui/FeaturesPlugin/images/Measurement4.png
new file mode 100644 (file)
index 0000000..b43c36a
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Measurement4.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Measurement5.png b/doc/gui/FeaturesPlugin/images/Measurement5.png
new file mode 100644 (file)
index 0000000..b5d860a
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Measurement5.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Partition.png b/doc/gui/FeaturesPlugin/images/Partition.png
new file mode 100644 (file)
index 0000000..6e131f9
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Partition.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Pipe1.png b/doc/gui/FeaturesPlugin/images/Pipe1.png
new file mode 100644 (file)
index 0000000..5db8d2a
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Pipe1.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Pipe2.png b/doc/gui/FeaturesPlugin/images/Pipe2.png
new file mode 100644 (file)
index 0000000..b3f4868
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Pipe2.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Pipe3.png b/doc/gui/FeaturesPlugin/images/Pipe3.png
new file mode 100644 (file)
index 0000000..fe84a2b
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Pipe3.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Placement.png b/doc/gui/FeaturesPlugin/images/Placement.png
new file mode 100644 (file)
index 0000000..4d5beb7
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Placement.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Recover.png b/doc/gui/FeaturesPlugin/images/Recover.png
new file mode 100644 (file)
index 0000000..ecf06df
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Recover.png differ

diff --git a/doc/gui/FeaturesPlugin/images/RemoveSubShapes.png b/doc/gui/FeaturesPlugin/images/RemoveSubShapes.png
new file mode 100644 (file)
index 0000000..b26f89d
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/RemoveSubShapes.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Rotation1.png b/doc/gui/FeaturesPlugin/images/Rotation1.png
new file mode 100644 (file)
index 0000000..9549eea
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Rotation1.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Rotation2.png b/doc/gui/FeaturesPlugin/images/Rotation2.png
new file mode 100644 (file)
index 0000000..4b1224b
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Rotation2.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Smash.png b/doc/gui/FeaturesPlugin/images/Smash.png
new file mode 100644 (file)
index 0000000..8ec0ae6
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Smash.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Symmetry.png b/doc/gui/FeaturesPlugin/images/Symmetry.png
new file mode 100644 (file)
index 0000000..a369a0f
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Symmetry.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Translation1.png b/doc/gui/FeaturesPlugin/images/Translation1.png
new file mode 100644 (file)
index 0000000..3d17295
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Translation1.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Translation2.png b/doc/gui/FeaturesPlugin/images/Translation2.png
new file mode 100644 (file)
index 0000000..8b367d1
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Translation2.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Translation3.png b/doc/gui/FeaturesPlugin/images/Translation3.png
new file mode 100644 (file)
index 0000000..82cdb8d
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Translation3.png differ

diff --git a/doc/gui/FeaturesPlugin/images/Union.png b/doc/gui/FeaturesPlugin/images/Union.png
new file mode 100644 (file)
index 0000000..b45f8fd
Binary files /dev/null and b/doc/gui/FeaturesPlugin/images/Union.png differ

diff --git a/doc/gui/FeaturesPlugin/intersectionFeature.rst b/doc/gui/FeaturesPlugin/intersectionFeature.rst
index d48c825a1aeeb2ca2de14ec951cb0cb2a8cf7e1b..21e2be6f013b5543374469da88ba52b3a5880098 100644 (file)
--- a/doc/gui/FeaturesPlugin/intersectionFeature.rst
+++ b/doc/gui/FeaturesPlugin/intersectionFeature.rst
@@ -1,3 +1,10 @@
 
 Intersection
 ============
+
+
+.. image:: images/Intersection.png
+  :align: center
+
+.. centered::
+  Intersection definition

diff --git a/doc/gui/FeaturesPlugin/linearCopyFeature.rst b/doc/gui/FeaturesPlugin/linearCopyFeature.rst
index a01a993a2859b09b12563e7180334a21c2b9df64..38509c3b97e35a5f05cc709388bac04b85278ad2 100644 (file)
--- a/doc/gui/FeaturesPlugin/linearCopyFeature.rst
+++ b/doc/gui/FeaturesPlugin/linearCopyFeature.rst
@@ -1,3 +1,10 @@
 
 Linear copy
 ===========
+
+
+.. image:: images/LinearCopy.png
+  :align: center
+
+.. centered::
+  Linear copy

diff --git a/doc/gui/FeaturesPlugin/measurementFeature.rst b/doc/gui/FeaturesPlugin/measurementFeature.rst
index 5fe679ff9a00128eb23a55a329d3ec753dfdf265..9f999a09782e1f2f359580936ae3b8cd6ed60a23 100644 (file)
--- a/doc/gui/FeaturesPlugin/measurementFeature.rst
+++ b/doc/gui/FeaturesPlugin/measurementFeature.rst
@@ -1,3 +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

diff --git a/doc/gui/FeaturesPlugin/partitionFeature.rst b/doc/gui/FeaturesPlugin/partitionFeature.rst
index e6ef3cd10f64a457f1e51ebe35fe2be9a93e0bdf..4b2ac1068d31504d9326bc449f73fbf0b9aaf65c 100644 (file)
--- a/doc/gui/FeaturesPlugin/partitionFeature.rst
+++ b/doc/gui/FeaturesPlugin/partitionFeature.rst
@@ -1,3 +1,10 @@
 
 Partition
 =========
+
+
+.. image:: images/Partition.png
+  :align: center
+
+.. centered::
+  Partition definition

diff --git a/doc/gui/FeaturesPlugin/pipeFeature.rst b/doc/gui/FeaturesPlugin/pipeFeature.rst
index 71cbddbd4ec804b235eb95a519bb707ac7b6828c..0ec31da4d464dee584fd3d9ede25d425ddd3c90a 100644 (file)
--- a/doc/gui/FeaturesPlugin/pipeFeature.rst
+++ b/doc/gui/FeaturesPlugin/pipeFeature.rst
@@ -1,3 +1,24 @@
 
 Pipe
 ====
+
+
+.. image:: images/Pipe1.png
+  :align: center
+
+.. centered::
+  Pipe by object and path
+
+
+.. image:: images/Pipe2.png
+  :align: center
+
+.. centered::
+  Pipe by object, path and Bi-normal
+
+
+.. image:: images/Pipe3.png
+  :align: center
+
+.. centered::
+  Pipe by object, path and locations

diff --git a/doc/gui/FeaturesPlugin/placementFeature.rst b/doc/gui/FeaturesPlugin/placementFeature.rst
index 8fc4f8e8796cc788c6893fa54e4ed09721600579..bc45a835ebeb6ef35ca78a77850461c97bb9d239 100644 (file)
--- a/doc/gui/FeaturesPlugin/placementFeature.rst
+++ b/doc/gui/FeaturesPlugin/placementFeature.rst
@@ -1,3 +1,10 @@
 
 Placement
 =========
+
+
+.. image:: images/Placement.png
+  :align: center
+
+.. centered::
+  Placement definition

diff --git a/doc/gui/FeaturesPlugin/recoverFeature.rst b/doc/gui/FeaturesPlugin/recoverFeature.rst
index 2134d27dcbe7cecc46279583dc816f2a1437c762..7a98e3f7ad5e63539d28fec86a82ace3ce54f618 100644 (file)
--- a/doc/gui/FeaturesPlugin/recoverFeature.rst
+++ b/doc/gui/FeaturesPlugin/recoverFeature.rst
@@ -1,3 +1,10 @@
 
  Recover
  =======
+
+
+.. image:: images/Recover.png
+  :align: center
+
+.. centered::
+  Recover operation

diff --git a/doc/gui/FeaturesPlugin/removeSubShapesFeature.rst b/doc/gui/FeaturesPlugin/removeSubShapesFeature.rst
index 487026aa47cfdaa4e7f03219a107d7801e72eeec..a8f1d440d19aedd3c7c47632cdd870e312ffa9f7 100644 (file)
--- a/doc/gui/FeaturesPlugin/removeSubShapesFeature.rst
+++ b/doc/gui/FeaturesPlugin/removeSubShapesFeature.rst
@@ -1,3 +1,10 @@
 
 Remove sub-shapes
 =================
+
+
+.. image:: images/RemoveSubShapes.png
+  :align: center
+
+.. centered::
+  Remove sub-shapes

diff --git a/doc/gui/FeaturesPlugin/rotationFeature.rst b/doc/gui/FeaturesPlugin/rotationFeature.rst
index daaa47ab01b4be9411c0936cd88dcd8d9a80f22f..ff0380d0c23e36acaf11f7e89830a04900ae5fba 100644 (file)
--- a/doc/gui/FeaturesPlugin/rotationFeature.rst
+++ b/doc/gui/FeaturesPlugin/rotationFeature.rst
@@ -1,3 +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/doc/gui/FeaturesPlugin/smashFeature.rst b/doc/gui/FeaturesPlugin/smashFeature.rst
index e7103110561e88739c77d33504f95391d8c64b5c..dbeb1642b7217e723ba071c33e719a5ed9f5ef68 100644 (file)
--- a/doc/gui/FeaturesPlugin/smashFeature.rst
+++ b/doc/gui/FeaturesPlugin/smashFeature.rst
@@ -1,3 +1,10 @@
 
 Smash
 =====
+
+
+.. image:: images/Smash.png
+  :align: center
+
+.. centered::
+  Smash definition

diff --git a/doc/gui/FeaturesPlugin/symmetryFeature.rst b/doc/gui/FeaturesPlugin/symmetryFeature.rst
index cf5e27fee94607ab2526d3f2aeed6095d5370bd7..dc8150c74bcac50d49bad84b3b380144cd2fd1bf 100644 (file)
--- a/doc/gui/FeaturesPlugin/symmetryFeature.rst
+++ b/doc/gui/FeaturesPlugin/symmetryFeature.rst
@@ -1,3 +1,10 @@
 
 Symmetry
 ========
+
+
+.. image:: images/Symmetry.png
+  :align: center
+
+.. centered::
+  Symmetry definition

diff --git a/doc/gui/FeaturesPlugin/translationFeature.rst b/doc/gui/FeaturesPlugin/translationFeature.rst
index 730589cc7b1c927ae68eb078cab862abb2ae2e3b..99ce5db7232fa6ed2c6474e21183452d94db93ea 100644 (file)
--- a/doc/gui/FeaturesPlugin/translationFeature.rst
+++ b/doc/gui/FeaturesPlugin/translationFeature.rst
@@ -1,3 +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

diff --git a/doc/gui/FeaturesPlugin/unionFeature.rst b/doc/gui/FeaturesPlugin/unionFeature.rst
index feadac9a2da4e566e6f9586c8cce2868079be7ab..6e3d9a2b0c474682fb659a2e03ddd6eec2b9d37d 100644 (file)
--- a/doc/gui/FeaturesPlugin/unionFeature.rst
+++ b/doc/gui/FeaturesPlugin/unionFeature.rst
@@ -1,3 +1,10 @@
 
 Union
 =====
+
+
+.. image:: images/Union.png
+  :align: center
+
+.. centered::
+  Union definition

diff --git a/src/FeaturesPlugin/translation_widget.xml b/src/FeaturesPlugin/translation_widget.xml
index 3c9c72e725ddb797575dba2a06e4f13743d8b3c9..28bb25115ef0ba4363f26de0757ae7442001644f 100644 (file)
--- a/src/FeaturesPlugin/translation_widget.xml
+++ b/src/FeaturesPlugin/translation_widget.xml
@@ -49,7 +49,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
       </doublevalue>
     </box>
     <box id="ByDimensions"
-         title="By dimensions in X, in X and in Z"
+         title="By X, Y and Z dimensions"
          icon="icons/Features/translation_dxyz_32x32.png">
       <multi_selector id="main_objects"
                       label="Main objects"

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index ed2ba64718bbb06452cb7d0a5e2cac2e1142f3f0..ea60b2aaa72515737956e043d93e0f78fffbe8d7 100755 (executable)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -569,22 +569,22 @@ void XGUI_Workshop::onHelpActionClicked()
     if (aOperation) {
       QString aDocDir;
       const QChar aSep = QDir::separator();
-#ifdef HAVE_SALOME
-      QString aDir(getenv("SHAPER_ROOT_DIR"));
-      if (!aDir.isEmpty()) {
-        aDocDir = aDir + aSep + "share" + aSep + "doc" + aSep +
-          "salome" + aSep + "gui" + aSep + "SHAPER";
-      }
-      SUIT_ResourceMgr* aResMgr = ModuleBase_Preferences::resourceMgr();
       QString platform;
+      SUIT_ResourceMgr* aResMgr = ModuleBase_Preferences::resourceMgr();
 #ifdef WIN32
       platform = "winapplication";
 #else
       platform = "application";
 #endif
       QString aBrowserName = aResMgr->stringValue("ExternalBrowser", platform);
+
+#ifdef HAVE_SALOME
+      QString aDir(getenv("SHAPER_ROOT_DIR"));
+      if (!aDir.isEmpty()) {
+        aDocDir = aDir + aSep + "share" + aSep + "doc" + aSep +
+          "salome" + aSep + "gui" + aSep + "SHAPER";
+      }
 #else
-      QString aBrowserName("C:\\Program Files\\Internet Explorer\\iexplore.exe");
       QString aDir(getenv("OPENPARTS_ROOT_DIR"));
       aDocDir = aDir + aSep + "doc";
 #endif