From: gdd <gdd>
Date: Fri, 17 Sep 2010 16:43:28 +0000 (+0000)
Subject: GDD: Check that the PipeTShape is a block if it is required by user
X-Git-Tag: V5_1_5a1~13
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e332fbdfc4f224782443bdaff8cbf4edcd630bbc;p=modules%2Fgeom.git

GDD: Check that the PipeTShape is a block if it is required by user
---

diff --git a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx
index 91722ecd6..9899fc5da 100644
--- a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx
@@ -996,7 +996,12 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
   }
   Te3->GetLastFunction()->SetDescription("");
 
-
+  // Last verification: result should be a block
+  std::list<GEOMImpl_IBlocksOperations::BCError> errList;
+  if (!myBlocksOperations->CheckCompoundOfBlocks(Te3,errList)) {
+    SetErrorCode("TShape is not a block");
+    return false;
+  }
   TopoDS_Shape aShape = Te3->GetValue();
   theShape->GetLastFunction()->SetValue(aShape);
     
@@ -1843,7 +1848,8 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFillet(double theR1, double theW1, d
     return NULL;
   }
   if (aFillet.IsNull()) {
-    SetErrorCode("Fillet can not be computed on the given shape with the given parameters");
+//     SetErrorCode("Fillet can not be computed on the given shape with the given parameters");
+    SetErrorCode(myLocalOperations->GetErrorCode());
     return NULL;
   }
   aFillet->GetLastFunction()->SetDescription("");