mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2025-02-05 01:14:17 +05:00
dynamic_log_messages: Fixed compilation errors because of forgotten semicolons after log macros.
This commit is contained in:
parent
be1d76dd6a
commit
f932f85c16
@ -88,7 +88,7 @@ void VolumeSection::CenterOfGravity()
|
|||||||
TopoDS_Face F = TopoDS::Face(ex.Current());
|
TopoDS_Face F = TopoDS::Face(ex.Current());
|
||||||
Handle(Poly_Triangulation) Tr = BRep_Tool::Triangulation(F, L);
|
Handle(Poly_Triangulation) Tr = BRep_Tool::Triangulation(F, L);
|
||||||
if(Tr.IsNull())
|
if(Tr.IsNull())
|
||||||
MESSAGE("Error, null layer" )
|
MESSAGE("Error, null layer" );
|
||||||
nbNodes = Tr->NbNodes();
|
nbNodes = Tr->NbNodes();
|
||||||
const TColgp_Array1OfPnt& Nodes = Tr->Nodes();
|
const TColgp_Array1OfPnt& Nodes = Tr->Nodes();
|
||||||
|
|
||||||
@ -113,8 +113,8 @@ void VolumeSection::CenterOfGravity()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Creation du point d'initialisation, c'est € dire le centre de gravit‰
|
// Creation du point d'initialisation, c'est e dire le centre de gravite
|
||||||
//g‰om‰trique de la boite englobante
|
// geometrique de la boite englobante
|
||||||
|
|
||||||
InitPoint.SetX(0.5 * (Xmin + Xmax));
|
InitPoint.SetX(0.5 * (Xmin + Xmax));
|
||||||
InitPoint.SetY(0.5 * (Ymin + Ymax));
|
InitPoint.SetY(0.5 * (Ymin + Ymax));
|
||||||
@ -141,14 +141,14 @@ Standard_Real VolumeSection::CalculateVolume(Standard_Real Elevation)
|
|||||||
TopoDS_Face F = TopoDS::Face(ex.Current());
|
TopoDS_Face F = TopoDS::Face(ex.Current());
|
||||||
Handle(Poly_Triangulation) Tr = BRep_Tool::Triangulation(F, L);
|
Handle(Poly_Triangulation) Tr = BRep_Tool::Triangulation(F, L);
|
||||||
if(Tr.IsNull())
|
if(Tr.IsNull())
|
||||||
MESSAGE("Error, null layer" )
|
MESSAGE("Error, null layer" );
|
||||||
const Poly_Array1OfTriangle& triangles = Tr->Triangles();
|
const Poly_Array1OfTriangle& triangles = Tr->Triangles();
|
||||||
Standard_Integer nbTriangles = Tr->NbTriangles();
|
Standard_Integer nbTriangles = Tr->NbTriangles();
|
||||||
//nbNodes = Tr->NbNodes();
|
//nbNodes = Tr->NbNodes();
|
||||||
const TColgp_Array1OfPnt& Nodes = Tr->Nodes();
|
const TColgp_Array1OfPnt& Nodes = Tr->Nodes();
|
||||||
|
|
||||||
// Calcul des volumes de chaque triangle, de chaque face
|
// Calcul des volumes de chaque triangle, de chaque face
|
||||||
//en tenant compte des triangles coup‰s par le plan de section
|
// en tenant compte des triangles coupes par le plan de section
|
||||||
|
|
||||||
for (i=1;i<=nbTriangles;i++)
|
for (i=1;i<=nbTriangles;i++)
|
||||||
{
|
{
|
||||||
@ -234,7 +234,7 @@ Standard_Real VolumeSection::Archimede(Standard_Real Constante , Standard_Real E
|
|||||||
Bsup = Zmax;
|
Bsup = Zmax;
|
||||||
if(Binf>Bsup)
|
if(Binf>Bsup)
|
||||||
{
|
{
|
||||||
MESSAGE("error, Bound + < Bound - in dichotomy")
|
MESSAGE("error, Bound + < Bound - in dichotomy");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
tempBsupVolume = CalculateVolume(Bsup);
|
tempBsupVolume = CalculateVolume(Bsup);
|
||||||
@ -242,7 +242,7 @@ Standard_Real VolumeSection::Archimede(Standard_Real Constante , Standard_Real E
|
|||||||
|
|
||||||
if (Constante>tempBsupVolume || Constante<tempBinfVolume)
|
if (Constante>tempBsupVolume || Constante<tempBinfVolume)
|
||||||
{
|
{
|
||||||
MESSAGE("error, algorithm start Impossible. Wrong constant value" )
|
MESSAGE("error, algorithm start Impossible. Wrong constant value" );
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -286,7 +286,7 @@ Standard_Real VolumeSection::Archimede(Standard_Real Constante , Standard_Real E
|
|||||||
|
|
||||||
}
|
}
|
||||||
endMethod:
|
endMethod:
|
||||||
MESSAGE("La ligne de flottaison correspondant a la constante :"<<Constante<<" est a la cote Z = "<<c)
|
MESSAGE("La ligne de flottaison correspondant a la constante :"<<Constante<<" est a la cote Z = "<<c);
|
||||||
|
|
||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
@ -372,7 +372,7 @@ gp_Pnt VolumeSection::Intersection(gp_Pnt P1,gp_Pnt P2,Standard_Real Hauteur)
|
|||||||
return Point;
|
return Point;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Fonction calculant le volume ‰l‰mentaire de chaque t‰traedre € partir de 3 points
|
// Fonction calculant le volume elementaire de chaque tetraedre e partir de 3 points
|
||||||
Standard_Real VolumeSection::ElementaryVolume(gp_Pnt P1,gp_Pnt P2,gp_Pnt P3)
|
Standard_Real VolumeSection::ElementaryVolume(gp_Pnt P1,gp_Pnt P2,gp_Pnt P3)
|
||||||
{
|
{
|
||||||
Standard_Real Determinant;
|
Standard_Real Determinant;
|
||||||
|
@ -352,7 +352,7 @@ bool EntityGUI::OnMouseMove( QMouseEvent* pe, SUIT_Desktop* /*parent*/, SUIT_Vie
|
|||||||
//=====================================================================================
|
//=====================================================================================
|
||||||
void EntityGUI::DisplaySimulationShape( const TopoDS_Shape& S1, const TopoDS_Shape& S2 )
|
void EntityGUI::DisplaySimulationShape( const TopoDS_Shape& S1, const TopoDS_Shape& S2 )
|
||||||
{
|
{
|
||||||
MESSAGE("EntityGUI::DisplaySimulationShape")
|
MESSAGE("EntityGUI::DisplaySimulationShape");
|
||||||
SalomeApp_Application* app = getGeometryGUI()->getApp();
|
SalomeApp_Application* app = getGeometryGUI()->getApp();
|
||||||
if ( !app ) return;
|
if ( !app ) return;
|
||||||
|
|
||||||
@ -401,7 +401,7 @@ void EntityGUI::DisplaySimulationShape( const TopoDS_Shape& S1, const TopoDS_Sha
|
|||||||
//==================================================================================
|
//==================================================================================
|
||||||
void EntityGUI::EraseSimulationShape()
|
void EntityGUI::EraseSimulationShape()
|
||||||
{
|
{
|
||||||
MESSAGE("EntityGUI::EraseSimulationShape")
|
MESSAGE("EntityGUI::EraseSimulationShape");
|
||||||
SalomeApp_Application* app = getGeometryGUI()->getApp();
|
SalomeApp_Application* app = getGeometryGUI()->getApp();
|
||||||
if ( !app ) return;
|
if ( !app ) return;
|
||||||
|
|
||||||
|
@ -505,7 +505,7 @@ bool EntityGUI_FeatureDetectorDlg::ClickOnApply()
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void EntityGUI_FeatureDetectorDlg::ConstructorsClicked(int id)
|
void EntityGUI_FeatureDetectorDlg::ConstructorsClicked(int id)
|
||||||
{
|
{
|
||||||
MESSAGE("Constructor id ="<<id)
|
MESSAGE("Constructor id ="<<id);
|
||||||
myConstructorId = id;
|
myConstructorId = id;
|
||||||
switch (id)
|
switch (id)
|
||||||
{
|
{
|
||||||
@ -671,7 +671,7 @@ ShapeRec_Parameters* EntityGUI_FeatureDetectorDlg::parametersChanged()
|
|||||||
void EntityGUI_FeatureDetectorDlg::setStartPnt(const gp_Pnt& theStartPnt)
|
void EntityGUI_FeatureDetectorDlg::setStartPnt(const gp_Pnt& theStartPnt)
|
||||||
{
|
{
|
||||||
myStartPnt = theStartPnt;
|
myStartPnt = theStartPnt;
|
||||||
MESSAGE("myStartPnt = ("<<theStartPnt.X()<<", "<<theStartPnt.Y()<<")")
|
MESSAGE("myStartPnt = ("<<theStartPnt.X()<<", "<<theStartPnt.Y()<<")");
|
||||||
}
|
}
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
@ -681,7 +681,7 @@ void EntityGUI_FeatureDetectorDlg::setStartPnt(const gp_Pnt& theStartPnt)
|
|||||||
void EntityGUI_FeatureDetectorDlg::setEndPnt(const gp_Pnt& theEndPnt)
|
void EntityGUI_FeatureDetectorDlg::setEndPnt(const gp_Pnt& theEndPnt)
|
||||||
{
|
{
|
||||||
myEndPnt = theEndPnt;
|
myEndPnt = theEndPnt;
|
||||||
MESSAGE("myEndPnt = ("<<theEndPnt.X()<<", "<<theEndPnt.Y()<<")")
|
MESSAGE("myEndPnt = ("<<theEndPnt.X()<<", "<<theEndPnt.Y()<<")");
|
||||||
if (setSelectionRect() && myDetector->GetImgHeight() > 0)
|
if (setSelectionRect() && myDetector->GetImgHeight() > 0)
|
||||||
showImageSample();
|
showImageSample();
|
||||||
}
|
}
|
||||||
@ -814,7 +814,7 @@ bool EntityGUI_FeatureDetectorDlg::execute( ObjectList& objects )
|
|||||||
|
|
||||||
bool insert;
|
bool insert;
|
||||||
|
|
||||||
MESSAGE("hierarchy.size() =" << hierarchy.size())
|
MESSAGE("hierarchy.size() =" << hierarchy.size());
|
||||||
if ( hierarchy.size() < 1 ) {
|
if ( hierarchy.size() < 1 ) {
|
||||||
getOperation()->SetErrorCode( "Impossible detected contours" );
|
getOperation()->SetErrorCode( "Impossible detected contours" );
|
||||||
return false;
|
return false;
|
||||||
|
@ -135,7 +135,7 @@ void EntityGUI_PictureImportDlg::FileSelectionClicked()
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void EntityGUI_PictureImportDlg::ClickOnOk()
|
void EntityGUI_PictureImportDlg::ClickOnOk()
|
||||||
{
|
{
|
||||||
MESSAGE("EntityGUI_PictureImportDlg::ClickOnOk()")
|
MESSAGE("EntityGUI_PictureImportDlg::ClickOnOk()");
|
||||||
setIsApplyAndClose( true );
|
setIsApplyAndClose( true );
|
||||||
if ( ClickOnApply() )
|
if ( ClickOnApply() )
|
||||||
ClickOnCancel();
|
ClickOnCancel();
|
||||||
@ -147,7 +147,7 @@ void EntityGUI_PictureImportDlg::ClickOnOk()
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
bool EntityGUI_PictureImportDlg::ClickOnApply()
|
bool EntityGUI_PictureImportDlg::ClickOnApply()
|
||||||
{
|
{
|
||||||
MESSAGE("EntityGUI_PictureImportDlg::ClickOnApply()")
|
MESSAGE("EntityGUI_PictureImportDlg::ClickOnApply()");
|
||||||
if ( !onAccept() )
|
if ( !onAccept() )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
@ -671,7 +671,7 @@ gp_Ax3 EntityGUI_PolylineDlg::WPlaneToLCS(GEOM::GeomObjPtr theGeomObj)
|
|||||||
gp_Ax3 aLCS;
|
gp_Ax3 aLCS;
|
||||||
|
|
||||||
if (theGeomObj || aShape.IsNull()) {
|
if (theGeomObj || aShape.IsNull()) {
|
||||||
MESSAGE("CORBA::is_nil(theGeomObj) || aShape.IsNull()")
|
MESSAGE("CORBA::is_nil(theGeomObj) || aShape.IsNull()");
|
||||||
}
|
}
|
||||||
|
|
||||||
aLCS.Transform(aShape.Location().Transformation());
|
aLCS.Transform(aShape.Location().Transformation());
|
||||||
|
@ -529,7 +529,7 @@ void EntityGUI_SketcherDlg::Init()
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void EntityGUI_SketcherDlg::InitClick()
|
void EntityGUI_SketcherDlg::InitClick()
|
||||||
{
|
{
|
||||||
MESSAGE("EntityGUI_SketcherDlg::InitClick()")
|
MESSAGE("EntityGUI_SketcherDlg::InitClick()");
|
||||||
disconnect( myGeometryGUI->getApp()->selectionMgr(), 0, this, 0 );
|
disconnect( myGeometryGUI->getApp()->selectionMgr(), 0, this, 0 );
|
||||||
myCheckFlag = 0;
|
myCheckFlag = 0;
|
||||||
|
|
||||||
@ -694,7 +694,7 @@ void EntityGUI_SketcherDlg::DestClicked( int constructorId )
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void EntityGUI_SketcherDlg::PointClicked( int constructorId )
|
void EntityGUI_SketcherDlg::PointClicked( int constructorId )
|
||||||
{
|
{
|
||||||
MESSAGE("PointClicked")
|
MESSAGE("PointClicked");
|
||||||
myConstructorPntId = constructorId;
|
myConstructorPntId = constructorId;
|
||||||
GroupPt->RB_Point3->setEnabled( true );
|
GroupPt->RB_Point3->setEnabled( true );
|
||||||
int buttonId = GroupPt2->ButtonGroup->checkedId();
|
int buttonId = GroupPt2->ButtonGroup->checkedId();
|
||||||
@ -713,7 +713,7 @@ void EntityGUI_SketcherDlg::PointClicked( int constructorId )
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void EntityGUI_SketcherDlg::Point2Clicked( int constructorId )
|
void EntityGUI_SketcherDlg::Point2Clicked( int constructorId )
|
||||||
{
|
{
|
||||||
MESSAGE("Point2Clicked")
|
MESSAGE("Point2Clicked");
|
||||||
InitClick();
|
InitClick();
|
||||||
|
|
||||||
// Get setting of step value from file configuration
|
// Get setting of step value from file configuration
|
||||||
@ -1134,7 +1134,7 @@ void EntityGUI_SketcherDlg::ClickOnCancel()
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void EntityGUI_SketcherDlg::ClickOnEnd()
|
void EntityGUI_SketcherDlg::ClickOnEnd()
|
||||||
{
|
{
|
||||||
MESSAGE("EntityGUI_SketcherDlg::ClickOnEnd()")
|
MESSAGE("EntityGUI_SketcherDlg::ClickOnEnd()");
|
||||||
if ( sender() == MainWidget->buttonClose ) {
|
if ( sender() == MainWidget->buttonClose ) {
|
||||||
// Verify validity of commands
|
// Verify validity of commands
|
||||||
if ( myCommand.count() <= 2 ) {
|
if ( myCommand.count() <= 2 ) {
|
||||||
@ -1190,7 +1190,7 @@ void EntityGUI_SketcherDlg::ClickOnEnd()
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
bool EntityGUI_SketcherDlg::ClickOnApply()
|
bool EntityGUI_SketcherDlg::ClickOnApply()
|
||||||
{
|
{
|
||||||
MESSAGE("EntityGUI_SketcherDlg::ClickOnApply()")
|
MESSAGE("EntityGUI_SketcherDlg::ClickOnApply()");
|
||||||
if ( sender() && sender()->inherits( "QPushButton" ) )
|
if ( sender() && sender()->inherits( "QPushButton" ) )
|
||||||
( (QPushButton*)sender() )->setFocus(); // to update value of currently edited spin-box (PAL11948)
|
( (QPushButton*)sender() )->setFocus(); // to update value of currently edited spin-box (PAL11948)
|
||||||
|
|
||||||
@ -1357,7 +1357,7 @@ void EntityGUI_SketcherDlg::setEnabledRedo( bool value )
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void EntityGUI_SketcherDlg::SelectionIntoArgument()
|
void EntityGUI_SketcherDlg::SelectionIntoArgument()
|
||||||
{
|
{
|
||||||
MESSAGE("EntityGUI_SketcherDlg::SelectionIntoArgument")
|
MESSAGE("EntityGUI_SketcherDlg::SelectionIntoArgument");
|
||||||
myEditCurrentArgument->setText( "" );
|
myEditCurrentArgument->setText( "" );
|
||||||
|
|
||||||
LightApp_SelectionMgr* aSelMgr = myGeometryGUI->getApp()->selectionMgr();
|
LightApp_SelectionMgr* aSelMgr = myGeometryGUI->getApp()->selectionMgr();
|
||||||
@ -1627,7 +1627,7 @@ void EntityGUI_SketcherDlg::DeactivateActiveDialog()
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void EntityGUI_SketcherDlg::ActivateThisDialog()
|
void EntityGUI_SketcherDlg::ActivateThisDialog()
|
||||||
{
|
{
|
||||||
MESSAGE("EntityGUI_SketcherDlg::ActivateThisDialog()")
|
MESSAGE("EntityGUI_SketcherDlg::ActivateThisDialog()");
|
||||||
myGeometryGUI->EmitSignalDeactivateDialog();
|
myGeometryGUI->EmitSignalDeactivateDialog();
|
||||||
setEnabled( true );
|
setEnabled( true );
|
||||||
myGeometryGUI->SetActiveDialogBox( this );
|
myGeometryGUI->SetActiveDialogBox( this );
|
||||||
@ -1679,7 +1679,7 @@ void EntityGUI_SketcherDlg::enterEvent( QEvent* )
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void EntityGUI_SketcherDlg::closeEvent( QCloseEvent* e )
|
void EntityGUI_SketcherDlg::closeEvent( QCloseEvent* e )
|
||||||
{
|
{
|
||||||
MESSAGE("EntityGUI_SketcherDlg::closeEvent")
|
MESSAGE("EntityGUI_SketcherDlg::closeEvent");
|
||||||
//myGeometryGUI->SetState( -1 );
|
//myGeometryGUI->SetState( -1 );
|
||||||
disconnect( myGeometryGUI->getApp()->selectionMgr(), 0, this, 0 );
|
disconnect( myGeometryGUI->getApp()->selectionMgr(), 0, this, 0 );
|
||||||
myGeometryGUI->getApp()->updateActions();
|
myGeometryGUI->getApp()->updateActions();
|
||||||
@ -2317,7 +2317,7 @@ bool EntityGUI_SketcherDlg::isValid( QString& msg )
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
bool EntityGUI_SketcherDlg::execute( ObjectList& objects )
|
bool EntityGUI_SketcherDlg::execute( ObjectList& objects )
|
||||||
{
|
{
|
||||||
MESSAGE("EntityGUI_SketcherDlg::execute")
|
MESSAGE("EntityGUI_SketcherDlg::execute");
|
||||||
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
|
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
|
||||||
int aPrecision = resMgr->integerValue( "Geometry", "length_precision", 6 );
|
int aPrecision = resMgr->integerValue( "Geometry", "length_precision", 6 );
|
||||||
int DigNum = qAbs(aPrecision); // options for the format of numbers in myNewCommand
|
int DigNum = qAbs(aPrecision); // options for the format of numbers in myNewCommand
|
||||||
@ -2789,7 +2789,7 @@ gp_Ax3 EntityGUI_SketcherDlg::WPlaneToLCS( GEOM::GEOM_Object_var geomObj )
|
|||||||
gp_Ax3 aLCS;
|
gp_Ax3 aLCS;
|
||||||
if (CORBA::is_nil( geomObj ) || aShape.IsNull())
|
if (CORBA::is_nil( geomObj ) || aShape.IsNull())
|
||||||
{
|
{
|
||||||
MESSAGE("CORBA::is_nil( geomObj ) || aShape.IsNull()")
|
MESSAGE("CORBA::is_nil( geomObj ) || aShape.IsNull()");
|
||||||
}
|
}
|
||||||
aLCS.Transform(aShape.Location().Transformation());
|
aLCS.Transform(aShape.Location().Transformation());
|
||||||
if (aShape.ShapeType() == TopAbs_FACE)
|
if (aShape.ShapeType() == TopAbs_FACE)
|
||||||
|
@ -754,7 +754,7 @@ bool GEOMBase_Helper::openCommand()
|
|||||||
bool res = false;
|
bool res = false;
|
||||||
if ( !getStudy() || hasCommand() )
|
if ( !getStudy() || hasCommand() )
|
||||||
{
|
{
|
||||||
MESSAGE("Getting out from openCommand()")
|
MESSAGE("Getting out from openCommand()");
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -766,7 +766,7 @@ bool GEOMBase_Helper::openCommand()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
MESSAGE("anOp->_is_nil() = true")
|
MESSAGE("anOp->_is_nil() = true");
|
||||||
}
|
}
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
@ -857,7 +857,7 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b
|
|||||||
SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( SUIT_Session::session()->activeApplication()->activeStudy() );
|
SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( SUIT_Session::session()->activeApplication()->activeStudy() );
|
||||||
if ( !appStudy )
|
if ( !appStudy )
|
||||||
{
|
{
|
||||||
MESSAGE("appStudy is empty")
|
MESSAGE("appStudy is empty");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
_PTR(Study) aStudy = appStudy->studyDS();
|
_PTR(Study) aStudy = appStudy->studyDS();
|
||||||
@ -968,12 +968,12 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b
|
|||||||
catch( const SALOME::SALOME_Exception& e ) {
|
catch( const SALOME::SALOME_Exception& e ) {
|
||||||
SalomeApp_Tools::QtCatchCorbaException( e );
|
SalomeApp_Tools::QtCatchCorbaException( e );
|
||||||
abortCommand();
|
abortCommand();
|
||||||
MESSAGE("Exception caught")
|
MESSAGE("Exception caught");
|
||||||
}
|
}
|
||||||
|
|
||||||
updateViewer();
|
updateViewer();
|
||||||
|
|
||||||
MESSAGE("result ="<<result)
|
MESSAGE("result ="<<result);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1846,7 +1846,7 @@ Standard_Integer GEOMImpl_IShapesOperations::GetSubShapeIndex (Handle(GEOM_Objec
|
|||||||
Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetSubShapesIndices (Handle(GEOM_Object) theMainShape,
|
Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetSubShapesIndices (Handle(GEOM_Object) theMainShape,
|
||||||
std::list<Handle(GEOM_Object)> theSubShapes)
|
std::list<Handle(GEOM_Object)> theSubShapes)
|
||||||
{
|
{
|
||||||
MESSAGE("GEOMImpl_IShapesOperations::GetSubShapesIndices")
|
MESSAGE("GEOMImpl_IShapesOperations::GetSubShapesIndices");
|
||||||
SetErrorCode(KO);
|
SetErrorCode(KO);
|
||||||
|
|
||||||
Handle(TColStd_HSequenceOfInteger) aSeq = new TColStd_HSequenceOfInteger;
|
Handle(TColStd_HSequenceOfInteger) aSeq = new TColStd_HSequenceOfInteger;
|
||||||
@ -1854,7 +1854,7 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetSubShapesIndic
|
|||||||
TopoDS_Shape aMainShape = theMainShape->GetValue();
|
TopoDS_Shape aMainShape = theMainShape->GetValue();
|
||||||
if (aMainShape.IsNull())
|
if (aMainShape.IsNull())
|
||||||
{
|
{
|
||||||
MESSAGE("NULL main shape")
|
MESSAGE("NULL main shape");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1867,7 +1867,7 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetSubShapesIndic
|
|||||||
TopoDS_Shape aSubShape = (*it)->GetValue();
|
TopoDS_Shape aSubShape = (*it)->GetValue();
|
||||||
if (aSubShape.IsNull())
|
if (aSubShape.IsNull())
|
||||||
{
|
{
|
||||||
MESSAGE("NULL subshape")
|
MESSAGE("NULL subshape");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
int id = anIndices.FindIndex(aSubShape);
|
int id = anIndices.FindIndex(aSubShape);
|
||||||
|
@ -977,7 +977,7 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetSubShapesIndices
|
|||||||
Handle(::GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]);
|
Handle(::GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]);
|
||||||
if (aSh.IsNull())
|
if (aSh.IsNull())
|
||||||
{
|
{
|
||||||
MESSAGE("NULL shape")
|
MESSAGE("NULL shape");
|
||||||
return aSeq._retn();
|
return aSeq._retn();
|
||||||
}
|
}
|
||||||
aShapes.push_back(aSh);
|
aShapes.push_back(aSh);
|
||||||
|
@ -253,9 +253,9 @@ void GEOM_OCCReader::createIsos(const GEOMUtils::Hatcher &theHatcher,
|
|||||||
|
|
||||||
if (anIndices.IsNull() || aParams.IsNull()) {
|
if (anIndices.IsNull() || aParams.IsNull()) {
|
||||||
if (IsUIso) {
|
if (IsUIso) {
|
||||||
MESSAGE("GEOMUtils_Hatcher: null U-isoline indices")
|
MESSAGE("GEOMUtils_Hatcher: null U-isoline indices");
|
||||||
} else {
|
} else {
|
||||||
MESSAGE("GEOMUtils_Hatcher: null V-isoline indices")
|
MESSAGE("GEOMUtils_Hatcher: null V-isoline indices");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
const GeomAbs_IsoType aType = (IsUIso ? GeomAbs_IsoU : GeomAbs_IsoV);
|
const GeomAbs_IsoType aType = (IsUIso ? GeomAbs_IsoU : GeomAbs_IsoV);
|
||||||
@ -271,9 +271,9 @@ void GEOM_OCCReader::createIsos(const GEOMUtils::Hatcher &theHatcher,
|
|||||||
|
|
||||||
if (aNbDomains < 0) {
|
if (aNbDomains < 0) {
|
||||||
if (IsUIso) {
|
if (IsUIso) {
|
||||||
MESSAGE("GEOMUtils_Hatcher: U iso of parameter: "<<aParam)
|
MESSAGE("GEOMUtils_Hatcher: U iso of parameter: "<<aParam);
|
||||||
} else {
|
} else {
|
||||||
MESSAGE("GEOMUtils_Hatcher: V iso of parameter: "<<aParam)
|
MESSAGE("GEOMUtils_Hatcher: V iso of parameter: "<<aParam);
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (theHatcher.GetHatcher().Status (aHatchingIndex)) {
|
switch (theHatcher.GetHatcher().Status (aHatchingIndex)) {
|
||||||
|
@ -257,7 +257,7 @@ bool ShapeRec_FeatureDetector::ComputeContours( bool useROI, ShapeRec_Parameters
|
|||||||
Computes the lines in the image located at imagePath
|
Computes the lines in the image located at imagePath
|
||||||
*/
|
*/
|
||||||
bool ShapeRec_FeatureDetector::ComputeLines(){
|
bool ShapeRec_FeatureDetector::ComputeLines(){
|
||||||
MESSAGE("ShapeRec_FeatureDetector::ComputeLines()")
|
MESSAGE("ShapeRec_FeatureDetector::ComputeLines()");
|
||||||
// Initialising images
|
// Initialising images
|
||||||
cv::Mat src, src_gray, detected_edges, dst;
|
cv::Mat src, src_gray, detected_edges, dst;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user