#18963 Minimize compiler warnings

[modules/smesh.git] / src / StdMeshers_I / StdMeshers_QuadrangleParams_i.cxx

diff --git a/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx b/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx
index 78b2841e1575a4d7a3f56809f3faaa3fe1a0ad2a..45f26349b4f2eda07ac2532613a7dad084d8018a 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020  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
@@ -207,7 +207,6 @@ StdMeshers::QuadType StdMeshers_QuadrangleParams_i::GetQuadType()
 
 void StdMeshers_QuadrangleParams_i::SetEnforcedNodes(const GEOM::ListOfGO&     theVertices,
                                                      const SMESH::nodes_array& thePoints)
-  throw ( SALOME::SALOME_Exception )
 {
   try {
     std::vector< TopoDS_Shape > shapes;
@@ -293,6 +292,43 @@ SMESH::string_array* StdMeshers_QuadrangleParams_i::GetEnfVertices()
   return arr._retn();
 }
 
+//=============================================================================
+/*!
+ * Set corner vertices
+ */
+//=============================================================================
+
+void StdMeshers_QuadrangleParams_i::SetCorners(const SMESH::long_array& theVertexIDs )
+{
+  std::vector< int > ids;
+  for ( CORBA::ULong i = 0; i < theVertexIDs.length(); ++i )
+    ids.push_back( theVertexIDs[i] );
+
+  if ( ids != GetImpl()->GetCorners() )
+  {
+    GetImpl()->SetCorners( ids );
+    SMESH::TPythonDump() << _this() << ".SetCorners( " << theVertexIDs << " )";
+  }
+}
+
+//=============================================================================
+/*!
+ * Return IDs of corner vertices
+ */
+//=============================================================================
+
+SMESH::long_array* StdMeshers_QuadrangleParams_i::GetCorners()
+{
+  const std::vector< int >& ids = GetImpl()->GetCorners();
+
+  SMESH::long_array_var  result = new SMESH::long_array;
+  result->length( ids.size() );
+  for ( size_t i = 0; i < ids.size(); ++i )
+    result[ i ] = ids[ i ];
+
+  return result._retn();
+}
+
 //=============================================================================
 /*!
  *  StdMeshers_QuadrangleParams_i::GetImpl
@@ -378,3 +414,54 @@ void StdMeshers_QuadrangleParams_i::LoadFrom( const char* theStream )
 
   myBaseImpl->LoadFrom( is );
 }
+
+//================================================================================
+/*!
+ * \brief Return geometry this hypothesis depends on. Return false if there is no geometry parameter
+ */
+//================================================================================
+
+bool
+StdMeshers_QuadrangleParams_i::getObjectsDependOn( std::vector< std::string > & entryArray,
+                                                   std::vector< int >         & subIDArray ) const
+{
+  const ::StdMeshers_QuadrangleParams* impl =
+    static_cast<const ::StdMeshers_QuadrangleParams*>( myBaseImpl );
+
+  subIDArray.push_back( impl->GetTriaVertex() );
+
+  entryArray.push_back( impl->GetObjectEntry() );
+  entryArray.insert( entryArray.end(), myShapeEntries.begin(), myShapeEntries.end() );
+
+  return true;
+}
+
+//================================================================================
+/*!
+ * \brief Set new geometry instead of that returned by getObjectsDependOn()
+ */
+//================================================================================
+
+bool
+StdMeshers_QuadrangleParams_i::setObjectsDependOn( std::vector< std::string > & entryArray,
+                                                   std::vector< int >         & subIDArray )
+{
+  if ( !subIDArray.empty() )
+    GetImpl()->SetTriaVertex( subIDArray[0] );
+
+  GetImpl()->SetObjectEntry( entryArray[0].c_str() );
+
+  myShapeEntries.assign( ++entryArray.begin(), entryArray.end() );
+
+  std::vector< TopoDS_Shape > shapes;
+  std::vector< gp_Pnt       > points;
+  this->GetImpl()->GetEnforcedNodes( shapes, points );
+
+  shapes.clear();
+  for ( size_t i = 0; i < myShapeEntries.size(); ++i )
+    shapes.push_back( StdMeshers_ObjRefUlils::EntryToShape( myShapeEntries[i] ));
+
+  this->GetImpl()->SetEnforcedNodes( shapes, points );
+
+  return true;
+}