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
Some corrections related to using UNICODE.
[modules/geom.git]
/
src
/
BasicGUI
/
BasicGUI_MarkerDlg.cxx
diff --git
a/src/BasicGUI/BasicGUI_MarkerDlg.cxx
b/src/BasicGUI/BasicGUI_MarkerDlg.cxx
index 8cb1dd447466a920a2dbc33bd141462eecb07fce..ee6448c35fadf887ce58c1ba46b03a1d9f1ca859 100644
(file)
--- a/
src/BasicGUI/BasicGUI_MarkerDlg.cxx
+++ b/
src/BasicGUI/BasicGUI_MarkerDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-228,7
+228,7
@@
void BasicGUI_MarkerDlg::ConstructorsClicked( int constructorId )
{
if ( myConstructorId == constructorId && myConstructorId == 0 ) {
globalSelection(); // close local contexts, if any
{
if ( myConstructorId == constructorId && myConstructorId == 0 ) {
globalSelection(); // close local contexts, if any
- localSelection(
GEOM::GEOM_Object::_nil(),
TopAbs_VERTEX );
+ localSelection( TopAbs_VERTEX );
activate( GEOM_MARKER );
return;
}
activate( GEOM_MARKER );
return;
}
@@
-244,7
+244,7
@@
void BasicGUI_MarkerDlg::ConstructorsClicked( int constructorId )
Group2->hide();
aMainGrp->show();
globalSelection(); // close local contexts, if any
Group2->hide();
aMainGrp->show();
globalSelection(); // close local contexts, if any
- localSelection(
GEOM::GEOM_Object::_nil(),
TopAbs_VERTEX );
+ localSelection( TopAbs_VERTEX );
activate( GEOM_MARKER );
break;
}
activate( GEOM_MARKER );
break;
}
@@
-269,7
+269,7
@@
void BasicGUI_MarkerDlg::ConstructorsClicked( int constructorId )
Group2->PushButton2->setDown( false );
Group2->PushButton3->setDown( false );
globalSelection(); // close local contexts, if any
Group2->PushButton2->setDown( false );
Group2->PushButton3->setDown( false );
globalSelection(); // close local contexts, if any
- localSelection(
GEOM::GEOM_Object::_nil(),
TopAbs_VERTEX );
+ localSelection( TopAbs_VERTEX );
myEditCurrentArgument = Group2->LineEdit1;
Group2->LineEdit1->setText( "" );
Group2->LineEdit2->setText( "" );
myEditCurrentArgument = Group2->LineEdit1;
Group2->LineEdit1->setText( "" );
Group2->LineEdit2->setText( "" );
@@
-442,7
+442,7
@@
void BasicGUI_MarkerDlg::SetEditCurrentArgument()
}
else if ( send == Group2->PushButton1 ) {
myEditCurrentArgument = Group2->LineEdit1;
}
else if ( send == Group2->PushButton1 ) {
myEditCurrentArgument = Group2->LineEdit1;
- localSelection(
GEOM::GEOM_Object::_nil(),
TopAbs_VERTEX );
+ localSelection( TopAbs_VERTEX );
Group2->PushButton2->setDown( false );
Group2->PushButton3->setDown( false );
Group2->LineEdit1->setEnabled( true );
Group2->PushButton2->setDown( false );
Group2->PushButton3->setDown( false );
Group2->LineEdit1->setEnabled( true );
@@
-451,7
+451,7
@@
void BasicGUI_MarkerDlg::SetEditCurrentArgument()
}
else if ( send == Group2->PushButton2 ) {
myEditCurrentArgument = Group2->LineEdit2;
}
else if ( send == Group2->PushButton2 ) {
myEditCurrentArgument = Group2->LineEdit2;
- localSelection(
GEOM::GEOM_Object::_nil(),
TopAbs_EDGE );
+ localSelection( TopAbs_EDGE );
Group2->PushButton1->setDown( false );
Group2->PushButton3->setDown( false );
Group2->LineEdit1->setEnabled( false );
Group2->PushButton1->setDown( false );
Group2->PushButton3->setDown( false );
Group2->LineEdit1->setEnabled( false );
@@
-460,7
+460,7
@@
void BasicGUI_MarkerDlg::SetEditCurrentArgument()
}
else if ( send == Group2->PushButton3 ) {
myEditCurrentArgument = Group2->LineEdit3;
}
else if ( send == Group2->PushButton3 ) {
myEditCurrentArgument = Group2->LineEdit3;
- localSelection(
GEOM::GEOM_Object::_nil(),
TopAbs_EDGE );
+ localSelection( TopAbs_EDGE );
Group2->PushButton1->setDown( false );
Group2->PushButton2->setDown( false );
Group2->LineEdit1->setEnabled( false );
Group2->PushButton1->setDown( false );
Group2->PushButton2->setDown( false );
Group2->LineEdit1->setEnabled( false );
@@
-511,7
+511,7
@@
void BasicGUI_MarkerDlg::enterEvent( QEvent* )
//=================================================================================
GEOM::GEOM_IOperations_ptr BasicGUI_MarkerDlg::createOperation()
{
//=================================================================================
GEOM::GEOM_IOperations_ptr BasicGUI_MarkerDlg::createOperation()
{
- return myGeomGUI->GetGeomGen()->GetIBasicOperations(
getStudyId()
);
+ return myGeomGUI->GetGeomGen()->GetIBasicOperations();
}
//=================================================================================
}
//=================================================================================