X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers_I%2FStdMeshers_QuadrangleParams_i.cxx;h=85295c055e8b763193b07299da118087e30c7af1;hb=d8f644ca3d4ce62f2ef41d4aacb52f5bb1221df3;hp=9113359b680673c93525b4a975b71fcce0ec1e3c;hpb=55510e5ccd337f72bb1caa755b131cf0916d91b3;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx b/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx
index 9113359b6..85295c055 100644
--- a/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -23,8 +20,7 @@
 //  File   : StdMeshers_QuadrangleParams_i.cxx
 //  Author : Sergey KUUL, OCC
 //  Module : SMESH
-//  $Header$
-//
+
 #include "StdMeshers_QuadrangleParams_i.hxx"
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
@@ -47,15 +43,15 @@ using namespace std;
 
 StdMeshers_QuadrangleParams_i::StdMeshers_QuadrangleParams_i
                                           (PortableServer::POA_ptr thePOA,
-					   int                     theStudyId,
-					   ::SMESH_Gen*            theGenImpl )
+                                           int                     theStudyId,
+                                           ::SMESH_Gen*            theGenImpl )
      : SALOME::GenericObj_i( thePOA ), 
        SMESH_Hypothesis_i( thePOA )
 {
   MESSAGE( "StdMeshers_QuadrangleParams_i::StdMeshers_QuadrangleParams_i" );
   myBaseImpl = new ::StdMeshers_QuadrangleParams(theGenImpl->GetANewId(),
-						 theStudyId,
-						 theGenImpl);
+                                                 theStudyId,
+                                                 theGenImpl);
 }
 
 //=============================================================================
@@ -88,12 +84,27 @@ void StdMeshers_QuadrangleParams_i::SetTriaVertex(CORBA::Long vertID)
   }
   catch ( SALOME_Exception& S_ex ) {
     THROW_SALOME_CORBA_EXCEPTION( S_ex.what(),
-				  SALOME::BAD_PARAM );
+                                  SALOME::BAD_PARAM );
   }
 
   // Update Python script
-  /*  SMESH::TPythonDump() << _this() << ".SetEdgesToReverse( "
-      << theList << " )";*/
+  SMESH::TPythonDump() << _this() << ".SetTriaVertex( "
+      << vertID << " )";
+}
+
+//=============================================================================
+/*!
+ *  StdMeshers_QuadrangleParams_i::GetTriaVertex
+ *
+ *  Get base vertex for triangles
+ */
+//=============================================================================
+
+CORBA::Long StdMeshers_QuadrangleParams_i::GetTriaVertex()
+{
+  MESSAGE( "StdMeshers_QuadrangleParams_i::GetTriaVertex" );
+  ASSERT( myBaseImpl );
+  return this->GetImpl()->GetTriaVertex();
 }
 
 //=============================================================================
@@ -145,17 +156,65 @@ char* StdMeshers_QuadrangleParams_i::GetObjectEntry()
 
 //=============================================================================
 /*!
- *  StdMeshers_QuadrangleParams_i::GetTriaVertex
+ *  StdMeshers_QuadrangleParams_i::SetQuadType
  *
- *  Get base vertex for triangles
+ *  Set the type of quadrangulation
  */
 //=============================================================================
+void StdMeshers_QuadrangleParams_i::SetQuadType(StdMeshers::QuadType type)
+{
+  //static char* quadTypes[5] = {"StdMeshers.QUAD_STANDARD",
+  //                             "StdMeshers.QUAD_TRIANGLE_PREF",
+  //                             "StdMeshers.QUAD_QUADRANGLE_PREF",
+  //                             "StdMeshers.QUAD_QUADRANGLE_PREF_REVERSED",
+  //                             "StdMeshers.QUAD_REDUCED"};
 
-CORBA::Long StdMeshers_QuadrangleParams_i::GetTriaVertex()
+  MESSAGE("StdMeshers_QuadrangleParams_i::SetQuadType");
+  ASSERT(myBaseImpl);
+
+  if (int(type) >= int(StdMeshers::QUAD_NB_TYPES)) {
+    THROW_SALOME_CORBA_EXCEPTION("Bad type of quadrangulation", SALOME::BAD_PARAM);
+  }
+
+  try {
+    this->GetImpl()->SetQuadType(StdMeshers_QuadType(int(type)));
+  }
+  catch (SALOME_Exception& S_ex) {
+    THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM);
+  }
+
+  // Update Python script
+  const char* quadType;
+  switch (type) {
+  case StdMeshers::QUAD_STANDARD:
+    quadType = "StdMeshers.QUAD_STANDARD"; break;
+  case StdMeshers::QUAD_TRIANGLE_PREF:
+    quadType = "StdMeshers.QUAD_TRIANGLE_PREF"; break;
+  case StdMeshers::QUAD_QUADRANGLE_PREF:
+    quadType = "StdMeshers.QUAD_QUADRANGLE_PREF"; break;
+  case StdMeshers::QUAD_QUADRANGLE_PREF_REVERSED:
+    quadType = "StdMeshers.QUAD_QUADRANGLE_PREF_REVERSED"; break;
+  case StdMeshers::QUAD_REDUCED:
+    quadType = "StdMeshers.QUAD_REDUCED"; break;
+  default:
+    quadType = "UNKNOWN";
+  }
+  SMESH::TPythonDump() << _this() << ".SetQuadType( " << quadType << " )";
+  //SMESH::TPythonDump() << _this() << ".SetQuadType( " << quadTypes[int(type)] << " )";
+}
+
+//=============================================================================
+/*!
+ *  StdMeshers_QuadrangleParams_i::GetQuadType
+ *
+ *  Get the type of quadrangulation
+ */
+//=============================================================================
+StdMeshers::QuadType StdMeshers_QuadrangleParams_i::GetQuadType()
 {
-  MESSAGE( "StdMeshers_QuadrangleParams_i::GetTriaVertex" );
-  ASSERT( myBaseImpl );
-  return this->GetImpl()->GetTriaVertex();
+  MESSAGE("StdMeshers_QuadrangleParams_i::GetQuadType");
+  ASSERT(myBaseImpl);
+  return StdMeshers::QuadType(int(this->GetImpl()->GetQuadType()));
 }
 
 //=============================================================================
@@ -185,4 +244,3 @@ CORBA::Boolean StdMeshers_QuadrangleParams_i::IsDimSupported( SMESH::Dimension t
 {
   return type == SMESH::DIM_2D;
 }
-