From aa2fd1bea855b72bb4a00aa0b471c8107624a258 Mon Sep 17 00:00:00 2001
From: jfa <jfa@opencascade.com>
Date: Fri, 26 Jan 2007 12:06:25 +0000
Subject: [PATCH] Rename 'Prism 3D' algorithm to '3D extrusion', following
 customer remarks.

---
 doc/salome/gui/SMESH/prism_3d_algorithm.htm | 20 +++++++++-----------
 doc/salome/gui/SMESH/whdata/whftdata0.htm   |  2 +-
 doc/salome/gui/SMESH/whdata/whtdata0.htm    |  2 +-
 doc/salome/gui/SMESH/whxdata/whftdata0.xml  |  2 +-
 doc/salome/gui/SMESH/whxdata/whtdata0.xml   |  2 +-
 idl/SMESH_BasicHypothesis.idl               |  2 +-
 resources/StdMeshers.xml                    |  2 +-
 src/SMESH_SWIG/smesh.py                     |  8 ++++----
 8 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/doc/salome/gui/SMESH/prism_3d_algorithm.htm b/doc/salome/gui/SMESH/prism_3d_algorithm.htm
index da64656c0..9bdf4a4ef 100644
--- a/doc/salome/gui/SMESH/prism_3d_algorithm.htm
+++ b/doc/salome/gui/SMESH/prism_3d_algorithm.htm
@@ -3,7 +3,7 @@
 <html>
 
 <head>
-<title>Prism 3D Algorithm</title>
+<title>3D extrusion meshing algorithm</title>
 <meta http-equiv="content-type" content="text/html; charset=windows-1252">
 <meta name="generator" content="RoboHelp by eHelp Corporation www.ehelp.com"><style type="text/css">
 <!--
