mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-12-25 17:00:34 +05:00
Some classes from library SalomeApp moved to library LightApp. Replace its.
This commit is contained in:
parent
fbaf4c789f
commit
25acdb0e74
@ -9,7 +9,7 @@
|
||||
#include "SUIT_Session.h"
|
||||
|
||||
#include "SalomeApp_Study.h"
|
||||
#include "SalomeApp_DataOwner.h"
|
||||
#include "LightApp_DataOwner.h"
|
||||
|
||||
#include "SALOME_InteractiveObject.hxx"
|
||||
#include "SALOMEDSClient_SObject.hxx"
|
||||
@ -128,8 +128,8 @@ bool SMESH_NumberFilter::isOk (const SUIT_DataOwner* theDataOwner) const
|
||||
GEOM::GEOM_Object_ptr SMESH_NumberFilter::getGeom
|
||||
(const SUIT_DataOwner* theDataOwner) const
|
||||
{
|
||||
const SalomeApp_DataOwner* owner =
|
||||
dynamic_cast<const SalomeApp_DataOwner*>(theDataOwner);
|
||||
const LightApp_DataOwner* owner =
|
||||
dynamic_cast<const LightApp_DataOwner*>(theDataOwner);
|
||||
SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>
|
||||
(SUIT_Session::session()->activeApplication()->activeStudy());
|
||||
|
||||
|
@ -3,7 +3,7 @@
|
||||
#include <SUIT_Session.h>
|
||||
|
||||
#include <SalomeApp_Study.h>
|
||||
#include <SalomeApp_DataOwner.h>
|
||||
#include <LightApp_DataOwner.h>
|
||||
|
||||
SMESH_TypeFilter::SMESH_TypeFilter (MeshObjectType theType)
|
||||
{
|
||||
@ -18,8 +18,8 @@ bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const
|
||||
{
|
||||
bool Ok = false;
|
||||
|
||||
const SalomeApp_DataOwner* owner =
|
||||
dynamic_cast<const SalomeApp_DataOwner*>(theDataOwner);
|
||||
const LightApp_DataOwner* owner =
|
||||
dynamic_cast<const LightApp_DataOwner*>(theDataOwner);
|
||||
SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>
|
||||
(SUIT_Session::session()->activeApplication()->activeStudy());
|
||||
|
||||
|
@ -82,13 +82,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"
|
||||
|
||||
@ -249,7 +249,7 @@ namespace{
|
||||
|
||||
void ExportMeshToFile( int theCommandID )
|
||||
{
|
||||
SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
|
||||
LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
|
||||
SALOME_ListIO selected;
|
||||
if( aSel )
|
||||
aSel->selectedObjects( selected );
|
||||
@ -362,7 +362,7 @@ namespace{
|
||||
}
|
||||
|
||||
void SetDisplayEntity(int theCommandID){
|
||||
SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
|
||||
LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
|
||||
SALOME_ListIO selected;
|
||||
if( aSel )
|
||||
aSel->selectedObjects( selected );
|
||||
@ -397,7 +397,7 @@ namespace{
|
||||
}
|
||||
|
||||
void SetDisplayMode(int theCommandID){
|
||||
SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
|
||||
LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
|
||||
SALOME_ListIO selected;
|
||||
if( aSel )
|
||||
aSel->selectedObjects( selected );
|
||||
@ -520,7 +520,7 @@ namespace{
|
||||
|
||||
void Control( int theCommandID )
|
||||
{
|
||||
SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
|
||||
LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
|
||||
SALOME_ListIO selected;
|
||||
if( aSel )
|
||||
aSel->selectedObjects( selected );
|
||||
@ -604,7 +604,7 @@ namespace{
|
||||
if( !theIO.IsNull() )
|
||||
{
|
||||
entry = theIO->getEntry();
|
||||
SalomeApp_DataOwner owner( entry );
|
||||
LightApp_DataOwner owner( entry );
|
||||
if ( aTypeFilter.isOk( &owner )) {
|
||||
theOutTypeName = theInTypeName;
|
||||
return true;
|
||||
@ -642,7 +642,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 );
|
||||
@ -664,7 +664,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 aParentComponent = QString::null;
|
||||
@ -831,11 +831,11 @@ SMESHGUI::~SMESHGUI()
|
||||
*
|
||||
*/
|
||||
//=============================================================================
|
||||
SalomeApp_SelectionMgr* SMESHGUI::selectionMgr()
|
||||
LightApp_SelectionMgr* SMESHGUI::selectionMgr()
|
||||
{
|
||||
SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*>( SUIT_Session::session()->activeApplication() );
|
||||
if( anApp )
|
||||
return dynamic_cast<SalomeApp_SelectionMgr*>( anApp->selectionMgr() );
|
||||
return dynamic_cast<LightApp_SelectionMgr*>( anApp->selectionMgr() );
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
@ -1091,7 +1091,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 );
|
||||
@ -1138,7 +1138,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;
|
||||
}
|
||||
@ -1154,7 +1154,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
|
||||
case 302: anAction = SMESH::eDisplayOnly; break;
|
||||
}
|
||||
|
||||
SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
|
||||
LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
|
||||
SALOME_ListIO selected;
|
||||
if (aSel)
|
||||
aSel->selectedObjects( selected );
|
||||
@ -1221,7 +1221,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();
|
||||
@ -1469,7 +1469,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 );
|
||||
@ -1496,7 +1496,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 );
|
||||
@ -1559,7 +1559,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 );
|
||||
@ -1650,7 +1650,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 );
|
||||
@ -1674,7 +1674,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 );
|
||||
@ -1700,7 +1700,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 );
|
||||
@ -1736,7 +1736,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 );
|
||||
@ -1754,7 +1754,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 );
|
||||
@ -1779,7 +1779,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 );
|
||||
@ -2020,7 +2020,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
|
||||
case 6004:
|
||||
if ( vtkwnd ) {
|
||||
|
||||
SalomeApp_SelectionMgr* mgr = selectionMgr();
|
||||
LightApp_SelectionMgr* mgr = selectionMgr();
|
||||
SALOME_ListIO selected; mgr->selectedObjects( selected );
|
||||
|
||||
if ( selected.Extent() == 1 && selected.First()->hasEntry() ) {
|
||||
@ -2051,7 +2051,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) {
|
||||
@ -2065,7 +2065,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) {
|
||||
@ -2804,22 +2804,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" );
|
||||
@ -2836,21 +2836,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 );
|
||||
@ -2862,33 +2862,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" ) );
|
||||
@ -2905,16 +2905,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" ) );
|
||||
@ -2923,10 +2923,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 );
|
||||
@ -2941,10 +2941,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 );
|
||||
@ -2972,7 +2972,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 )
|
||||
@ -3023,9 +3023,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 )
|
||||
{
|
||||
|
@ -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();
|
||||
@ -125,7 +125,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();
|
||||
|
@ -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;
|
||||
|
@ -32,7 +32,7 @@
|
||||
//#include "SMESH_TypeFilter.hxx"
|
||||
|
||||
#include "SUIT_SelectionFilter.h"
|
||||
#include "SalomeApp_SelectionMgr.h"
|
||||
#include "LightApp_SelectionMgr.h"
|
||||
|
||||
// QT Includes
|
||||
#include <qdialog.h>
|
||||
@ -75,7 +75,7 @@ private:
|
||||
|
||||
private:
|
||||
SMESHGUI* mySMESHGUI;
|
||||
SalomeApp_SelectionMgr* mySelectionMgr;
|
||||
LightApp_SelectionMgr* mySelectionMgr;
|
||||
|
||||
SMESH::SMESH_Mesh_var myMesh;
|
||||
GEOM::GEOM_Object_var myGeomShape;
|
||||
|
@ -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"
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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;
|
||||
|
||||
|
@ -47,7 +47,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"
|
||||
|
@ -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 */
|
||||
|
@ -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"
|
||||
|
@ -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<SMESH::SMESH_GroupBase_var> myListGrp;
|
||||
bool myBlockSelection;
|
||||
|
@ -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();
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
|
@ -30,7 +30,7 @@
|
||||
#ifndef SMESHGUI_DIALOG_H
|
||||
#define SMESHGUI_DIALOG_H
|
||||
|
||||
#include <SalomeApp_Dialog.h>
|
||||
#include <LightApp_Dialog.h>
|
||||
|
||||
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
|
||||
|
||||
|
@ -31,7 +31,7 @@
|
||||
|
||||
//#include "SMESH_TypeFilter.hxx"
|
||||
#include "SUIT_SelectionFilter.h"
|
||||
#include "SalomeApp_SelectionMgr.h"
|
||||
#include "LightApp_SelectionMgr.h"
|
||||
|
||||
// QT Includes
|
||||
#include <qdialog.h>
|
||||
@ -92,7 +92,7 @@ private:
|
||||
|
||||
private:
|
||||
SMESHGUI* mySMESHGUI;
|
||||
SalomeApp_SelectionMgr* mySelectionMgr;
|
||||
LightApp_SelectionMgr* mySelectionMgr;
|
||||
|
||||
GEOM::GEOM_Object_var myGeomShape;
|
||||
QLineEdit* myEditCurrentArgument;
|
||||
|
@ -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;
|
||||
|
@ -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 */
|
||||
|
@ -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 */
|
||||
|
@ -34,7 +34,7 @@
|
||||
#include <qmap.h>
|
||||
#include <qvaluelist.h>
|
||||
|
||||
#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<int> myTypes;
|
||||
SMESHGUI* mySMESHGUI;
|
||||
SalomeApp_SelectionMgr* mySelectionMgr;
|
||||
LightApp_SelectionMgr* mySelectionMgr;
|
||||
SVTK_Selector* mySelector;
|
||||
SMESH::SMESH_Mesh_ptr myMesh;
|
||||
QWidget* mySourceWg;
|
||||
|
@ -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 */
|
||||
|
@ -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"
|
||||
|
@ -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;
|
||||
|
||||
|
@ -32,7 +32,7 @@
|
||||
//#include "SMESH_TypeFilter.hxx"
|
||||
|
||||
#include "SUIT_SelectionFilter.h"
|
||||
#include "SalomeApp_SelectionMgr.h"
|
||||
#include "LightApp_SelectionMgr.h"
|
||||
|
||||
// QT Includes
|
||||
#include <qdialog.h>
|
||||
@ -76,7 +76,7 @@ private:
|
||||
|
||||
private:
|
||||
SMESHGUI* mySMESHGUI;
|
||||
SalomeApp_SelectionMgr* mySelectionMgr;
|
||||
LightApp_SelectionMgr* mySelectionMgr;
|
||||
|
||||
GEOM::GEOM_Object_var myGeomShape;
|
||||
QLineEdit* myEditCurrentArgument;
|
||||
|
@ -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;
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
@ -31,8 +31,8 @@
|
||||
#include <SALOMEDSClient_AttributeName.hxx>
|
||||
#include <SALOMEDS_SComponent.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>
|
||||
@ -77,10 +77,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;
|
||||
}
|
||||
|
@ -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();
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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"
|
||||
|
||||
|
@ -29,7 +29,7 @@
|
||||
#ifndef DIALOGBOX_MOVE_NODES_H
|
||||
#define DIALOGBOX_MOVE_NODES_H
|
||||
|
||||
#include "SalomeApp_SelectionMgr.h"
|
||||
#include "LightApp_SelectionMgr.h"
|
||||
|
||||
#include <qdialog.h>
|
||||
|
||||
@ -96,7 +96,7 @@ private:
|
||||
SMESHGUI_SpinBox* myY;
|
||||
SMESHGUI_SpinBox* myZ;
|
||||
|
||||
SalomeApp_SelectionMgr* mySelectionMgr;
|
||||
LightApp_SelectionMgr* mySelectionMgr;
|
||||
SVTK_Selector* mySelector;
|
||||
SMESHGUI* mySMESHGUI;
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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<SMESHGUI_Dialog*>( dlg() );
|
||||
if( d )
|
||||
|
@ -12,7 +12,7 @@
|
||||
#ifndef SMESHGUI_Operation_H
|
||||
#define SMESHGUI_Operation_H
|
||||
|
||||
#include <SalomeApp_Operation.h>
|
||||
#include <LightApp_Operation.h>
|
||||
#include <SALOMEDSClient.hxx>
|
||||
|
||||
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
|
||||
|
||||
|
@ -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 <QtxDblSpinBox.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;
|
||||
|
@ -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 <qvariant.h>
|
||||
@ -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;
|
||||
|
||||
|
@ -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 <qvariant.h>
|
||||
@ -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;
|
||||
|
||||
|
@ -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 */
|
||||
|
||||
|
@ -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 */
|
||||
|
@ -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;
|
||||
|
@ -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<SalomeApp_Study*>(study());
|
||||
if (!aSStudy)
|
||||
return;
|
||||
_PTR(Study) aStudy = aSStudy->studyDS();
|
||||
|
||||
SUIT_DataOwnerPtrList sel;
|
||||
mgr->selected( sel, client );
|
||||
@ -57,7 +60,7 @@ void SMESHGUI_Selection::init( const QString& client, SalomeApp_SelectionMgr* mg
|
||||
for( ; anIt!=aLast; anIt++ )
|
||||
{
|
||||
SUIT_DataOwner* owner = ( SUIT_DataOwner* )( (*anIt ).get() );
|
||||
SalomeApp_DataOwner* sowner = dynamic_cast<SalomeApp_DataOwner*>( owner );
|
||||
LightApp_DataOwner* sowner = dynamic_cast<LightApp_DataOwner*>( owner );
|
||||
if( sowner )
|
||||
myTypes.append( typeName( type( sowner, aStudy ) ) );
|
||||
else
|
||||
@ -100,8 +103,8 @@ QtxValue SMESHGUI_Selection::param( const int ind, const QString& p ) const
|
||||
SMESH_Actor* SMESHGUI_Selection::getActor( int ind ) const
|
||||
{
|
||||
if ( ind >= 0 && ind < myDataOwners.count() ) {
|
||||
const SalomeApp_SVTKDataOwner* owner =
|
||||
dynamic_cast<const SalomeApp_SVTKDataOwner*> ( myDataOwners[ ind ].get() );
|
||||
const LightApp_SVTKDataOwner* owner =
|
||||
dynamic_cast<const LightApp_SVTKDataOwner*> ( myDataOwners[ ind ].get() );
|
||||
if ( owner )
|
||||
return dynamic_cast<SMESH_Actor*>( owner->GetActor() );
|
||||
}
|
||||
@ -236,7 +239,7 @@ int SMESHGUI_Selection::numberOfNodes( int ind ) const
|
||||
if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
|
||||
{
|
||||
CORBA::Object_var obj =
|
||||
SMESH::DataOwnerToObject( static_cast<SalomeApp_DataOwner*>( myDataOwners[ ind ].get() ));
|
||||
SMESH::DataOwnerToObject( static_cast<LightApp_DataOwner*>( myDataOwners[ ind ].get() ));
|
||||
if ( ! CORBA::is_nil( obj )) {
|
||||
SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow( obj );
|
||||
if ( ! mesh->_is_nil() )
|
||||
@ -262,7 +265,7 @@ QVariant SMESHGUI_Selection::isComputable( int ind ) const
|
||||
if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
|
||||
{
|
||||
Handle(SALOME_InteractiveObject) io =
|
||||
static_cast<SalomeApp_DataOwner*>( myDataOwners[ ind ].get() )->IO();
|
||||
static_cast<LightApp_DataOwner*>( myDataOwners[ ind ].get() )->IO();
|
||||
if ( !io.IsNull() ) {
|
||||
SMESH::SMESH_Mesh_var mesh = SMESH::GetMeshByIO(io) ; // m,sm,gr->m
|
||||
if ( !mesh->_is_nil() ) {
|
||||
@ -286,11 +289,14 @@ QVariant SMESHGUI_Selection::hasReference( int ind ) const
|
||||
{
|
||||
if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
|
||||
{
|
||||
SalomeApp_DataOwner* owner = dynamic_cast<SalomeApp_DataOwner*>( myDataOwners[ ind ].operator->() );
|
||||
LightApp_DataOwner* owner = dynamic_cast<LightApp_DataOwner*>( myDataOwners[ ind ].operator->() );
|
||||
if( owner )
|
||||
{
|
||||
_PTR(SObject) obj ( study()->studyDS()->FindObjectID( owner->entry().latin1() ) ), ref;
|
||||
return QVariant( obj->ReferencedObject( ref ), 0 );
|
||||
SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>(study());
|
||||
if (aStudy) {
|
||||
_PTR(SObject) obj ( aStudy->studyDS()->FindObjectID( owner->entry().latin1() ) ), ref;
|
||||
return QVariant( obj->ReferencedObject( ref ), 0 );
|
||||
}
|
||||
}
|
||||
}
|
||||
return QVariant( false, 0 );
|
||||
@ -305,7 +311,7 @@ QVariant SMESHGUI_Selection::isVisible( int ind ) const
|
||||
{
|
||||
if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
|
||||
{
|
||||
QString entry = static_cast<SalomeApp_DataOwner*>( myDataOwners[ ind ].get() )->entry();
|
||||
QString entry = static_cast<LightApp_DataOwner*>( myDataOwners[ ind ].get() )->entry();
|
||||
SMESH_Actor* actor = SMESH::FindActorByEntry( entry.latin1() );
|
||||
if ( actor && actor->hasIO() ) {
|
||||
SVTK_RenderWindowInteractor* renderInter = SMESH::GetCurrentVtkView()->getRWInteractor();
|
||||
@ -320,7 +326,7 @@ QVariant SMESHGUI_Selection::isVisible( int ind ) const
|
||||
//function : type
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
int SMESHGUI_Selection::type( SalomeApp_DataOwner* owner, _PTR(Study) study )
|
||||
int SMESHGUI_Selection::type( LightApp_DataOwner* owner, _PTR(Study) study )
|
||||
{
|
||||
return type( owner->entry(), study );
|
||||
}
|
||||
|
@ -29,22 +29,22 @@
|
||||
#ifndef SMESHGUI_SELECTION_HeaderFile
|
||||
#define SMESHGUI_SELECTION_HeaderFile
|
||||
|
||||
#include "SalomeApp_Selection.h"
|
||||
#include "LightApp_Selection.h"
|
||||
#include "SALOMEDSClient_definitions.hxx"
|
||||
#include "SUIT_DataOwner.h"
|
||||
|
||||
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;
|
||||
|
||||
// got from object, not from actor
|
||||
@ -64,7 +64,7 @@ public:
|
||||
SMESH_Actor* getActor( int ind ) const;
|
||||
|
||||
static int type( const QString&, _PTR(Study) );
|
||||
static int type( SalomeApp_DataOwner* owner, _PTR(Study) study);
|
||||
static int type( LightApp_DataOwner* owner, _PTR(Study) study);
|
||||
static QString typeName( const int type);
|
||||
|
||||
private:
|
||||
|
@ -29,9 +29,9 @@
|
||||
#include <SMESHGUI_Selection.h>
|
||||
#include <SMESHGUI.h>
|
||||
#include <SUIT_SelectionFilter.h>
|
||||
#include <SalomeApp_SelectionMgr.h>
|
||||
#include <LightApp_SelectionMgr.h>
|
||||
#include <SalomeApp_Study.h>
|
||||
#include <SalomeApp_VTKSelector.h>
|
||||
#include <LightApp_VTKSelector.h>
|
||||
#include <SVTK_ViewWindow.h>
|
||||
#include <SVTK_ViewModel.h>
|
||||
#include <SVTK_Selector.h>
|
||||
@ -46,7 +46,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
|
||||
*/
|
||||
|
||||
//=================================================================================
|
||||
@ -99,7 +99,7 @@ void SMESHGUI_SelectionOp::startOperation()
|
||||
//=================================================================================
|
||||
void SMESHGUI_SelectionOp::removeCustomFilters() const
|
||||
{
|
||||
SalomeApp_SelectionMgr* mgr = selectionMgr();
|
||||
LightApp_SelectionMgr* mgr = selectionMgr();
|
||||
if( !mgr )
|
||||
return;
|
||||
|
||||
@ -154,7 +154,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 );
|
||||
}
|
||||
@ -174,7 +174,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;
|
||||
|
||||
@ -193,7 +193,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 ] );
|
||||
}
|
||||
@ -354,7 +354,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 );
|
||||
@ -362,8 +362,8 @@ void SMESHGUI_SelectionOp::selected( QStringList& names,
|
||||
aLast = list.end();
|
||||
for( ; anIt!=aLast; anIt++ )
|
||||
{
|
||||
SalomeApp_DataOwner* owner = dynamic_cast<SalomeApp_DataOwner*>( (*anIt).operator->() );
|
||||
SalomeApp_SVTKDataOwner* vtkowner = dynamic_cast<SalomeApp_SVTKDataOwner*>( (*anIt).operator->() );
|
||||
LightApp_DataOwner* owner = dynamic_cast<LightApp_DataOwner*>( (*anIt).operator->() );
|
||||
LightApp_SVTKDataOwner* vtkowner = dynamic_cast<LightApp_SVTKDataOwner*>( (*anIt).operator->() );
|
||||
|
||||
if( vtkowner )
|
||||
{
|
||||
@ -458,7 +458,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 );
|
||||
}
|
||||
|
@ -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
|
||||
{
|
||||
|
@ -29,7 +29,7 @@
|
||||
#ifndef DIALOGBOX_SEWING_H
|
||||
#define DIALOGBOX_SEWING_H
|
||||
|
||||
#include "SalomeApp_SelectionMgr.h"
|
||||
#include "LightApp_SelectionMgr.h"
|
||||
|
||||
// QT Includes
|
||||
#include <qdialog.h>
|
||||
@ -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;
|
||||
|
@ -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"
|
||||
|
@ -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;
|
||||
};
|
||||
|
@ -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 */
|
||||
|
@ -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"
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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 */
|
||||
|
||||
|
@ -41,7 +41,7 @@
|
||||
#include "SALOME_InteractiveObject.hxx"
|
||||
|
||||
#include "SalomeApp_Study.h"
|
||||
#include "SalomeApp_SelectionMgr.h"
|
||||
#include "LightApp_SelectionMgr.h"
|
||||
|
||||
#include "SVTK_ViewWindow.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;
|
||||
|
@ -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;
|
||||
|
@ -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<class TInterface> 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);
|
||||
|
||||
|
@ -31,7 +31,7 @@
|
||||
#include <SUIT_Session.h>
|
||||
#include <SUIT_Study.h>
|
||||
|
||||
#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 <SalomeApp_Application.h>
|
||||
#include <SalomeApp_SelectionMgr.h>
|
||||
#include <LightApp_SelectionMgr.h>
|
||||
#include <SalomeApp_Study.h>
|
||||
|
||||
#include <SALOMEDSClient_Study.hxx>
|
||||
@ -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 );
|
||||
|
||||
|
@ -38,7 +38,7 @@ class SVTK_InteractorStyle;
|
||||
class SVTK_ViewWindow;
|
||||
class SVTK_Selector;
|
||||
|
||||
class SalomeApp_SelectionMgr;
|
||||
class LightApp_SelectionMgr;
|
||||
class SMESHGUI;
|
||||
|
||||
#include <CORBA.h>
|
||||
@ -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);
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user