]> SALOME platform Git repositories - modules/geom.git/commitdiff
Salome HOME
Using files from package LightApp instead of SalomeApp
authornds <nds@opencascade.com>
Thu, 3 Nov 2005 08:30:14 +0000 (08:30 +0000)
committernds <nds@opencascade.com>
Thu, 3 Nov 2005 08:30:14 +0000 (08:30 +0000)
79 files changed:
src/BasicGUI/BasicGUI_ArcDlg.cxx
src/BasicGUI/BasicGUI_CircleDlg.cxx
src/BasicGUI/BasicGUI_CurveDlg.cxx
src/BasicGUI/BasicGUI_EllipseDlg.cxx
src/BasicGUI/BasicGUI_LineDlg.cxx
src/BasicGUI/BasicGUI_MarkerDlg.cxx
src/BasicGUI/BasicGUI_PlaneDlg.cxx
src/BasicGUI/BasicGUI_PointDlg.cxx
src/BasicGUI/BasicGUI_VectorDlg.cxx
src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
src/BlocksGUI/BlocksGUI_BlockDlg.cxx
src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
src/BlocksGUI/BlocksGUI_PropagateDlg.cxx
src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx
src/BlocksGUI/BlocksGUI_TrsfDlg.cxx
src/BooleanGUI/BooleanGUI_Dialog.cxx
src/BuildGUI/BuildGUI_CompoundDlg.cxx
src/BuildGUI/BuildGUI_EdgeDlg.cxx
src/BuildGUI/BuildGUI_FaceDlg.cxx
src/BuildGUI/BuildGUI_ShellDlg.cxx
src/BuildGUI/BuildGUI_SolidDlg.cxx
src/BuildGUI/BuildGUI_WireDlg.cxx
src/DisplayGUI/DisplayGUI.cxx
src/EntityGUI/EntityGUI_SketcherDlg.cxx
src/EntityGUI/EntityGUI_SubShapeDlg.cxx
src/GEOMBase/GEOMBase_Helper.cxx
src/GEOMBase/GEOMBase_Skeleton.cxx
src/GEOMFiltersSelection/GEOM_OCCFilter.cxx
src/GEOMFiltersSelection/GEOM_OCCFilter.h
src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx
src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx
src/GEOMGUI/GEOMGUI_OCCSelector.cxx
src/GEOMGUI/GEOMGUI_OCCSelector.h
src/GEOMGUI/GEOMGUI_Selection.cxx
src/GEOMGUI/GEOMGUI_Selection.h
src/GEOMGUI/GEOM_Displayer.cxx
src/GEOMGUI/GEOM_Displayer.h
src/GEOMGUI/GeometryGUI.cxx
src/GEOMGUI/GeometryGUI.h
src/GEOMToolsGUI/GEOMToolsGUI.cxx
src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
src/GenerationGUI/GenerationGUI_FillingDlg.cxx
src/GenerationGUI/GenerationGUI_PipeDlg.cxx
src/GenerationGUI/GenerationGUI_PrismDlg.cxx
src/GenerationGUI/GenerationGUI_RevolDlg.cxx
src/GroupGUI/GroupGUI.cxx
src/GroupGUI/GroupGUI_GroupDlg.cxx
src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx
src/MeasureGUI/MeasureGUI_PointDlg.cxx
src/MeasureGUI/MeasureGUI_Skeleton.cxx
src/OperationGUI/OperationGUI_ArchimedeDlg.cxx
src/OperationGUI/OperationGUI_ChamferDlg.cxx
src/OperationGUI/OperationGUI_FilletDlg.cxx
src/OperationGUI/OperationGUI_MaterialDlg.cxx
src/OperationGUI/OperationGUI_PartitionDlg.cxx
src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx
src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx
src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
src/RepairGUI/RepairGUI_CloseContourDlg.cxx
src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
src/RepairGUI/RepairGUI_FreeBoundDlg.cxx
src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
src/RepairGUI/RepairGUI_GlueDlg.cxx
src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
src/RepairGUI/RepairGUI_SewingDlg.cxx
src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx
src/TransformationGUI/TransformationGUI_OffsetDlg.cxx
src/TransformationGUI/TransformationGUI_PositionDlg.cxx
src/TransformationGUI/TransformationGUI_RotationDlg.cxx
src/TransformationGUI/TransformationGUI_ScaleDlg.cxx
src/TransformationGUI/TransformationGUI_TranslationDlg.cxx

index 0aa8408a3e3e5c8c4ad4f25917443883c7028d4a..07de548cd3268e74d5a00c009e96fa8655e36f9c 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 
index 503489d1bc0504815c56b49736dca749200a946e..8476ef36e037b614fefadf688863fac47cdbc2f9 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 
index 8fba90e2f488125326c5fd7459d3efa4a2c6fe85..a558a22f0fded01c7f9860b5487a7cf5489cfca8 100644 (file)
@@ -30,7 +30,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 
index 85cf7a7e1b1b1ca6316d640f46dbc569f9faa53e..273d3267af865b3491bfe1329e3983e2320dc8a4 100644 (file)
@@ -30,7 +30,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 
index 308f66146787b9b9d84c42bd15aabb72e9e3ca93..014f7e18c440f07a45ab13486a790e7ab3d80791 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 
index a276a06553561e8a85b5efbe0083615e70adb608..faf073950ca762b68bd15ea6dc6cf0cfa9735541 100644 (file)
@@ -32,7 +32,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 
index eee53f1d469efec0427fb0c172e13f639367a53f..544f2611de1b8b884002526c80426ba2fedf220d 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 
index 29b7bf62e30dc7057753ddd0e8932d5728409c85..b63a8bd1ed0fb8d374576138e5225a56ccc8183f 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include "GEOMImpl_Types.hxx"
 
