ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-11 16:19:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '4823245056426a9ccf9c7965daecf11459f58af5' into V9_11_BR

Browse Source
This commit is contained in:
DOROVSKIKH Julia OpenCascade 2023-06-01 17:56:27 +02:00
commit 7725eb65c0
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/GEOM_I/GEOM_IMeasureOperations_i.cc
View File

@ -31,6 +31,8 @@
#include "GEOM_Engine.hxx" #include "GEOM_Engine.hxx"
#include "GEOM_Object.hxx" #include "GEOM_Object.hxx"
#define WRN_SHAPE_IS_NULL "WRN_SHAPE_IS_NULL"
/** /**
* This function converts shape errors from theErrorsFrom to theErrorsTo. * This function converts shape errors from theErrorsFrom to theErrorsTo.
* Note that theErrorsTo is not cleared at first. * Note that theErrorsTo is not cleared at first.
@ -690,8 +692,10 @@ char* GEOM_IMeasureOperations_i::PrintShapeErrors
//Get the reference shape //Get the reference shape
Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) { if (aShape.IsNull())
return NULL; {
GetOperations()->SetErrorCode(WRN_SHAPE_IS_NULL);
return CORBA::string_dup("");
} }
// Convert the errors sequence // Convert the errors sequence
@ -920,7 +924,12 @@ char* GEOM_IMeasureOperations_i::WhatIs (GEOM::GEOM_Object_ptr theShape)
//Get the reference shape //Get the reference shape
Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return NULL; if (aShape.IsNull())
{
//Assume the "WhatIs" operation as being done
GetOperations()->SetErrorCode(OK);
return CORBA::string_dup(WRN_SHAPE_IS_NULL);
}
// Get shape parameters // Get shape parameters
TCollection_AsciiString aDescription = GetOperations()->WhatIs(aShape); TCollection_AsciiString aDescription = GetOperations()->WhatIs(aShape);