From c5ee55eb8461fe45ac63777908bac9a63a088587 Mon Sep 17 00:00:00 2001 From: ouv Date: Tue, 11 Oct 2005 14:19:25 +0000 Subject: [PATCH] The following dialogs has been moved to SVTK : VisuGUI_NonIsometricDlg VisuGUI_CubeAxes VisuGUI_FontWg --- src/VISUGUI/Makefile.in | 7 ------ src/VISUGUI/VisuGUI.cxx | 35 -------------------------- src/VISUGUI/VisuGUI.h | 3 --- src/VISUGUI/VisuGUI_GaussPointsDlg.cxx | 2 +- src/VISUGUI/VisuGUI_ScalarBarDlg.cxx | 7 +++--- src/VISUGUI/VisuGUI_ScalarBarDlg.h | 6 ++--- 6 files changed, 8 insertions(+), 52 deletions(-) diff --git a/src/VISUGUI/Makefile.in b/src/VISUGUI/Makefile.in index 3cae73e8..3e9f92da 100644 --- a/src/VISUGUI/Makefile.in +++ b/src/VISUGUI/Makefile.in @@ -35,7 +35,6 @@ VPATH=.:@srcdir@ # header files EXPORT_HEADERS= \ - VisuGUI_NonIsometricDlg.h \ VisuGUI_Tools.h # .po files to transform in .qm @@ -60,12 +59,9 @@ LIB_SRC = VisuGUI.cxx \ VisuGUI_TimeAnimation.cxx \ VisuGUI_EditContainerDlg.cxx \ VisuGUI_ClippingDlg.cxx \ - VisuGUI_CubeAxesDlg.cxx \ VisuGUI_DialogRunner.cxx \ - VisuGUI_FontWg.cxx \ VisuGUI_OffsetDlg.cxx \ VisuGUI_Plot3DDlg.cxx \ - VisuGUI_NonIsometricDlg.cxx \ VisuGUI_ScalarBarDlg.cxx \ VisuGUI_GaussPointsDlg.cxx \ VisuGUI_DeformedShapeDlg.cxx \ @@ -84,12 +80,9 @@ LIB_MOC = VisuGUI.h \ VisuGUI_TimeAnimation.h \ VisuGUI_EditContainerDlg.h \ VisuGUI_ClippingDlg.h \ - VisuGUI_CubeAxesDlg.h \ VisuGUI_DialogRunner.h \ - VisuGUI_FontWg.h \ VisuGUI_OffsetDlg.h \ VisuGUI_Plot3DDlg.h \ - VisuGUI_NonIsometricDlg.h \ VisuGUI_ScalarBarDlg.h \ VisuGUI_GaussPointsDlg.h \ VisuGUI_DeformedShapeDlg.h \ diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx index 275e4523..713a1005 100644 --- a/src/VISUGUI/VisuGUI.cxx +++ b/src/VISUGUI/VisuGUI.cxx @@ -95,10 +95,8 @@ #include "VisuGUI_Selection.h" #include "VisuGUI_TimeAnimation.h" #include "VisuGUI_EditContainerDlg.h" -#include "VisuGUI_NonIsometricDlg.h" #include "VisuGUI_ClippingDlg.h" #include "VisuGUI_Plot3DDlg.h" -#include "VisuGUI_CubeAxesDlg.h" #include "VisuGUI_OffsetDlg.h" #include "VISU_ScalarMap_i.hh" @@ -1757,25 +1755,6 @@ OnSelectionInfo() tr("BUT_OK") ); } -void -VisuGUI:: -OnScaling() -{ - VisuGUI_NonIsometricDlg* m_NonIsoDlg = - new VisuGUI_NonIsometricDlg (GetDesktop(this), "m_NonIsoDlg", - false, Qt::WDestructiveClose); - m_NonIsoDlg->show(); -} - -void -VisuGUI:: -OnCubeAxes() -{ - //Show dialog that allows to select scale function and corresponding scale factor - VisuGUI_CubeAxesDlg* aDlg = new VisuGUI_CubeAxesDlg (GetDesktop(this)); - aDlg->show(); -} - void VisuGUI:: OnMergeScalarBars() @@ -2226,16 +2205,6 @@ createActions() //this, SLOT(OnEraseAll())); this); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_SCALING")); - createAction( VISU_SCALING, tr("MEN_SCALING"), QIconSet(aPixmap), - tr("MEN_SCALING"), "", 0, aParent, false, - this, SLOT(OnScaling())); - - aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_CUBE_AXES")); - createAction( VISU_CUBE_AXES, tr("MEN_CUBE_AXES"), QIconSet(aPixmap), - tr("MEN_CUBE_AXES"), "", 0, aParent, false, - this, SLOT(OnCubeAxes())); - createAction( VISU_SHOW_ANIMATION, tr("MEN_SHOW_ANIMATION"), QIconSet(), tr("MEN_SHOW_ANIMATION"), "", 0, aParent, false, this, SLOT(OnShowAnimation())); @@ -2275,8 +2244,6 @@ createMenus() createMenu( VISU_ERASE_ALL, aMenuId, 10 ); // erase all createMenu( VISU_GLOBAL_SELECTION, aMenuId, 10 ); // global selection createMenu( VISU_PARTIAL_SELECTION, aMenuId, 10 ); // partial selection - createMenu( VISU_SCALING, aMenuId, 10 ); // scaling - createMenu( VISU_CUBE_AXES, aMenuId, 10 ); // scaling } void @@ -2300,8 +2267,6 @@ createToolBars() createTool( VISU_ERASE_ALL, aToolId ); createTool( VISU_GLOBAL_SELECTION, aToolId ); createTool( VISU_PARTIAL_SELECTION, aToolId ); - createTool( VISU_SCALING, aToolId ); - createTool( VISU_CUBE_AXES, aToolId ); } void diff --git a/src/VISUGUI/VisuGUI.h b/src/VISUGUI/VisuGUI.h index d0b5c1a5..aa8e4316 100644 --- a/src/VISUGUI/VisuGUI.h +++ b/src/VISUGUI/VisuGUI.h @@ -137,9 +137,6 @@ protected slots: void OnTranslatePrs(); void OnArrangeActors(); - void OnScaling(); - void OnCubeAxes(); - protected: virtual SalomeApp_Selection* createSelection() const; diff --git a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx index f3ffcc7c..bcc078af 100644 --- a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx +++ b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx @@ -29,7 +29,6 @@ #include "VISUConfig.hh" -#include "VisuGUI_FontWg.h" #include "VisuGUI_Tools.h" #include "VISU_GaussPoints_i.hh" @@ -42,6 +41,7 @@ #include "SUIT_ResourceMgr.h" #include "SUIT_Session.h" #include "SUIT_MessageBox.h" +#include "SVTK_FontWidget.h" #include #include diff --git a/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx b/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx index 399e0637..c55615ff 100644 --- a/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx +++ b/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx @@ -30,7 +30,8 @@ #include "VisuGUI.h" #include "VisuGUI_Tools.h" -#include "VisuGUI_FontWg.h" + +#include "SVTK_FontWidget.h" #include "VISUConfig.hh" #include "VISU_Convertor.hxx" @@ -906,7 +907,7 @@ VisuGUI_TextPrefDlg::VisuGUI_TextPrefDlg (QWidget* parent) // font QHBox* aHBox = new QHBox (aTitleGrp); aHBox->setSpacing(5); - myTitleFont = new VisuGUI_FontWg (aHBox); + myTitleFont = new SVTK_FontWidget (aHBox); TopLayout->addWidget(aTitleGrp); @@ -916,7 +917,7 @@ VisuGUI_TextPrefDlg::VisuGUI_TextPrefDlg (QWidget* parent) // font aHBox = new QHBox (aLabelsGrp); aHBox->setSpacing(5); - myLabelFont = new VisuGUI_FontWg (aHBox); + myLabelFont = new SVTK_FontWidget (aHBox); TopLayout->addWidget(aLabelsGrp); diff --git a/src/VISUGUI/VisuGUI_ScalarBarDlg.h b/src/VISUGUI/VisuGUI_ScalarBarDlg.h index c8ddc6ab..4695f475 100644 --- a/src/VISUGUI/VisuGUI_ScalarBarDlg.h +++ b/src/VISUGUI/VisuGUI_ScalarBarDlg.h @@ -60,7 +60,7 @@ class QToolButton; class QtxDblSpinBox; class SalomeApp_Module; -class VisuGUI_FontWg; +class SVTK_FontWidget; class VisuGUI_TextPrefDlg: public QDialog { @@ -77,8 +77,8 @@ class VisuGUI_TextPrefDlg: public QDialog { (isVisible)? myTitleEdt->show() : myTitleEdt->hide(); } public: - VisuGUI_FontWg* myTitleFont; - VisuGUI_FontWg* myLabelFont; + SVTK_FontWidget* myTitleFont; + SVTK_FontWidget* myLabelFont; private: QLineEdit* myTitleEdt; -- 2.39.2