index 3581fca1a88cd9b8d5da165cba2fe2a585d8b570..8860b2e48129dc88cb29e2ea0dbd210909c50bbc 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 
index cf56ed78cce9c73e67cde46bbc99ac4eafcc63d5..168c8bc7b818e1a6a3de65fd0be7366a84d1edd4 100644 (file)
@@ -32,7 +32,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <Geom_Surface.hxx>
 #include <Geom_Plane.hxx>
index 059c8facd8e0477ae68493499e358e1c918b6f02..5d0444ea468642b2bf4e577973d13055ab1089d0 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include "GEOMImpl_Types.hxx"
 
index 9ebdd93eccaca6923b2441c292d5ab7c6e9c84fa..728082a4e9f3e4db14107f99683102fe4977294a 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "OCCViewer_ViewModel.h"
 #include "SALOME_ListIteratorOfListIO.hxx"
 
index de52f9992099131efe1e95368038bc89b7603678..0c4bdc44bb05a92606c778b491c5cfc6f2ae3466 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <TColStd_MapOfInteger.hxx>
 
index 72f017df2fc7c8f5321417c35ac4db57a74dd24c..ebf979a2b0002e40d693daf08a932568ce9d1769 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 //using namespace std;
 
index 7dca35c48c04a58a9e335f9596487fcd72f5be3a..b58b8c62d47753a6b1c58510d56887f3b03db942 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "OCCViewer_ViewModel.h"
 
 #include <TColStd_IndexedMapOfInteger.hxx>
index a50f0881cc3fe3346e3899fa46cdacb93744186d..c1e4e6d5ddab7922c0c4c9d244f516df42f87a87 100644 (file)
@@ -32,7 +32,7 @@
 
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 
index df8814144f69bb308f922d74374e33227528b4a3..d993cbbe00188566901077da000a6b50731cd970 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 
index ae81504074ebac116fb5076b892c48b5443e4b96..e43e9e6f9d7b1a4e00481b3bd779580c07f8ace2 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 
index 3b7a2c08a19ca852eec5d27c00cb3632bff895e5..f9a5891f2574759e2be4857642ae5c0ef3b471de 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 //Qt includes
 #include <qcheckbox.h>
index 5972e29941a50fc4c925d7cef7a848ae4f372d45..54fd59132151d82b6dfa002919d02e69349dab69 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include "TColStd_MapOfInteger.hxx"
 
index f871dbf799d2636638ba7eee5bcdc75698e03d7f..9dbdec0db4269489681bb64bde216127ba13c34b 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 //Qt includes
 #include <qcheckbox.h>
index 425cb14a01f07c4c7fb5046d48ce73f32919ed16..9775a5cb155181789f5447cc45df78ba1719e7b7 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include "TColStd_MapOfInteger.hxx"
 
index 6f337597d9fb09b029197ae3df0c1339d16c9863..0ee5a70ee55f03aa5db1f84e5bd5441086a3a01d 100644 (file)
 #include <SVTK_Prs.h>
 #include <SOCC_Prs.h>
 
+#include <QtxActionMenuMgr.h>
+
 #include <SalomeApp_Application.h>
-#include <SalomeApp_SelectionMgr.h>
+#include <LightApp_SelectionMgr.h>
 #include <SalomeApp_Study.h>
 
 #include <AIS_ListIteratorOfListOfInteractive.hxx>
@@ -234,7 +236,7 @@ void DisplayGUI::Display()
   if ( !anActiveStudy ) return;
   
   //get SalomeApp selection manager
-  SalomeApp_SelectionMgr* aSelMgr = app->selectionMgr();
+  LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
   if ( !aSelMgr ) return;
   
   SALOME_ListIO aList;
@@ -290,7 +292,7 @@ void DisplayGUI::Erase()
   if ( !anActiveStudy ) return;
   
   //get SalomeApp selection manager
-  SalomeApp_SelectionMgr* aSelMgr = app->selectionMgr();
+  LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
   if ( !aSelMgr ) return;
   
   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() );
   if ( !app ) return;
 
-  SalomeApp_SelectionMgr* aSelMgr = app->selectionMgr();
+  LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
   if ( !aSelMgr ) return;
   
   SUIT_OverrideCursor();
index 8224cc58135a2a80ba16bcc709ea9fa966380923..0e6a141d5cfb20b14b1130b92308a197bc840816 100644 (file)
@@ -35,7 +35,7 @@
 #include "SUIT_MessageBox.h"
 #include "SUIT_ResourceMgr.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qpushbutton.h>
 #include <qlabel.h>
index 0e55e14ccaf358300ebbd0eb309dd443d027870d..27c0b6c873f472daea543c1b1b4c76511c0e0647 100644 (file)
@@ -33,7 +33,7 @@
 #include "SUIT_Session.h"
 #include "OCCViewer_ViewModel.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "SALOME_ListIteratorOfListIO.hxx"
 
 #include <TColStd_IndexedMapOfInteger.hxx>
