From: nds Date: Thu, 3 Nov 2005 08:38:17 +0000 (+0000) Subject: Using files from package LightApp instead of files from package SalomeApp X-Git-Tag: V3_1_0a3~26 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=81a502af8470190be359d6491a20796dbad5bb97;p=modules%2Fsmesh.git Using files from package LightApp instead of files from package SalomeApp --- diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx index c8a766657..4d9cb4fcd 100644 --- a/src/SMESHGUI/SMESHGUI.cxx +++ b/src/SMESHGUI/SMESHGUI.cxx @@ -81,13 +81,13 @@ #include "SalomeApp_Tools.h" #include "SalomeApp_Study.h" -#include "SalomeApp_NameDlg.h" -#include "SalomeApp_DataOwner.h" +#include "LightApp_NameDlg.h" +#include "LightApp_DataOwner.h" #include "SalomeApp_Application.h" -#include "SalomeApp_Preferences.h" -#include "SalomeApp_VTKSelector.h" -#include "SalomeApp_Operation.h" -#include "SalomeApp_UpdateFlags.h" +#include "LightApp_Preferences.h" +#include "LightApp_VTKSelector.h" +#include "LightApp_Operation.h" +#include "LightApp_UpdateFlags.h" #include "SalomeApp_ImportOperation.h" @@ -247,7 +247,7 @@ namespace{ void ExportMeshToFile( int theCommandID ) { - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -361,7 +361,7 @@ namespace{ } void SetDisplayEntity(int theCommandID){ - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -396,7 +396,7 @@ namespace{ } void SetDisplayMode(int theCommandID){ - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -519,7 +519,7 @@ namespace{ void Control( int theCommandID ) { - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -607,7 +607,7 @@ namespace{ if( !theIO.IsNull() ) { entry = theIO->getEntry(); - SalomeApp_DataOwner owner( entry ); + LightApp_DataOwner owner( entry ); if ( aTypeFilter.isOk( &owner )) { theOutTypeName = theInTypeName; return true; @@ -645,7 +645,7 @@ namespace{ QString CheckHomogeneousSelection() { //SUIT_Study* aStudy = SMESH::GetActiveStudy(); - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -667,7 +667,7 @@ namespace{ void SMESHGUI::OnEditDelete() { // VSR 17/11/04: check if all objects selected belong to SMESH component --> start - SalomeApp_SelectionMgr* aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr* aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; aSel->selectedObjects( selected, QString::null, false ); QString aParentComponent = QString::null; @@ -836,11 +836,11 @@ SMESHGUI::~SMESHGUI() * */ //============================================================================= -SalomeApp_SelectionMgr* SMESHGUI::selectionMgr() +LightApp_SelectionMgr* SMESHGUI::selectionMgr() { SalomeApp_Application* anApp = dynamic_cast( SUIT_Session::session()->activeApplication() ); if( anApp ) - return dynamic_cast( anApp->selectionMgr() ); + return dynamic_cast( anApp->selectionMgr() ); else return 0; } @@ -1100,7 +1100,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) case 200: // SCALAR BAR { - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -1147,7 +1147,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) SMESH::UpdateView(); SALOME_ListIO l; - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); aSel->setSelectedObjects( l ); break; } @@ -1163,7 +1163,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) case 302: anAction = SMESH::eDisplayOnly; break; } - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO sel_objects, to_process; if (aSel) aSel->selectedObjects( sel_objects ); @@ -1269,7 +1269,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) { if(checkLock(aStudy)) break; if ( vtkwnd ) { - SalomeApp_SelectionMgr *Sel = selectionMgr(); + LightApp_SelectionMgr *Sel = selectionMgr(); SALOME_ListIO selected; Sel->selectedObjects( selected ); int nbSel = selected.Extent(); @@ -1517,7 +1517,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) EmitSignalDeactivateDialog(); SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_nil(); - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -1544,7 +1544,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) if(checkLock(aStudy)) break; EmitSignalDeactivateDialog(); - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -1607,7 +1607,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) if(checkLock(aStudy)) break; EmitSignalDeactivateDialog(); - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -1698,7 +1698,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) case 900: // MESH INFOS { EmitSignalDeactivateDialog(); - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -1722,7 +1722,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) case 902: // STANDARD MESH INFOS { EmitSignalDeactivateDialog(); - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -1748,7 +1748,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) { if(checkLock(aStudy)) break; - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -1784,7 +1784,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) if ( checkLock( aStudy ) ) break; - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected ); @@ -1802,7 +1802,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) { aName = anAttr; QString newName = QString(aName->Value().c_str()); - newName = SalomeApp_NameDlg::getName( desktop(), newName ); + newName = LightApp_NameDlg::getName( desktop(), newName ); if ( !newName.isEmpty() ) { //old source: aStudy->renameIObject( IObject, newName ); @@ -1827,7 +1827,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) if(checkLock(aStudy)) break; SUIT_OverrideCursor wc; - SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr(); SALOME_ListIO selected; if( aSel ) aSel->selectedObjects( selected, QString::null, false ); @@ -2069,7 +2069,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) case 6009: if ( vtkwnd ) { - SalomeApp_SelectionMgr* mgr = selectionMgr(); + LightApp_SelectionMgr* mgr = selectionMgr(); SALOME_ListIO selected; mgr->selectedObjects( selected ); if ( selected.Extent() == 1 && selected.First()->hasEntry() ) { @@ -2100,7 +2100,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) break; case 9010: { - SalomeApp_SelectionMgr* mgr = selectionMgr(); + LightApp_SelectionMgr* mgr = selectionMgr(); SALOME_ListIO selected; mgr->selectedObjects( selected ); if (selected.Extent() == 1) { @@ -2114,7 +2114,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) } case 9011: { - SalomeApp_SelectionMgr* mgr = selectionMgr(); + LightApp_SelectionMgr* mgr = selectionMgr(); SALOME_ListIO selected; mgr->selectedObjects( selected ); if (selected.Extent() == 1) { @@ -2863,22 +2863,22 @@ void SMESHGUI::createPreferences() int genTab = addPreference( tr( "PREF_TAB_GENERAL" ) ); int updateGroup = addPreference( tr( "PREF_GROUP_UPDATE" ), genTab ); - addPreference( tr( "PREF_AUTO_UPDATE" ), updateGroup, SalomeApp_Preferences::Bool, "SMESH", "auto_update" ); + addPreference( tr( "PREF_AUTO_UPDATE" ), updateGroup, LightApp_Preferences::Bool, "SMESH", "auto_update" ); int qaGroup = addPreference( tr( "PREF_GROUP_QUALITY" ), genTab ); - addPreference( tr( "PREF_DISPLAY_ENTITY" ), qaGroup, SalomeApp_Preferences::Bool, "SMESH", "display_entity" ); - addPreference( tr( "PREF_PRECISION_USE" ), qaGroup, SalomeApp_Preferences::Bool, "SMESH", "use_precision" ); + addPreference( tr( "PREF_DISPLAY_ENTITY" ), qaGroup, LightApp_Preferences::Bool, "SMESH", "display_entity" ); + addPreference( tr( "PREF_PRECISION_USE" ), qaGroup, LightApp_Preferences::Bool, "SMESH", "use_precision" ); int precGroup = addPreference( tr( "PREF_GROUP_PRECISION" ), genTab ); setPreferenceProperty( precGroup, "columns", 1 ); - int prec = addPreference( tr( "PREF_PRECISION_VALUE" ), precGroup, SalomeApp_Preferences::IntSpin, "SMESH", "controls_precision" ); + int prec = addPreference( tr( "PREF_PRECISION_VALUE" ), precGroup, LightApp_Preferences::IntSpin, "SMESH", "controls_precision" ); setPreferenceProperty( prec, "min", 0 ); setPreferenceProperty( prec, "max", 16 ); int dispgroup = addPreference( tr( "PREF_DISPLAY_MODE" ), genTab ); - int dispmode = addPreference( tr( "PREF_DISPLAY_MODE" ), dispgroup, SalomeApp_Preferences::Selector, "SMESH", "display_mode" ); + int dispmode = addPreference( tr( "PREF_DISPLAY_MODE" ), dispgroup, LightApp_Preferences::Selector, "SMESH", "display_mode" ); QStringList modes; modes.append( "Wireframe" ); modes.append( "Shading" ); @@ -2895,21 +2895,21 @@ void SMESHGUI::createPreferences() int meshTab = addPreference( tr( "PREF_TAB_MESH" ) ); int nodeGroup = addPreference( tr( "PREF_GROUP_NODES" ), meshTab ); - addPreference( tr( "PREF_COLOR" ), nodeGroup, SalomeApp_Preferences::Color, "SMESH", "node_color" ); - int nodeSz = addPreference( tr( "PREF_SIZE" ), nodeGroup, SalomeApp_Preferences::IntSpin, "SMESH", "node_size" ); + addPreference( tr( "PREF_COLOR" ), nodeGroup, LightApp_Preferences::Color, "SMESH", "node_color" ); + int nodeSz = addPreference( tr( "PREF_SIZE" ), nodeGroup, LightApp_Preferences::IntSpin, "SMESH", "node_size" ); setPreferenceProperty( nodeSz, "min", 1 ); setPreferenceProperty( nodeSz, "max", 5 ); int elemGroup = addPreference( tr( "PREF_GROUP_ELEMENTS" ), meshTab ); - addPreference( tr( "PREF_FILL" ), elemGroup, SalomeApp_Preferences::Color, "SMESH", "fill_color" ); - addPreference( tr( "PREF_OUTLINE" ), elemGroup, SalomeApp_Preferences::Color, "SMESH", "outline_color" ); - addPreference( tr( "PREF_BACKFACE" ), elemGroup, SalomeApp_Preferences::Color, "SMESH", "backface_color" ); - addPreference( "", elemGroup, SalomeApp_Preferences::Space ); + addPreference( tr( "PREF_FILL" ), elemGroup, LightApp_Preferences::Color, "SMESH", "fill_color" ); + addPreference( tr( "PREF_OUTLINE" ), elemGroup, LightApp_Preferences::Color, "SMESH", "outline_color" ); + addPreference( tr( "PREF_BACKFACE" ), elemGroup, LightApp_Preferences::Color, "SMESH", "backface_color" ); + addPreference( "", elemGroup, LightApp_Preferences::Space ); - int elemW = addPreference( tr( "PREF_WIDTH" ), elemGroup, SalomeApp_Preferences::IntSpin, "SMESH", "element_width" ); - int shrink = addPreference( tr( "PREF_SHRINK_COEFF" ), elemGroup, SalomeApp_Preferences::IntSpin, "SMESH", "shrink_coeff" ); + int elemW = addPreference( tr( "PREF_WIDTH" ), elemGroup, LightApp_Preferences::IntSpin, "SMESH", "element_width" ); + int shrink = addPreference( tr( "PREF_SHRINK_COEFF" ), elemGroup, LightApp_Preferences::IntSpin, "SMESH", "shrink_coeff" ); setPreferenceProperty( elemW, "min", 1 ); setPreferenceProperty( elemW, "max", 5 ); @@ -2921,33 +2921,33 @@ void SMESHGUI::createPreferences() int selGroup = addPreference( tr( "PREF_GROUP_SELECTION" ), selTab ); - addPreference( tr( "PREF_OBJECT_COLOR" ), selGroup, SalomeApp_Preferences::Color, "SMESH", "selection_object_color" ); - addPreference( tr( "PREF_ELEMENT_COLOR" ), selGroup, SalomeApp_Preferences::Color, "SMESH", "selection_element_color" ); - int selW = addPreference( tr( "PREF_WIDTH" ), selGroup, SalomeApp_Preferences::IntSpin, "SMESH", "selection_width" ); + addPreference( tr( "PREF_OBJECT_COLOR" ), selGroup, LightApp_Preferences::Color, "SMESH", "selection_object_color" ); + addPreference( tr( "PREF_ELEMENT_COLOR" ), selGroup, LightApp_Preferences::Color, "SMESH", "selection_element_color" ); + int selW = addPreference( tr( "PREF_WIDTH" ), selGroup, LightApp_Preferences::IntSpin, "SMESH", "selection_width" ); setPreferenceProperty( selW, "min", 1 ); setPreferenceProperty( selW, "max", 5 ); int preGroup = addPreference( tr( "PREF_GROUP_PRESELECTION" ), selTab ); - addPreference( tr( "PREF_HIGHLIGHT_COLOR" ), preGroup, SalomeApp_Preferences::Color, "SMESH", "highlight_color" ); - int preW = addPreference( tr( "PREF_WIDTH" ), preGroup, SalomeApp_Preferences::IntSpin, "SMESH", "highlight_width" ); + addPreference( tr( "PREF_HIGHLIGHT_COLOR" ), preGroup, LightApp_Preferences::Color, "SMESH", "highlight_color" ); + int preW = addPreference( tr( "PREF_WIDTH" ), preGroup, LightApp_Preferences::IntSpin, "SMESH", "highlight_width" ); setPreferenceProperty( preW, "min", 1 ); setPreferenceProperty( preW, "max", 5 ); int precSelGroup = addPreference( tr( "PREF_GROUP_PRECISION" ), selTab ); - addPreference( tr( "PREF_NODES" ), precSelGroup, SalomeApp_Preferences::Double, "SMESH", "selection_precision_node" ); - addPreference( tr( "PREF_ELEMENTS" ), precSelGroup, SalomeApp_Preferences::Double, "SMESH", "selection_precision_element" ); + addPreference( tr( "PREF_NODES" ), precSelGroup, LightApp_Preferences::Double, "SMESH", "selection_precision_node" ); + addPreference( tr( "PREF_ELEMENTS" ), precSelGroup, LightApp_Preferences::Double, "SMESH", "selection_precision_element" ); int sbarTab = addPreference( tr( "SMESH_SCALARBAR" ) ); int fontGr = addPreference( tr( "SMESH_FONT_SCALARBAR" ), sbarTab ); - int tfont = addPreference( tr( "SMESH_TITLE" ), fontGr, SalomeApp_Preferences::Font, "SMESH", "scalar_bar_title_font" ); - addPreference( tr( "SMESH_TITLE" ), fontGr, SalomeApp_Preferences::Color, "SMESH", "scalar_bar_title_color" ); - int lfont = addPreference( tr( "SMESH_LABELS" ), fontGr, SalomeApp_Preferences::Font, "SMESH", "scalar_bar_label_font" ); - addPreference( tr( "SMESH_LABELS" ), fontGr, SalomeApp_Preferences::Color, "SMESH", "scalar_bar_label_color" ); + int tfont = addPreference( tr( "SMESH_TITLE" ), fontGr, LightApp_Preferences::Font, "SMESH", "scalar_bar_title_font" ); + addPreference( tr( "SMESH_TITLE" ), fontGr, LightApp_Preferences::Color, "SMESH", "scalar_bar_title_color" ); + int lfont = addPreference( tr( "SMESH_LABELS" ), fontGr, LightApp_Preferences::Font, "SMESH", "scalar_bar_label_font" ); + addPreference( tr( "SMESH_LABELS" ), fontGr, LightApp_Preferences::Color, "SMESH", "scalar_bar_label_color" ); QStringList fam; fam.append( tr( "SMESH_FONT_ARIAL" ) ); @@ -2964,16 +2964,16 @@ void SMESHGUI::createPreferences() int colorsLabelsGr = addPreference( tr( "SMESH_LABELS_COLORS_SCALARBAR" ), sbarTab ); - int numcol = addPreference( tr( "SMESH_NUMBEROFCOLORS" ), colorsLabelsGr, SalomeApp_Preferences::IntSpin, "SMESH", "scalar_bar_num_colors" ); + int numcol = addPreference( tr( "SMESH_NUMBEROFCOLORS" ), colorsLabelsGr, LightApp_Preferences::IntSpin, "SMESH", "scalar_bar_num_colors" ); setPreferenceProperty( numcol, "min", 2 ); setPreferenceProperty( numcol, "max", 256 ); - int numlab = addPreference( tr( "SMESH_NUMBEROFLABELS" ), colorsLabelsGr, SalomeApp_Preferences::IntSpin, "SMESH", "scalar_bar_num_labels" ); + int numlab = addPreference( tr( "SMESH_NUMBEROFLABELS" ), colorsLabelsGr, LightApp_Preferences::IntSpin, "SMESH", "scalar_bar_num_labels" ); setPreferenceProperty( numlab, "min", 2 ); setPreferenceProperty( numlab, "max", 65 ); int orientGr = addPreference( tr( "SMESH_ORIENTATION" ), sbarTab ); - int orient = addPreference( tr( "SMESH_ORIENTATION" ), orientGr, SalomeApp_Preferences::Selector, "SMESH", "scalar_bar_orientation" ); + int orient = addPreference( tr( "SMESH_ORIENTATION" ), orientGr, LightApp_Preferences::Selector, "SMESH", "scalar_bar_orientation" ); QStringList orients; orients.append( tr( "SMESH_VERTICAL" ) ); orients.append( tr( "SMESH_HORIZONTAL" ) ); @@ -2982,10 +2982,10 @@ void SMESHGUI::createPreferences() setPreferenceProperty( orient, "indexes", indices ); int posVSizeGr = addPreference( tr( "SMESH_POSITION_SIZE_SCALARBAR" ) + " " + tr( "SMESH_VERTICAL" ), sbarTab ); - int xv = addPreference( tr( "SMESH_X_SCALARBAR" ), posVSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_x" ); - int yv = addPreference( tr( "SMESH_Y_SCALARBAR" ), posVSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_y" ); - int wv = addPreference( tr( "SMESH_WIDTH" ), posVSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_width" ); - int hv = addPreference( tr( "SMESH_HEIGHT" ), posVSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_height" ); + int xv = addPreference( tr( "SMESH_X_SCALARBAR" ), posVSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_x" ); + int yv = addPreference( tr( "SMESH_Y_SCALARBAR" ), posVSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_y" ); + int wv = addPreference( tr( "SMESH_WIDTH" ), posVSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_width" ); + int hv = addPreference( tr( "SMESH_HEIGHT" ), posVSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_height" ); setPreferenceProperty( xv, "step", 0.1 ); setPreferenceProperty( xv, "min", 0.0 ); setPreferenceProperty( xv, "max", 1.0 ); @@ -3000,10 +3000,10 @@ void SMESHGUI::createPreferences() setPreferenceProperty( hv, "step", 0.1 ); int posHSizeGr = addPreference( tr( "SMESH_POSITION_SIZE_SCALARBAR" ) + " " + tr( "SMESH_HORIZONTAL" ), sbarTab ); - int xh = addPreference( tr( "SMESH_X_SCALARBAR" ), posHSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_x" ); - int yh = addPreference( tr( "SMESH_Y_SCALARBAR" ), posHSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_y" ); - int wh = addPreference( tr( "SMESH_WIDTH" ), posHSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_width" ); - int hh = addPreference( tr( "SMESH_HEIGHT" ), posHSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_height" ); + int xh = addPreference( tr( "SMESH_X_SCALARBAR" ), posHSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_x" ); + int yh = addPreference( tr( "SMESH_Y_SCALARBAR" ), posHSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_y" ); + int wh = addPreference( tr( "SMESH_WIDTH" ), posHSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_width" ); + int hh = addPreference( tr( "SMESH_HEIGHT" ), posHSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_height" ); setPreferenceProperty( xv, "min", 0.0 ); setPreferenceProperty( xv, "max", 1.0 ); setPreferenceProperty( xv, "step", 0.1 ); @@ -3036,7 +3036,7 @@ void SMESHGUI::preferencesChanged( const QString& sect, const QString& name ) * \param theFlags - update flags * * Update viewer or/and object browser etc. in accordance with update flags ( see -* SalomeApp_UpdateFlags enumeration ). +* LightApp_UpdateFlags enumeration ). */ //================================================================================ void SMESHGUI::update( const int flags ) @@ -3087,9 +3087,9 @@ void SMESHGUI::onOperationAborted( SUIT_Operation* ) * It is called called automatically from startOperation method of base class. */ //================================================================================ -SalomeApp_Operation* SMESHGUI::createOperation( const int id ) const +LightApp_Operation* SMESHGUI::createOperation( const int id ) const { - SalomeApp_Operation* op = 0; + LightApp_Operation* op = 0; // to do : create operation here switch( id ) { @@ -3111,7 +3111,7 @@ SalomeApp_Operation* SMESHGUI::createOperation( const int id ) const return op; } -SalomeApp_Displayer* SMESHGUI::displayer() +LightApp_Displayer* SMESHGUI::displayer() { if( !myDisplayer ) myDisplayer = new SMESHGUI_Displayer( dynamic_cast( getApp()->activeStudy() ) ); diff --git a/src/SMESHGUI/SMESHGUI.h b/src/SMESHGUI/SMESHGUI.h index 4efe43dfa..595d831e7 100644 --- a/src/SMESHGUI/SMESHGUI.h +++ b/src/SMESHGUI/SMESHGUI.h @@ -44,9 +44,9 @@ class SUIT_ViewWindow; class SUIT_ResourceMgr; class SUIT_ViewManager; -class SalomeApp_Operation; +class LightApp_Operation; class SalomeApp_Study; -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; //================================================================================= @@ -63,7 +63,7 @@ public : static SMESH::SMESH_Gen_var GetSMESHGen(); static SMESHGUI* GetSMESHGUI(); - static SalomeApp_SelectionMgr* selectionMgr(); + static LightApp_SelectionMgr* selectionMgr(); static SUIT_ResourceMgr* resourceMgr(); static SUIT_Desktop* desktop() ; static SalomeApp_Study* activeStudy(); @@ -71,7 +71,7 @@ public : static bool automaticUpdate(); - virtual SalomeApp_Displayer* displayer(); + virtual LightApp_Displayer* displayer(); virtual QString engineIOR() const; virtual void initialize( CAM_Application* ); virtual void windows( QMap& ) const; @@ -126,7 +126,7 @@ protected: void createPopupItem( const int, const QString&, const QString&, const QString& = QString::null, const int = -1 ); - virtual SalomeApp_Operation* createOperation( const int ) const; + virtual LightApp_Operation* createOperation( const int ) const; private: void OnEditDelete(); @@ -136,7 +136,7 @@ private : QDialog* myActiveDialogBox; int myState; QMap myRules; - SalomeApp_Displayer* myDisplayer; + LightApp_Displayer* myDisplayer; }; #endif diff --git a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h index e6149a33e..33f8a3d3a 100644 --- a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h +++ b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h @@ -29,7 +29,7 @@ #ifndef DIALOGBOX_ADD_FACE_H #define DIALOGBOX_ADD_FACE_H -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SMDSAbs_ElementType.hxx" @@ -85,7 +85,7 @@ private: void displaySimulation(); SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */ - SalomeApp_SelectionMgr* mySelectionMgr; /* User shape selection */ + LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */ int myNbOkNodes; /* to check when arguments is defined */ bool myBusy; SVTK_Selector* mySelector; diff --git a/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx b/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx index bdc7b83af..4fe87b62a 100644 --- a/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx @@ -43,7 +43,7 @@ #include "SALOME_ListIteratorOfListIO.hxx" #include "SalomeApp_Application.h" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SVTK_Selector.h" #include "SVTK_ViewWindow.h" diff --git a/src/SMESHGUI/SMESHGUI_ClippingDlg.h b/src/SMESHGUI/SMESHGUI_ClippingDlg.h index 288724434..bc4bab595 100644 --- a/src/SMESHGUI/SMESHGUI_ClippingDlg.h +++ b/src/SMESHGUI/SMESHGUI_ClippingDlg.h @@ -46,7 +46,7 @@ class QTable; class QCheckBox; class QComboBox; -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; class SVTK_Selector; class SMESHGUI; @@ -89,7 +89,7 @@ public: private: - SalomeApp_SelectionMgr* mySelectionMgr; + LightApp_SelectionMgr* mySelectionMgr; SVTK_Selector* mySelector; SMESHGUI* mySMESHGUI; SMESH_Actor* myActor; diff --git a/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx b/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx index 6b1f20e12..fdf604ae7 100755 --- a/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx @@ -42,8 +42,8 @@ #include "SUIT_FileDlg.h" #include "SalomeApp_Study.h" -#include "SalomeApp_DataOwner.h" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_DataOwner.h" +#include "LightApp_SelectionMgr.h" #include "SalomeApp_Tools.h" #include "SALOMEDS_SObject.hxx" @@ -290,7 +290,7 @@ void SMESHGUI_CreatePatternDlg::SetMesh (SMESH::SMESH_Mesh_ptr thePtr) _PTR(SObject) aSobj = SMESH::FindSObject(myMesh.in()); //Handle(SALOME_InteractiveObject) anIObj = // new SALOME_InteractiveObject(aSobj->GetID().c_str(), "SMESH"); - SUIT_DataOwnerPtr anIObj (new SalomeApp_DataOwner(aSobj->GetID().c_str())); + SUIT_DataOwnerPtr anIObj (new LightApp_DataOwner(aSobj->GetID().c_str())); isValidMesh = mySelectionMgr->isOk(anIObj); } diff --git a/src/SMESHGUI/SMESHGUI_CreatePatternDlg.h b/src/SMESHGUI/SMESHGUI_CreatePatternDlg.h index 2e2555c55..84a0cbd34 100755 --- a/src/SMESHGUI/SMESHGUI_CreatePatternDlg.h +++ b/src/SMESHGUI/SMESHGUI_CreatePatternDlg.h @@ -43,7 +43,7 @@ class QFrame; class QLineEdit; class SMESHGUI_SpinBox; class QPushButton; -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; class QRadioButton; class QCheckBox; class QButtonGroup; @@ -131,7 +131,7 @@ private: SMESHGUI* mySMESHGUI; SVTK_Selector* mySelector; - SalomeApp_SelectionMgr* mySelectionMgr; + LightApp_SelectionMgr* mySelectionMgr; int myNbPoints; int myType; diff --git a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx index d32bd78d7..ed4acc259 100644 --- a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx @@ -45,7 +45,7 @@ #include "SalomeApp_Study.h" #include "SUIT_Desktop.h" #include "SUIT_MessageBox.h" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "utilities.h" #include "SVTK_ViewWindow.h" diff --git a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.h b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.h index 8ba99e3ba..5070b4471 100644 --- a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.h +++ b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.h @@ -45,7 +45,7 @@ class SMESHGUI; class SMESH_Actor; class SVTK_Selector; class SVTK_ViewWindow; -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; namespace SMESH{ struct TPolySimulation; @@ -77,7 +77,7 @@ private: void displaySimulation(); SMESHGUI* mySMESHGUI ; /* Current SMESHGUI object */ - SalomeApp_SelectionMgr* mySelectionMgr ; /* User shape selection */ + LightApp_SelectionMgr* mySelectionMgr ; /* User shape selection */ SVTK_Selector* mySelector; QString myIDs; int myNbOkElements ; /* to check when elements are defined */ diff --git a/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx b/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx index cd6afe1c1..90f42d96a 100644 --- a/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx @@ -36,7 +36,7 @@ #include "SUIT_Desktop.h" #include "SalomeApp_Study.h" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SALOME_ListIO.hxx" #include "SALOME_ListIteratorOfListIO.hxx" diff --git a/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.h b/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.h index 320f411b5..f944b3020 100644 --- a/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.h +++ b/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.h @@ -40,7 +40,7 @@ class QListBox; class SMESHGUI; class SVTK_ViewWindow; -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; /*! * Class : SMESHGUI_DeleteGroupDlg @@ -86,7 +86,7 @@ private: QListBox* myListBox; SMESHGUI* mySMESHGUI; - SalomeApp_SelectionMgr* mySelectionMgr; + LightApp_SelectionMgr* mySelectionMgr; QValueList myListGrp; bool myBlockSelection; diff --git a/src/SMESHGUI/SMESHGUI_Dialog.cxx b/src/SMESHGUI/SMESHGUI_Dialog.cxx index 1e1df649c..a3277e0a7 100644 --- a/src/SMESHGUI/SMESHGUI_Dialog.cxx +++ b/src/SMESHGUI/SMESHGUI_Dialog.cxx @@ -37,7 +37,7 @@ //================================================================================= SMESHGUI_Dialog::SMESHGUI_Dialog( QWidget* parent, const bool modal, const bool allowResize, const int flags ) -: SalomeApp_Dialog( parent == 0 ? desktop() : parent, "", modal, allowResize, flags ) +: LightApp_Dialog( parent == 0 ? desktop() : parent, "", modal, allowResize, flags ) { int pr = prefix( "SMESH" ); typeName( pr + MESH ) = tr( "DLG_MESH" ); @@ -66,7 +66,7 @@ void SMESHGUI_Dialog::show() int x = abs( PP->x() + PP->size().width() - size().width() - 10 ), y = abs( PP->y() + PP->size().height() - size().height() - 10 ); move(x, y); - SalomeApp_Dialog::show(); + LightApp_Dialog::show(); } //================================================================================= diff --git a/src/SMESHGUI/SMESHGUI_Dialog.h b/src/SMESHGUI/SMESHGUI_Dialog.h index 66f61c6d3..73c92abe2 100644 --- a/src/SMESHGUI/SMESHGUI_Dialog.h +++ b/src/SMESHGUI/SMESHGUI_Dialog.h @@ -30,7 +30,7 @@ #ifndef SMESHGUI_DIALOG_H #define SMESHGUI_DIALOG_H -#include +#include class SUIT_Desktop; class SUIT_ResourceMgr; @@ -39,7 +39,7 @@ class SUIT_ResourceMgr; // class : SMESHGUI_Dialog // purpose : Base dialog for all SMESHGUI dialogs //================================================================================= -class SMESHGUI_Dialog : public SalomeApp_Dialog +class SMESHGUI_Dialog : public LightApp_Dialog { Q_OBJECT diff --git a/src/SMESHGUI/SMESHGUI_Displayer.cxx b/src/SMESHGUI/SMESHGUI_Displayer.cxx index f1ddb5b2d..386b54bbc 100644 --- a/src/SMESHGUI/SMESHGUI_Displayer.cxx +++ b/src/SMESHGUI/SMESHGUI_Displayer.cxx @@ -34,7 +34,7 @@ #include SMESHGUI_Displayer::SMESHGUI_Displayer( SalomeApp_Study* st ) -: SalomeApp_Displayer(), +: LightApp_Displayer(), myStudy( st ) { } @@ -61,7 +61,7 @@ SALOME_Prs* SMESHGUI_Displayer::buildPresentation( const QString& entry, SALOME_ if( anActor ) { SMESH::DisplayActor( wnd, anActor ); - prs = SalomeApp_Displayer::buildPresentation( entry.latin1(), aViewFrame ); + prs = LightApp_Displayer::buildPresentation( entry.latin1(), aViewFrame ); } if( prs ) UpdatePrs( prs ); diff --git a/src/SMESHGUI/SMESHGUI_Displayer.h b/src/SMESHGUI/SMESHGUI_Displayer.h index b8458e6c7..e4be5fdde 100644 --- a/src/SMESHGUI/SMESHGUI_Displayer.h +++ b/src/SMESHGUI/SMESHGUI_Displayer.h @@ -29,11 +29,11 @@ #ifndef SMESHGUI_DISPLAYER_HEADER #define SMESHGUI_DISPLAYER_HEADER -#include +#include class SalomeApp_Study; -class SMESHGUI_Displayer : public SalomeApp_Displayer +class SMESHGUI_Displayer : public LightApp_Displayer { public: SMESHGUI_Displayer( SalomeApp_Study* ); diff --git a/src/SMESHGUI/SMESHGUI_EditHypothesesDlg.h b/src/SMESHGUI/SMESHGUI_EditHypothesesDlg.h index 6c40460e5..6fe085dc6 100644 --- a/src/SMESHGUI/SMESHGUI_EditHypothesesDlg.h +++ b/src/SMESHGUI/SMESHGUI_EditHypothesesDlg.h @@ -31,7 +31,7 @@ //#include "SMESH_TypeFilter.hxx" #include "SUIT_SelectionFilter.h" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" // QT Includes #include @@ -92,7 +92,7 @@ private: private: SMESHGUI* mySMESHGUI; - SalomeApp_SelectionMgr* mySelectionMgr; + LightApp_SelectionMgr* mySelectionMgr; GEOM::GEOM_Object_var myGeomShape; QLineEdit* myEditCurrentArgument; diff --git a/src/SMESHGUI/SMESHGUI_EditMeshDlg.h b/src/SMESHGUI/SMESHGUI_EditMeshDlg.h index 20cf71080..7d7ff0615 100644 --- a/src/SMESHGUI/SMESHGUI_EditMeshDlg.h +++ b/src/SMESHGUI/SMESHGUI_EditMeshDlg.h @@ -2,7 +2,7 @@ #ifndef DIALOGBOX_GETMESH_H #define DIALOGBOX_GETMESH_H -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SUIT_SelectionFilter.h" // QT Includes @@ -46,7 +46,7 @@ class SMESHGUI_EditMeshDlg : public QDialog private: SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */ - SalomeApp_SelectionMgr* mySelectionMgr; /* User shape selection */ + LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */ SMESH::SMESH_Mesh_var myMesh; SUIT_SelectionFilter* myMeshFilter; diff --git a/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.h b/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.h index 91ba5084c..57f7be3b7 100644 --- a/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.h +++ b/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.h @@ -29,7 +29,7 @@ #ifndef DIALOGBOX_EXTRUSION_PATH_H #define DIALOGBOX_EXTRUSION_PATH_H -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SUIT_SelectionFilter.h" // QT Includes @@ -87,7 +87,7 @@ private: void SetEditCurrentArgument (QToolButton* button); SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */ - SalomeApp_SelectionMgr* mySelectionMgr; /* User shape selection */ + LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */ SVTK_Selector* mySelector; QWidget* myEditCurrentArgument; /* Current argument */ diff --git a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h index cebdaefb7..935a2716c 100644 --- a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h +++ b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h @@ -29,7 +29,7 @@ #ifndef DIALOGBOX_EXTRUSION_H #define DIALOGBOX_EXTRUSION_H -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SUIT_SelectionFilter.h" // QT Includes @@ -76,7 +76,7 @@ private: //void hideEvent (QHideEvent*); /* ESC key */ SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */ - SalomeApp_SelectionMgr* mySelectionMgr; /* User shape selection */ + LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */ QLineEdit* myEditCurrentArgument; /* Current LineEdit */ QString myElementsId; int myNbOkElements; /* to check when elements are defined */ diff --git a/src/SMESHGUI/SMESHGUI_FilterDlg.h b/src/SMESHGUI/SMESHGUI_FilterDlg.h index 7427fe7be..04dfc4a5e 100755 --- a/src/SMESHGUI/SMESHGUI_FilterDlg.h +++ b/src/SMESHGUI/SMESHGUI_FilterDlg.h @@ -34,7 +34,7 @@ #include #include -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SALOME_InteractiveObject.hxx" #include "SALOME_DataMapOfIOMapOfInteger.hxx" #include "SVTK_Selection.h" @@ -56,7 +56,7 @@ class QStringList; class QTable; class QTableItem; class QWidgetStack; -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; class SMESHGUI; class SMESHGUI_FilterLibraryDlg; class SVTK_Selector; @@ -291,7 +291,7 @@ private: // initial fields QValueList myTypes; SMESHGUI* mySMESHGUI; - SalomeApp_SelectionMgr* mySelectionMgr; + LightApp_SelectionMgr* mySelectionMgr; SVTK_Selector* mySelector; SMESH::SMESH_Mesh_ptr myMesh; QWidget* mySourceWg; diff --git a/src/SMESHGUI/SMESHGUI_GroupDlg.h b/src/SMESHGUI/SMESHGUI_GroupDlg.h index 112738099..af101fcff 100644 --- a/src/SMESHGUI/SMESHGUI_GroupDlg.h +++ b/src/SMESHGUI/SMESHGUI_GroupDlg.h @@ -28,7 +28,7 @@ #ifndef DIALOGBOX_GROUP_H #define DIALOGBOX_GROUP_H -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" //#include "SMESH_TypeFilter.hxx" #include "SUIT_SelectionFilter.h" @@ -114,7 +114,7 @@ private: void updateButtons(); SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */ - SalomeApp_SelectionMgr* mySelectionMgr; /* User shape selection */ + LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */ SMESH_Actor* myActor; /* Current mesh actor */ int myGrpTypeId; /* Current group type id : standalone or group on geometry */ int myTypeId; /* Current type id = radio button id */ diff --git a/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx index 5cff77713..cdefc1e42 100644 --- a/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx @@ -36,7 +36,7 @@ #include "SUIT_ResourceMgr.h" #include "SUIT_Desktop.h" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SVTK_Selection.h" #include "SVTK_ViewWindow.h" #include "SVTK_Selector.h" diff --git a/src/SMESHGUI/SMESHGUI_GroupOpDlg.h b/src/SMESHGUI/SMESHGUI_GroupOpDlg.h index 774455d4e..7a62a35b3 100644 --- a/src/SMESHGUI/SMESHGUI_GroupOpDlg.h +++ b/src/SMESHGUI/SMESHGUI_GroupOpDlg.h @@ -36,7 +36,7 @@ class QCloseEvent; class QLabel; class QFrame; class QPushButton; -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; class QLineEdit; class SMESHGUI; class SVTK_ViewWindow; @@ -95,7 +95,7 @@ private: QPushButton* myBtn2; SMESHGUI* mySMESHGUI; - SalomeApp_SelectionMgr* mySelectionMgr; + LightApp_SelectionMgr* mySelectionMgr; int myMode; SVTK_Selector* mySelector; diff --git a/src/SMESHGUI/SMESHGUI_MergeNodesDlg.h b/src/SMESHGUI/SMESHGUI_MergeNodesDlg.h index 3eaf68acb..457259574 100644 --- a/src/SMESHGUI/SMESHGUI_MergeNodesDlg.h +++ b/src/SMESHGUI/SMESHGUI_MergeNodesDlg.h @@ -29,7 +29,7 @@ #ifndef DIALOGBOX_MERGENODES_H #define DIALOGBOX_MERGENODES_H -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" //#include "SMESH_TypeFilter.hxx" #include "SUIT_SelectionFilter.h" @@ -82,7 +82,7 @@ private: void onEditNodesGroup(); SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */ - SalomeApp_SelectionMgr* mySelectionMgr; /* User shape selection */ + LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */ SVTK_Selector* mySelector; QWidget* myEditCurrentArgument; diff --git a/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx b/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx index 3584bae23..58fc13179 100644 --- a/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx @@ -35,7 +35,7 @@ #include "SUIT_ResourceMgr.h" #include "SUIT_OverrideCursor.h" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SALOMEDSClient_Study.hxx" #include "SALOME_ListIO.hxx" diff --git a/src/SMESHGUI/SMESHGUI_MeshInfosDlg.h b/src/SMESHGUI/SMESHGUI_MeshInfosDlg.h index 49db8c13a..4ff11f1d9 100644 --- a/src/SMESHGUI/SMESHGUI_MeshInfosDlg.h +++ b/src/SMESHGUI/SMESHGUI_MeshInfosDlg.h @@ -37,7 +37,7 @@ class QLabel; class QPushButton; class QWidgetStack; -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; class SMESHGUI; class SMESHGUI_MeshInfosDlg : public QDialog @@ -64,7 +64,7 @@ private slots: private: SMESHGUI* mySMESHGUI; - SalomeApp_SelectionMgr* mySelectionMgr; + LightApp_SelectionMgr* mySelectionMgr; bool myStartSelection; bool myIsActiveWindow; diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx index f7d370d9e..c5b03f9b0 100644 --- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx @@ -33,8 +33,8 @@ #include "SALOMEDS_SObject.hxx" -#include "SalomeApp_SelectionMgr.h" -#include "SalomeApp_UpdateFlags.h" +#include "LightApp_SelectionMgr.h" +#include "LightApp_UpdateFlags.h" #include "SUIT_MessageBox.h" #include "SUIT_Desktop.h" #include "SUIT_OverrideCursor.h" @@ -80,10 +80,10 @@ SMESHGUI_MeshOp::~SMESHGUI_MeshOp() //================================================================================ /*! * \brief Gets dialog of this operation - * \retval SalomeApp_Dialog* - pointer to dialog of this operation + * \retval LightApp_Dialog* - pointer to dialog of this operation */ //================================================================================ -SalomeApp_Dialog* SMESHGUI_MeshOp::dlg() const +LightApp_Dialog* SMESHGUI_MeshOp::dlg() const { return myDlg; } diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.h b/src/SMESHGUI/SMESHGUI_MeshOp.h index 9fd854e4c..b79f67643 100644 --- a/src/SMESHGUI/SMESHGUI_MeshOp.h +++ b/src/SMESHGUI/SMESHGUI_MeshOp.h @@ -40,7 +40,7 @@ public: SMESHGUI_MeshOp( const bool theToCreate, const bool theIsMesh = true ); virtual ~SMESHGUI_MeshOp(); - virtual SalomeApp_Dialog* dlg() const; + virtual LightApp_Dialog* dlg() const; protected: virtual void startOperation(); diff --git a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx index 827969018..21db972aa 100755 --- a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx @@ -47,7 +47,7 @@ #include "SUIT_Desktop.h" #include "SUIT_FileDlg.h" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SalomeApp_Tools.h" #include "SalomeApp_Study.h" diff --git a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.h b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.h index c09ab443c..106dc8b27 100755 --- a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.h +++ b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.h @@ -40,7 +40,7 @@ class QFrame; class QLineEdit; class SMESHGUI_SpinBox; class QPushButton; -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; class QRadioButton; class QCheckBox; class QButtonGroup; @@ -157,7 +157,7 @@ private: SMESHGUI* mySMESHGUI; SVTK_Selector* mySelector; - SalomeApp_SelectionMgr* mySelectionMgr; + LightApp_SelectionMgr* mySelectionMgr; int mySelInput; int myNbPoints; int myType; diff --git a/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx b/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx index 1a366bd09..cc1be0697 100644 --- a/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx @@ -39,7 +39,7 @@ #include "SMDS_Mesh.hxx" #include "SMDS_MeshNode.hxx" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SUIT_ResourceMgr.h" #include "SUIT_Desktop.h" diff --git a/src/SMESHGUI/SMESHGUI_MoveNodesDlg.h b/src/SMESHGUI/SMESHGUI_MoveNodesDlg.h index aa4d51d96..d115e52ff 100644 --- a/src/SMESHGUI/SMESHGUI_MoveNodesDlg.h +++ b/src/SMESHGUI/SMESHGUI_MoveNodesDlg.h @@ -29,7 +29,7 @@ #ifndef DIALOGBOX_MOVE_NODES_H #define DIALOGBOX_MOVE_NODES_H -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include @@ -96,7 +96,7 @@ private: SMESHGUI_SpinBox* myY; SMESHGUI_SpinBox* myZ; - SalomeApp_SelectionMgr* mySelectionMgr; + LightApp_SelectionMgr* mySelectionMgr; SVTK_Selector* mySelector; SMESHGUI* mySMESHGUI; diff --git a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx index 2887e3c59..ac7e5969b 100755 --- a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx @@ -44,7 +44,7 @@ #include "SUIT_ResourceMgr.h" #include "SUIT_Desktop.h" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SALOME_ListIO.hxx" #include "SALOME_ListIteratorOfListIO.hxx" diff --git a/src/SMESHGUI/SMESHGUI_MultiEditDlg.h b/src/SMESHGUI/SMESHGUI_MultiEditDlg.h index e66ebc0f2..5e6c66326 100755 --- a/src/SMESHGUI/SMESHGUI_MultiEditDlg.h +++ b/src/SMESHGUI/SMESHGUI_MultiEditDlg.h @@ -43,7 +43,7 @@ class SMESHGUI_SpinBox; class SMESH_Actor; -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; class SALOME_Actor; class SVTK_Selector; class SVTK_ViewWindow; @@ -124,7 +124,7 @@ protected: SMESH_Actor* myActor; SMESH::SMESH_Mesh_var myMesh; - SalomeApp_SelectionMgr* mySelectionMgr; + LightApp_SelectionMgr* mySelectionMgr; SVTK_Selector* mySelector; SMESHGUI* mySMESHGUI; diff --git a/src/SMESHGUI/SMESHGUI_NodesDlg.cxx b/src/SMESHGUI/SMESHGUI_NodesDlg.cxx index 3f20596c5..55b31e524 100644 --- a/src/SMESHGUI/SMESHGUI_NodesDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_NodesDlg.cxx @@ -49,7 +49,7 @@ #include "SUIT_Desktop.h" #include "SalomeApp_Study.h" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SVTK_Selector.h" #include "SVTK_ViewWindow.h" diff --git a/src/SMESHGUI/SMESHGUI_NodesDlg.h b/src/SMESHGUI/SMESHGUI_NodesDlg.h index e7da8a686..4ec0005a0 100644 --- a/src/SMESHGUI/SMESHGUI_NodesDlg.h +++ b/src/SMESHGUI/SMESHGUI_NodesDlg.h @@ -47,7 +47,7 @@ class SMESHGUI; class SVTK_Selector; class SVTK_ViewWindow; class SMESHGUI_SpinBox; -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; namespace SMESH{ struct TNodeSimulation; @@ -74,7 +74,7 @@ public: ~SMESHGUI_NodesDlg(); private: - SalomeApp_SelectionMgr* mySelectionMgr; + LightApp_SelectionMgr* mySelectionMgr; SVTK_Selector* mySelector; SMESHGUI* mySMESHGUI; diff --git a/src/SMESHGUI/SMESHGUI_Operation.cxx b/src/SMESHGUI/SMESHGUI_Operation.cxx index c26f5f69e..562f4da80 100755 --- a/src/SMESHGUI/SMESHGUI_Operation.cxx +++ b/src/SMESHGUI/SMESHGUI_Operation.cxx @@ -29,7 +29,7 @@ // Purpose : Constructor //======================================================================= SMESHGUI_Operation::SMESHGUI_Operation() -: SalomeApp_Operation() +: LightApp_Operation() { } @@ -79,7 +79,7 @@ void SMESHGUI_Operation::startOperation() initDialog(); } - SalomeApp_Operation::startOperation(); + LightApp_Operation::startOperation(); } //======================================================================= @@ -88,7 +88,7 @@ void SMESHGUI_Operation::startOperation() //======================================================================= bool SMESHGUI_Operation::isReadyToStart() const { - if ( !SalomeApp_Operation::isReadyToStart() ) + if ( !LightApp_Operation::isReadyToStart() ) return false; else if ( getSMESHGUI() == 0 ) { @@ -108,7 +108,7 @@ bool SMESHGUI_Operation::isReadyToStart() const //======================================================================= void SMESHGUI_Operation::setDialogActive( const bool active ) { - SalomeApp_Operation::setDialogActive( active ); + LightApp_Operation::setDialogActive( active ); SMESHGUI_Dialog* d = dynamic_cast( dlg() ); if( d ) diff --git a/src/SMESHGUI/SMESHGUI_Operation.h b/src/SMESHGUI/SMESHGUI_Operation.h index 3bc76d4f2..181cb2cc7 100755 --- a/src/SMESHGUI/SMESHGUI_Operation.h +++ b/src/SMESHGUI/SMESHGUI_Operation.h @@ -12,7 +12,7 @@ #ifndef SMESHGUI_Operation_H #define SMESHGUI_Operation_H -#include +#include #include class SMESHGUI; @@ -22,7 +22,7 @@ class SMESHGUI; Description : Base class for all SMESH operations */ -class SMESHGUI_Operation : public SalomeApp_Operation +class SMESHGUI_Operation : public LightApp_Operation { Q_OBJECT diff --git a/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx b/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx index d9ca05180..e06f880b9 100644 --- a/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx @@ -37,7 +37,7 @@ #include "SUIT_Desktop.h" #include "SUIT_ResourceMgr.h" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SALOME_ListIO.hxx" #include diff --git a/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h b/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h index 75fb1e4e4..5d4dce8a9 100644 --- a/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h +++ b/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h @@ -45,7 +45,7 @@ class SMESHGUI; class QtxDblSpinBox; -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; class SMESH_Actor; @@ -76,7 +76,7 @@ protected slots: private: SMESHGUI* mySMESHGUI; - SalomeApp_SelectionMgr* mySelectionMgr; + LightApp_SelectionMgr* mySelectionMgr; SMESH_Actor* myActor; double myIniX, myIniY, myIniW, myIniH; int myIniOrientation; diff --git a/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.h b/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.h index 4c9b62b1b..8300d124c 100644 --- a/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.h +++ b/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.h @@ -29,7 +29,7 @@ #ifndef DIALOGBOX_REMOVE_ELEMENTS_H #define DIALOGBOX_REMOVE_ELEMENTS_H -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" // QT Includes #include @@ -76,7 +76,7 @@ private: void enterEvent ( QEvent * ) ; /* mouse enter the QWidget */ void hideEvent ( QHideEvent * ); /* ESC key */ - SalomeApp_SelectionMgr* mySelectionMgr; + LightApp_SelectionMgr* mySelectionMgr; SVTK_Selector* mySelector; SMESHGUI* mySMESHGUI; diff --git a/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.h b/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.h index e0a89b00d..68fb7817f 100644 --- a/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.h +++ b/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.h @@ -29,7 +29,7 @@ #ifndef DIALOGBOX_REMOVE_NODES_H #define DIALOGBOX_REMOVE_NODES_H -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" // QT Includes #include @@ -79,7 +79,7 @@ private: void enterEvent ( QEvent * ) ; /* mouse enter the QWidget */ void hideEvent ( QHideEvent * ); /* ESC key */ - SalomeApp_SelectionMgr* mySelectionMgr; + LightApp_SelectionMgr* mySelectionMgr; SVTK_Selector* mySelector; SMESHGUI* mySMESHGUI; diff --git a/src/SMESHGUI/SMESHGUI_RenumberingDlg.h b/src/SMESHGUI/SMESHGUI_RenumberingDlg.h index 22e5fc617..50932fdbc 100644 --- a/src/SMESHGUI/SMESHGUI_RenumberingDlg.h +++ b/src/SMESHGUI/SMESHGUI_RenumberingDlg.h @@ -29,7 +29,7 @@ #ifndef DIALOGBOX_RENUMBERING_H #define DIALOGBOX_RENUMBERING_H -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" //#include "SMESH_TypeFilter.hxx" #include "SUIT_SelectionFilter.h" @@ -74,7 +74,7 @@ private: void hideEvent ( QHideEvent * ); /* ESC key */ SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */ - SalomeApp_SelectionMgr* mySelectionMgr; /* User shape selection */ + LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */ int myConstructorId; /* Current constructor id = radio button id */ QLineEdit* myEditCurrentArgument; /* Current LineEdit */ diff --git a/src/SMESHGUI/SMESHGUI_RevolutionDlg.h b/src/SMESHGUI/SMESHGUI_RevolutionDlg.h index 31912fa8a..dc1da869d 100644 --- a/src/SMESHGUI/SMESHGUI_RevolutionDlg.h +++ b/src/SMESHGUI/SMESHGUI_RevolutionDlg.h @@ -29,7 +29,7 @@ #ifndef DIALOGBOX_REVOLUTION_H #define DIALOGBOX_REVOLUTION_H -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SMESH_LogicalFilter.hxx" @@ -82,7 +82,7 @@ private: bool IsAxisOk(); SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */ - SalomeApp_SelectionMgr* mySelectionMgr; /* User shape selection */ + LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */ int myNbOkElements; /* to check when elements are defined */ QString myElementsId; QWidget* myEditCurrentArgument; /* Current argument */ diff --git a/src/SMESHGUI/SMESHGUI_RotationDlg.h b/src/SMESHGUI/SMESHGUI_RotationDlg.h index 7e71856d1..75a263154 100644 --- a/src/SMESHGUI/SMESHGUI_RotationDlg.h +++ b/src/SMESHGUI/SMESHGUI_RotationDlg.h @@ -29,7 +29,7 @@ #ifndef DIALOGBOX_ROTATION_H #define DIALOGBOX_ROTATION_H -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SMESH_LogicalFilter.hxx" @@ -80,7 +80,7 @@ private: bool IsAxisOk(); SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */ - SalomeApp_SelectionMgr* mySelectionMgr; /* User shape selection */ + LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */ int myNbOkElements; /* to check when elements are defined */ QString myElementsId; SVTK_Selector* mySelector; diff --git a/src/SMESHGUI/SMESHGUI_Selection.cxx b/src/SMESHGUI/SMESHGUI_Selection.cxx index 1b281d27f..df576fdab 100644 --- a/src/SMESHGUI/SMESHGUI_Selection.cxx +++ b/src/SMESHGUI/SMESHGUI_Selection.cxx @@ -8,9 +8,9 @@ #include "SMESH_Type.h" #include "SMESH_Actor.h" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SalomeApp_Study.h" -#include "SalomeApp_VTKSelector.h" +#include "LightApp_VTKSelector.h" #include "SUIT_Session.h" @@ -25,7 +25,7 @@ //purpose : //======================================================================= SMESHGUI_Selection::SMESHGUI_Selection() -: SalomeApp_Selection() +: LightApp_Selection() { } @@ -41,13 +41,16 @@ SMESHGUI_Selection::~SMESHGUI_Selection() //function : init //purpose : //======================================================================= -void SMESHGUI_Selection::init( const QString& client, SalomeApp_SelectionMgr* mgr ) +void SMESHGUI_Selection::init( const QString& client, LightApp_SelectionMgr* mgr ) { - SalomeApp_Selection::init( client, mgr ); + LightApp_Selection::init( client, mgr ); if( mgr && study() ) { - _PTR(Study) aStudy = study()->studyDS(); + SalomeApp_Study* aSStudy = dynamic_cast(study()); + if (!aSStudy) + return; + _PTR(Study) aStudy = aSStudy->studyDS(); for( int i=0, n=count(); i ( ow ); + const LightApp_SVTKDataOwner* owner = + dynamic_cast ( ow ); if( owner ) myActors.append( dynamic_cast( owner->GetActor() ) ); else @@ -95,7 +98,7 @@ QtxValue SMESHGUI_Selection::param( const int ind, const QString& p ) const if( val.isValid() ) return val; else - return SalomeApp_Selection::param( ind, p ); + return LightApp_Selection::param( ind, p ); } //======================================================================= @@ -267,7 +270,7 @@ QVariant SMESHGUI_Selection::isComputable( int ind ) const if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" ) { /* Handle(SALOME_InteractiveObject) io = - static_cast( myDataOwners[ ind ].get() )->IO(); + static_cast( myDataOwners[ ind ].get() )->IO(); if ( !io.IsNull() ) { SMESH::SMESH_Mesh_var mesh = SMESH::GetMeshByIO(io) ; // m,sm,gr->m if ( !mesh->_is_nil() ) {*/ diff --git a/src/SMESHGUI/SMESHGUI_Selection.h b/src/SMESHGUI/SMESHGUI_Selection.h index 833dde674..5f2e05fb6 100644 --- a/src/SMESHGUI/SMESHGUI_Selection.h +++ b/src/SMESHGUI/SMESHGUI_Selection.h @@ -29,23 +29,23 @@ #ifndef SMESHGUI_SELECTION_HeaderFile #define SMESHGUI_SELECTION_HeaderFile -#include "SalomeApp_Selection.h" +#include "LightApp_Selection.h" #include "SALOMEDSClient_definitions.hxx" -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; class SALOMEDSClient_Study; -class SalomeApp_DataOwner; +class LightApp_DataOwner; class SMESH_Actor; -class SMESHGUI_Selection : public SalomeApp_Selection +class SMESHGUI_Selection : public LightApp_Selection { public: SMESHGUI_Selection(); virtual ~SMESHGUI_Selection(); - virtual void init( const QString&, SalomeApp_SelectionMgr* ); + virtual void init( const QString&, LightApp_SelectionMgr* ); virtual QtxValue param( const int , const QString& paramName ) const; - virtual void processOwner( const SalomeApp_DataOwner* ); + virtual void processOwner( const LightApp_DataOwner* ); // got from object, not from actor virtual int numberOfNodes( int ind ) const; diff --git a/src/SMESHGUI/SMESHGUI_SelectionOp.cxx b/src/SMESHGUI/SMESHGUI_SelectionOp.cxx index ec170a047..b43fcb120 100644 --- a/src/SMESHGUI/SMESHGUI_SelectionOp.cxx +++ b/src/SMESHGUI/SMESHGUI_SelectionOp.cxx @@ -29,9 +29,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include @@ -48,7 +48,7 @@ /* Class : SMESHGUI_SelectionOp Description : Base operation for all operations using object selection in viewer or objectbrowser - through common widgets created by SalomeApp_Dialog::createObject + through common widgets created by LightApp_Dialog::createObject */ //================================================================================= @@ -101,7 +101,7 @@ void SMESHGUI_SelectionOp::startOperation() //================================================================================= void SMESHGUI_SelectionOp::removeCustomFilters() const { - SalomeApp_SelectionMgr* mgr = selectionMgr(); + LightApp_SelectionMgr* mgr = selectionMgr(); if( !mgr ) return; @@ -156,7 +156,7 @@ void SMESHGUI_SelectionOp::selectionDone() } QStringList names, ids; - SalomeApp_Dialog::TypesList types; + LightApp_Dialog::TypesList types; selected( names, types, ids ); dlg()->selectObject( names, types, ids ); } @@ -176,7 +176,7 @@ SUIT_SelectionFilter* SMESHGUI_SelectionOp::createFilter( const int ) const //================================================================================= void SMESHGUI_SelectionOp::onActivateObject( int id ) { - SalomeApp_SelectionMgr* mgr = selectionMgr(); + LightApp_SelectionMgr* mgr = selectionMgr(); if( !mgr ) return; @@ -195,7 +195,7 @@ void SMESHGUI_SelectionOp::onActivateObject( int id ) //================================================================================= void SMESHGUI_SelectionOp::onDeactivateObject( int id ) { - SalomeApp_SelectionMgr* mgr = selectionMgr(); + LightApp_SelectionMgr* mgr = selectionMgr(); if( mgr && myFilters.contains( id ) && myFilters[ id ] ) mgr->removeFilter( myFilters[ id ] ); } @@ -356,7 +356,7 @@ int SMESHGUI_SelectionOp::typeById( const QString& str, const EntityType objtype // Purpose : Get names, types and ids of selected objects //======================================================================= void SMESHGUI_SelectionOp::selected( QStringList& names, - SalomeApp_Dialog::TypesList& types, + LightApp_Dialog::TypesList& types, QStringList& ids ) const { /* SUIT_DataOwnerPtrList list; selectionMgr()->selected( list ); @@ -364,8 +364,8 @@ void SMESHGUI_SelectionOp::selected( QStringList& names, aLast = list.end(); for( ; anIt!=aLast; anIt++ ) { - SalomeApp_DataOwner* owner = dynamic_cast( (*anIt).operator->() ); - SalomeApp_SVTKDataOwner* vtkowner = dynamic_cast( (*anIt).operator->() ); + LightApp_DataOwner* owner = dynamic_cast( (*anIt).operator->() ); + LightApp_SVTKDataOwner* vtkowner = dynamic_cast( (*anIt).operator->() ); if( vtkowner ) { @@ -491,7 +491,7 @@ void SMESHGUI_SelectionOp::onTextChanged( int, const QStringList& list ) selector()->AddOrRemoveIndex( sel.First(), newIndices, false ); highlight( sel.First(), true, true ); - QStringList names, _ids; SalomeApp_Dialog::TypesList types; + QStringList names, _ids; LightApp_Dialog::TypesList types; selected( names, types, _ids ); dlg()->selectObject( names, types, _ids, false ); } diff --git a/src/SMESHGUI/SMESHGUI_SelectionOp.h b/src/SMESHGUI/SMESHGUI_SelectionOp.h index 5dde0a059..bb1a05b66 100644 --- a/src/SMESHGUI/SMESHGUI_SelectionOp.h +++ b/src/SMESHGUI/SMESHGUI_SelectionOp.h @@ -45,7 +45,7 @@ class SMESH_Actor; /* Class : SMESHGUI_SelectionOp Description : Base operation for all operations using object selection in viewer or objectbrowser - through common widgets created by SalomeApp_Dialog::createObject + through common widgets created by LightApp_Dialog::createObject */ class SMESHGUI_SelectionOp : public SMESHGUI_Operation { diff --git a/src/SMESHGUI/SMESHGUI_SewingDlg.h b/src/SMESHGUI/SMESHGUI_SewingDlg.h index 6a800d6ac..425a92853 100644 --- a/src/SMESHGUI/SMESHGUI_SewingDlg.h +++ b/src/SMESHGUI/SMESHGUI_SewingDlg.h @@ -29,7 +29,7 @@ #ifndef DIALOGBOX_SEWING_H #define DIALOGBOX_SEWING_H -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" // QT Includes #include @@ -76,7 +76,7 @@ private: bool IsValid(); SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */ - SalomeApp_SelectionMgr* mySelectionMgr; /* User shape selection */ + LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */ int myOk1, myOk2, myOk3, myOk4, myOk5, myOk6; QLineEdit* myEditCurrentArgument; /* Current LineEdit */ SVTK_Selector* mySelector; diff --git a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx index 11b9a66ba..2787ba3cb 100755 --- a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx @@ -36,7 +36,7 @@ #include "SMESH_Actor.h" #include "SMDS_Mesh.hxx" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SUIT_ResourceMgr.h" #include "SUIT_MessageBox.h" #include "SUIT_Desktop.h" diff --git a/src/SMESHGUI/SMESHGUI_SingleEditDlg.h b/src/SMESHGUI/SMESHGUI_SingleEditDlg.h index 01f724a4c..6a1ddc7d2 100755 --- a/src/SMESHGUI/SMESHGUI_SingleEditDlg.h +++ b/src/SMESHGUI/SMESHGUI_SingleEditDlg.h @@ -42,7 +42,7 @@ class SMESHGUI; class SMESH_Actor; class SVTK_Selector; class SVTK_ViewWindow; -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; /*! * Class : SMESHGUI_SingleEditDlg @@ -88,7 +88,7 @@ protected: QLineEdit* myEdge; SMESH_Actor* myActor; - SalomeApp_SelectionMgr* mySelectionMgr; + LightApp_SelectionMgr* mySelectionMgr; SVTK_Selector* mySelector; SMESHGUI* mySMESHGUI; }; diff --git a/src/SMESHGUI/SMESHGUI_SmoothingDlg.h b/src/SMESHGUI/SMESHGUI_SmoothingDlg.h index 32dc80513..5cccb1b22 100644 --- a/src/SMESHGUI/SMESHGUI_SmoothingDlg.h +++ b/src/SMESHGUI/SMESHGUI_SmoothingDlg.h @@ -29,7 +29,7 @@ #ifndef DIALOGBOX_SMOOTHING_H #define DIALOGBOX_SMOOTHING_H -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SMESH_LogicalFilter.hxx" @@ -81,7 +81,7 @@ private: void hideEvent (QHideEvent*); /* ESC key */ SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */ - SalomeApp_SelectionMgr* mySelectionMgr; /* User shape selection */ + LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */ QString myElementsId; int myNbOkElements; /* to check when elements are defined */ int myNbOkNodes; /* to check when fixed nodes are defined */ diff --git a/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.cxx b/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.cxx index 8960524b3..30b5eb0ea 100644 --- a/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.cxx @@ -42,7 +42,7 @@ #include "SUIT_Session.h" #include "SUIT_OverrideCursor.h" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SALOME_ListIO.hxx" #include "utilities.h" diff --git a/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.h b/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.h index 7fcbdc239..28a6dfbc7 100644 --- a/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.h +++ b/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.h @@ -40,7 +40,7 @@ class QLabel; class QPushButton; class QLineEdit; class QTextBrowser; -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; class SMESHGUI; @@ -65,7 +65,7 @@ private slots: private: SMESHGUI* mySMESHGUI; - SalomeApp_SelectionMgr* mySelectionMgr; + LightApp_SelectionMgr* mySelectionMgr; bool myStartSelection; bool myIsActiveWindow; diff --git a/src/SMESHGUI/SMESHGUI_SymmetryDlg.h b/src/SMESHGUI/SMESHGUI_SymmetryDlg.h index b09ad5e46..ba49ca860 100644 --- a/src/SMESHGUI/SMESHGUI_SymmetryDlg.h +++ b/src/SMESHGUI/SMESHGUI_SymmetryDlg.h @@ -29,7 +29,7 @@ #ifndef DIALOGBOX_SYMMETRY_H #define DIALOGBOX_SYMMETRY_H -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SMESH_LogicalFilter.hxx" @@ -80,7 +80,7 @@ private: bool IsMirrorOk(); SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */ - SalomeApp_SelectionMgr* mySelectionMgr; /* User shape selection */ + LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */ int myNbOkElements; /* to check when elements are defined */ QString myElementsId; SVTK_Selector* mySelector; diff --git a/src/SMESHGUI/SMESHGUI_TranslationDlg.h b/src/SMESHGUI/SMESHGUI_TranslationDlg.h index 117a71b42..a101c7182 100644 --- a/src/SMESHGUI/SMESHGUI_TranslationDlg.h +++ b/src/SMESHGUI/SMESHGUI_TranslationDlg.h @@ -29,7 +29,7 @@ #ifndef DIALOGBOX_TRANSLATION_H #define DIALOGBOX_TRANSLATION_H -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SMESH_LogicalFilter.hxx" @@ -78,7 +78,7 @@ private: int GetConstructorId(); SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */ - SalomeApp_SelectionMgr* mySelectionMgr; /* User shape selection */ + LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */ QString myElementsId; int myNbOkElements; /* to check when elements are defined */ diff --git a/src/SMESHGUI/SMESHGUI_TransparencyDlg.cxx b/src/SMESHGUI/SMESHGUI_TransparencyDlg.cxx index 283306aa4..b390e717a 100644 --- a/src/SMESHGUI/SMESHGUI_TransparencyDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_TransparencyDlg.cxx @@ -41,7 +41,7 @@ #include "SALOME_InteractiveObject.hxx" #include "SalomeApp_Study.h" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SVTK_ViewWindow.h" diff --git a/src/SMESHGUI/SMESHGUI_TransparencyDlg.h b/src/SMESHGUI/SMESHGUI_TransparencyDlg.h index c1cced61e..d41385430 100644 --- a/src/SMESHGUI/SMESHGUI_TransparencyDlg.h +++ b/src/SMESHGUI/SMESHGUI_TransparencyDlg.h @@ -35,7 +35,7 @@ class QLabel; class QPushButton; class QSlider; -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; class SVTK_Selector; class SVTK_ViewWindow; class SMESHGUI; @@ -59,7 +59,7 @@ public: private : SMESHGUI* mySMESHGUI; - SalomeApp_SelectionMgr* mySelectionMgr; + LightApp_SelectionMgr* mySelectionMgr; SVTK_ViewWindow* myViewWindow; QPushButton* buttonOk; diff --git a/src/SMESHGUI/SMESHGUI_Utils.cxx b/src/SMESHGUI/SMESHGUI_Utils.cxx index 78b997460..94714bcd7 100644 --- a/src/SMESHGUI/SMESHGUI_Utils.cxx +++ b/src/SMESHGUI/SMESHGUI_Utils.cxx @@ -28,7 +28,7 @@ #include "SUIT_Application.h" #include "SUIT_Session.h" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SalomeApp_Application.h" #include "SalomeApp_Module.h" #include "SalomeApp_Study.h" @@ -50,7 +50,7 @@ namespace SMESH{ return theModule->application()->desktop(); } - SalomeApp_SelectionMgr* + LightApp_SelectionMgr* GetSelectionMgr(const SalomeApp_Module* theModule) { return theModule->getApp()->selectionMgr(); @@ -69,7 +69,7 @@ namespace SMESH{ } CORBA::Object_var - DataOwnerToObject(const SalomeApp_DataOwnerPtr& theOwner) + DataOwnerToObject(const LightApp_DataOwnerPtr& theOwner) { CORBA::Object_var anObj; if(theOwner){ @@ -195,7 +195,7 @@ namespace SMESH{ return app->orb()->string_to_object(theIOR); } - int GetNameOfSelectedIObjects(SalomeApp_SelectionMgr* theMgr, QString& theName) + int GetNameOfSelectedIObjects(LightApp_SelectionMgr* theMgr, QString& theName) { if (!theMgr) return 0; diff --git a/src/SMESHGUI/SMESHGUI_Utils.h b/src/SMESHGUI/SMESHGUI_Utils.h index 69e1f6160..83278e4a5 100644 --- a/src/SMESHGUI/SMESHGUI_Utils.h +++ b/src/SMESHGUI/SMESHGUI_Utils.h @@ -24,7 +24,7 @@ #include "SALOMEDSClient_definitions.hxx" #include "SALOME_InteractiveObject.hxx" -#include "SalomeApp_DataOwner.h" +#include "LightApp_DataOwner.h" class QString; @@ -40,14 +40,14 @@ class SALOMEDSClient_SObject; class SalomeApp_Study; class SalomeApp_Module; -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; namespace SMESH { SUIT_Desktop* GetDesktop(const CAM_Module* theModule); - SalomeApp_SelectionMgr* + LightApp_SelectionMgr* GetSelectionMgr(const SalomeApp_Module* theModule); SalomeApp_Study* @@ -59,10 +59,10 @@ namespace SMESH { _PTR(Study) GetCStudy(const SalomeApp_Study* theStudy); - CORBA::Object_var DataOwnerToObject(const SalomeApp_DataOwnerPtr& theOwner); + CORBA::Object_var DataOwnerToObject(const LightApp_DataOwnerPtr& theOwner); template typename TInterface::_var_type - DataOwnerToInterface(const SalomeApp_DataOwnerPtr& theDataOwner) + DataOwnerToInterface(const LightApp_DataOwnerPtr& theDataOwner) { CORBA::Object_var anObj = DataOwnerToObject(theDataOwner); if(!CORBA::is_nil(anObj)) @@ -118,7 +118,7 @@ namespace SMESH { return TInterface::_nil(); } - int GetNameOfSelectedIObjects (SalomeApp_SelectionMgr*, QString& theName); + int GetNameOfSelectedIObjects (LightApp_SelectionMgr*, QString& theName); _PTR(SObject) GetMeshOrSubmesh (_PTR(SObject) theSObject); diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx index c9141ec82..01cf071d8 100644 --- a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx @@ -31,7 +31,7 @@ #include #include -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SVTK_Selector.h" #include "SVTK_ViewModel.h" @@ -53,7 +53,7 @@ #include "SMESH_ObjectDef.h" #include -#include +#include #include #include @@ -373,7 +373,7 @@ namespace SMESH{ void UpdateView(){ if(SVTK_ViewWindow* aWnd = SMESH::GetCurrentVtkView()){ - SalomeApp_SelectionMgr* mgr = SMESHGUI::selectionMgr(); + LightApp_SelectionMgr* mgr = SMESHGUI::selectionMgr(); SALOME_ListIO selected; mgr->selectedObjects( selected ); if( selected.Extent() == 0){ @@ -639,7 +639,7 @@ namespace SMESH{ } //---------------------------------------------------------------------------- - int GetNameOfSelectedNodes(SalomeApp_SelectionMgr *theMgr, + int GetNameOfSelectedNodes(LightApp_SelectionMgr *theMgr, const Handle(SALOME_InteractiveObject)& theIO, QString& theName) { @@ -657,7 +657,7 @@ namespace SMESH{ return -1; } - int GetNameOfSelectedNodes(SalomeApp_SelectionMgr *theMgr, QString& theName){ + int GetNameOfSelectedNodes(LightApp_SelectionMgr *theMgr, QString& theName){ theName = ""; SALOME_ListIO selected; theMgr->selectedObjects( selected ); if(selected.Extent() == 1){ @@ -668,7 +668,7 @@ namespace SMESH{ } - int GetNameOfSelectedElements(SalomeApp_SelectionMgr *theMgr, + int GetNameOfSelectedElements(LightApp_SelectionMgr *theMgr, const Handle(SALOME_InteractiveObject)& theIO, QString& theName) { @@ -692,7 +692,7 @@ namespace SMESH{ } - int GetNameOfSelectedElements(SalomeApp_SelectionMgr *theMgr, QString& theName) + int GetNameOfSelectedElements(LightApp_SelectionMgr *theMgr, QString& theName) { theName = ""; SALOME_ListIO selected; theMgr->selectedObjects( selected ); @@ -704,7 +704,7 @@ namespace SMESH{ return -1; } - int GetSelected(SalomeApp_SelectionMgr* theMgr, + int GetSelected(LightApp_SelectionMgr* theMgr, TColStd_IndexedMapOfInteger& theMap, const bool theIsElement) { @@ -722,7 +722,7 @@ namespace SMESH{ } - int GetEdgeNodes( SalomeApp_SelectionMgr* theMgr, int& theId1, int& theId2 ) + int GetEdgeNodes( LightApp_SelectionMgr* theMgr, int& theId1, int& theId2 ) { SALOME_ListIO selected; theMgr->selectedObjects( selected ); diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.h b/src/SMESHGUI/SMESHGUI_VTKUtils.h index f94695cd5..53754a313 100644 --- a/src/SMESHGUI/SMESHGUI_VTKUtils.h +++ b/src/SMESHGUI/SMESHGUI_VTKUtils.h @@ -38,7 +38,7 @@ class SVTK_InteractorStyle; class SVTK_ViewWindow; class SVTK_Selector; -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; class SMESHGUI; #include @@ -154,25 +154,25 @@ namespace SMESH{ int& theId2); //---------------------------------------------------------------------------- - int GetNameOfSelectedNodes (SalomeApp_SelectionMgr*, + int GetNameOfSelectedNodes (LightApp_SelectionMgr*, const Handle(SALOME_InteractiveObject)& theIO, QString& theName); - int GetNameOfSelectedNodes (SalomeApp_SelectionMgr*, + int GetNameOfSelectedNodes (LightApp_SelectionMgr*, QString& aName); - int GetNameOfSelectedElements (SalomeApp_SelectionMgr*, + int GetNameOfSelectedElements (LightApp_SelectionMgr*, const Handle(SALOME_InteractiveObject)& theIO, QString& theName); - int GetNameOfSelectedElements (SalomeApp_SelectionMgr*, + int GetNameOfSelectedElements (LightApp_SelectionMgr*, QString& aName); - int GetSelected (SalomeApp_SelectionMgr*, + int GetSelected (LightApp_SelectionMgr*, TColStd_IndexedMapOfInteger& theMap, const bool theIsElement = true ); - int GetEdgeNodes (SalomeApp_SelectionMgr*, int& theId1, int& theId2); + int GetEdgeNodes (LightApp_SelectionMgr*, int& theId1, int& theId2); void SetControlsPrecision (const long theVal); };