ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-26 09:20:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix usage of SUIT_OverrideCursor

Browse Source 
-  SUIT_OverrideCursor();
+  SUIT_OverrideCursor wc;
This commit is contained in:
eap 2015-03-05 16:37:28 +03:00
parent 478182de8e
commit 3412372987
10 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/DisplayGUI/DisplayGUI.cxx
View File

@ -189,7 +189,7 @@ void DisplayGUI::DisplayAll()
_PTR(ChildIterator) anIter ( aStudy->NewChildIterator( SC ) ); _PTR(ChildIterator) anIter ( aStudy->NewChildIterator( SC ) );
anIter->InitEx( true ); anIter->InitEx( true );
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
while( anIter->More() ) { while( anIter->More() ) {
_PTR(SObject) valSO ( anIter->Value() ); _PTR(SObject) valSO ( anIter->Value() );
@ -210,7 +210,7 @@ void DisplayGUI::DisplayAll()
//===================================================================================== //=====================================================================================
void DisplayGUI::EraseAll() void DisplayGUI::EraseAll()
{ {
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
SUIT_Application* app = getGeometryGUI()->getApp(); SUIT_Application* app = getGeometryGUI()->getApp();
if ( app ) { if ( app ) {
@ -261,7 +261,7 @@ void DisplayGUI::DisplayOnlyChildren()
aSelMgr->selectedObjects(aList, "ObjectBrowser", false); aSelMgr->selectedObjects(aList, "ObjectBrowser", false);
SALOME_ListIteratorOfListIO It (aList); SALOME_ListIteratorOfListIO It (aList);
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
for (; It.More(); It.Next()) { for (; It.More(); It.Next()) {
Handle(SALOME_InteractiveObject) anIObject = It.Value(); Handle(SALOME_InteractiveObject) anIObject = It.Value();
@ -314,7 +314,7 @@ void DisplayGUI::Display()
aSelMgr->selectedObjects( aList ); aSelMgr->selectedObjects( aList );
SALOME_ListIteratorOfListIO It( aList ); SALOME_ListIteratorOfListIO It( aList );
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
for( ;It.More();It.Next() ) { for( ;It.More();It.Next() ) {
Handle(SALOME_InteractiveObject) anIObject = It.Value(); Handle(SALOME_InteractiveObject) anIObject = It.Value();
@ -372,7 +372,7 @@ void DisplayGUI::Erase()
aSelMgr->selectedObjects( aList ); aSelMgr->selectedObjects( aList );
SALOME_ListIteratorOfListIO It( aList ); SALOME_ListIteratorOfListIO It( aList );
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
for( ; It.More(); It.Next() ) { for( ; It.More(); It.Next() ) {
Handle(SALOME_InteractiveObject) anIObject = It.Value(); Handle(SALOME_InteractiveObject) anIObject = It.Value();
@ -420,7 +420,7 @@ void DisplayGUI::Erase()
//===================================================================================== //=====================================================================================
void DisplayGUI::SetDisplayMode( const int mode, SUIT_ViewWindow* viewWindow ) void DisplayGUI::SetDisplayMode( const int mode, SUIT_ViewWindow* viewWindow )
{ {
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
SalomeApp_Application* app = getGeometryGUI()->getApp(); SalomeApp_Application* app = getGeometryGUI()->getApp();
if ( !app ) return; if ( !app ) return;
@ -453,7 +453,7 @@ void DisplayGUI::SetDisplayMode( const int mode, SUIT_ViewWindow* viewWindow )
//===================================================================================== //=====================================================================================
void DisplayGUI::SetVectorMode( const bool mode, SUIT_ViewWindow* viewWindow ) void DisplayGUI::SetVectorMode( const bool mode, SUIT_ViewWindow* viewWindow )
{ {
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
SalomeApp_Application* app = getGeometryGUI()->getApp(); SalomeApp_Application* app = getGeometryGUI()->getApp();
if ( !app ) return; if ( !app ) return;
@ -499,7 +499,7 @@ int DisplayGUI::GetVectorMode( SUIT_ViewWindow* viewWindow )
//===================================================================================== //=====================================================================================
void DisplayGUI::SetVerticesMode( const bool mode, SUIT_ViewWindow* viewWindow ) void DisplayGUI::SetVerticesMode( const bool mode, SUIT_ViewWindow* viewWindow )
{ {
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
SalomeApp_Application* app = getGeometryGUI()->getApp(); SalomeApp_Application* app = getGeometryGUI()->getApp();
if ( !app ) return; if ( !app ) return;
@ -558,7 +558,7 @@ void DisplayGUI::ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindow
SalomeApp_Study* aStudy = dynamic_cast< SalomeApp_Study* >( app->activeStudy() ); SalomeApp_Study* aStudy = dynamic_cast< SalomeApp_Study* >( app->activeStudy() );
if ( !aStudy ) return; if ( !aStudy ) return;
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
SALOME_ListIO selected; SALOME_ListIO selected;
aSelMgr->selectedObjects( selected ); aSelMgr->selectedObjects( selected );

12
src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
View File

@ -191,7 +191,7 @@ void GEOMToolsGUI::OnAutoColor()
QColor c( (int)( aColor.R * 255.0 ), (int)( aColor.G * 255.0 ), (int)( aColor.B * 255.0 ) ); QColor c( (int)( aColor.R * 255.0 ), (int)( aColor.G * 255.0 ), (int)( aColor.B * 255.0 ) );
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
appStudy->setObjectProperty( aMgrId, aChildObject->GetStudyEntry(), GEOM::propertyName( GEOM::Color ), c ); appStudy->setObjectProperty( aMgrId, aChildObject->GetStudyEntry(), GEOM::propertyName( GEOM::Color ), c );
Handle( SALOME_InteractiveObject ) io = new SALOME_InteractiveObject( aChildObject->GetStudyEntry(), "GEOM", "" ); Handle( SALOME_InteractiveObject ) io = new SALOME_InteractiveObject( aChildObject->GetStudyEntry(), "GEOM", "" );
@ -272,7 +272,7 @@ void GEOMToolsGUI::OnColor()
aSColor.B = (double)color.blue() / 255.0; aSColor.B = (double)color.blue() / 255.0;
// iterate through list of objects and assign new color // iterate through list of objects and assign new color
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) { for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
Handle( SALOME_InteractiveObject ) io = It.Value(); Handle( SALOME_InteractiveObject ) io = It.Value();
GEOM::GEOM_Object_var aObject = GEOMBase::ConvertIOinGEOMObject( io ); GEOM::GEOM_Object_var aObject = GEOMBase::ConvertIOinGEOMObject( io );
@ -417,7 +417,7 @@ void GEOMToolsGUI::OnNbIsos( ActionType actionType )
NbIsosDlg->setV( VIso ); NbIsosDlg->setV( VIso );
if ( NbIsosDlg->exec() ) { if ( NbIsosDlg->exec() ) {
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
newNbUIso = NbIsosDlg->getU(); newNbUIso = NbIsosDlg->getU();
newNbVIso = NbIsosDlg->getV(); newNbVIso = NbIsosDlg->getV();
} else //Cancel case } else //Cancel case
@ -473,7 +473,7 @@ void GEOMToolsGUI::OnDeflection()
( SUIT_Session::session()->activeApplication()->desktop() ); ( SUIT_Session::session()->activeApplication()->desktop() );
DeflectionDlg->setTheDC( aDC ); DeflectionDlg->setTheDC( aDC );
if ( DeflectionDlg->exec() ) { if ( DeflectionDlg->exec() ) {
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
aDC = DeflectionDlg->getTheDC(); aDC = DeflectionDlg->getTheDC();
for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) { for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
@ -674,7 +674,7 @@ void GEOMToolsGUI::OnEdgeWidth()
Dlg->setTheLW( aWidth ); Dlg->setTheLW( aWidth );
if ( Dlg->exec() ) { if ( Dlg->exec() ) {
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
aWidth = Dlg->getTheLW(); aWidth = Dlg->getTheLW();
} else } else
return; //Cancel case return; //Cancel case
@ -717,7 +717,7 @@ void GEOMToolsGUI::OnIsosWidth() {
Dlg->setTheLW( aWidth ); Dlg->setTheLW( aWidth );
if ( Dlg->exec() ) { if ( Dlg->exec() ) {
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
aWidth = Dlg->getTheLW(); aWidth = Dlg->getTheLW();
} else } else
return; //Cancel case return; //Cancel case

4
src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
View File

@ -282,7 +282,7 @@ void GEOMToolsGUI_TransparencyDlg::SetTransparency()
return; return;
} }
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) { for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
aView->SetTransparency( It.Value(), newValue ); aView->SetTransparency( It.Value(), newValue );
aStudy->setObjectProperty( aMgrId , It.Value()->getEntry(), GEOM::propertyName( GEOM::Transparency ) , newValue ); aStudy->setObjectProperty( aMgrId , It.Value()->getEntry(), GEOM::propertyName( GEOM::Transparency ) , newValue );
@ -306,7 +306,7 @@ void GEOMToolsGUI_TransparencyDlg::SetTransparency()
return; return;
} }
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
OCCViewer_Viewer* vm = dynamic_cast<OCCViewer_Viewer*>( window->getViewManager()->getViewModel() ); OCCViewer_Viewer* vm = dynamic_cast<OCCViewer_Viewer*>( window->getViewManager()->getViewModel() );
if ( !vm ) if ( !vm )
return; return;

2
src/MeasureGUI/MeasureGUI.cxx
View File

@ -195,7 +195,7 @@ void MeasureGUI::ChangeDimensionsVisibility( const bool theIsVisible )
return; return;
} }
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
GEOMGUI_DimensionProperty aDimensions( anActiveStudy, anIObject->getEntry() ); GEOMGUI_DimensionProperty aDimensions( anActiveStudy, anIObject->getEntry() );

2
src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx
View File

@ -329,7 +329,7 @@ void MeasureGUI_BndBoxDlg::redisplayPreview()
erasePreview(false); erasePreview(false);
try { try {
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
getDisplayer()->SetColor(Quantity_NOC_VIOLET); getDisplayer()->SetColor(Quantity_NOC_VIOLET);
getDisplayer()->SetToActivate(false); getDisplayer()->SetToActivate(false);

2
src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx
View File

@ -410,6 +410,8 @@ bool MeasureGUI_CheckSelfIntersectionsDlg::findSelfIntersections
int nbPairs = 0; int nbPairs = 0;
int aLevel = myLevelBox->currentIndex(); int aLevel = myLevelBox->currentIndex();
SUIT_OverrideCursor wc;
try { try {
HasSelfInte = !anOper->CheckSelfIntersections(myObj, aLevel, myInters); HasSelfInte = !anOper->CheckSelfIntersections(myObj, aLevel, myInters);
nbPairs = myInters->length()/2; nbPairs = myInters->length()/2;

2
src/MeasureGUI/MeasureGUI_DistanceDlg.cxx
View File

@ -511,7 +511,7 @@ void MeasureGUI_DistanceDlg::redisplayPreview()
erasePreview(false); erasePreview(false);
try { try {
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
getDisplayer()->SetColor(Quantity_NOC_VIOLET); getDisplayer()->SetColor(Quantity_NOC_VIOLET);
getDisplayer()->SetToActivate(false); getDisplayer()->SetToActivate(false);

2
src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.cxx
View File

@ -228,6 +228,8 @@ void MeasureGUI_FastCheckIntersectionsDlg::clear()
//================================================================================= //=================================================================================
void MeasureGUI_FastCheckIntersectionsDlg::onCompute() void MeasureGUI_FastCheckIntersectionsDlg::onCompute()
{ {
SUIT_OverrideCursor wc;
myShapeList1->clear(); myShapeList1->clear();
myShapeList2->clear(); myShapeList2->clear();

2
src/MeasureGUI/MeasureGUI_Skeleton.cxx
View File

@ -324,7 +324,7 @@ void MeasureGUI_Skeleton::redisplayPreview()
erasePreview( false ); erasePreview( false );
try { try {
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
getDisplayer()->SetColor( Quantity_NOC_VIOLET ); getDisplayer()->SetColor( Quantity_NOC_VIOLET );
getDisplayer()->SetToActivate( false ); getDisplayer()->SetToActivate( false );

2
src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
View File

@ -286,7 +286,7 @@ bool RepairGUI_FreeFacesDlg::execute( ObjectList& objects )
return false; return false;
} }
SUIT_OverrideCursor(); SUIT_OverrideCursor wc;
TopExp::MapShapes( aSelShape, anIndices); TopExp::MapShapes( aSelShape, anIndices);
SALOME_Prs* aPrs = 0; SALOME_Prs* aPrs = 0;