index c2e7114d335a8a75a1b20b150a445a8c83d6343c..f48979a4ef4fbcd6b5ae9d2f6cabc22a6dc8c12c 100755 (executable)
@@ -43,7 +43,7 @@
 #include <SalomeApp_Module.h>
 #include <SalomeApp_Application.h>
 #include <SalomeApp_Study.h>
-#include <SalomeApp_SelectionMgr.h>
+#include <LightApp_SelectionMgr.h>
 #include <SalomeApp_Tools.h>
 #include <SalomeApp_DataModel.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() );
   if ( app ) {
-    SalomeApp_SelectionMgr* aSelMgr = app->selectionMgr();
+    LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
     if ( aSelMgr )
       aSelMgr->selectedObjects( mySelected );
   }
index 93eeb0a904e5eead2fadddaad8bca2de2c7df94e..84760134d3a45ff2bc892dc0f6ab811c47f1e31e 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qpushbutton.h>
 
index 6f22d93c18f7a1d61549e217a176d59b0d5acb0e..95367104555907462b8e3d1702c925caf09187db 100644 (file)
@@ -1,7 +1,7 @@
 #include "GEOM_OCCFilter.h"
 
-#include <SalomeApp_SelectionMgr.h> 
-#include <SalomeApp_DataOwner.h>
+#include <LightApp_SelectionMgr.h> 
+#include <LightApp_DataOwner.h>
 
 #include <SALOME_InteractiveObject.hxx>
 
@@ -15,7 +15,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOM_OCCFilter, SelectMgr_Filter)
 // function : GEOM_OCCFilter
 // purpose  : 
 //=======================================================================
-GEOM_OCCFilter::GEOM_OCCFilter( SalomeApp_SelectionMgr* theSelMgr )
+GEOM_OCCFilter::GEOM_OCCFilter( LightApp_SelectionMgr* theSelMgr )
   : SelectMgr_Filter()
 {
   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()); 
   if ( anIO.IsNull() ) return false;
   
-  return mySelMgr->isOk( new SalomeApp_DataOwner( QString( anIO->getEntry() ) ) );
+  return mySelMgr->isOk( new LightApp_DataOwner( QString( anIO->getEntry() ) ) );
 }
index b19764305618d506d3ae2825cc575045eb2c3e8b..2d477ccab44dcb6ec27d56615002127bc6c53dfb 100644 (file)
@@ -5,18 +5,18 @@
 
 #include <Standard_DefineHandle.hxx>
 
-class SalomeApp_SelectionMgr;
+class LightApp_SelectionMgr;
 
 class GEOM_OCCFilter : public SelectMgr_Filter
 {
 public:
-  Standard_EXPORT GEOM_OCCFilter( SalomeApp_SelectionMgr* theSelMgr);
+  Standard_EXPORT GEOM_OCCFilter( LightApp_SelectionMgr* theSelMgr);
   Standard_EXPORT ~GEOM_OCCFilter();
   
   Standard_EXPORT virtual Standard_Boolean IsOk( const Handle(SelectMgr_EntityOwner)& anObj ) const;
     
 private:
-  SalomeApp_SelectionMgr* mySelMgr;
+  LightApp_SelectionMgr* mySelMgr;
 
 public:
   
index 815ff81cb012695d78efa923d203038d45609020..ae7543320602c4419504573310a2781b9ac869d3 100644 (file)
@@ -1,6 +1,6 @@
 #include "GEOM_PreviewFilter.h"
 
-#include <SalomeApp_DataOwner.h>
+#include <LightApp_DataOwner.h>
 
 //=======================================================================
 // function : GEOM_SelectionFilter
@@ -25,7 +25,7 @@ GEOM_PreviewFilter::~GEOM_PreviewFilter()
 //=======================================================================
 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" ) );
 }
 
index 33e3a9482c2f0d451c08990cbebcd4b3f3f67ecd..4e027b87bf74f240545835361ec0c6efee04ce9b 100644 (file)
@@ -2,7 +2,7 @@
 
 #include "GEOM_Client.hxx"
 
-#include <SalomeApp_DataOwner.h>
+#include <LightApp_DataOwner.h>
 #include <SalomeApp_Study.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;
 
-  const SalomeApp_DataOwner* owner = dynamic_cast<const SalomeApp_DataOwner*>(sOwner);
+  const LightApp_DataOwner* owner = dynamic_cast<const LightApp_DataOwner*>(sOwner);
   SalomeApp_Study* appStudy = getStudy();
   if (owner && appStudy)
   {
index e9f04b03614c56fa1f96609e2b04bb5b3d1fb5da..c8604d3ce98c9a581285286fc500258661cfe471 100644 (file)
@@ -1,6 +1,6 @@
 #include "GEOMGUI_OCCSelector.h"
 
-#include <SalomeApp_DataSubOwner.h>
+#include <LightApp_DataSubOwner.h>
 
 #include <OCCViewer_ViewModel.h>
 
@@ -26,7 +26,7 @@
 // Purpose  : 
 //================================================================
 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() )
            {
-             SalomeApp_DataOwner* owner;
+             LightApp_DataOwner* owner;
              if ( index > -1 ) // Local Selection
-               owner = new SalomeApp_DataSubOwner( entryStr, index );
+               owner = new LightApp_DataSubOwner( entryStr, index );
              else // Global Selection
-               owner = new SalomeApp_DataOwner( entryStr );
+               owner = new LightApp_DataOwner( entryStr );
 
              aList.append( SUIT_DataOwnerPtr( owner ) );
            }
