Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
395112a
)
Fixing of bugs concerning the clipping planes functionality
author
mpa
<mpa@opencascade.com>
Wed, 12 Mar 2014 06:11:57 +0000
(10:11 +0400)
committer
mpa
<mpa@opencascade.com>
Wed, 12 Mar 2014 06:11:57 +0000
(10:11 +0400)
src/SMESHGUI/SMESHGUI_ClippingDlg.cxx
patch
|
blob
|
history
diff --git
a/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx
b/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx
index e9bf24bc05584deec7bcd6abc85ec8d85ba75c56..5df21bca00fcd09f657a66f75d6294807f6406f8 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_ClippingDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_ClippingDlg.cxx
@@
-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 )
anActorList.remove( anActor );
else if( theItem->checkState() == Qt::Unchecked && anIsPushed )
anActorList.remove( anActor );
- SMESH::ComputeBounds( anActorList, myBounds );
- myPreviewWidget->PlaceWidget( myBounds[0], myBounds[1], myBounds[2],
- myBounds[3], myBounds[4], myBounds[5] );
+ if( SMESH::ComputeBounds( anActorList, myBounds ) ) {
+ myPreviewWidget->On();
+ 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 );
- myPreviewWidget->PlaceWidget( myBounds[0],myBounds[1],myBounds[2],
- myBounds[3],myBounds[4],myBounds[5] );
+ if( SMESH::ComputeBounds( anActorList, myBounds ) ) {
+ myPreviewWidget->On();
+ myPreviewWidget->PlaceWidget( myBounds[0], myBounds[1], myBounds[2],
+ myBounds[3], myBounds[4], myBounds[5] );
+ }
+ else
+ myPreviewWidget->Off();
+
synchronize();
SetCurrentPlaneParam();
synchronize();
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],
- myBounds[3], myBounds[4], myBounds[5] );
+
+ if( SMESH::ComputeBounds( aPlaneData.ActorList, myBounds ) ) {
+ myPreviewWidget->On();
+ myPreviewWidget->PlaceWidget( myBounds[0], myBounds[1], myBounds[2],
+ myBounds[3], myBounds[4], myBounds[5] );
+ }
+ else
+ myPreviewWidget->Off();
+
SetCurrentPlaneParam();
// Actors
SetCurrentPlaneParam();
// Actors
@@
-1779,11
+1794,9
@@
void SMESHGUI_ClippingDlg::ClickOnApply()
aClippingPlaneInfoList.push_back( aClippingPlaneInfo );
}
aClippingPlaneInfoList.push_back( aClippingPlaneInfo );
}
- SMESH_Actor* anSMESHActor;
anAllActors->InitTraversal();
while( vtkActor* aVTKActor = anAllActors->GetNextActor() )
if( SMESH_Actor* anActor = SMESH_Actor::SafeDownCast( aVTKActor ) ) {
anAllActors->InitTraversal();
while( vtkActor* aVTKActor = anAllActors->GetNextActor() )
if( SMESH_Actor* anActor = SMESH_Actor::SafeDownCast( aVTKActor ) ) {
- anSMESHActor = anActor;
anActor->SetOpenGLClippingPlane();
}
anActor->SetOpenGLClippingPlane();
}