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
Add of exports
[modules/geom.git]
/
src
/
BasicGUI
/
BasicGUI_MarkerDlg.cxx
diff --git
a/src/BasicGUI/BasicGUI_MarkerDlg.cxx
b/src/BasicGUI/BasicGUI_MarkerDlg.cxx
index 98c22720a5b092e39b4a3e2c3d79ff682c4f38ce..57c925b16c10b7258c2dd7647b3fc6c6ae35f282 100644
(file)
--- a/
src/BasicGUI/BasicGUI_MarkerDlg.cxx
+++ b/
src/BasicGUI/BasicGUI_MarkerDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, 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
@@
-394,19
+394,19
@@
void BasicGUI_MarkerDlg::onSelectionDone()
}
else if ( getConstructorId() == 2 ) { // by point and two vectors
if ( myEditCurrentArgument == Group2->LineEdit1 ) {
}
else if ( getConstructorId() == 2 ) { // by point and two vectors
if ( myEditCurrentArgument == Group2->LineEdit1 ) {
- myPoint = aSelectedObject;
- if (myPoint && !myVectorX)
- Group2->PushButton2->click();
+
myPoint = aSelectedObject;
+
if (myPoint && !myVectorX)
+
Group2->PushButton2->click();
}
else if (myEditCurrentArgument == Group2->LineEdit2) {
}
else if (myEditCurrentArgument == Group2->LineEdit2) {
- myVectorX = aSelectedObject;
- if (myVectorX && !myVectorY)
- Group2->PushButton3->click();
+
myVectorX = aSelectedObject;
+
if (myVectorX && !myVectorY)
+
Group2->PushButton3->click();
}
else if ( myEditCurrentArgument == Group2->LineEdit3 ) {
}
else if ( myEditCurrentArgument == Group2->LineEdit3 ) {
- myVectorY = aSelectedObject;
- if (myVectorY && !myPoint)
- Group2->PushButton1->click();
+
myVectorY = aSelectedObject;
+
if (myVectorY && !myPoint)
+
Group2->PushButton1->click();
}
}
}
}
}
}
@@
-531,7
+531,7
@@
bool BasicGUI_MarkerDlg::isValid( QString& msg )
if ( v1.Magnitude() > gp::Resolution() && v2.Magnitude() > gp::Resolution() ) {
ok = !v1.IsParallel( v2, Precision::Angular() );
if ( !ok )
if ( v1.Magnitude() > gp::Resolution() && v2.Magnitude() > gp::Resolution() ) {
ok = !v1.IsParallel( v2, Precision::Angular() );
if ( !ok )
- msg += tr( "VEC_PARALLEL" );
+
msg += tr( "VEC_PARALLEL" );
}
for ( DataMap::iterator anIter = myData.begin(); anIter != myData.end() && ok; ++anIter )
ok = anIter.value()->isValid( msg, !IsPreview()) && ok;
}
for ( DataMap::iterator anIter = myData.begin(); anIter != myData.end() && ok; ++anIter )
ok = anIter.value()->isValid( msg, !IsPreview()) && ok;