@@ -99,7 +99,7 @@ void GEOMGUI_OCCSelector::getSelection( SUIT_DataOwnerPtrList& aList ) const
          
          if ( !entryStr.isEmpty() )
            {
-             SalomeApp_DataOwner* owner = new SalomeApp_DataOwner( entryStr );
+             LightApp_DataOwner* owner = new LightApp_DataOwner( entryStr );
              aList.append( SUIT_DataOwnerPtr( owner ) );
            }
        }
@@ -168,7 +168,7 @@ void GEOMGUI_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList )
   // "entry - to - list_of_ids" map
   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 )
     {
       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
     {
-      const SalomeApp_DataOwner* owner = dynamic_cast<const SalomeApp_DataOwner*>( (*itr).operator->() );
+      const LightApp_DataOwner* owner = dynamic_cast<const LightApp_DataOwner*>( (*itr).operator->() );
       if ( owner )
       {
        globalSelMap[owner->entry()] = 1;
index 70ab0b77c4325d039b038e07f856bbf95423650d..dbcdc0cd53dcf7d5e6d2c3f5c0bab35ffd137f4d 100644 (file)
@@ -1,9 +1,9 @@
 #ifndef 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:
   GEOMGUI_OCCSelector( OCCViewer_Viewer*, SUIT_SelectionMgr* );
index bc44c2b0bb4677d829f11e7dc6b9c0575df107b3..be0e2dd840fd53e3ea740f99aa43c5554dfd06bc 100644 (file)
@@ -3,7 +3,7 @@
 #include "GeometryGUI.h"
 #include "GEOM_Displayer.h"
 
-#include <SalomeApp_DataOwner.h>
+#include <LightApp_DataOwner.h>
 #include <SalomeApp_Study.h>
 
 #include <OCCViewer_ViewModel.h>
@@ -47,8 +47,8 @@ GEOMGUI_Selection::~GEOMGUI_Selection()
 QtxValue GEOMGUI_Selection::globalParam( const QString& p ) const
 {
   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
@@ -61,7 +61,7 @@ QtxValue GEOMGUI_Selection::param( const int ind, const QString& p ) const
   else if ( p == "displaymode" )
     return QtxValue( displayMode( ind ) );
   else
-    return SalomeApp_Selection::param( ind, p );
+    return LightApp_Selection::param( ind, p );
 }
 
 QString GEOMGUI_Selection::typeName( const int index ) const
index 0a6f9f21799a7ae8bc5383e24a34a9156f05afca..fe7a6bc9accf2e6f5c27f07a8b8d0f1413dc353d 100644 (file)
 #ifndef GEOMGUI_SELECTION_HeaderFile
 #define GEOMGUI_SELECTION_HeaderFile
 
-#include <SalomeApp_Selection.h>
+#include <LightApp_Selection.h>
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(GEOM_Gen)
 
-class GEOMGUI_Selection : public SalomeApp_Selection
+class GEOMGUI_Selection : public LightApp_Selection
 {
 public:
   GEOMGUI_Selection();
index 4ee4823ddc3e6b61c7dfc0b7247ace8cb15ac621..e13cba929e188f2da6de86d914c928f8353cc722 100644 (file)
@@ -51,7 +51,7 @@
 
 #include <SalomeApp_Study.h>
 #include <SalomeApp_Application.h>
-#include <SalomeApp_SelectionMgr.h>
+#include <LightApp_SelectionMgr.h>
 #include <SalomeApp_TypeFilter.h>
 #include <SalomeApp_Tools.h>
 
@@ -759,7 +759,7 @@ SALOME_Prs* GEOM_Displayer::buildPresentation( const QString& entry,
 
   if ( myViewFrame )
   {
-    prs = SalomeApp_Displayer::buildPresentation( entry, theViewFrame );
+    prs = LightApp_Displayer::buildPresentation( entry, theViewFrame );
     if ( prs )
     {
       Handle( SALOME_InteractiveObject ) theIO = new SALOME_InteractiveObject();
@@ -829,7 +829,7 @@ void GEOM_Displayer::LocalSelection( const Handle(SALOME_InteractiveObject)& the
   if ( !app )
     return;
 
-  SalomeApp_SelectionMgr* sm = app->selectionMgr();
+  LightApp_SelectionMgr* sm = app->selectionMgr();
 
   // remove all filters from selection
   sm->clearFilters();
@@ -880,7 +880,7 @@ void GEOM_Displayer::GlobalSelection( const TColStd_MapOfInteger& theModes,
   vf->GlobalSelection( update );
 
   // Set selection filters in accordance with current mode
-  SalomeApp_SelectionMgr* sm = app->selectionMgr();
+  LightApp_SelectionMgr* sm = app->selectionMgr();
   if ( !sm )
     return;
 
@@ -1053,7 +1053,7 @@ bool GEOM_Displayer::ToActivate() const
  *  Removes from selection temporary objects
  */
 //=================================================================
-void GEOM_Displayer::clearTemporary( SalomeApp_SelectionMgr* theSelMgr )
+void GEOM_Displayer::clearTemporary( LightApp_SelectionMgr* theSelMgr )
 {
   SALOME_ListIO selected, toSelect;
   theSelMgr->selectedObjects( selected );
index 4091324b34186e5e4efe864a85f0db9f523d742d..72718951f21789504189bb3d0aa21c2c063ec77e 100644 (file)
@@ -34,7 +34,7 @@
 #include "SALOME_ListIO.hxx"
 #include <TopoDS_Shape.hxx>
 #include <Quantity_Color.hxx>
-#include <SalomeApp_Displayer.h>
+#include <LightApp_Displayer.h>
 
 #include <list>
 
@@ -49,7 +49,7 @@
 typedef std::list<GEOM::GEOM_Object_ptr> ObjectList;
 
 class TColStd_MapOfInteger;
-class SalomeApp_SelectionMgr;
+class LightApp_SelectionMgr;
 class SalomeApp_Study;
 class SUIT_SelectionFilter;
 //class SALOME_Selection;
@@ -64,7 +64,7 @@ class SUIT_SelectionFilter;
 #define GEOMGUI_WNT_EXPORT
 #endif
 
-class GEOMGUI_WNT_EXPORT GEOM_Displayer : public SalomeApp_Displayer
+class GEOMGUI_WNT_EXPORT GEOM_Displayer : public LightApp_Displayer
 {
     
 public:
@@ -162,7 +162,7 @@ protected:
   /* Resets internal data */
   void        internalReset();
 
-  void        clearTemporary( SalomeApp_SelectionMgr* theSelMgr );
+  void        clearTemporary( LightApp_SelectionMgr* theSelMgr );
 
   SUIT_SelectionFilter* getFilter( const int theMode );
   
index 759e40e15b11186fc2d4bab4c36c669a36d4dd43..882b38a0e8c32fd31cc3b24864c6135ff0b600c7 100644 (file)
 #include <SVTK_ViewManager.h>
 
 #include <SalomeApp_Application.h>
-#include <SalomeApp_SelectionMgr.h>
-#include <SalomeApp_VTKSelector.h>
+#include <LightApp_SelectionMgr.h>
+#include <LightApp_VTKSelector.h>
 #include <SalomeApp_Study.h>
-#include <SalomeApp_Preferences.h>
+#include <LightApp_Preferences.h>
 #include <SALOME_LifeCycleCORBA.hxx>
 #include <SALOME_ListIO.hxx>
 
@@ -1105,7 +1105,7 @@ bool GeometryGUI::activateModule( SUIT_Study* study )
   for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it )
     it.data()->activate( application()->desktop() );
 
-  SalomeApp_SelectionMgr* sm = getApp()->selectionMgr();
+  LightApp_SelectionMgr* sm = getApp()->selectionMgr();
   SUIT_ViewManager* vm;
   ViewManagerList OCCViewManagers, VTKViewManagers;
   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 ) );
   application()->viewManagers( SVTK_Viewer::Type(), VTKViewManagers );
   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
   getApp()->selectionMgr()->setEnabled( false, OCCViewer_Viewer::Type() );
@@ -1122,7 +1122,7 @@ bool GeometryGUI::activateModule( SUIT_Study* study )
   
   // disable VTK selectors
   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);
   
   return true;
@@ -1512,7 +1512,7 @@ void GeometryGUI::onViewManagerAdded( SUIT_ViewManager* vm )
 {
   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 ) );
 
     // disable OCC selectors
@@ -1522,12 +1522,12 @@ void GeometryGUI::onViewManagerAdded( SUIT_ViewManager* vm )
   }
   else if ( vm->getType() == SVTK_Viewer::Type() )
   {
-    SalomeApp_SelectionMgr* sm = getApp()->selectionMgr();
-    myVTKSelectors.append( new SalomeApp_VTKSelector( dynamic_cast<SVTK_Viewer*>( vm->getViewModel() ), sm ) );
-    
+    LightApp_SelectionMgr* sm = getApp()->selectionMgr();
+    myVTKSelectors.append( new LightApp_VTKSelector( dynamic_cast<SVTK_Viewer*>( vm->getViewModel() ), sm ) );
+
     // disable VTK selectors
     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);
   }
 }
@@ -1546,7 +1546,7 @@ void GeometryGUI::onViewManagerRemoved( SUIT_ViewManager* vm )
   }
   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 )
       {
        myVTKSelectors.remove( sr );
@@ -1562,7 +1562,7 @@ QString GeometryGUI::engineIOR() const
   return QString( "" );
 }
 
-SalomeApp_Selection* GeometryGUI::createSelection() const
+LightApp_Selection* GeometryGUI::createSelection() const
 {
   return new GEOMGUI_Selection();
 }
@@ -1588,11 +1588,11 @@ void GeometryGUI::createPreferences()
 
   int genGroup = addPreference( tr( "PREF_GROUP_GENERAL" ), tabId );
   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,
-                           SalomeApp_Preferences::IntSpin, "Geometry", "SettingsGeomStep" );
+                           LightApp_Preferences::IntSpin, "Geometry", "SettingsGeomStep" );
   int dispmode = addPreference( tr( "PREF_DISPLAY_MODE" ), genGroup,
-                           SalomeApp_Preferences::Selector, "Geometry", "display_mode" );
+                           LightApp_Preferences::Selector, "Geometry", "display_mode" );
 
   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 )
     myDisplayer = new GEOM_Displayer( dynamic_cast<SalomeApp_Study*>( getApp()->activeStudy() ) );
