From a3a6c690baad8a568546cceff02dad9af440e9ca Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 25 Sep 2012 11:54:33 +0000 Subject: [PATCH] 0021869: [CEA 672] Clipping always apply even with auto-apply not checked --- src/SMESHGUI/SMESHGUI_ClippingDlg.cxx | 13 ++++++++++--- src/SMESHGUI/SMESHGUI_ClippingDlg.h | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx b/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx index 3143626c6..82638364b 100644 --- a/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx @@ -370,7 +370,7 @@ SMESHGUI_ClippingDlg::SMESHGUI_ClippingDlg( SMESHGUI* theModule, SVTK_ViewWindow ActorList = new QListWidget(GroupPlanes); ActorList->setSelectionMode(QAbstractItemView::SingleSelection); - + SelectAllCheckBox = new QCheckBox(tr("SELECT_ALL"), GroupPlanes); GroupPlanesLayout->addWidget(ComboBoxPlanes, 0, 0); @@ -477,7 +477,7 @@ SMESHGUI_ClippingDlg::SMESHGUI_ClippingDlg( SMESHGUI* theModule, SVTK_ViewWindow connect(SpinBoxRot1, SIGNAL(valueChanged(double)), this, SLOT(SetCurrentPlaneParam())); connect(SpinBoxRot2, SIGNAL(valueChanged(double)), this, SLOT(SetCurrentPlaneParam())); connect(PreviewCheckBox, SIGNAL(toggled(bool)), this, SLOT(OnPreviewToggle(bool))); - connect(AutoApplyCheckBox, SIGNAL(toggled(bool)), this, SLOT(ClickOnApply())); + connect(AutoApplyCheckBox, SIGNAL(toggled(bool)), this, SLOT(onAutoApply(bool))); connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); @@ -1063,7 +1063,9 @@ void SMESHGUI_ClippingDlg::initializePlaneData() SMESHGUI_ClippingPlaneInfoList::const_iterator anIter2 = aClippingPlaneInfoList.begin(); for( ; anIter2 != aClippingPlaneInfoList.end(); anIter2++ ) { const SMESH::ClippingPlaneInfo& aClippingPlaneInfo = *anIter2; - SMESH::TPlane aTPlane( aClippingPlaneInfo.Plane ); + SMESH::OrientedPlane* anOrientedPlane = SMESH::OrientedPlane::New(myViewWindow); + anOrientedPlane->ShallowCopy(aClippingPlaneInfo.Plane); + SMESH::TPlane aTPlane( anOrientedPlane ); SMESH::TPlaneData aPlaneData( aTPlane, aClippingPlaneInfo.ActorList ); myPlanes.push_back( aPlaneData ); } @@ -1170,3 +1172,8 @@ void SMESHGUI_ClippingDlg::dumpPlaneData() const } printf( "----------------------------------\n" ); } + +void SMESHGUI_ClippingDlg::onAutoApply(bool toggled) +{ + if ( toggled ) ClickOnApply(); +} diff --git a/src/SMESHGUI/SMESHGUI_ClippingDlg.h b/src/SMESHGUI/SMESHGUI_ClippingDlg.h index 70bd03b89..e8cb095f8 100644 --- a/src/SMESHGUI/SMESHGUI_ClippingDlg.h +++ b/src/SMESHGUI/SMESHGUI_ClippingDlg.h @@ -201,6 +201,7 @@ public slots: void onSelectOrientation( int ); void SetCurrentPlaneParam(); void OnPreviewToggle( bool ); + void onAutoApply(bool); void ClickOnOk(); void ClickOnCancel(); void ClickOnApply(); -- 2.39.2