Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compilation error (conflict of OK name between OCCT Plate_Plate.hxx and GEOM...
[modules/geom.git]
/
src
/
EntityGUI
/
EntityGUI_FeatureDetectorDlg.cxx
diff --git
a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx
b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx
index 5c2495d6514357abc1133b208b5f8da4251d33aa..2a684aa233dea4d60a8e60b55f9204bfbdcb1266 100644
(file)
--- a/
src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx
+++ b/
src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
2 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-202
4 CEA, EDF
, 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) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-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;
switch (id)
{
myConstructorId = id;
switch (id)
{
@@
-671,7
+671,7
@@
ShapeRec_Parameters* EntityGUI_FeatureDetectorDlg::parametersChanged()
void EntityGUI_FeatureDetectorDlg::setStartPnt(const gp_Pnt& theStartPnt)
{
myStartPnt = theStartPnt;
void EntityGUI_FeatureDetectorDlg::setStartPnt(const gp_Pnt& 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)
{
myEndPnt = theEndPnt;
void EntityGUI_FeatureDetectorDlg::setEndPnt(const gp_Pnt& theEndPnt)
{
myEndPnt = theEndPnt;
- MESSAGE("myEndPnt = ("<<theEndPnt.X()<<", "<<theEndPnt.Y()<<")")
+ MESSAGE("myEndPnt = ("<<theEndPnt.X()<<", "<<theEndPnt.Y()<<")")
;
if (setSelectionRect() && myDetector->GetImgHeight() > 0)
showImageSample();
}
if (setSelectionRect() && myDetector->GetImgHeight() > 0)
showImageSample();
}
@@
-814,10
+814,10
@@
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" );
- return false;
+
getOperation()->SetErrorCode( "Impossible detected contours" );
+
return false;
}
for( ; idx >= 0; idx = hierarchy[idx][0])
}
for( ; idx >= 0; idx = hierarchy[idx][0])