index 8ed80aee24dbc407d731b9556f15420e0f5f092b..57f0d65420412352affd4e89106b45caa940b728 100644 (file)
@@ -70,7 +70,8 @@ typedef QMap<QString, GEOMGUI*> GUIMap;
 class QDialog;
 class QPopupMenu;
 class GEOMGUI_OCCSelector;
-class SalomeApp_VTKSelector;
+class LightApp_VTKSelector;
+class LightApp_Selection;
 class SUIT_ViewManager;
 
 //=================================================================================
@@ -88,7 +89,7 @@ public:
   // Destructor
   ~GeometryGUI();
 
-  virtual SalomeApp_Displayer* displayer();
+  virtual LightApp_Displayer* displayer();
   virtual void                initialize( CAM_Application* );
   virtual QString             engineIOR() const;
 
@@ -157,7 +158,7 @@ signals :
   void                        SignalDefaultStepValueChanged( double newVal );
 
 protected:
-  virtual SalomeApp_Selection* createSelection() const;
+  virtual LightApp_Selection* createSelection() const;
 
 private:
   GEOMGUI*                    getLibrary( const QString& libraryName );
@@ -181,9 +182,9 @@ private:
   QMap<int,QString>           myRules;           // popup rules
 
   QPtrList<GEOMGUI_OCCSelector>   myOCCSelectors;
