From: nds Date: Thu, 3 Nov 2005 08:40:17 +0000 (+0000) Subject: Using files from package LightApp instead of files from package SalomeApp X-Git-Tag: V3_1_0a3~15 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8cd74e43589177ea9659ddbffe381da4bab3ec2d;p=modules%2Fvisu.git Using files from package LightApp instead of files from package SalomeApp --- diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx index 90791a23..0a521376 100644 --- a/src/VISUGUI/VisuGUI.cxx +++ b/src/VISUGUI/VisuGUI.cxx @@ -71,9 +71,9 @@ #include "SalomeApp_Application.h" #include "SalomeApp_DataModel.h" #include "SalomeApp_Study.h" -#include "SalomeApp_SelectionMgr.h" -#include "SalomeApp_Selection.h" -#include "SalomeApp_Preferences.h" +#include "LightApp_SelectionMgr.h" +#include "LightApp_Selection.h" +#include "LightApp_Preferences.h" #include "QtxAction.h" @@ -294,7 +294,7 @@ OnExportTableToFile() _PTR(Study) aCStudy = GetCStudy(GetAppStudy(this)); - SalomeApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); + LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); SALOME_ListIO aListIO; aSelectionMgr->selectedObjects(aListIO); @@ -398,7 +398,7 @@ OnImportMedField() return; SALOMEDS::Study_var aStudy = GetDSStudy(aCStudy); - SalomeApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); + LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); SALOME_ListIO aListIO; aSelectionMgr->selectedObjects(aListIO); @@ -518,7 +518,7 @@ OnCreateManyMesh() GetViewWindow( this, /*create=*/true ); // Get selected SObject - SalomeApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); + LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); SALOME_ListIO aListIO; aSelectionMgr->selectedObjects(aListIO); SALOME_ListIteratorOfListIO anIter (aListIO); @@ -605,7 +605,7 @@ OnDisplayPrs() QApplication::setOverrideCursor(Qt::waitCursor); SALOME_ListIO aList; - SalomeApp_SelectionMgr* mgr = GetSelectionMgr(this); + LightApp_SelectionMgr* mgr = GetSelectionMgr(this); mgr->selectedObjects(aList); Handle(SALOME_InteractiveObject) anIO; @@ -676,7 +676,7 @@ OnErasePrs() vw->unHighlightAll(); SALOME_ListIO aList; - SalomeApp_SelectionMgr* mgr = GetSelectionMgr(this); + LightApp_SelectionMgr* mgr = GetSelectionMgr(this); mgr->selectedObjects(aList); Handle(SALOME_InteractiveObject) anIO; @@ -1130,7 +1130,7 @@ OnDeleteObjects() return; SALOME_ListIO aList; - SalomeApp_SelectionMgr* mgr = GetSelectionMgr(this); + LightApp_SelectionMgr* mgr = GetSelectionMgr(this); mgr->selectedObjects(aList,QString::null,false); int i = 0, nbSelected = aList.Extent(); if (nbSelected < 1) return; @@ -1323,7 +1323,7 @@ void VisuGUI:: OnCurveProperties() { - SalomeApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); + LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); SALOME_ListIO aListIO; aSelectionMgr->selectedObjects(aListIO); if (aListIO.Extent() != 1) return; @@ -1421,7 +1421,7 @@ OnSaveViewParams() if (aViewMgr->getType() != SVTK_Viewer::Type()) return; - SalomeApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); + LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); SALOME_ListIO aListIO; aSelectionMgr->selectedObjects(aListIO); if (aListIO.Extent() > 1) @@ -1444,7 +1444,7 @@ OnRestoreViewParams() if (aViewMgr->getType() != SVTK_Viewer::Type()) return; - SalomeApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); + LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); SALOME_ListIO aListIO; aSelectionMgr->selectedObjects(aListIO); if (aListIO.Extent() != 1) @@ -1604,7 +1604,7 @@ OnTimeAnimation() // new VisuGUI_TimeAnimationDlg(GetDesktop(this), aCStudy); new VisuGUI_TimeAnimationDlg (this, aCStudy); - SalomeApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); + LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); SALOME_ListIO aListIO; aSelectionMgr->selectedObjects(aListIO); @@ -1636,7 +1636,7 @@ void VisuGUI:: OnShowAnimation() { - SalomeApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); + LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); SALOME_ListIO aListIO; aSelectionMgr->selectedObjects(aListIO); @@ -1798,7 +1798,7 @@ void VisuGUI:: OnMergeScalarBars() { - SalomeApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); + LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); SALOME_ListIO aListIO; aSelectionMgr->selectedObjects(aListIO); @@ -1861,7 +1861,7 @@ void VisuGUI:: OnFreeScalarBars() { - SalomeApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); + LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); SALOME_ListIO aListIO; aSelectionMgr->selectedObjects(aListIO); @@ -1905,7 +1905,7 @@ OnTranslatePrs() _PTR(Study) aCStudy = GetCStudy(GetAppStudy(this)); - SalomeApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); + LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); SALOME_ListIO aListIO; aSelectionMgr->selectedObjects(aListIO); @@ -2603,7 +2603,7 @@ void VisuGUI::contextMenuPopup( const QString& theClient, QPopupMenu* theMenu, Q OB_Browser* ob = getApp()->objectBrowser(); bool isOBClient = (ob && theClient == ob->popupClientType()); - SalomeApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); + LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); SALOME_ListIO aListIO; aSelectionMgr->selectedObjects(aListIO); @@ -2760,7 +2760,7 @@ deactivateModule( SUIT_Study* theStudy ) return true; } -SalomeApp_Selection* +LightApp_Selection* VisuGUI:: createSelection() const { @@ -2787,10 +2787,10 @@ void VisuGUI::createPreferences() int sbarTab = addPreference( tr( "VISU_SCALAR_BAR" ) ); int fontGr = addPreference( tr( "VISU_FONT" ), sbarTab ); - int tfont = addPreference( tr( "VISU_TITLE" ), fontGr, SalomeApp_Preferences::Font, "VISU", "scalar_bar_title_font" ); - addPreference( tr( "VISU_TITLE" ), fontGr, SalomeApp_Preferences::Color, "VISU", "scalar_bar_title_color" ); - int lfont = addPreference( tr( "VISU_LABELS" ), fontGr, SalomeApp_Preferences::Font, "VISU", "scalar_bar_label_font" ); - addPreference( tr( "VISU_LABELS" ), fontGr, SalomeApp_Preferences::Color, "VISU", "scalar_bar_label_color" ); + int tfont = addPreference( tr( "VISU_TITLE" ), fontGr, LightApp_Preferences::Font, "VISU", "scalar_bar_title_font" ); + addPreference( tr( "VISU_TITLE" ), fontGr, LightApp_Preferences::Color, "VISU", "scalar_bar_title_color" ); + int lfont = addPreference( tr( "VISU_LABELS" ), fontGr, LightApp_Preferences::Font, "VISU", "scalar_bar_label_font" ); + addPreference( tr( "VISU_LABELS" ), fontGr, LightApp_Preferences::Color, "VISU", "scalar_bar_label_color" ); QStringList fam; fam.append( tr( "VISU_FONT_ARIAL" ) ); @@ -2807,16 +2807,16 @@ void VisuGUI::createPreferences() int colorsLabelsGr = addPreference( tr( "VISU_COLORS_AND_LABELS" ), sbarTab ); - int numcol = addPreference( tr( "VISU_NB_COLORS" ), colorsLabelsGr, SalomeApp_Preferences::IntSpin, "VISU", "scalar_bar_num_colors" ); + int numcol = addPreference( tr( "VISU_NB_COLORS" ), colorsLabelsGr, LightApp_Preferences::IntSpin, "VISU", "scalar_bar_num_colors" ); setPreferenceProperty( numcol, "min", 2 ); setPreferenceProperty( numcol, "max", 64 ); - int numlab = addPreference( tr( "VISU_NB_LABELS" ), colorsLabelsGr, SalomeApp_Preferences::IntSpin, "VISU", "scalar_bar_num_labels" ); + int numlab = addPreference( tr( "VISU_NB_LABELS" ), colorsLabelsGr, LightApp_Preferences::IntSpin, "VISU", "scalar_bar_num_labels" ); setPreferenceProperty( numlab, "min", 2 ); setPreferenceProperty( numlab, "max", 65 ); int orientGr = addPreference( tr( "VISU_ORIENTATION" ), sbarTab ); - int orient = addPreference( tr( "VISU_ORIENTATION" ), orientGr, SalomeApp_Preferences::Selector, "VISU", "scalar_bar_orientation" ); + int orient = addPreference( tr( "VISU_ORIENTATION" ), orientGr, LightApp_Preferences::Selector, "VISU", "scalar_bar_orientation" ); QStringList orients; orients.append( tr( "VISU_VERTICAL" ) ); orients.append( tr( "VISU_HORIZONTAL" ) ); @@ -2827,10 +2827,10 @@ void VisuGUI::createPreferences() setPreferenceProperty( orient, "indexes", indices ); int posVSizeGr = addPreference( tr( "VISU_ORIGIN_AND_SIZE" ) + " " + tr( "VISU_VERTICAL" ), sbarTab ); - int xv = addPreference( tr( "VISU_X" ), posVSizeGr, SalomeApp_Preferences::DblSpin, "VISU", "scalar_bar_vertical_x" ); - int yv = addPreference( tr( "VISU_Y" ), posVSizeGr, SalomeApp_Preferences::DblSpin, "VISU", "scalar_bar_vertical_y" ); - int wv = addPreference( tr( "VISU_WIDTH" ), posVSizeGr, SalomeApp_Preferences::DblSpin, "VISU", "scalar_bar_vertical_width" ); - int hv = addPreference( tr( "VISU_HEIGHT" ), posVSizeGr, SalomeApp_Preferences::DblSpin, "VISU", "scalar_bar_vertical_height" ); + int xv = addPreference( tr( "VISU_X" ), posVSizeGr, LightApp_Preferences::DblSpin, "VISU", "scalar_bar_vertical_x" ); + int yv = addPreference( tr( "VISU_Y" ), posVSizeGr, LightApp_Preferences::DblSpin, "VISU", "scalar_bar_vertical_y" ); + int wv = addPreference( tr( "VISU_WIDTH" ), posVSizeGr, LightApp_Preferences::DblSpin, "VISU", "scalar_bar_vertical_width" ); + int hv = addPreference( tr( "VISU_HEIGHT" ), posVSizeGr, LightApp_Preferences::DblSpin, "VISU", "scalar_bar_vertical_height" ); setPreferenceProperty( xv, "step", 0.1 ); setPreferenceProperty( yv, "step", 0.1 ); setPreferenceProperty( wv, "step", 0.1 ); @@ -2845,10 +2845,10 @@ void VisuGUI::createPreferences() setPreferenceProperty( hv, "max", 1.0 ); int posHSizeGr = addPreference( tr( "VISU_ORIGIN_AND_SIZE" ) + " " + tr( "VISU_HORIZONTAL" ), sbarTab ); - int xh = addPreference( tr( "VISU_X" ), posHSizeGr, SalomeApp_Preferences::DblSpin, "VISU", "scalar_bar_horizontal_x" ); - int yh = addPreference( tr( "VISU_Y" ), posHSizeGr, SalomeApp_Preferences::DblSpin, "VISU", "scalar_bar_horizontal_y" ); - int wh = addPreference( tr( "VISU_WIDTH" ), posHSizeGr, SalomeApp_Preferences::DblSpin, "VISU", "scalar_bar_horizontal_width" ); - int hh = addPreference( tr( "VISU_HEIGHT" ), posHSizeGr, SalomeApp_Preferences::DblSpin, "VISU", "scalar_bar_horizontal_height" ); + int xh = addPreference( tr( "VISU_X" ), posHSizeGr, LightApp_Preferences::DblSpin, "VISU", "scalar_bar_horizontal_x" ); + int yh = addPreference( tr( "VISU_Y" ), posHSizeGr, LightApp_Preferences::DblSpin, "VISU", "scalar_bar_horizontal_y" ); + int wh = addPreference( tr( "VISU_WIDTH" ), posHSizeGr, LightApp_Preferences::DblSpin, "VISU", "scalar_bar_horizontal_width" ); + int hh = addPreference( tr( "VISU_HEIGHT" ), posHSizeGr, LightApp_Preferences::DblSpin, "VISU", "scalar_bar_horizontal_height" ); setPreferenceProperty( xh, "step", 0.1 ); setPreferenceProperty( yh, "step", 0.1 ); setPreferenceProperty( wh, "step", 0.1 ); @@ -2867,7 +2867,7 @@ void VisuGUI::createPreferences() int rangeGr = addPreference( tr( "VISU_SCALAR_RANGE" ), srangeTab ); setPreferenceProperty( rangeGr, "columns", 1 ); - int mode = addPreference( tr( "VISU_SCALAR_MODE" ), rangeGr, SalomeApp_Preferences::Selector, "VISU", "scalar_bar_mode" ); + int mode = addPreference( tr( "VISU_SCALAR_MODE" ), rangeGr, LightApp_Preferences::Selector, "VISU", "scalar_bar_mode" ); QStringList modes; modes.append( tr( "VISU_MODULUS" ) ); modes.append( tr( "VISU_COMPONENT" ) + tr("1") ); @@ -2881,9 +2881,9 @@ void VisuGUI::createPreferences() setPreferenceProperty( mode, "strings", modes ); setPreferenceProperty( mode, "indexes", indices ); - addPreference( tr( "VISU_LOGARITHMIC_SCALING" ), rangeGr, SalomeApp_Preferences::Bool, "VISU", "scalar_bar_logarithmic" ); + addPreference( tr( "VISU_LOGARITHMIC_SCALING" ), rangeGr, LightApp_Preferences::Bool, "VISU", "scalar_bar_logarithmic" ); - int rangetype = addPreference( tr( "VISU_RANGE_TO_USE" ), rangeGr, SalomeApp_Preferences::Selector, "VISU", "scalar_range_type" ); + int rangetype = addPreference( tr( "VISU_RANGE_TO_USE" ), rangeGr, LightApp_Preferences::Selector, "VISU", "scalar_range_type" ); QStringList types; types.append( tr( "VISU_FIELD_RANGE" ) ); types.append( tr( "VISU_IMPOSED_RANGE" ) ); @@ -2895,17 +2895,17 @@ void VisuGUI::createPreferences() int imposedGr = addPreference( tr( "VISU_MINMAX_IMPOSED_RANGE" ), srangeTab ); - int min = addPreference( tr( "VISU_MIN" ), imposedGr, SalomeApp_Preferences::DblSpin, "VISU", "scalar_range_min" ); - int max = addPreference( tr( "VISU_MAX" ), imposedGr, SalomeApp_Preferences::DblSpin, "VISU", "scalar_range_max" ); + int min = addPreference( tr( "VISU_MIN" ), imposedGr, LightApp_Preferences::DblSpin, "VISU", "scalar_range_min" ); + int max = addPreference( tr( "VISU_MAX" ), imposedGr, LightApp_Preferences::DblSpin, "VISU", "scalar_range_max" ); setPreferenceProperty( min, "step", 0.1 ); setPreferenceProperty( max, "step", 0.1 ); int sweepGr = addPreference( tr( "VISU_SWEEPING_PREF" ), srangeTab ); setPreferenceProperty( sweepGr, "columns", 1 ); - int timestep = addPreference( tr( "VISU_TIME_STEP" ), sweepGr, SalomeApp_Preferences::DblSpin, "VISU", "sweeping_time_step" ); - int nbcycles = addPreference( tr( "VISU_NB_CYCLES" ), sweepGr, SalomeApp_Preferences::IntSpin, "VISU", "sweeping_number_cycles" ); - int nbsteps = addPreference( tr( "VISU_NB_STEPS" ), sweepGr, SalomeApp_Preferences::IntSpin, "VISU", "sweeping_number_steps" ); + int timestep = addPreference( tr( "VISU_TIME_STEP" ), sweepGr, LightApp_Preferences::DblSpin, "VISU", "sweeping_time_step" ); + int nbcycles = addPreference( tr( "VISU_NB_CYCLES" ), sweepGr, LightApp_Preferences::IntSpin, "VISU", "sweeping_number_cycles" ); + int nbsteps = addPreference( tr( "VISU_NB_STEPS" ), sweepGr, LightApp_Preferences::IntSpin, "VISU", "sweeping_number_steps" ); setPreferenceProperty( timestep, "min", 0.1 ); setPreferenceProperty( timestep, "step", 0.1 ); setPreferenceProperty( timestep, "max", 1000 ); @@ -2913,7 +2913,7 @@ void VisuGUI::createPreferences() setPreferenceProperty( nbsteps, "max", 200 ); int importGr = addPreference( tr( "MED files import" ), srangeTab ); - addPreference( tr( "Full MED loading" ), importGr, SalomeApp_Preferences::Bool, "VISU", "full_med_loading" ); + addPreference( tr( "Full MED loading" ), importGr, LightApp_Preferences::Bool, "VISU", "full_med_loading" ); } void VisuGUI::preferencesChanged( const QString&, const QString& ) @@ -2928,7 +2928,7 @@ VisuGUI return getApp()->getViewManager(theType,theIsCreate); } -SalomeApp_Displayer* VisuGUI::displayer() +LightApp_Displayer* VisuGUI::displayer() { return 0; } diff --git a/src/VISUGUI/VisuGUI.h b/src/VISUGUI/VisuGUI.h index 5b64c53a..87240116 100644 --- a/src/VISUGUI/VisuGUI.h +++ b/src/VISUGUI/VisuGUI.h @@ -42,7 +42,7 @@ public: VisuGUI(); virtual ~VisuGUI(); - virtual SalomeApp_Displayer* displayer(); + virtual LightApp_Displayer* displayer(); virtual void initialize( CAM_Application* ); virtual void windows( QMap& ) const; virtual void viewManagers( QStringList& ) const; @@ -144,7 +144,7 @@ protected slots: void OnCubeAxes(); protected: - virtual SalomeApp_Selection* createSelection() const; + virtual LightApp_Selection* createSelection() const; private: void createActions(); @@ -153,7 +153,7 @@ private: void createPopupMenus(); private: - SalomeApp_Displayer* myDisplayer; + LightApp_Displayer* myDisplayer; }; #endif diff --git a/src/VISUGUI/VisuGUI_ClippingDlg.cxx b/src/VISUGUI/VisuGUI_ClippingDlg.cxx index e8c5c0a7..418fc8d1 100644 --- a/src/VISUGUI/VisuGUI_ClippingDlg.cxx +++ b/src/VISUGUI/VisuGUI_ClippingDlg.cxx @@ -9,7 +9,7 @@ #include "VISU_PipeLine.hxx" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SVTK_ViewWindow.h" diff --git a/src/VISUGUI/VisuGUI_ClippingDlg.h b/src/VISUGUI/VisuGUI_ClippingDlg.h index b7f7fc5c..9c5c9ca1 100644 --- a/src/VISUGUI/VisuGUI_ClippingDlg.h +++ b/src/VISUGUI/VisuGUI_ClippingDlg.h @@ -28,7 +28,7 @@ class QTabWidget; class QtxDblSpinBox; -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; class VisuGUI; @@ -68,7 +68,7 @@ public: private: - SalomeApp_SelectionMgr* mySelectionMgr; + LightApp_SelectionMgr* mySelectionMgr; Handle(SALOME_InteractiveObject) myIO; VisuGUI * myVisuGUI; diff --git a/src/VISUGUI/VisuGUI_NonIsometricDlg.cxx b/src/VISUGUI/VisuGUI_NonIsometricDlg.cxx index beca47aa..323c384f 100644 --- a/src/VISUGUI/VisuGUI_NonIsometricDlg.cxx +++ b/src/VISUGUI/VisuGUI_NonIsometricDlg.cxx @@ -17,7 +17,7 @@ #include "VISU_PipeLine.hxx" #include "SalomeApp_Application.h" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SVTK_ViewWindow.h" #include "SVTK_RenderWindowInteractor.h" @@ -158,7 +158,7 @@ void VisuGUI_NonIsometricDlg::onClickApply() { SalomeApp_Application* anApp = dynamic_cast (SUIT_Session::session()->activeApplication()); - SalomeApp_SelectionMgr* mgr = anApp->selectionMgr(); + LightApp_SelectionMgr* mgr = anApp->selectionMgr(); SVTK_ViewWindow* vf = VISU::GetViewWindow(); if (!vf) diff --git a/src/VISUGUI/VisuGUI_PopupTools.cxx b/src/VISUGUI/VisuGUI_PopupTools.cxx index 73826c96..0e1c308f 100644 --- a/src/VISUGUI/VisuGUI_PopupTools.cxx +++ b/src/VISUGUI/VisuGUI_PopupTools.cxx @@ -27,6 +27,8 @@ #include "VisuGUI_PopupTools.h" #include "VisuGUI_Tools.h" +#include "SalomeApp_Study.h" +#include "LightApp_Study.h" #include "VISU_Actor.h" #include "VISU_ScalarMapAct.h" @@ -39,7 +41,7 @@ using namespace VISU; QtxValue VisuGUI_Selection::param( const int ind, const QString& p ) const { - QtxValue val( SalomeApp_Selection::param( ind, p ) ); + QtxValue val( LightApp_Selection::param( ind, p ) ); if ( !val.isValid() ) { if ( p == "type" ) val = QtxValue( type( ind ) ); else if ( p == "nbComponents" ) val = QtxValue( nbComponents( ind ) ); @@ -67,7 +69,10 @@ QString VisuGUI_Selection::type( const int ind ) const { QString aResStr; VISU::Storable::TRestoringMap aMap; - CORBA::Object_var anObject = GetSelectedObj( study(), entry( ind ), &aMap ); + SalomeApp_Study* aStudy = dynamic_cast( ( LightApp_Study* )study() ); + if ( !aStudy ) + return aResStr; + CORBA::Object_var anObject = GetSelectedObj( aStudy, entry( ind ), &aMap ); VISU::Base_var aVisuObj = VISU::Base::_narrow( anObject ); if ( !CORBA::is_nil( aVisuObj ) ){ @@ -120,7 +125,10 @@ QString VisuGUI_Selection::nbComponents( const int ind ) const { QString aResStr; VISU::Storable::TRestoringMap aMap; - GetSelectedObj( study(), entry( ind ), &aMap ); + SalomeApp_Study* aStudy = dynamic_cast( ( LightApp_Study* )study() ); + if ( !aStudy ) + return aResStr; + GetSelectedObj( aStudy, entry( ind ), &aMap ); bool isExist; const QString& aVal = VISU::Storable::FindValue(aMap,"myNumComponent",&isExist); if ( isExist ) @@ -132,7 +140,10 @@ QString VisuGUI_Selection::nbTimeStamps( const int ind ) const { QString aResStr; VISU::Storable::TRestoringMap aMap; - GetSelectedObj( study(), entry( ind ), &aMap ); + SalomeApp_Study* aStudy = dynamic_cast( ( LightApp_Study* )study() ); + if ( !aStudy ) + return aResStr; + GetSelectedObj( aStudy, entry( ind ), &aMap ); bool isExist; const QString& aVal = VISU::Storable::FindValue(aMap,"myNbTimeStamps",&isExist); if ( isExist ) @@ -163,7 +174,10 @@ QString VisuGUI_Selection::representation( const int ind ) const int VisuGUI_Selection::nbChild( const int ind, const bool named ) const { int cnt = 0; - _PTR(Study) aStudy = GetCStudy( study() ); + SalomeApp_Study* aSStudy = dynamic_cast( ( LightApp_Study* )study() ); + if ( !aSStudy ) + return cnt; + _PTR(Study) aStudy = GetCStudy( aSStudy ); if ( aStudy ){ _PTR(SObject) SO = aStudy->FindObjectID( entry( ind ).latin1() ); if ( SO ){ diff --git a/src/VISUGUI/VisuGUI_PopupTools.h b/src/VISUGUI/VisuGUI_PopupTools.h index 537dfafb..19005c88 100644 --- a/src/VISUGUI/VisuGUI_PopupTools.h +++ b/src/VISUGUI/VisuGUI_PopupTools.h @@ -28,7 +28,7 @@ #ifndef VisuGUI_PopupTools_HeaderFile #define VisuGUI_PopupTools_HeaderFile -#include +#include ////////////////////////////////////////////////// // Class: VisuGUI_Selection @@ -36,7 +36,7 @@ class SalomeApp_Module; -class VisuGUI_Selection : public SalomeApp_Selection +class VisuGUI_Selection : public LightApp_Selection { public: VisuGUI_Selection( SalomeApp_Module* theModule ) : myModule( theModule ) {}; diff --git a/src/VISUGUI/VisuGUI_Selection.cxx b/src/VISUGUI/VisuGUI_Selection.cxx index 433b6467..7b0bf293 100644 --- a/src/VISUGUI/VisuGUI_Selection.cxx +++ b/src/VISUGUI/VisuGUI_Selection.cxx @@ -38,8 +38,8 @@ #include "SalomeApp_Study.h" #include "SalomeApp_Application.h" -#include "SalomeApp_SelectionMgr.h" -#include "SalomeApp_VTKSelector.h" +#include "LightApp_SelectionMgr.h" +#include "LightApp_VTKSelector.h" #include "SUIT_MessageBox.h" #include "SUIT_ViewWindow.h" @@ -511,7 +511,7 @@ typedef vtkIdType (vtkDataSet::* TDataSetMethod)(); bool onIdEdit (const QString& theText, TDataSetMethod theMethod, bool theIsCell, - SalomeApp_SelectionMgr* theSelectionMgr, + LightApp_SelectionMgr* theSelectionMgr, QLabel* theMeshName, QString theValue, QLabel* theFieldName) diff --git a/src/VISUGUI/VisuGUI_Selection.h b/src/VISUGUI/VisuGUI_Selection.h index c1976404..4fc4f265 100644 --- a/src/VISUGUI/VisuGUI_Selection.h +++ b/src/VISUGUI/VisuGUI_Selection.h @@ -36,7 +36,7 @@ class QWidgetStack; class QVBox; class QLineEdit; class QTable; -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; class SalomeApp_Application; class VisuGUI_SelectionDlg: public QDialog { @@ -85,7 +85,7 @@ private slots: QLabel* myDYLbl; QLabel* myDZLbl; - SalomeApp_SelectionMgr* mySelectionMgr; + LightApp_SelectionMgr* mySelectionMgr; bool myFl; }; diff --git a/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx b/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx index 904f438d..e5bf1e2c 100644 --- a/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx +++ b/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx @@ -20,7 +20,7 @@ #include "VISU_Actor.h" #include "SalomeApp_Application.h" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SVTK_ViewWindow.h" @@ -85,7 +85,7 @@ VisuGUI_StreamLinesDlg::VisuGUI_StreamLinesDlg (SalomeApp_Module* theModule) // Find All prs obj //SUIT_Study* aActiveStudy = VISU::(myVisuGUI); _PTR(Study) aActiveStudy = VISU::GetCStudy(VISU::GetAppStudy(myVisuGUI)); - SalomeApp_SelectionMgr* aSel = VISU::GetSelectionMgr(myVisuGUI); + LightApp_SelectionMgr* aSel = VISU::GetSelectionMgr(myVisuGUI); SALOME_ListIO selected; aSel->selectedObjects(selected); if (selected.Extent() > 0) { diff --git a/src/VISUGUI/VisuGUI_Tools.cxx b/src/VISUGUI/VisuGUI_Tools.cxx index bbce9f1d..9c3f7088 100644 --- a/src/VISUGUI/VisuGUI_Tools.cxx +++ b/src/VISUGUI/VisuGUI_Tools.cxx @@ -41,7 +41,7 @@ #include "SalomeApp_Module.h" #include "SalomeApp_Study.h" #include "SalomeApp_Application.h" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SALOME_ListIO.hxx" #include "SALOME_ListIteratorOfListIO.hxx" @@ -71,7 +71,7 @@ namespace VISU return theModule->application()->desktop(); } - SalomeApp_SelectionMgr* + LightApp_SelectionMgr* GetSelectionMgr(const SalomeApp_Module* theModule) { return theModule->getApp()->selectionMgr(); @@ -193,7 +193,7 @@ namespace VISU Handle(SALOME_InteractiveObject)* theIO, VISU::Storable::TRestoringMap* theMap) { - SalomeApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(theModule); + LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(theModule); SALOME_ListIO aListIO; aSelectionMgr->selectedObjects(aListIO); SALOME_ListIteratorOfListIO anIter(aListIO); @@ -227,7 +227,7 @@ namespace VISU } void - Add(SalomeApp_SelectionMgr* theSelectionMgr, + Add(LightApp_SelectionMgr* theSelectionMgr, const Handle(SALOME_InteractiveObject)& theIO) { SALOME_ListIO aListIO; @@ -237,7 +237,7 @@ namespace VISU } void - Remove(SalomeApp_SelectionMgr* theSelectionMgr, + Remove(LightApp_SelectionMgr* theSelectionMgr, const Handle(SALOME_InteractiveObject)& theIO) { if (theIO.IsNull()) return; @@ -262,7 +262,7 @@ namespace VISU bool IsRemovableSelected (const SalomeApp_Module* theModule) { - SalomeApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(theModule); + LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(theModule); SALOME_ListIO aListIO; aSelectionMgr->selectedObjects(aListIO); @@ -434,7 +434,7 @@ namespace VISU return; SALOMEDS::SObject_var aSObject = thePrs->GetSObject(); CORBA::String_var anEntry = aSObject->GetID(); - SalomeApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(theModule); + LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(theModule); Remove(aSelectionMgr,theIO); TViewWindows aViewWindows = GetViews(theModule); for(int i = 0, iEnd = aViewWindows.size(); i < iEnd; i++){ diff --git a/src/VISUGUI/VisuGUI_Tools.h b/src/VISUGUI/VisuGUI_Tools.h index f5fee097..9bde033e 100644 --- a/src/VISUGUI/VisuGUI_Tools.h +++ b/src/VISUGUI/VisuGUI_Tools.h @@ -46,7 +46,7 @@ class VISU_Actor; class SVTK_ViewWindow; class SPlot2d_Viewer; class CAM_Module; -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; class SalomeApp_Study; namespace VISU { @@ -75,7 +75,7 @@ namespace VISU { QString getValue(_PTR(SObject) theSObject, QString theKey); // Selection - SalomeApp_SelectionMgr* GetSelectionMgr(const SalomeApp_Module* theModule); + LightApp_SelectionMgr* GetSelectionMgr(const SalomeApp_Module* theModule); CORBA::Object_var GetSelectedObj(const SalomeApp_Study* theStudy, const QString& theEntry, VISU::Storable::TRestoringMap* theMap = NULL); @@ -86,9 +86,9 @@ namespace VISU { Handle(SALOME_InteractiveObject)* theIO = NULL, VISU::Storable::TRestoringMap* theMap = NULL); - void Add(SalomeApp_SelectionMgr* theSelectionMgr, + void Add(LightApp_SelectionMgr* theSelectionMgr, const Handle(SALOME_InteractiveObject)& theIO); - void Remove(SalomeApp_SelectionMgr* theSelectionMgr, + void Remove(LightApp_SelectionMgr* theSelectionMgr, const Handle(SALOME_InteractiveObject)& theIO); bool IsRemovableSelected(const SalomeApp_Module* theModule); diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc index d1b47cf3..4801ceee 100644 --- a/src/VISU_I/VISU_Gen_i.cc +++ b/src/VISU_I/VISU_Gen_i.cc @@ -53,7 +53,7 @@ #include "SUIT_Session.h" #include "SalomeApp_Study.h" #include "SalomeApp_Application.h" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SVTK_ViewModel.h" #include "SVTK_ViewWindow.h" #include "SALOME_Event.hxx" diff --git a/src/VISU_I/VISU_ViewManager_i.cc b/src/VISU_I/VISU_ViewManager_i.cc index cb396ceb..670656c1 100644 --- a/src/VISU_I/VISU_ViewManager_i.cc +++ b/src/VISU_I/VISU_ViewManager_i.cc @@ -46,7 +46,7 @@ #include "SalomeApp_Study.h" #include "SalomeApp_Application.h" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SALOME_Event.hxx" #include "SALOME_ListIO.hxx" @@ -507,7 +507,7 @@ namespace VISU { SALOMEDS::SObject_var aSObject = myPrs->GetSObject(); CORBA::String_var anEntry = aSObject->GetID(); - SalomeApp_SelectionMgr* aSelectionMgr = anApp->selectionMgr(); + LightApp_SelectionMgr* aSelectionMgr = anApp->selectionMgr(); SALOME_ListIO aListIO, aNewListIO; aSelectionMgr->selectedObjects(aListIO); @@ -585,7 +585,7 @@ namespace VISU { SALOMEDS::SObject_var aSObject = thePrs->GetSObject(); CORBA::String_var anEntry = aSObject->GetID(); - SalomeApp_SelectionMgr* aSelectionMgr = anApp->selectionMgr(); + LightApp_SelectionMgr* aSelectionMgr = anApp->selectionMgr(); SALOME_ListIO aListIO, aNewListIO; aSelectionMgr->selectedObjects(aListIO); @@ -661,7 +661,7 @@ namespace VISU { SALOMEDS::SObject_var aSObject = thePrs->GetSObject(); CORBA::String_var anEntry = aSObject->GetID(); - SalomeApp_SelectionMgr* aSelectionMgr = anApp->selectionMgr(); + LightApp_SelectionMgr* aSelectionMgr = anApp->selectionMgr(); SALOME_ListIO aListIO, aNewListIO; aSelectionMgr->selectedObjects(aListIO);