From cc2118319228ba9848af1f17a4cc0d74ac86de6c Mon Sep 17 00:00:00 2001 From: abd Date: Tue, 21 Aug 2007 05:40:43 +0000 Subject: [PATCH] Fix dependence of ObjectBrowser and signal for ButtonGroup (buttonClicked() instead clicked()) --- src/VISUGUI/VisuGUI.cxx | 12 ++++++------ src/VISUGUI/VisuGUI_ClippingDlg.cxx | 2 +- src/VISUGUI/VisuGUI_GaussPointsDlg.cxx | 2 +- src/VISUGUI/VisuGUI_Plot3DDlg.cxx | 4 ++-- src/VISUGUI/VisuGUI_TimeAnimation.cxx | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx index 7968682f..29651cfb 100644 --- a/src/VISUGUI/VisuGUI.cxx +++ b/src/VISUGUI/VisuGUI.cxx @@ -68,8 +68,7 @@ #include "Plot2d_ViewManager.h" #include "QtxPagePrefMgr.h" -//TODO -//#include "OB_Browser.h" +#include "OB_Browser.h" #include "SALOME_ListIteratorOfListIO.hxx" @@ -81,6 +80,7 @@ #include "LightApp_SelectionMgr.h" #include "LightApp_Selection.h" #include "LightApp_Preferences.h" +#include #include "QtxAction.h" #include "QtxFontEdit.h" @@ -2690,10 +2690,10 @@ void VisuGUI::contextMenuPopup( const QString& theClient, QMenu* theMenu, QStrin { SalomeApp_Module::contextMenuPopup(theClient, theMenu, theTitle); - //TODO: object Browser - //OB_Browser* ob = getApp()->objectBrowser(); - //bool isOBClient = (ob && theClient == ob->popupClientType()); - bool isOBClient = false; + //TODO: object Browser DONE + OB_Browser* ob = getApp()->objectBrowser(); + bool isOBClient = (ob && theClient == ob->popupClientType()); + //bool isOBClient = false; LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); SALOME_ListIO aListIO; diff --git a/src/VISUGUI/VisuGUI_ClippingDlg.cxx b/src/VISUGUI/VisuGUI_ClippingDlg.cxx index 50a5a19b..91e97f4d 100644 --- a/src/VISUGUI/VisuGUI_ClippingDlg.cxx +++ b/src/VISUGUI/VisuGUI_ClippingDlg.cxx @@ -364,7 +364,7 @@ VisuGUI_ClippingDlg::VisuGUI_ClippingDlg (VisuGUI* theModule, connect(SpinBoxDistance , SIGNAL(valueChanged(double)) , this, SLOT(SetCurrentPlaneParam())); connect(SpinBoxRot1 , SIGNAL(valueChanged(double)) , this, SLOT(SetCurrentPlaneParam())); connect(SpinBoxRot2 , SIGNAL(valueChanged(double)) , this, SLOT(SetCurrentPlaneParam())); - connect(ButtonGroupIJKAxis , SIGNAL(clicked(int)) , this, SLOT(onIJKAxisChanged(int))); + connect(ButtonGroupIJKAxis , SIGNAL(buttonClicked(int)) , this, SLOT(onIJKAxisChanged(int))); connect(SpinBoxIJKIndex , SIGNAL(valueChanged(int)) , this, SLOT(SetCurrentPlaneIJKParam())); connect(CheckBoxIJKPlaneReverse, SIGNAL(toggled(bool)) , this, SLOT(SetCurrentPlaneIJKParam())); connect(TabPane , SIGNAL(currentChanged (QWidget*)), this, SLOT(onTabChanged(QWidget*))); diff --git a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx index e00c6593..8c1017e8 100644 --- a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx +++ b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx @@ -311,7 +311,7 @@ VisuGUI_GaussScalarBarPane::VisuGUI_GaussScalarBarPane (QWidget * parent, bool S connect( RainbowButton, SIGNAL( toggled( bool ) ), ColorSpin, SLOT( setEnabled( bool ) ) ); connect( RainbowButton, SIGNAL( toggled( bool ) ), LabelLabel, SLOT( setEnabled( bool ) ) ); connect( RainbowButton, SIGNAL( toggled( bool ) ), LabelSpin, SLOT( setEnabled( bool ) ) ); - connect( OrientGroup, SIGNAL( clicked( int ) ), this, SLOT( changeDefaults( int ) ) ); + connect( OrientGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( changeDefaults( int ) ) ); connect( XSpin, SIGNAL( valueChanged( double ) ), this, SLOT( XYChanged( double ) ) ); connect( YSpin, SIGNAL( valueChanged( double ) ), this, SLOT( XYChanged( double ) ) ); connect( myTextBtn, SIGNAL( clicked() ), this, SLOT( onTextPref() ) ); diff --git a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx index f84910ae..adcf1282 100644 --- a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx +++ b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx @@ -269,12 +269,12 @@ VisuGUI_Plot3DPane::VisuGUI_Plot3DPane (QWidget* parent) bottomLayout->addWidget(PreviewChkB, 3, 0); // signals and slots connections - connect(GBOrientation, SIGNAL(clicked(int)), this, SLOT(orientationChanged(int))); + connect(GBOrientation, SIGNAL(buttonClicked(int)), this, SLOT(orientationChanged(int))); connect(Rot1, SIGNAL(valueChanged(double)), this, SLOT(updatePreview())); connect(Rot2, SIGNAL(valueChanged(double)), this, SLOT(updatePreview())); connect(PositionSpn, SIGNAL(valueChanged(double)), this, SLOT(onPositionSpn())); connect(RelativeChkB, SIGNAL(toggled(bool)), this, SLOT(onRelativePos(bool))); - connect(GBPrsType, SIGNAL(clicked(int)), this, SLOT(onPrsType(int))); + connect(GBPrsType, SIGNAL(buttonClicked(int)), this, SLOT(onPrsType(int))); connect(PreviewChkB, SIGNAL(toggled(bool)), this, SLOT(updatePreview())); } diff --git a/src/VISUGUI/VisuGUI_TimeAnimation.cxx b/src/VISUGUI/VisuGUI_TimeAnimation.cxx index 89878cbf..be085527 100644 --- a/src/VISUGUI/VisuGUI_TimeAnimation.cxx +++ b/src/VISUGUI/VisuGUI_TimeAnimation.cxx @@ -254,7 +254,7 @@ void ArrangeDlg::init() myStackWgt->setCurrentIndex(AutoMode); - connect(aBtnGrp, SIGNAL(clicked(int)), myStackWgt, SLOT(raiseWidget(int)) ); + connect(aBtnGrp, SIGNAL(buttonClicked(int)), myStackWgt, SLOT(raiseWidget(int)) ); SUIT_Study* aSUITStudy = myViewWindow->getViewManager()->study(); SalomeApp_Study* anAppStudy = dynamic_cast(aSUITStudy); -- 2.39.2