ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-26 17:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Using files from package LightApp instead of SalomeApp

Browse Source
This commit is contained in:
nds 2005-11-03 08:30:14 +00:00
parent 222b83a9ee
commit 6fa64130e5
79 changed files with 143 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BasicGUI/BasicGUI_ArcDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>

2
src/BasicGUI/BasicGUI_CircleDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>

2
src/BasicGUI/BasicGUI_CurveDlg.cxx
View File

@ -30,7 +30,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>

2
src/BasicGUI/BasicGUI_EllipseDlg.cxx
View File

@ -30,7 +30,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>

2
src/BasicGUI/BasicGUI_LineDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>

2
src/BasicGUI/BasicGUI_MarkerDlg.cxx
View File

@ -32,7 +32,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>

2
src/BasicGUI/BasicGUI_PlaneDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>

2
src/BasicGUI/BasicGUI_PointDlg.cxx
View File

@ -30,7 +30,7 @@
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "GEOMImpl_Types.hxx" #include "GEOMImpl_Types.hxx"

2
src/BasicGUI/BasicGUI_VectorDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>

2
src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
View File

@ -32,7 +32,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <Geom_Surface.hxx> #include <Geom_Surface.hxx>
#include <Geom_Plane.hxx> #include <Geom_Plane.hxx>

2
src/BlocksGUI/BlocksGUI_BlockDlg.cxx
View File

@ -29,7 +29,7 @@
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "GEOMImpl_Types.hxx" #include "GEOMImpl_Types.hxx"

2
src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
View File

@ -33,7 +33,7 @@
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "OCCViewer_ViewModel.h" #include "OCCViewer_ViewModel.h"
#include "SALOME_ListIteratorOfListIO.hxx" #include "SALOME_ListIteratorOfListIO.hxx"

2
src/BlocksGUI/BlocksGUI_PropagateDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>

2
src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx
View File

@ -30,7 +30,7 @@
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
//using namespace std; //using namespace std;

2
src/BlocksGUI/BlocksGUI_TrsfDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "OCCViewer_ViewModel.h" #include "OCCViewer_ViewModel.h"
#include <TColStd_IndexedMapOfInteger.hxx> #include <TColStd_IndexedMapOfInteger.hxx>

2
src/BooleanGUI/BooleanGUI_Dialog.cxx
View File

@ -32,7 +32,7 @@
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>

2
src/BuildGUI/BuildGUI_CompoundDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>

2
src/BuildGUI/BuildGUI_EdgeDlg.cxx
View File

@ -36,7 +36,7 @@
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>

2
src/BuildGUI/BuildGUI_FaceDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
//Qt includes //Qt includes
#include <qcheckbox.h> #include <qcheckbox.h>

2
src/BuildGUI/BuildGUI_ShellDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "TColStd_MapOfInteger.hxx" #include "TColStd_MapOfInteger.hxx"

2
src/BuildGUI/BuildGUI_SolidDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
//Qt includes //Qt includes
#include <qcheckbox.h> #include <qcheckbox.h>

2
src/BuildGUI/BuildGUI_WireDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "TColStd_MapOfInteger.hxx" #include "TColStd_MapOfInteger.hxx"

10
src/DisplayGUI/DisplayGUI.cxx
View File

@ -48,8 +48,10 @@
#include <SVTK_Prs.h> #include <SVTK_Prs.h>
#include <SOCC_Prs.h> #include <SOCC_Prs.h>
#include <QtxActionMenuMgr.h>
#include <SalomeApp_Application.h> #include <SalomeApp_Application.h>
#include <SalomeApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
#include <SalomeApp_Study.h> #include <SalomeApp_Study.h>
#include <AIS_ListIteratorOfListOfInteractive.hxx> #include <AIS_ListIteratorOfListOfInteractive.hxx>
@ -234,7 +236,7 @@ void DisplayGUI::Display()
if ( !anActiveStudy ) return; if ( !anActiveStudy ) return;
//get SalomeApp selection manager //get SalomeApp selection manager
SalomeApp_SelectionMgr* aSelMgr = app->selectionMgr(); LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
if ( !aSelMgr ) return; if ( !aSelMgr ) return;
SALOME_ListIO aList; SALOME_ListIO aList;
@ -290,7 +292,7 @@ void DisplayGUI::Erase()
if ( !anActiveStudy ) return; if ( !anActiveStudy ) return;
//get SalomeApp selection manager //get SalomeApp selection manager
SalomeApp_SelectionMgr* aSelMgr = app->selectionMgr(); LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
if ( !aSelMgr ) return; if ( !aSelMgr ) return;
SALOME_ListIO aList; SALOME_ListIO aList;
@ -417,7 +419,7 @@ void DisplayGUI::ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindow
SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() ); SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
if ( !app ) return; if ( !app ) return;
SalomeApp_SelectionMgr* aSelMgr = app->selectionMgr(); LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
if ( !aSelMgr ) return; if ( !aSelMgr ) return;
SUIT_OverrideCursor(); SUIT_OverrideCursor();

2
src/EntityGUI/EntityGUI_SketcherDlg.cxx
View File

@ -35,7 +35,7 @@
#include "SUIT_MessageBox.h" #include "SUIT_MessageBox.h"
#include "SUIT_ResourceMgr.h" #include "SUIT_ResourceMgr.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qpushbutton.h> #include <qpushbutton.h>
#include <qlabel.h> #include <qlabel.h>

2
src/EntityGUI/EntityGUI_SubShapeDlg.cxx
View File

@ -33,7 +33,7 @@
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "OCCViewer_ViewModel.h" #include "OCCViewer_ViewModel.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "SALOME_ListIteratorOfListIO.hxx" #include "SALOME_ListIteratorOfListIO.hxx"
#include <TColStd_IndexedMapOfInteger.hxx> #include <TColStd_IndexedMapOfInteger.hxx>

4
src/GEOMBase/GEOMBase_Helper.cxx
View File

