-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014 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
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
#include "SMESHGUI_VTKUtils.h"
#include "SMESHGUI_SpinBox.h"
+#include <QtxDoubleSpinSlider.h>
+#include <QtxIntSpinSlider.h>
+
#include <SMESH_Actor.h>
#include <SMESH_ActorUtils.h>
CBRelativeOrientation->addItem( tr("ALONG_ZX") );
GroupParametersLayout->addWidget( CBRelativeOrientation, 0, 1 );
- TLValueDistance = new QLabel( GroupParameters );
- TLValueDistance->setObjectName( "TLValueDistance" );
- TLValueDistance->setAlignment( Qt::AlignCenter );
- TLValueDistance->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
- QFont fnt = TLValueDistance->font(); fnt.setBold( true ); TLValueDistance->setFont( fnt );
- GroupParametersLayout->addWidget( TLValueDistance, 1, 1 );
-
TextLabelDistance = new QLabel( tr("SMESH_DISTANCE"), GroupParameters );
TextLabelDistance->setObjectName( "TextLabelDistance" );
- GroupParametersLayout->addWidget( TextLabelDistance, 2, 0 );
-
- SliderDistance = new QSlider( Qt::Horizontal, GroupParameters );
- SliderDistance->setObjectName( "SliderDistance" );
- SliderDistance->setMinimumSize( 300, 0 );
- SliderDistance->setMinimum( 0 );
- SliderDistance->setMaximum( 100 );
- SliderDistance->setSingleStep( 1 );
- SliderDistance->setPageStep( 10 );
- SliderDistance->setTracking( false );
- GroupParametersLayout->addWidget( SliderDistance, 2, 1 );
-
- TLValueRotation1 = new QLabel( GroupParameters );
- TLValueRotation1->setObjectName( "TLValueRotation1" );
- TLValueRotation1->setAlignment( Qt::AlignCenter );
- TLValueRotation1->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
- TLValueRotation1->setFont( fnt );
- GroupParametersLayout->addWidget( TLValueRotation1, 3, 1 );
+ GroupParametersLayout->addWidget( TextLabelDistance, 1, 0 );
+
+ SpinSliderDistance = new QtxDoubleSpinSlider( 0., 1., 0.01, GroupParameters );
+ SpinSliderDistance->setObjectName( "SpinSliderDistance" );
+ SpinSliderDistance->setPrecision( precision );
+ QFont fnt = SpinSliderDistance->font(); fnt.setBold( true ); SpinSliderDistance->setFont( fnt );
+ GroupParametersLayout->addWidget( SpinSliderDistance, 1, 1 );
+
+ QString aUnitRot = "\xB0";
TextLabelRotation1 = new QLabel( tr("ROTATION_AROUND_X_Y2Z"), GroupParameters );
TextLabelRotation1->setObjectName( "TextLabelRotation1" );
- GroupParametersLayout->addWidget( TextLabelRotation1, 4, 0 );
-
- SliderRotation1 = new QSlider( Qt::Horizontal, GroupParameters );
- SliderRotation1->setObjectName( "SliderRotation1" );
- SliderRotation1->setMinimumSize( 300, 0 );
- SliderRotation1->setMinimum( -180 );
- SliderRotation1->setMaximum( 180 );
- SliderRotation1->setSingleStep( 1 );
- SliderRotation1->setPageStep( 10 );
- SliderRotation1->setTracking(false);
- GroupParametersLayout->addWidget( SliderRotation1, 4, 1 );
-
- TLValueRotation2 = new QLabel( GroupParameters );
- TLValueRotation2->setObjectName( "TLValueRotation2" );
- TLValueRotation2->setAlignment( Qt::AlignCenter );
- TLValueRotation2->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
- TLValueRotation2->setFont( fnt );
- GroupParametersLayout->addWidget( TLValueRotation2, 5, 1 );
+ GroupParametersLayout->addWidget( TextLabelRotation1, 2, 0 );
+
+ SpinSliderRotation1 = new QtxIntSpinSlider( -180, 180, 1, GroupParameters );
+ SpinSliderRotation1->setObjectName( "SpinSliderRotation1" );
+ SpinSliderRotation1->setUnit( aUnitRot );
+ SpinSliderRotation1->setFont( fnt );
+ GroupParametersLayout->addWidget( SpinSliderRotation1, 2, 1 );
TextLabelRotation2 = new QLabel(tr("ROTATION_AROUND_Y_X2Z"), GroupParameters);
TextLabelRotation2->setObjectName( "TextLabelRotation2" );
TextLabelRotation2->setObjectName( "TextLabelRotation2" );
- GroupParametersLayout->addWidget( TextLabelRotation2, 6, 0 );
-
- SliderRotation2 = new QSlider( Qt::Horizontal, GroupParameters );
- SliderRotation2->setObjectName( "SliderRotation2" );
- SliderRotation2->setMinimumSize( 300, 0 );
- SliderRotation2->setMinimum( -180 );
- SliderRotation2->setMaximum( 180 );
- SliderRotation2->setSingleStep( 1 );
- SliderRotation2->setPageStep( 10 );
- SliderRotation2->setTracking(false);
- GroupParametersLayout->addWidget( SliderRotation2, 6, 1 );
+ GroupParametersLayout->addWidget( TextLabelRotation2, 3, 0 );
+
+ SpinSliderRotation2 = new QtxIntSpinSlider( -180, 180, 1, GroupParameters );
+ SpinSliderRotation2->setObjectName( "SpinSliderRotation2" );
+ SpinSliderRotation2->setUnit( aUnitRot );
+ SpinSliderRotation2->setFont( fnt );
+ GroupParametersLayout->addWidget( SpinSliderRotation2, 3, 1 );
/***************************************************************/
QWidget* CheckBoxWidget = new QWidget( this );
connect( CBAbsoluteOrientation, SIGNAL ( activated ( int ) ), this, SLOT( onSelectAbsoluteOrientation( int ) ) ) ;
connect( CBRelativeOrientation, SIGNAL( activated( int ) ), this, SLOT( onSelectRelativeOrientation( int ) ) );
- connect( SliderDistance, SIGNAL( sliderMoved( int ) ), this, SLOT( SliderDistanceHasMoved( int ) ) );
- connect( SliderDistance, SIGNAL( valueChanged( int ) ), this, SLOT( SliderDistanceHasMoved( int ) ) );
- connect( SliderRotation1, SIGNAL( sliderMoved( int ) ), this, SLOT( SliderRotation1HasMoved( int ) ) );
- connect( SliderRotation1, SIGNAL( valueChanged( int ) ), this, SLOT( SliderRotation1HasMoved( int ) ) );
- connect( SliderRotation2, SIGNAL( sliderMoved( int ) ), this, SLOT( SliderRotation2HasMoved( int ) ) );
- connect( SliderRotation2, SIGNAL( valueChanged( int ) ), this, SLOT( SliderRotation2HasMoved( int ) ) );
+ connect( SpinSliderDistance, SIGNAL( valueChanged( double ) ), this, SLOT( SetCurrentPlaneParam() ) );
+ connect( SpinSliderRotation1, SIGNAL( valueChanged( int ) ), this, SLOT( SetCurrentPlaneParam() ) );
+ connect( SpinSliderRotation2, SIGNAL( valueChanged( int ) ), this, SLOT( SetCurrentPlaneParam() ) );
connect( PreviewCheckBox, SIGNAL( toggled( bool ) ), this, SLOT( OnPreviewToggle( bool ) ) );
connect( AutoApplyCheckBox, SIGNAL( toggled( bool ) ), this, SLOT( onAutoApply( bool ) ) );
*/
double SMESHGUI_ClippingDlg::getDistance() const
{
- return TLValueDistance->text().toDouble();
+ return SpinSliderDistance->value();
}
/*!
*/
void SMESHGUI_ClippingDlg::setDistance( const double theDistance )
{
- SliderDistance->setValue( theDistance*100 );
+ SpinSliderDistance->setValue( theDistance );
}
/*!
*/
double SMESHGUI_ClippingDlg::getRotation1() const
{
- return TLValueRotation1->text().remove("\xB0").toInt();
+ return SpinSliderRotation1->value();
}
/*!
*/
double SMESHGUI_ClippingDlg::getRotation2() const
{
- return TLValueRotation2->text().remove("\xB0").toInt();
+ return SpinSliderRotation2->value();
}
/*!
*/
void SMESHGUI_ClippingDlg::setRotation (const double theRot1, const double theRot2)
{
- SliderRotation1->setValue( theRot1 );
- SliderRotation2->setValue( theRot2 );
+ SpinSliderRotation1->setValue( int(floor(theRot1)) );
+ SpinSliderRotation2->setValue( int(floor(theRot2)) );
}
/*!
switch ( theOrientation ) {
case 0:
case 1:
- theDir[0][1] = anU[0];
- theDir[0][2] = aV[0];
- theDir[1][0] = anU[1];
- theDir[1][2] = aV[1];
+ theDir[0][1] = anU[0];
+ theDir[0][2] = aV[0];
+ theDir[1][0] = anU[1];
+ theDir[1][2] = aV[1];
break;
case 2:
- theDir[0][2] = anU[0];
- theDir[0][0] = aV[0];
- theDir[1][1] = anU[1];
- theDir[1][0] = aV[1];
+ theDir[0][2] = anU[0];
+ theDir[0][0] = aV[0];
+ theDir[1][1] = anU[1];
+ theDir[1][0] = aV[1];
break;
case 3:
- theDir[0][0] = anU[0];
- theDir[0][1] = aV[0];
- theDir[1][2] = anU[1];
- theDir[1][1] = aV[1];
+ theDir[0][0] = anU[0];
+ theDir[0][1] = aV[0];
+ theDir[1][2] = anU[1];
+ theDir[1][1] = aV[1];
break;
}
int anOrientation;
if ( thePlane->PlaneMode == SMESH::Absolute )
- anOrientation = thePlane->myAbsoluteOrientation;
+ anOrientation = thePlane->myAbsoluteOrientation;
else if ( thePlane->PlaneMode == SMESH::Relative )
- anOrientation = thePlane->myRelativeOrientation + 1;
+ anOrientation = thePlane->myRelativeOrientation + 1;
if ( anOrientation == 0 ) {
- // compute a direction for plane in absolute mode
+ // compute a direction for plane in absolute mode
double znam = sqrt( thePlane->Dx*thePlane->Dx + thePlane->Dy*thePlane->Dy + thePlane->Dz*thePlane->Dz );
double aRotation = acos( thePlane->Dy/znam )/aCoeff;
if ( thePlane->Dy >= 0.0 && thePlane->Dz >= 0.0 ) thePlane->myAngle[0] = 90.0 + aRotation;
for ( ; anIter != theActorList.end(); anIter++ )
if( vtkActor* aVTKActor = *anIter )
if( SMESH_Actor* anActor = SMESH_Actor::SafeDownCast( aVTKActor ) ) {
- if( thePlane->IsOpenGLClipping )
+ if( thePlane->IsOpenGLClipping )
anActor->AddOpenGLClippingPlane( thePlane->InvertPlane() );
- else
- anActor->AddClippingPlane( thePlane );
+ else
+ anActor->AddClippingPlane( thePlane );
}
return true;
CBAbsoluteOrientation->setCurrentIndex(0);
- TLValueDistance->setText( "0.5" );
- TLValueRotation1->setText( "0\xB0" );
- TLValueRotation2->setText( "0\xB0" );
+ SpinSliderDistance->setValue( 0.5 );
+ SpinSliderRotation1->setValue( 0 );
+ SpinSliderRotation2->setValue( 0 );
CBRelativeOrientation->setCurrentIndex( 0 );
- SliderDistance->setValue( 50 );
- SliderRotation1->setValue( 0 );
- SliderRotation2->setValue( 0 );
}
/*!
}
else if ( CurrentMode == SMESH::Relative ) {
CBRelativeOrientation->setEnabled( anIsControlsEnable );
- SliderDistance->setEnabled( anIsControlsEnable );
- SliderRotation1->setEnabled( anIsControlsEnable );
- SliderRotation2->setEnabled( anIsControlsEnable );
+ SpinSliderDistance->setEnabled( anIsControlsEnable );
+ SpinSliderRotation1->setEnabled( anIsControlsEnable );
+ SpinSliderRotation2->setEnabled( anIsControlsEnable );
}
}
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();
}
}
}
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();
}
}
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
double aRot[2] = { getRotation1(), getRotation2() };
int anOrient;
if ( aPlane->PlaneMode == SMESH::Absolute )
- anOrient = CBAbsoluteOrientation->currentIndex();
+ anOrient = CBAbsoluteOrientation->currentIndex();
else if ( aPlane->PlaneMode == SMESH::Relative )
- anOrient = CBRelativeOrientation->currentIndex() + 1;
+ anOrient = CBRelativeOrientation->currentIndex() + 1;
if ( aPlane->PlaneMode == SMESH::Relative ) {
aPlane->myAngle[0] = aRot[0];
}
if ( anOrient == 0 ) {
- // compute a direction for plane in absolute mode
+ // compute a direction for plane in absolute mode
double znam = sqrt( aPlane->Dx*aPlane->Dx + aPlane->Dy*aPlane->Dy + aPlane->Dz*aPlane->Dz );
double aRotation = acos( aPlane->Dy/znam )/aCoeff;
if ( aPlane->Dy >= 0.0 && aPlane->Dz >= 0.0 ) aRot[0] = 90.0 + aRotation;
anOrigin[1] = aPlane->Y;
anOrigin[2] = aPlane->Z;
}
-
+
if( anIsOk ) {
aPlane->SetNormal( aNormal );
aPlane->SetOrigin( anOrigin );
if( anOrigin[2] < aBounds[4] ) {
myBounds[4] = anOrigin[2]; isBoundsChanged = true; }
if( anOrigin[2] > aBounds[5] ) {
- myBounds[5] = anOrigin[2]; isBoundsChanged = true; }
+ myBounds[5] = anOrigin[2]; isBoundsChanged = true; }
}
if( isBoundsChanged )
else if( aDirection[0] < 0 && aDirection[1] < 0 && aDirection[2] < 0 && aRot[0] > 0 ) {
aRot[0] = aRotation1 + 270.0; aRot[1] = aRotation2 + 90.0; }
- SliderRotation1HasMoved( qRound( aRot[0] ) );
- SliderRotation1->setValue( qRound( aRot[0] ) );
- SliderRotation2HasMoved( qRound( aRot[1] ) );
- SliderRotation2->setValue( qRound( aRot[1] ) );
+ SpinSliderRotation1->setValue( qRound( aRot[0] ) );
+ SpinSliderRotation2->setValue( qRound( aRot[1] ) );
int aCurPlaneIndex = ComboBoxPlanes->currentIndex();
const SMESH::TPlaneData& aPlaneData = myPlanes[ aCurPlaneIndex ];
else if( aDist < 0.0 )
aDist = 0.0;
- SliderDistanceHasMoved( qRound( aDist*100 ) );
- SliderDistance->setValue( qRound( aDist*100 ) );
+ SpinSliderDistance->setValue( qRound( aDist*100 ) );
return;
}
for( ; anIter3 != anActorList.end(); anIter3++ )
if( vtkActor* aVTKActor = *anIter3 )
if( SMESH_Actor* anActor = SMESH_Actor::SafeDownCast( aVTKActor ) ) {
- if( anOrientedPlane->IsOpenGLClipping )
+ if( anOrientedPlane->IsOpenGLClipping )
anActor->AddOpenGLClippingPlane( anOrientedPlane->InvertPlane() );
- else
- anActor->AddClippingPlane( anOrientedPlane );
+ else
+ anActor->AddClippingPlane( anOrientedPlane );
}
SMESH::ClippingPlaneInfo aClippingPlaneInfo;
aClippingPlaneInfoList.push_back( aClippingPlaneInfo );
}
- SMESH_Actor* anSMESHActor;
anAllActors->InitTraversal();
while( vtkActor* aVTKActor = anAllActors->GetNextActor() )
if( SMESH_Actor* anActor = SMESH_Actor::SafeDownCast( aVTKActor ) ) {
- anSMESHActor = anActor;
anActor->SetOpenGLClippingPlane();
}
}
}
-/*!
- SLOT: Called when value of slider distance change
-*/
-void SMESHGUI_ClippingDlg::SliderDistanceHasMoved( int value )
-{
- double new_value = value/100.;
- TLValueDistance->setText( QString("%1").arg( new_value ) );
- SetCurrentPlaneParam();
-}
-
-/*!
- SLOT: Called when value of slider rotation1 change
-*/
-void SMESHGUI_ClippingDlg::SliderRotation1HasMoved( int value )
-{
- TLValueRotation1->setText( QString("%1\xB0").arg( value ) );
- SetCurrentPlaneParam();
-}
-
-/*!
- SLOT: Called when value of slider rotation2 change
-*/
-void SMESHGUI_ClippingDlg::SliderRotation2HasMoved( int value )
-{
- TLValueRotation2->setText( QString("%1\xB0").arg( value ) );
- SetCurrentPlaneParam();
-}
-
void SMESHGUI_ClippingDlg::onSelectAbsoluteOrientation( int mode )
{
bool isUserMode = (mode==0);