ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-04-08 10:57:26 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fixing of bugs concerning the clipping planes functionality

Browse Source
This commit is contained in:
mpa 2014-03-12 10:11:57 +04:00
parent 395112afac
commit 88c84e8922
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/SMESHGUI/SMESHGUI_ClippingDlg.cxx
View File

@ -629,7 +629,7 @@ double SMESHGUI_ClippingDlg::getDistance() const
*/ */
void SMESHGUI_ClippingDlg::setDistance( const double theDistance ) void SMESHGUI_ClippingDlg::setDistance( const double theDistance )
{ {
SpinSliderDistance->setValue( theDistance*100 ); SpinSliderDistance->setValue( theDistance );
} }
/*! /*!
@ -1133,9 +1133,13 @@ void SMESHGUI_ClippingDlg::updateActorItem( QListWidgetItem* theItem,
else if( theItem->checkState() == Qt::Unchecked && anIsPushed ) else if( theItem->checkState() == Qt::Unchecked && anIsPushed )
anActorList.remove( anActor ); anActorList.remove( anActor );
SMESH::ComputeBounds( anActorList, myBounds ); if( SMESH::ComputeBounds( anActorList, myBounds ) ) {
myPreviewWidget->PlaceWidget( myBounds[0], myBounds[1], myBounds[2], myPreviewWidget->On();
myBounds[3], myBounds[4], myBounds[5] ); myPreviewWidget->PlaceWidget( myBounds[0], myBounds[1], myBounds[2],
myBounds[3], myBounds[4], myBounds[5] );
}
else
myPreviewWidget->Off();
} }
} }
} }
@ -1244,9 +1248,14 @@ void SMESHGUI_ClippingDlg::ClickOnNew()
bool anIsBlocked = ActorList->blockSignals( true ); bool anIsBlocked = ActorList->blockSignals( true );
SMESH::ComputeBounds( anActorList, myBounds ); if( SMESH::ComputeBounds( anActorList, myBounds ) ) {
myPreviewWidget->PlaceWidget( myBounds[0],myBounds[1],myBounds[2], myPreviewWidget->On();
myBounds[3],myBounds[4],myBounds[5] ); myPreviewWidget->PlaceWidget( myBounds[0], myBounds[1], myBounds[2],
myBounds[3], myBounds[4], myBounds[5] );
}
else
myPreviewWidget->Off();
synchronize(); synchronize();
SetCurrentPlaneParam(); SetCurrentPlaneParam();
@ -1331,9 +1340,15 @@ void SMESHGUI_ClippingDlg::onSelectPlane ( int theIndex )
} }
} }
myIsSelectPlane = false; myIsSelectPlane = false;
SMESH::ComputeBounds( aPlaneData.ActorList, myBounds );
myPreviewWidget->PlaceWidget( myBounds[0], myBounds[1], myBounds[2], if( SMESH::ComputeBounds( aPlaneData.ActorList, myBounds ) ) {
myBounds[3], myBounds[4], myBounds[5] ); myPreviewWidget->On();
myPreviewWidget->PlaceWidget( myBounds[0], myBounds[1], myBounds[2],
myBounds[3], myBounds[4], myBounds[5] );
}
else
myPreviewWidget->Off();
SetCurrentPlaneParam(); SetCurrentPlaneParam();
// Actors // Actors
@ -1779,11 +1794,9 @@ void SMESHGUI_ClippingDlg::ClickOnApply()
aClippingPlaneInfoList.push_back( aClippingPlaneInfo ); aClippingPlaneInfoList.push_back( aClippingPlaneInfo );
} }
SMESH_Actor* anSMESHActor;
anAllActors->InitTraversal(); anAllActors->InitTraversal();
while( vtkActor* aVTKActor = anAllActors->GetNextActor() ) while( vtkActor* aVTKActor = anAllActors->GetNextActor() )
if( SMESH_Actor* anActor = SMESH_Actor::SafeDownCast( aVTKActor ) ) { if( SMESH_Actor* anActor = SMESH_Actor::SafeDownCast( aVTKActor ) ) {
anSMESHActor = anActor;
anActor->SetOpenGLClippingPlane(); anActor->SetOpenGLClippingPlane();
} }