@ -43,7 +43,7 @@
#include <SalomeApp_Module.h> #include <SalomeApp_Module.h>
#include <SalomeApp_Application.h> #include <SalomeApp_Application.h>
#include <SalomeApp_Study.h> #include <SalomeApp_Study.h>
#include <SalomeApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
#include <SalomeApp_Tools.h> #include <SalomeApp_Tools.h>
#include <SalomeApp_DataModel.h> #include <SalomeApp_DataModel.h>
#include <SalomeApp_Module.h> #include <SalomeApp_Module.h>
@ -926,7 +926,7 @@ const SALOME_ListIO& GEOMBase_Helper::selectedIO()
SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() ); SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
if ( app ) { if ( app ) {
SalomeApp_SelectionMgr* aSelMgr = app->selectionMgr(); LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
if ( aSelMgr ) if ( aSelMgr )
aSelMgr->selectedObjects( mySelected ); aSelMgr->selectedObjects( mySelected );
} }

2
src/GEOMBase/GEOMBase_Skeleton.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qpushbutton.h> #include <qpushbutton.h>

8
src/GEOMFiltersSelection/GEOM_OCCFilter.cxx
View File

@ -1,7 +1,7 @@
#include "GEOM_OCCFilter.h" #include "GEOM_OCCFilter.h"
#include <SalomeApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
#include <SalomeApp_DataOwner.h> #include <LightApp_DataOwner.h>
#include <SALOME_InteractiveObject.hxx> #include <SALOME_InteractiveObject.hxx>
@ -15,7 +15,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOM_OCCFilter, SelectMgr_Filter)
// function : GEOM_OCCFilter // function : GEOM_OCCFilter
// purpose : // purpose :
//======================================================================= //=======================================================================
GEOM_OCCFilter::GEOM_OCCFilter( SalomeApp_SelectionMgr* theSelMgr ) GEOM_OCCFilter::GEOM_OCCFilter( LightApp_SelectionMgr* theSelMgr )
: SelectMgr_Filter() : SelectMgr_Filter()
{ {
mySelMgr = theSelMgr; mySelMgr = theSelMgr;
@ -42,5 +42,5 @@ Standard_Boolean GEOM_OCCFilter::IsOk( const Handle(SelectMgr_EntityOwner)& anOb
Handle(SALOME_InteractiveObject) anIO = Handle(SALOME_InteractiveObject)::DownCast(anAIS->GetOwner()); Handle(SALOME_InteractiveObject) anIO = Handle(SALOME_InteractiveObject)::DownCast(anAIS->GetOwner());
if ( anIO.IsNull() ) return false; if ( anIO.IsNull() ) return false;
return mySelMgr->isOk( new SalomeApp_DataOwner( QString( anIO->getEntry() ) ) ); return mySelMgr->isOk( new LightApp_DataOwner( QString( anIO->getEntry() ) ) );
} }

6
src/GEOMFiltersSelection/GEOM_OCCFilter.h
View File

@ -5,18 +5,18 @@
#include <Standard_DefineHandle.hxx> #include <Standard_DefineHandle.hxx>
class SalomeApp_SelectionMgr; class LightApp_SelectionMgr;
class GEOM_OCCFilter : public SelectMgr_Filter class GEOM_OCCFilter : public SelectMgr_Filter
{ {
public: public:
Standard_EXPORT GEOM_OCCFilter( SalomeApp_SelectionMgr* theSelMgr); Standard_EXPORT GEOM_OCCFilter( LightApp_SelectionMgr* theSelMgr);
Standard_EXPORT ~GEOM_OCCFilter(); Standard_EXPORT ~GEOM_OCCFilter();
Standard_EXPORT virtual Standard_Boolean IsOk( const Handle(SelectMgr_EntityOwner)& anObj ) const; Standard_EXPORT virtual Standard_Boolean IsOk( const Handle(SelectMgr_EntityOwner)& anObj ) const;
private: private:
SalomeApp_SelectionMgr* mySelMgr; LightApp_SelectionMgr* mySelMgr;
public: public:

4
src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx
View File

@ -1,6 +1,6 @@
#include "GEOM_PreviewFilter.h" #include "GEOM_PreviewFilter.h"
#include <SalomeApp_DataOwner.h> #include <LightApp_DataOwner.h>
//======================================================================= //=======================================================================
// function : GEOM_SelectionFilter // function : GEOM_SelectionFilter
@ -25,7 +25,7 @@ GEOM_PreviewFilter::~GEOM_PreviewFilter()
//======================================================================= //=======================================================================
bool GEOM_PreviewFilter::isOk( const SUIT_DataOwner* sOwner ) const bool GEOM_PreviewFilter::isOk( const SUIT_DataOwner* sOwner ) const
{ {
const SalomeApp_DataOwner* owner = dynamic_cast<const SalomeApp_DataOwner*> ( sOwner ); const LightApp_DataOwner* owner = dynamic_cast<const LightApp_DataOwner*> ( sOwner );
return ( owner && strstr( owner->entry(), "TEMP" ) ); return ( owner && strstr( owner->entry(), "TEMP" ) );
} }

4
src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx
View File

@ -2,7 +2,7 @@
#include "GEOM_Client.hxx" #include "GEOM_Client.hxx"
#include <SalomeApp_DataOwner.h> #include <LightApp_DataOwner.h>
#include <SalomeApp_Study.h> #include <SalomeApp_Study.h>
#include <SalomeApp_Application.h> #include <SalomeApp_Application.h>
@ -58,7 +58,7 @@ GEOM::GEOM_Object_ptr GEOM_SelectionFilter::getObject( const SUIT_DataOwner* sOw
{ {
GEOM::GEOM_Object_var anObj; GEOM::GEOM_Object_var anObj;
const SalomeApp_DataOwner* owner = dynamic_cast<const SalomeApp_DataOwner*>(sOwner); const LightApp_DataOwner* owner = dynamic_cast<const LightApp_DataOwner*>(sOwner);
SalomeApp_Study* appStudy = getStudy(); SalomeApp_Study* appStudy = getStudy();
if (owner && appStudy) if (owner && appStudy)
{ {

16
src/GEOMGUI/GEOMGUI_OCCSelector.cxx
View File

@ -1,6 +1,6 @@
#include "GEOMGUI_OCCSelector.h" #include "GEOMGUI_OCCSelector.h"
#include <SalomeApp_DataSubOwner.h> #include <LightApp_DataSubOwner.h>
#include <OCCViewer_ViewModel.h> #include <OCCViewer_ViewModel.h>
@ -26,7 +26,7 @@
// Purpose : // Purpose :
//================================================================ //================================================================
GEOMGUI_OCCSelector::GEOMGUI_OCCSelector( OCCViewer_Viewer* viewer, SUIT_SelectionMgr* mgr ) GEOMGUI_OCCSelector::GEOMGUI_OCCSelector( OCCViewer_Viewer* viewer, SUIT_SelectionMgr* mgr )
: SalomeApp_OCCSelector( viewer, mgr ) : LightApp_OCCSelector( viewer, mgr )
{ {
} }
@ -79,11 +79,11 @@ void GEOMGUI_OCCSelector::getSelection( SUIT_DataOwnerPtrList& aList ) const
if ( !entryStr.isEmpty() ) if ( !entryStr.isEmpty() )
{ {
SalomeApp_DataOwner* owner; LightApp_DataOwner* owner;
if ( index > -1 ) // Local Selection if ( index > -1 ) // Local Selection
owner = new SalomeApp_DataSubOwner( entryStr, index ); owner = new LightApp_DataSubOwner( entryStr, index );
else // Global Selection else // Global Selection
owner = new SalomeApp_DataOwner( entryStr ); owner = new LightApp_DataOwner( entryStr );
aList.append( SUIT_DataOwnerPtr( owner ) ); aList.append( SUIT_DataOwnerPtr( owner ) );
} }
@ -99,7 +99,7 @@ void GEOMGUI_OCCSelector::getSelection( SUIT_DataOwnerPtrList& aList ) const
if ( !entryStr.isEmpty() ) if ( !entryStr.isEmpty() )
{ {
SalomeApp_DataOwner* owner = new SalomeApp_DataOwner( entryStr ); LightApp_DataOwner* owner = new LightApp_DataOwner( entryStr );
aList.append( SUIT_DataOwnerPtr( owner ) ); aList.append( SUIT_DataOwnerPtr( owner ) );
} }
} }
@ -168,7 +168,7 @@ void GEOMGUI_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList )
// "entry - to - list_of_ids" map // "entry - to - list_of_ids" map
for ( SUIT_DataOwnerPtrList::const_iterator itr = aList.begin(); itr != aList.end(); ++itr ) for ( SUIT_DataOwnerPtrList::const_iterator itr = aList.begin(); itr != aList.end(); ++itr )
{ {
const SalomeApp_DataSubOwner* subOwner = dynamic_cast<const SalomeApp_DataSubOwner*>( (*itr).operator->() ); const LightApp_DataSubOwner* subOwner = dynamic_cast<const LightApp_DataSubOwner*>( (*itr).operator->() );
if ( subOwner ) if ( subOwner )
{ {
QString entry = subOwner->entry(); QString entry = subOwner->entry();
@ -191,7 +191,7 @@ void GEOMGUI_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList )
} }
else // the owner is NOT a sub owner, maybe it is a DataOwner == GLOBAL selection else // the owner is NOT a sub owner, maybe it is a DataOwner == GLOBAL selection
{ {
const SalomeApp_DataOwner* owner = dynamic_cast<const SalomeApp_DataOwner*>( (*itr).operator->() ); const LightApp_DataOwner* owner = dynamic_cast<const LightApp_DataOwner*>( (*itr).operator->() );
if ( owner ) if ( owner )
{ {
globalSelMap[owner->entry()] = 1; globalSelMap[owner->entry()] = 1;

4
src/GEOMGUI/GEOMGUI_OCCSelector.h
View File

@ -1,9 +1,9 @@
#ifndef GEOMGUI_OCCSELECTOR_H #ifndef GEOMGUI_OCCSELECTOR_H
#define GEOMGUI_OCCSELECTOR_H #define GEOMGUI_OCCSELECTOR_H
#include <SalomeApp_OCCSelector.h> #include <LightApp_OCCSelector.h>
class GEOMGUI_OCCSelector : public SalomeApp_OCCSelector class GEOMGUI_OCCSelector : public LightApp_OCCSelector
{ {
public: public:
GEOMGUI_OCCSelector( OCCViewer_Viewer*, SUIT_SelectionMgr* ); GEOMGUI_OCCSelector( OCCViewer_Viewer*, SUIT_SelectionMgr* );

6
src/GEOMGUI/GEOMGUI_Selection.cxx
View File

@ -3,7 +3,7 @@
#include "GeometryGUI.h" #include "GeometryGUI.h"
#include "GEOM_Displayer.h" #include "GEOM_Displayer.h"
#include <SalomeApp_DataOwner.h> #include <LightApp_DataOwner.h>
#include <SalomeApp_Study.h> #include <SalomeApp_Study.h>
#include <OCCViewer_ViewModel.h> #include <OCCViewer_ViewModel.h>
@ -48,7 +48,7 @@ QtxValue GEOMGUI_Selection::globalParam( const QString& p ) const
{ {
if ( p == "isOCC" ) return QtxValue( activeViewType() == OCCViewer_Viewer::Type() ); if ( p == "isOCC" ) return QtxValue( activeViewType() == OCCViewer_Viewer::Type() );
return SalomeApp_Selection::globalParam( p ); return LightApp_Selection::globalParam( p );
} }
QtxValue GEOMGUI_Selection::param( const int ind, const QString& p ) const QtxValue GEOMGUI_Selection::param( const int ind, const QString& p ) const
@ -61,7 +61,7 @@ QtxValue GEOMGUI_Selection::param( const int ind, const QString& p ) const
else if ( p == "displaymode" ) else if ( p == "displaymode" )
return QtxValue( displayMode( ind ) ); return QtxValue( displayMode( ind ) );
else else
return SalomeApp_Selection::param( ind, p ); return LightApp_Selection::param( ind, p );
} }
QString GEOMGUI_Selection::typeName( const int index ) const QString GEOMGUI_Selection::typeName( const int index ) const

4
src/GEOMGUI/GEOMGUI_Selection.h
View File

@ -29,12 +29,12 @@
#ifndef GEOMGUI_SELECTION_HeaderFile #ifndef GEOMGUI_SELECTION_HeaderFile
#define GEOMGUI_SELECTION_HeaderFile #define GEOMGUI_SELECTION_HeaderFile
#include <SalomeApp_Selection.h> #include <LightApp_Selection.h>
#include <SALOMEconfig.h> #include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(GEOM_Gen) #include CORBA_SERVER_HEADER(GEOM_Gen)
class GEOMGUI_Selection : public SalomeApp_Selection class GEOMGUI_Selection : public LightApp_Selection
{ {
public: public:
GEOMGUI_Selection(); GEOMGUI_Selection();

10
src/GEOMGUI/GEOM_Displayer.cxx
View File

@ -51,7 +51,7 @@
#include <SalomeApp_Study.h> #include <SalomeApp_Study.h>
#include <SalomeApp_Application.h> #include <SalomeApp_Application.h>
#include <SalomeApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
#include <SalomeApp_TypeFilter.h> #include <SalomeApp_TypeFilter.h>
#include <SalomeApp_Tools.h> #include <SalomeApp_Tools.h>
@ -759,7 +759,7 @@ SALOME_Prs* GEOM_Displayer::buildPresentation( const QString& entry,
if ( myViewFrame ) if ( myViewFrame )
{ {
prs = SalomeApp_Displayer::buildPresentation( entry, theViewFrame ); prs = LightApp_Displayer::buildPresentation( entry, theViewFrame );
if ( prs ) if ( prs )
{ {
Handle( SALOME_InteractiveObject ) theIO = new SALOME_InteractiveObject(); Handle( SALOME_InteractiveObject ) theIO = new SALOME_InteractiveObject();
@ -829,7 +829,7 @@ void GEOM_Displayer::LocalSelection( const Handle(SALOME_InteractiveObject)& the
if ( !app ) if ( !app )
return; return;
SalomeApp_SelectionMgr* sm = app->selectionMgr(); LightApp_SelectionMgr* sm = app->selectionMgr();
// remove all filters from selection // remove all filters from selection
sm->clearFilters(); sm->clearFilters();
@ -880,7 +880,7 @@ void GEOM_Displayer::GlobalSelection( const TColStd_MapOfInteger& theModes,
vf->GlobalSelection( update ); vf->GlobalSelection( update );
// Set selection filters in accordance with current mode // Set selection filters in accordance with current mode
SalomeApp_SelectionMgr* sm = app->selectionMgr(); LightApp_SelectionMgr* sm = app->selectionMgr();
if ( !sm ) if ( !sm )
return; return;
@ -1053,7 +1053,7 @@ bool GEOM_Displayer::ToActivate() const
* Removes from selection temporary objects * Removes from selection temporary objects
*/ */
//================================================================= //=================================================================
void GEOM_Displayer::clearTemporary( SalomeApp_SelectionMgr* theSelMgr ) void GEOM_Displayer::clearTemporary( LightApp_SelectionMgr* theSelMgr )
{ {
SALOME_ListIO selected, toSelect; SALOME_ListIO selected, toSelect;
theSelMgr->selectedObjects( selected ); theSelMgr->selectedObjects( selected );

8
src/GEOMGUI/GEOM_Displayer.h
View File

@ -34,7 +34,7 @@
#include "SALOME_ListIO.hxx" #include "SALOME_ListIO.hxx"
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include <Quantity_Color.hxx> #include <Quantity_Color.hxx>
#include <SalomeApp_Displayer.h> #include <LightApp_Displayer.h>
#include <list> #include <list>
@ -49,7 +49,7 @@
typedef std::list<GEOM::GEOM_Object_ptr> ObjectList; typedef std::list<GEOM::GEOM_Object_ptr> ObjectList;
class TColStd_MapOfInteger; class TColStd_MapOfInteger;
class SalomeApp_SelectionMgr; class LightApp_SelectionMgr;
class SalomeApp_Study; class SalomeApp_Study;
class SUIT_SelectionFilter; class SUIT_SelectionFilter;
//class SALOME_Selection; //class SALOME_Selection;
@ -64,7 +64,7 @@ class SUIT_SelectionFilter;
#define GEOMGUI_WNT_EXPORT #define GEOMGUI_WNT_EXPORT
#endif #endif
class GEOMGUI_WNT_EXPORT GEOM_Displayer : public SalomeApp_Displayer class GEOMGUI_WNT_EXPORT GEOM_Displayer : public LightApp_Displayer
{ {
public: public:
@ -162,7 +162,7 @@ protected:
/* Resets internal data */ /* Resets internal data */
void internalReset(); void internalReset();
void clearTemporary( SalomeApp_SelectionMgr* theSelMgr ); void clearTemporary( LightApp_SelectionMgr* theSelMgr );
SUIT_SelectionFilter* getFilter( const int theMode ); SUIT_SelectionFilter* getFilter( const int theMode );

32
src/GEOMGUI/GeometryGUI.cxx
View File

@ -48,10 +48,10 @@
#include <SVTK_ViewManager.h> #include <SVTK_ViewManager.h>
#include <SalomeApp_Application.h> #include <SalomeApp_Application.h>
#include <SalomeApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
#include <SalomeApp_VTKSelector.h> #include <LightApp_VTKSelector.h>
#include <SalomeApp_Study.h> #include <SalomeApp_Study.h>
#include <SalomeApp_Preferences.h> #include <LightApp_Preferences.h>
#include <SALOME_LifeCycleCORBA.hxx> #include <SALOME_LifeCycleCORBA.hxx>
#include <SALOME_ListIO.hxx> #include <SALOME_ListIO.hxx>
@ -1105,7 +1105,7 @@ bool GeometryGUI::activateModule( SUIT_Study* study )
for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it ) for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it )
it.data()->activate( application()->desktop() ); it.data()->activate( application()->desktop() );
SalomeApp_SelectionMgr* sm = getApp()->selectionMgr(); LightApp_SelectionMgr* sm = getApp()->selectionMgr();
SUIT_ViewManager* vm; SUIT_ViewManager* vm;
ViewManagerList OCCViewManagers, VTKViewManagers; ViewManagerList OCCViewManagers, VTKViewManagers;
application()->viewManagers( OCCViewer_Viewer::Type(), OCCViewManagers ); application()->viewManagers( OCCViewer_Viewer::Type(), OCCViewManagers );
@ -1113,7 +1113,7 @@ bool GeometryGUI::activateModule( SUIT_Study* study )
myOCCSelectors.append( new GEOMGUI_OCCSelector( ((OCCViewer_ViewManager*)vm)->getOCCViewer(), sm ) ); myOCCSelectors.append( new GEOMGUI_OCCSelector( ((OCCViewer_ViewManager*)vm)->getOCCViewer(), sm ) );
application()->viewManagers( SVTK_Viewer::Type(), VTKViewManagers ); application()->viewManagers( SVTK_Viewer::Type(), VTKViewManagers );
for ( vm = VTKViewManagers.first(); vm; vm = VTKViewManagers.next() ) for ( vm = VTKViewManagers.first(); vm; vm = VTKViewManagers.next() )
myVTKSelectors.append( new SalomeApp_VTKSelector( dynamic_cast<SVTK_Viewer*>( vm->getViewModel() ), sm ) ); myVTKSelectors.append( new LightApp_VTKSelector( dynamic_cast<SVTK_Viewer*>( vm->getViewModel() ), sm ) );
// disable OCC selectors // disable OCC selectors
getApp()->selectionMgr()->setEnabled( false, OCCViewer_Viewer::Type() ); getApp()->selectionMgr()->setEnabled( false, OCCViewer_Viewer::Type() );
@ -1122,7 +1122,7 @@ bool GeometryGUI::activateModule( SUIT_Study* study )
// disable VTK selectors // disable VTK selectors
getApp()->selectionMgr()->setEnabled( false, SVTK_Viewer::Type() ); getApp()->selectionMgr()->setEnabled( false, SVTK_Viewer::Type() );
for ( SalomeApp_VTKSelector* sr = myVTKSelectors.first(); sr; sr = myVTKSelectors.next() ) for ( LightApp_VTKSelector* sr = myVTKSelectors.first(); sr; sr = myVTKSelectors.next() )
sr->setEnabled(true); sr->setEnabled(true);
return true; return true;
@ -1512,7 +1512,7 @@ void GeometryGUI::onViewManagerAdded( SUIT_ViewManager* vm )
{ {
if ( vm->getType() == OCCViewer_Viewer::Type() ) if ( vm->getType() == OCCViewer_Viewer::Type() )
{ {
SalomeApp_SelectionMgr* sm = getApp()->selectionMgr(); LightApp_SelectionMgr* sm = getApp()->selectionMgr();
myOCCSelectors.append( new GEOMGUI_OCCSelector( ((OCCViewer_ViewManager*)vm)->getOCCViewer(), sm ) ); myOCCSelectors.append( new GEOMGUI_OCCSelector( ((OCCViewer_ViewManager*)vm)->getOCCViewer(), sm ) );
// disable OCC selectors // disable OCC selectors
@ -1522,12 +1522,12 @@ void GeometryGUI::onViewManagerAdded( SUIT_ViewManager* vm )
} }
else if ( vm->getType() == SVTK_Viewer::Type() ) else if ( vm->getType() == SVTK_Viewer::Type() )
{ {
SalomeApp_SelectionMgr* sm = getApp()->selectionMgr(); LightApp_SelectionMgr* sm = getApp()->selectionMgr();
myVTKSelectors.append( new SalomeApp_VTKSelector( dynamic_cast<SVTK_Viewer*>( vm->getViewModel() ), sm ) ); myVTKSelectors.append( new LightApp_VTKSelector( dynamic_cast<SVTK_Viewer*>( vm->getViewModel() ), sm ) );
// disable VTK selectors // disable VTK selectors
getApp()->selectionMgr()->setEnabled( false, SVTK_Viewer::Type() ); getApp()->selectionMgr()->setEnabled( false, SVTK_Viewer::Type() );
for ( SalomeApp_VTKSelector* sr = myVTKSelectors.first(); sr; sr = myVTKSelectors.next() ) for ( LightApp_VTKSelector* sr = myVTKSelectors.first(); sr; sr = myVTKSelectors.next() )
sr->setEnabled(true); sr->setEnabled(true);
} }
} }
@ -1546,7 +1546,7 @@ void GeometryGUI::onViewManagerRemoved( SUIT_ViewManager* vm )
} }
if ( vm->getType() == SVTK_Viewer::Type() ) if ( vm->getType() == SVTK_Viewer::Type() )
{ {
for ( SalomeApp_VTKSelector* sr = myVTKSelectors.first(); sr; sr = myVTKSelectors.next() ) for ( LightApp_VTKSelector* sr = myVTKSelectors.first(); sr; sr = myVTKSelectors.next() )
if ( sr->viewer() == viewer ) if ( sr->viewer() == viewer )
{ {
myVTKSelectors.remove( sr ); myVTKSelectors.remove( sr );
@ -1562,7 +1562,7 @@ QString GeometryGUI::engineIOR() const
return QString( "" ); return QString( "" );
} }
SalomeApp_Selection* GeometryGUI::createSelection() const LightApp_Selection* GeometryGUI::createSelection() const
{ {
return new GEOMGUI_Selection(); return new GEOMGUI_Selection();
} }
@ -1588,11 +1588,11 @@ void GeometryGUI::createPreferences()
int genGroup = addPreference( tr( "PREF_GROUP_GENERAL" ), tabId ); int genGroup = addPreference( tr( "PREF_GROUP_GENERAL" ), tabId );
addPreference( tr( "PREF_SHADING_COLOR" ), genGroup, addPreference( tr( "PREF_SHADING_COLOR" ), genGroup,
SalomeApp_Preferences::Color, "Geometry", "shading_color" ); LightApp_Preferences::Color, "Geometry", "shading_color" );
int step = addPreference( tr( "PREF_STEP_VALUE" ), genGroup, int step = addPreference( tr( "PREF_STEP_VALUE" ), genGroup,
SalomeApp_Preferences::IntSpin, "Geometry", "SettingsGeomStep" ); LightApp_Preferences::IntSpin, "Geometry", "SettingsGeomStep" );
int dispmode = addPreference( tr( "PREF_DISPLAY_MODE" ), genGroup, int dispmode = addPreference( tr( "PREF_DISPLAY_MODE" ), genGroup,
SalomeApp_Preferences::Selector, "Geometry", "display_mode" ); LightApp_Preferences::Selector, "Geometry", "display_mode" );
setPreferenceProperty( genGroup, "columns", 1 ); setPreferenceProperty( genGroup, "columns", 1 );
@ -1617,7 +1617,7 @@ void GeometryGUI::preferencesChanged( const QString& section, const QString& par
{ {
} }
SalomeApp_Displayer* GeometryGUI::displayer() LightApp_Displayer* GeometryGUI::displayer()
{ {
if( !myDisplayer ) if( !myDisplayer )
myDisplayer = new GEOM_Displayer( dynamic_cast<SalomeApp_Study*>( getApp()->activeStudy() ) ); myDisplayer = new GEOM_Displayer( dynamic_cast<SalomeApp_Study*>( getApp()->activeStudy() ) );

11
src/GEOMGUI/GeometryGUI.h
View File

@ -70,7 +70,8 @@ typedef QMap<QString, GEOMGUI*> GUIMap;
class QDialog; class QDialog;
class QPopupMenu; class QPopupMenu;
class GEOMGUI_OCCSelector; class GEOMGUI_OCCSelector;
class SalomeApp_VTKSelector; class LightApp_VTKSelector;
class LightApp_Selection;
class SUIT_ViewManager; class SUIT_ViewManager;
//================================================================================= //=================================================================================
@ -88,7 +89,7 @@ public:
// Destructor // Destructor
~GeometryGUI(); ~GeometryGUI();
virtual SalomeApp_Displayer* displayer(); virtual LightApp_Displayer* displayer();
virtual void initialize( CAM_Application* ); virtual void initialize( CAM_Application* );
virtual QString engineIOR() const; virtual QString engineIOR() const;
@ -157,7 +158,7 @@ signals :
void SignalDefaultStepValueChanged( double newVal ); void SignalDefaultStepValueChanged( double newVal );
protected: protected:
virtual SalomeApp_Selection* createSelection() const; virtual LightApp_Selection* createSelection() const;
private: private:
GEOMGUI* getLibrary( const QString& libraryName ); GEOMGUI* getLibrary( const QString& libraryName );
@ -181,9 +182,9 @@ private:
QMap<int,QString> myRules; // popup rules QMap<int,QString> myRules; // popup rules
QPtrList<GEOMGUI_OCCSelector> myOCCSelectors; QPtrList<GEOMGUI_OCCSelector> myOCCSelectors;
QPtrList<SalomeApp_VTKSelector> myVTKSelectors; QPtrList<LightApp_VTKSelector> myVTKSelectors;
SalomeApp_Displayer* myDisplayer; LightApp_Displayer* myDisplayer;
friend class DisplayGUI; friend class DisplayGUI;
}; };

6
src/GEOMToolsGUI/GEOMToolsGUI.cxx
View File

@ -45,7 +45,7 @@
#include <SalomeApp_Application.h> #include <SalomeApp_Application.h>
#include <SalomeApp_Study.h> #include <SalomeApp_Study.h>
#include <SalomeApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
#include <SALOME_ListIteratorOfListIO.hxx> #include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_Prs.h> #include <SALOME_Prs.h>
@ -229,7 +229,7 @@ void GEOMToolsGUI::OnEditDelete()
SALOME_ListIO selected; SALOME_ListIO selected;
SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() ); SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
if ( app ) { if ( app ) {
SalomeApp_SelectionMgr* aSelMgr = app->selectionMgr(); LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() ); SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
if ( aSelMgr && appStudy ) { if ( aSelMgr && appStudy ) {
aSelMgr->selectedObjects( selected, QString::null, false ); aSelMgr->selectedObjects( selected, QString::null, false );
@ -541,7 +541,7 @@ bool GEOMToolsGUI::Export()
aMap.insert( (char*)aPatterns[i], (char*)aFormats[i] ); aMap.insert( (char*)aPatterns[i], (char*)aFormats[i] );
// Get selected objects // Get selected objects
SalomeApp_SelectionMgr* sm = app->selectionMgr(); LightApp_SelectionMgr* sm = app->selectionMgr();
if ( !sm ) if ( !sm )
return false; return false;

6
src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
View File

@ -57,7 +57,7 @@
#include <SUIT_MessageBox.h> #include <SUIT_MessageBox.h>
#include <SalomeApp_Application.h> #include <SalomeApp_Application.h>
#include <SalomeApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
#include <SalomeApp_Study.h> #include <SalomeApp_Study.h>
#include <SalomeApp_Module.h> #include <SalomeApp_Module.h>
@ -170,7 +170,7 @@ void GEOMToolsGUI::OnRename()
SALOME_ListIO selected; SALOME_ListIO selected;
SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() ); SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
if ( app ) { if ( app ) {
SalomeApp_SelectionMgr* aSelMgr = app->selectionMgr(); LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() ); SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
if ( aSelMgr && appStudy ) { if ( aSelMgr && appStudy ) {
aSelMgr->selectedObjects( selected ); aSelMgr->selectedObjects( selected );
@ -225,7 +225,7 @@ void GEOMToolsGUI::OnColor()
SALOME_ListIO selected; SALOME_ListIO selected;
SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() ); SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
if ( app ) { if ( app ) {
SalomeApp_SelectionMgr* aSelMgr = app->selectionMgr(); LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
if ( aSelMgr ) { if ( aSelMgr ) {
aSelMgr->selectedObjects( selected ); aSelMgr->selectedObjects( selected );
if ( !selected.IsEmpty() ) { if ( !selected.IsEmpty() ) {

4
src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
View File

@ -48,7 +48,7 @@
#include <SUIT_OverrideCursor.h> #include <SUIT_OverrideCursor.h>
#include <SalomeApp_Application.h> #include <SalomeApp_Application.h>
#include <SalomeApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
#include <qframe.h> #include <qframe.h>
#include <qlabel.h> #include <qlabel.h>
@ -185,7 +185,7 @@ void GEOMToolsGUI_TransparencyDlg::ValueHasChanged( int newValue )
SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() ); SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
if ( !app ) if ( !app )
return; return;
SalomeApp_SelectionMgr* aSelMgr = app->selectionMgr(); LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
if ( !aSelMgr ) if ( !aSelMgr )
return; return;
SALOME_ListIO selected; SALOME_ListIO selected;

2
src/GenerationGUI/GenerationGUI_FillingDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <GeomFill_SectionGenerator.hxx> #include <GeomFill_SectionGenerator.hxx>
#include <GeomFill_Line.hxx> #include <GeomFill_Line.hxx>

2
src/GenerationGUI/GenerationGUI_PipeDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>

2
src/GenerationGUI/GenerationGUI_PrismDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <BRepPrimAPI_MakePrism.hxx> #include <BRepPrimAPI_MakePrism.hxx>
#include <BRepAdaptor_Curve.hxx> #include <BRepAdaptor_Curve.hxx>

2
src/GenerationGUI/GenerationGUI_RevolDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <gp_Lin.hxx> #include <gp_Lin.hxx>
#include <BRepAdaptor_Curve.hxx> #include <BRepAdaptor_Curve.hxx>

4
src/GroupGUI/GroupGUI.cxx
View File

@ -36,7 +36,7 @@
#include "SUIT_MessageBox.h" #include "SUIT_MessageBox.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_Study.h" #include "SalomeApp_Study.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
GroupGUI* GroupGUI::myGUIObject = 0; GroupGUI* GroupGUI::myGUIObject = 0;
@ -105,7 +105,7 @@ bool GroupGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() ); SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
if ( app ) { if ( app ) {
SalomeApp_SelectionMgr* aSelMgr = app->selectionMgr(); LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
if ( aSelMgr ) if ( aSelMgr )
aSelMgr->selectedObjects( aList ); aSelMgr->selectedObjects( aList );
} }

4
src/GroupGUI/GroupGUI_GroupDlg.cxx
View File

@ -32,7 +32,7 @@
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_Study.h" #include "SalomeApp_Study.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "GEOMBase.h" #include "GEOMBase.h"
@ -541,7 +541,7 @@ void GroupGUI_GroupDlg::highlightSubShapes()
if ( myIdList->isSelected( ii ) ) if ( myIdList->isSelected( ii ) )
anIds.Add( myIdList->item( ii )->text().toInt() ); anIds.Add( myIdList->item( ii )->text().toInt() );
SalomeApp_SelectionMgr* aSelMgr = ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(); LightApp_SelectionMgr* aSelMgr = ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr();
aSelMgr->clearSelected(); aSelMgr->clearSelected();
aSelMgr->AddOrRemoveIndex( aSh->getIO(), anIds, false ); aSelMgr->AddOrRemoveIndex( aSh->getIO(), anIds, false );

2
src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx
View File

@ -32,7 +32,7 @@
#include "utilities.h" #include "utilities.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "SalomeApp_Tools.h" #include "SalomeApp_Tools.h"
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>

2
src/MeasureGUI/MeasureGUI_PointDlg.cxx
View File

@ -32,7 +32,7 @@
#include "utilities.h" #include "utilities.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>
#include <TopAbs_ShapeEnum.hxx> #include <TopAbs_ShapeEnum.hxx>

10
src/MeasureGUI/MeasureGUI_Skeleton.cxx
View File

@ -32,7 +32,7 @@
#include "GeometryGUI.h" #include "GeometryGUI.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "SalomeApp_Tools.h" #include "SalomeApp_Tools.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SUIT_OverrideCursor.h" #include "SUIT_OverrideCursor.h"
@ -113,7 +113,7 @@ void MeasureGUI_Skeleton::Init()
connect( mySelBtn, SIGNAL( clicked() ), connect( mySelBtn, SIGNAL( clicked() ),
this, SLOT ( SetEditCurrentArgument() ) ); this, SLOT ( SetEditCurrentArgument() ) );
SalomeApp_SelectionMgr* aSel = ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(); LightApp_SelectionMgr* aSel = ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr();
if ( aSel ) if ( aSel )
connect( aSel, SIGNAL( currentSelectionChanged() ), connect( aSel, SIGNAL( currentSelectionChanged() ),
this, SLOT ( SelectionIntoArgument() ) ) ; this, SLOT ( SelectionIntoArgument() ) ) ;
@ -163,7 +163,7 @@ void MeasureGUI_Skeleton::DeactivateActiveDialog()
{ {
setEnabled( false ); setEnabled( false );
SalomeApp_SelectionMgr* aSel = ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(); LightApp_SelectionMgr* aSel = ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr();
if ( aSel ) if ( aSel )
disconnect( aSel, 0, this, 0 ); disconnect( aSel, 0, this, 0 );
@ -185,7 +185,7 @@ void MeasureGUI_Skeleton::ActivateThisDialog()
myGeomGUI->SetActiveDialogBox( ( QDialog* )this ); myGeomGUI->SetActiveDialogBox( ( QDialog* )this );
SalomeApp_SelectionMgr* aSel = ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(); LightApp_SelectionMgr* aSel = ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr();
if ( aSel ) if ( aSel )
connect( aSel, SIGNAL( currentSelectionChanged() ), connect( aSel, SIGNAL( currentSelectionChanged() ),
this, SLOT ( SelectionIntoArgument() ) ) ; this, SLOT ( SelectionIntoArgument() ) ) ;
@ -245,7 +245,7 @@ void MeasureGUI_Skeleton::processObject()
//================================================================================= //=================================================================================
void MeasureGUI_Skeleton::closeEvent( QCloseEvent* e ) void MeasureGUI_Skeleton::closeEvent( QCloseEvent* e )
{ {
SalomeApp_SelectionMgr* aSel = ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(); LightApp_SelectionMgr* aSel = ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr();
if ( aSel ) if ( aSel )
disconnect( aSel, 0, this, 0 ); disconnect( aSel, 0, this, 0 );
QDialog::closeEvent( e ); QDialog::closeEvent( e );

2
src/OperationGUI/OperationGUI_ArchimedeDlg.cxx
View File

@ -32,7 +32,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>

2
src/OperationGUI/OperationGUI_ChamferDlg.cxx
View File

@ -33,7 +33,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "OCCViewer_ViewModel.h" #include "OCCViewer_ViewModel.h"
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>

2
src/OperationGUI/OperationGUI_FilletDlg.cxx
View File

@ -33,7 +33,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "OCCViewer_ViewModel.h" #include "OCCViewer_ViewModel.h"
#include "qlabel.h" #include "qlabel.h"

2
src/OperationGUI/OperationGUI_MaterialDlg.cxx
View File

@ -30,7 +30,7 @@
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "utilities.h" #include "utilities.h"

2
src/OperationGUI/OperationGUI_PartitionDlg.cxx
View File

@ -34,7 +34,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qcheckbox.h> #include <qcheckbox.h>
#include <qcombobox.h> #include <qcombobox.h>

2
src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>

2
src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>

2
src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>

2
src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>

2
src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>

2
src/RepairGUI/RepairGUI_CloseContourDlg.cxx
View File

@ -29,7 +29,7 @@
#include "RepairGUI_CloseContourDlg.h" #include "RepairGUI_CloseContourDlg.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SALOME_ListIteratorOfListIO.hxx" #include "SALOME_ListIteratorOfListIO.hxx"

2
src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
View File

@ -29,7 +29,7 @@
#include "RepairGUI_DivideEdgeDlg.h" #include "RepairGUI_DivideEdgeDlg.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SALOME_ListIteratorOfListIO.hxx" #include "SALOME_ListIteratorOfListIO.hxx"

2
src/RepairGUI/RepairGUI_FreeBoundDlg.cxx
View File

@ -33,7 +33,7 @@
#include "GEOMImpl_Types.hxx" #include "GEOMImpl_Types.hxx"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>

2
src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
View File

@ -29,7 +29,7 @@
#include "RepairGUI_FreeFacesDlg.h" #include "RepairGUI_FreeFacesDlg.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "SalomeApp_Tools.h" #include "SalomeApp_Tools.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"

2
src/RepairGUI/RepairGUI_GlueDlg.cxx
View File

@ -32,7 +32,7 @@
#include "QtxDblSpinBox.h" #include "QtxDblSpinBox.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "SalomeApp_Study.h" #include "SalomeApp_Study.h"
#include "SalomeApp_Tools.h" #include "SalomeApp_Tools.h"

2
src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
View File

@ -29,7 +29,7 @@
#include "RepairGUI_RemoveHolesDlg.h" #include "RepairGUI_RemoveHolesDlg.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "SUIT_MessageBox.h" #include "SUIT_MessageBox.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"

2
src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
View File

@ -29,7 +29,7 @@
#include "RepairGUI_RemoveIntWiresDlg.h" #include "RepairGUI_RemoveIntWiresDlg.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SALOME_ListIteratorOfListIO.hxx" #include "SALOME_ListIteratorOfListIO.hxx"

2
src/RepairGUI/RepairGUI_SewingDlg.cxx
View File

@ -29,7 +29,7 @@
#include "RepairGUI_SewingDlg.h" #include "RepairGUI_SewingDlg.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SUIT_MessageBox.h" #include "SUIT_MessageBox.h"
#include "SALOME_ListIteratorOfListIO.hxx" #include "SALOME_ListIteratorOfListIO.hxx"

2
src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
View File

@ -31,7 +31,7 @@
#include "GEOMImpl_Types.hxx" #include "GEOMImpl_Types.hxx"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SALOME_ListIteratorOfListIO.hxx" #include "SALOME_ListIteratorOfListIO.hxx"
#include "SALOME_ListIO.hxx" #include "SALOME_ListIO.hxx"

2
src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
View File

@ -29,7 +29,7 @@
#include "RepairGUI_SuppressFacesDlg.h" #include "RepairGUI_SuppressFacesDlg.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SALOME_ListIteratorOfListIO.hxx" #include "SALOME_ListIteratorOfListIO.hxx"

2
src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qcheckbox.h> #include <qcheckbox.h>
#include <qlabel.h> #include <qlabel.h>

2
src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qcheckbox.h> #include <qcheckbox.h>
#include <qlabel.h> #include <qlabel.h>

2
src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>

2
src/TransformationGUI/TransformationGUI_OffsetDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>
#include <qcheckbox.h> #include <qcheckbox.h>

2
src/TransformationGUI/TransformationGUI_PositionDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>
#include <qcheckbox.h> #include <qcheckbox.h>

2
src/TransformationGUI/TransformationGUI_RotationDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qcheckbox.h> #include <qcheckbox.h>
#include <qlabel.h> #include <qlabel.h>

2
src/TransformationGUI/TransformationGUI_ScaleDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qlabel.h> #include <qlabel.h>
#include <qcheckbox.h> #include <qcheckbox.h>

2
src/TransformationGUI/TransformationGUI_TranslationDlg.cxx
View File

@ -31,7 +31,7 @@
#include "SUIT_Desktop.h" #include "SUIT_Desktop.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include <qcheckbox.h> #include <qcheckbox.h>
#include <qlabel.h> #include <qlabel.h>