-  QPtrList<SalomeApp_VTKSelector> myVTKSelectors;
+  QPtrList<LightApp_VTKSelector> myVTKSelectors;
 
-  SalomeApp_Displayer*        myDisplayer;
+  LightApp_Displayer*         myDisplayer;
 
 friend class DisplayGUI;
 };
index 84733dc543c7842a6641216ed94ae9e60133922c..03d85716884fef4ed05e60e5f1490f38d5d299d4 100644 (file)
@@ -45,7 +45,7 @@
 
 #include <SalomeApp_Application.h>
 #include <SalomeApp_Study.h>
-#include <SalomeApp_SelectionMgr.h>
+#include <LightApp_SelectionMgr.h>
 
 #include <SALOME_ListIteratorOfListIO.hxx>
 #include <SALOME_Prs.h>
@@ -229,7 +229,7 @@ void GEOMToolsGUI::OnEditDelete()
   SALOME_ListIO selected;
   SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
   if ( app ) {
-    SalomeApp_SelectionMgr* aSelMgr = app->selectionMgr();
+    LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
     SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
     if ( aSelMgr && appStudy ) {
       aSelMgr->selectedObjects( selected, QString::null, false );
@@ -541,7 +541,7 @@ bool GEOMToolsGUI::Export()
     aMap.insert( (char*)aPatterns[i], (char*)aFormats[i] );
 
   // Get selected objects
-  SalomeApp_SelectionMgr* sm = app->selectionMgr();
+  LightApp_SelectionMgr* sm = app->selectionMgr();
   if ( !sm )
     return false;
 
index 8c2d260307cfe799492168184a420a788e5da75b..56004de661577224e4317faf8b2ac6437ab116fb 100644 (file)
@@ -57,7 +57,7 @@
 #include <SUIT_MessageBox.h>
 
 #include <SalomeApp_Application.h>
-#include <SalomeApp_SelectionMgr.h>
+#include <LightApp_SelectionMgr.h>
 #include <SalomeApp_Study.h>
 #include <SalomeApp_Module.h>
 
@@ -170,7 +170,7 @@ void GEOMToolsGUI::OnRename()
   SALOME_ListIO selected;
   SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
   if ( app ) {
-    SalomeApp_SelectionMgr* aSelMgr = app->selectionMgr();
+    LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
     SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
     if ( aSelMgr && appStudy ) {
       aSelMgr->selectedObjects( selected );
@@ -225,7 +225,7 @@ void GEOMToolsGUI::OnColor()
   SALOME_ListIO selected;
   SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
   if ( app ) {
-    SalomeApp_SelectionMgr* aSelMgr = app->selectionMgr();
+    LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
     if ( aSelMgr ) {
       aSelMgr->selectedObjects( selected );
       if ( !selected.IsEmpty() ) {
index eb642a433fbbf481a241151f22d327a2a57ec0ae..45c470789884dc682ac40016b2aaff9beb1c1a33 100644 (file)
@@ -48,7 +48,7 @@
 #include <SUIT_OverrideCursor.h>
 
 #include <SalomeApp_Application.h>
-#include <SalomeApp_SelectionMgr.h>
+#include <LightApp_SelectionMgr.h>
 
 #include <qframe.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() );
   if ( !app )
     return;
-  SalomeApp_SelectionMgr* aSelMgr = app->selectionMgr();
+  LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
   if ( !aSelMgr )
     return;
   SALOME_ListIO selected;
index 6987ad088822c5df33d4bf626e757dc31064c4c9..5dde019e0e63818c870813ad99cb3598d6281880 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <GeomFill_SectionGenerator.hxx>
 #include <GeomFill_Line.hxx>
index 9a59cda5e74fb99b684f2a36bee79d5ab1d41419..5cf2f1458a4e82520bbf5898c8fe9fdd2e6b747f 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 
index 7ab104b48b17559cf46685446976c97e0fc9916d..bc3aa51dc45ad4ce5c11cf02573d85c174a98026 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <BRepPrimAPI_MakePrism.hxx>
 #include <BRepAdaptor_Curve.hxx>
index 6856a9f48be1fa43dac950f6e2fc7560e75bb000..14c0d011d64afa7977b48730c50c961bfd0b2ccd 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <gp_Lin.hxx>
 #include <BRepAdaptor_Curve.hxx>
index e7a489013847d74ca140d89e5117dd30c739552e..5bfaf9fcadba7af09d0be1ab8cbf86a00f1189c6 100644 (file)
@@ -36,7 +36,7 @@
 #include "SUIT_MessageBox.h"
 #include "SalomeApp_Application.h"
 #include "SalomeApp_Study.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 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() );
       if ( app ) {
-       SalomeApp_SelectionMgr* aSelMgr = app->selectionMgr();
+       LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
        if ( aSelMgr )
          aSelMgr->selectedObjects( aList );
       }
index 15b7b03d967e35e6a5d390ccb0be139ed341c7d3..6785e8bf19fac810a2c147a6182c2dd23bd660ba 100644 (file)
@@ -32,7 +32,7 @@
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
 #include "SalomeApp_Study.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include "GEOMBase.h"
 
@@ -541,7 +541,7 @@ void GroupGUI_GroupDlg::highlightSubShapes()
     if ( myIdList->isSelected( ii ) )
       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->AddOrRemoveIndex( aSh->getIO(), anIds, false );
 
index 9c1a927e9f22627222da44e920761929583ae2f6..9191ebd3429e668d35a4a1752d8932c232f4eff3 100644 (file)
@@ -32,7 +32,7 @@
 #include "utilities.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "SalomeApp_Tools.h"
 
 #include <BRep_Tool.hxx>
index d5aab6ed4c6bacb02073cb2d303aec907b64e897..7db3bee11c663dd543cab985d80c07b633d5075a 100644 (file)
@@ -32,7 +32,7 @@
 #include "utilities.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <TColStd_MapOfInteger.hxx>
 #include <TopAbs_ShapeEnum.hxx>
index 4e89cddc86f30f77e6bbb3685cdc0b3b9070aa4f..bbfdb0741488abd6199c8634ce3fa36b48a203ae 100644 (file)
@@ -32,7 +32,7 @@
 #include "GeometryGUI.h"
 
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "SalomeApp_Tools.h"
 #include "SUIT_Session.h"
 #include "SUIT_OverrideCursor.h"
@@ -113,7 +113,7 @@ void MeasureGUI_Skeleton::Init()
   connect( mySelBtn,    SIGNAL( clicked() ),
            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 )
     connect( aSel, SIGNAL( currentSelectionChanged() ), 
             this, SLOT  ( SelectionIntoArgument() ) ) ;
@@ -163,7 +163,7 @@ void MeasureGUI_Skeleton::DeactivateActiveDialog()
 {
   setEnabled( false );
   
-  SalomeApp_SelectionMgr* aSel = ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr();
+  LightApp_SelectionMgr* aSel = ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr();
   if ( aSel )
     disconnect( aSel, 0, this, 0 );
   
@@ -185,7 +185,7 @@ void MeasureGUI_Skeleton::ActivateThisDialog()
   
   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 )
     connect( aSel, SIGNAL( currentSelectionChanged() ), 
             this, SLOT  ( SelectionIntoArgument() ) ) ;
@@ -245,7 +245,7 @@ void MeasureGUI_Skeleton::processObject()
 //=================================================================================
 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 )
     disconnect( aSel, 0, this, 0 );
   QDialog::closeEvent( e );
index 2efc7b0f081a0c9b67780690f4f38486a7b0995d..0d024e7f36e7a4cadb497e88709aa3cae7599b22 100644 (file)
@@ -32,7 +32,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 
index 38486902b6c4c7238aa393b9d0d8b0ae1e59d81c..79678b359ec0c39155681a521a1c8190a4cc2979 100644 (file)
@@ -33,7 +33,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "OCCViewer_ViewModel.h"
 
 #include <TColStd_MapOfInteger.hxx>
index 3516a9280560d305c0b4e22280a811e3300453eb..583aad057650338ec8ad25e26021d7fc6a4582bf 100644 (file)
@@ -33,7 +33,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "OCCViewer_ViewModel.h"
 
 #include "qlabel.h"
index e63383883021af07f92de92c89ade559f0313885..b3055d38d48a017da19b3fd662e38135e84b716f 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include "utilities.h"
 
index bedc631806594561823729d45198cfd1cd8802f9..9315616f4535d58c74371f206d897f015f47d058 100644 (file)
@@ -34,7 +34,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qcheckbox.h>
 #include <qcombobox.h>
index 6ad4bbc87b68d5ed1fd5a8075c984904dc34466f..ea44ad1bc27404e1f0bf74fce46d876736522394 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 
index 3339c7afe6e0e7b84a90e138491c6a02dc50c384..45db91182ccd5e630dce1bf9bb14d16561dea0e3 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 
index cf4e3d02005ca59fee02174423d66424f23f3f21..19aaff74d751166fb22b079d92cb38eeb3453497 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 
index 6ffba6e31e8bf2307d5d1421d26049a696e9b427..49bca1dc29108886072c59c8ec622d78c3e1011e 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 
index 287ce0d28c2b99a8481eeda0efc6cd210c786575..05e6c7b6c4aeef236c24e38b586fe05b5f01e859 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 
index ac98b0de8d06847dc3f09db891f77f0b39050098..e5bb3a708a9ef34b48e7af6522368ef7acf01fd3 100644 (file)
@@ -29,7 +29,7 @@
 #include "RepairGUI_CloseContourDlg.h"
 
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "SUIT_Session.h"
 #include "SALOME_ListIteratorOfListIO.hxx"
 
index 145daa37bd78459cdff47d0749d3fe4a1db96ac1..969b7162a38349640dac5a6ebb5786bd727ca621 100644 (file)
@@ -29,7 +29,7 @@
 #include "RepairGUI_DivideEdgeDlg.h"
 
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "SUIT_Session.h"
 #include "SALOME_ListIteratorOfListIO.hxx"
 
index add5736ac87fb38ba162ab2c9802aea9a7a48894..896c0f0d4a2fac3918c63aa5de7fb818857da1ee 100644 (file)
@@ -33,7 +33,7 @@
 #include "GEOMImpl_Types.hxx"
 
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "SUIT_Session.h"
 
 #include <TColStd_MapOfInteger.hxx>
index 04c2b19b0d26b42f421bea34a379de2772ef5163..3143b7feca8b769880780a6b2f3b8e38f132aa47 100644 (file)
@@ -29,7 +29,7 @@
 #include "RepairGUI_FreeFacesDlg.h"
 
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "SalomeApp_Tools.h"
 
 #include "SUIT_Session.h"
index 9988bb38d944f067e4223c6692c0babe707f780c..789a0a70468ce33756c6e51e04fc4a43868bb026 100644 (file)
@@ -32,7 +32,7 @@
 
 #include "QtxDblSpinBox.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "SalomeApp_Study.h"
 #include "SalomeApp_Tools.h"
 
index 4e8ecc34ef14c499b39af6fff40d2ebcee0b567f..6dc3188eb0eb3e5b43216a794ab7bd8d0a3bba6e 100644 (file)
@@ -29,7 +29,7 @@
 #include "RepairGUI_RemoveHolesDlg.h"
 
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "SUIT_MessageBox.h"
 #include "SUIT_Session.h"
 
index db6fd60356c0a2e2b3d8f1fcccbe4bcfdcb4aec6..91822ded94d17c1325e22a44842fb139682653a4 100644 (file)
@@ -29,7 +29,7 @@
 #include "RepairGUI_RemoveIntWiresDlg.h"
 
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "SUIT_Session.h"
 #include "SALOME_ListIteratorOfListIO.hxx"
 
index 2bd0ee30a743d47e3c8946110ca769327eb94186..05ed7750954bd0a3ca6c18ff6b033d7818e9a7f4 100644 (file)
@@ -29,7 +29,7 @@
 #include "RepairGUI_SewingDlg.h"
 
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "SUIT_Session.h"
 #include "SUIT_MessageBox.h"
 #include "SALOME_ListIteratorOfListIO.hxx"
index cb30f82dcf714f5f717da09c8561fb21b75183cd..7c9005a1a8eeaec081e594e7b35fd8922663a1d0 100755 (executable)
@@ -31,7 +31,7 @@
 #include "GEOMImpl_Types.hxx"
 
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "SUIT_Session.h"
 #include "SALOME_ListIteratorOfListIO.hxx"
 #include "SALOME_ListIO.hxx"
index ee38297a102296ec7c7dcc578567b14dae12e918..4d996d2a143a170a6ba26c750749d1460ed8c53d 100644 (file)
@@ -29,7 +29,7 @@
 #include "RepairGUI_SuppressFacesDlg.h"
 
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "SUIT_Session.h"
 #include "SALOME_ListIteratorOfListIO.hxx"
 
index d255e8f0b5600b544c7ac6f97a89919fe79181cc..8f09b83f83f4c3a72aaa000416e571a2383a0454 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qcheckbox.h>
 #include <qlabel.h>
index aa50241418f1f1a61b008b5fe50e5d24c62751b0..88b262a447730dc79d865a00e0f9bd6b0dca4cd5 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qcheckbox.h>
 #include <qlabel.h>
index 61671b81878d5d8ed1a2379696cae0b765b0e037..255df8858f2060a340a3fd51bef722157691df53 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 
index 3b4d896b5fbb3eea23546997b933e03267aa9272..805bc8a72821d631f148588e476e1c8b1eb80267 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 #include <qcheckbox.h>
index dc8a9b583b800146b48fd1d32b48c4595a0712b6..e16e3bbd37bc3f982da347f12d255585a6aeca75 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 #include <qcheckbox.h>
index 03f9cd8d13ece9dfd08c4af5620581d2e95f220d..7b1abd28b385c021363925c292fe90eae36a7581 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qcheckbox.h>
 #include <qlabel.h>
index 1690ae6d3febd4f092cabd74acebcb775f9e529e..a215ba028c2e96e3e3b10313a38948bbac84bbe1 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qlabel.h>
 #include <qcheckbox.h>
index c56d2e4020315f89f4ef9cafa682dc1ef9698477..d221fb855ab3b86b2719aaccfffb94d78478d485 100644 (file)
@@ -31,7 +31,7 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 
 #include <qcheckbox.h>
 #include <qlabel.h>