@@ -53,7 +53,7 @@ if (window.gbWhTopic)
 {
 	if (window.setRelStartPage)
 	{
-	addTocInfo("MESH module\nCreating meshes\nDefining Algorithms\nPrism 3D Algorithm");
+	addTocInfo("MESH module\nCreating meshes\nDefining Algorithms\n3D extrusion meshing algorithm");
 addButton("show",BTN_IMG,"Show","","","","",0,0,"whd_show0.gif","whd_show2.gif","whd_show1.gif");
 addButton("hide",BTN_IMG,"Hide","","","","",0,0,"whd_hide0.gif","whd_hide2.gif","whd_hide1.gif");
 
@@ -82,27 +82,25 @@ if (window.writeIntopicBar)
 	writeIntopicBar(4);
 //-->
 </script>
-<h1>Prism 3D Algorithm</h1>
+<h1>3D extrusion meshing algorithm</h1>
 
-<p>Prism 3D algorithm can be used for meshing prisms, i.e. <span style="font-weight: bold;"><B>3D 
- Shapes</B></span> defined by<span style="margin-left: 24px;
-										margin-top: 0pt;
-										margin-bottom: 0pt;"> two opposing 
- faces having the same number of vertices and edges and meshed using the 
+<p>3D extrusion algorithm can be used for meshing prisms, i.e.
+<span style="font-weight: bold;"><B>3D Shapes</B></span> defined by
+ two opposing faces having the same number of vertices and edges and meshed using the 
  <a href="projection_algorithms.htm">2D Projection</a> algorithm. These 
- two faces should be connected by quadrangle &quot;side&quot; faces.</span></p>
+ two faces should be connected by quadrangle &quot;side&quot; faces.</p>
 
 <p><span style="margin-left: 24px;
 				margin-top: 0pt;
 				margin-bottom: 0pt;">The opposing faces can be meshed with 
  either quadrangles or triangles, while the side faces should be meshed 
- with quadranglees only. </span></p>
+ with quadrangles only. </span></p>
 
 <p class="whs1"><img src="image157.gif" width="324px" height="337px" border="0" class="img_whs2"></p>
 
 <p class="whs1">&nbsp;</p>
 
-<p class="whs3">As you can see, the <span style="font-weight: bold;"><B>Prism3D</B></span> 
+<p class="whs3">As you can see, the <span style="font-weight: bold;"><B>3D extrusion</B></span> 
  algorithm permits to build and to have in the same 3D mesh such elements 
  as hexahedrons, prisms and polyhedrons.</p>
 
diff --git a/doc/salome/gui/SMESH/whdata/whftdata0.htm b/doc/salome/gui/SMESH/whdata/whftdata0.htm
index dd23e6dd8..20d7845ed 100755
--- a/doc/salome/gui/SMESH/whdata/whftdata0.htm
+++ b/doc/salome/gui/SMESH/whdata/whftdata0.htm
@@ -78,7 +78,7 @@ aTE("SALOME - SMESH - v.version: Package smesh","namespacesmesh.html");
 aTE("Netgen 2D and 3D hypotheses","netgen_2d_and_3d_hypotheses.htm");
 aTE("Pattern mapping","pattern_mapping.htm");
 aTE("Presentation","presentation.htm");
-aTE("Prism 3D Algorithm","prism_3d_algorithm.htm");
+aTE("3D extrusion Algorithm","prism_3d_algorithm.htm");
 aTE("Projection Algorithms","projection_algorithms.htm");
 aTE("Quality Controls","quality_controls.htm");
 aTE("Radial Prism","radial_prism.htm");
diff --git a/doc/salome/gui/SMESH/whdata/whtdata0.htm b/doc/salome/gui/SMESH/whdata/whtdata0.htm
index 40eb3f33b..3ce072d69 100755
--- a/doc/salome/gui/SMESH/whdata/whtdata0.htm
+++ b/doc/salome/gui/SMESH/whdata/whtdata0.htm
@@ -20,7 +20,7 @@
        aTE(2,0,"Basic meshing algorithms","files/about_meshing_algorithms.htm");
        aTE(2,0,"Projection Algorithms","projection_algorithms.htm");
        aTE(2,0,"Radial Prism Algorithm","radial_prism.htm");
-       aTE(2,0,"Prism 3D Algorithm","prism_3d_algorithm.htm");
+       aTE(2,0,"3D extrusion Algorithm","prism_3d_algorithm.htm");
      aTE(1,6,"Defining hypotheses");
        aTE(2,0,"About Hypotheses","files/about_hypotheses.htm");
        aTE(2,0,"1D Meshing Hypotheses","files/arithmetic_1d.htm");
diff --git a/doc/salome/gui/SMESH/whxdata/whftdata0.xml b/doc/salome/gui/SMESH/whxdata/whftdata0.xml
index ffb88ad56..83ca09c48 100755
--- a/doc/salome/gui/SMESH/whxdata/whftdata0.xml
+++ b/doc/salome/gui/SMESH/whxdata/whftdata0.xml
@@ -66,7 +66,7 @@
 <topic name="Netgen 2D and 3D hypotheses" url="netgen_2d_and_3d_hypotheses.htm" />
 <topic name="Pattern mapping" url="pattern_mapping.htm" />
 <topic name="Presentation" url="presentation.htm" />
-<topic name="Prism 3D Algorithm" url="prism_3d_algorithm.htm" />
+<topic name="3D extrusion Algorithm" url="prism_3d_algorithm.htm" />
 <topic name="Projection Algorithms" url="projection_algorithms.htm" />
 <topic name="Quality Controls" url="quality_controls.htm" />
 <topic name="Radial Prism" url="radial_prism.htm" />
diff --git a/doc/salome/gui/SMESH/whxdata/whtdata0.xml b/doc/salome/gui/SMESH/whxdata/whtdata0.xml
index 97d991783..153fe7ada 100755
--- a/doc/salome/gui/SMESH/whxdata/whtdata0.xml
+++ b/doc/salome/gui/SMESH/whxdata/whtdata0.xml
@@ -12,7 +12,7 @@
       <item name="Basic meshing algorithms" url="files/about_meshing_algorithms.htm" />
       <item name="Projection Algorithms" url="projection_algorithms.htm" />
       <item name="Radial Prism Algorithm" url="radial_prism.htm" />
-      <item name="Prism 3D Algorithm" url="prism_3d_algorithm.htm" />
+      <item name="3D extrusion Algorithm" url="prism_3d_algorithm.htm" />
     </book>
     <book name="Defining hypotheses" >
       <item name="About Hypotheses" url="files/about_hypotheses.htm" />
diff --git a/idl/SMESH_BasicHypothesis.idl b/idl/SMESH_BasicHypothesis.idl
index 8ae1235e7..94472e81b 100644
--- a/idl/SMESH_BasicHypothesis.idl
+++ b/idl/SMESH_BasicHypothesis.idl
@@ -536,7 +536,7 @@ module StdMeshers
   };
 
   /*!
-   * StdMeshers_Prism_3D: interface of "Prism 3D" algorithm
+   * StdMeshers_Prism_3D: interface of "3D extrusion" algorithm
    */
   interface StdMeshers_Prism_3D : SMESH::SMESH_3D_Algo
   {
diff --git a/resources/StdMeshers.xml b/resources/StdMeshers.xml
index 2c884948a..8698166df 100644
--- a/resources/StdMeshers.xml
+++ b/resources/StdMeshers.xml
@@ -161,7 +161,7 @@
                dim="3"/>
 
     <algorithm type="Prism_3D"
-               label-id="Prism 3D"
+               label-id="3D extrusion"
                icon-id="mesh_algo_hexa.png"
                input="QUAD,TRIA"
                dim="3"/>
diff --git a/src/SMESH_SWIG/smesh.py b/src/SMESH_SWIG/smesh.py
index d7a687e93..0431ee027 100644
--- a/src/SMESH_SWIG/smesh.py
+++ b/src/SMESH_SWIG/smesh.py
@@ -920,7 +920,7 @@ class Mesh_Projection3D(Mesh_Algorithm):
 # Public class: Mesh_Prism
 # ------------------------
 
-## Class to define a Prism 3D algorithm
+## Class to define a 3D extrusion algorithm
 #
 #  More details.
 class Mesh_Prism3D(Mesh_Algorithm):
@@ -1213,7 +1213,7 @@ class Mesh:
     def Projection3D(self, geom=0):
         return Mesh_Projection3D(self, geom)
 
-    ## Creates a Prism 3D or RadialPrism 3D algorithm for solids.
+    ## Creates a 3D extrusion (Prism 3D) or RadialPrism 3D algorithm for solids.
     #  If the optional \a geom parameter is not sets, this algorithm is global.
     #  Otherwise, this algorithm define a submesh based on \a geom subshape.
     #  @param geom If defined, subshape to be meshed
@@ -1962,9 +1962,9 @@ class Mesh:
             if self.GetElemNbNodes(face_id) == 4: # quadrangle
                 quad_nodes = self.mesh.GetElemNodes(face_id)
                 node1_elems = self.GetNodeInverseElements(quad_nodes[1 -1])
-                isPrismFound = False
+                isVolumeFound = False
                 for node1_elem in node1_elems:
-                    if not isPrismFound:
+                    if not isVolumeFound:
                         if self.GetElementType(node1_elem, True) == SMESH.VOLUME:
                             nb_nodes = self.GetElemNbNodes(node1_elem)
                             if 3 < nb_nodes and nb_nodes < 7: # tetra or penta, or prism
-- 
2.39.2

