X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSalomeApp%2FSalomeApp_Module.cxx;h=600e3a6dc8c2470917b576a7d7b4cc66a4a09cc6;hb=331294345d3e1716fbf79ae25a2851011729be79;hp=9afbe27e491f286521ec3371ab3a4a5fc82b65e5;hpb=aa05f2a1b23a54321ea7248ae9ac3463652c734e;p=modules%2Fgui.git

diff --git a/src/SalomeApp/SalomeApp_Module.cxx b/src/SalomeApp/SalomeApp_Module.cxx
index 9afbe27e4..600e3a6dc 100644
--- a/src/SalomeApp/SalomeApp_Module.cxx
+++ b/src/SalomeApp/SalomeApp_Module.cxx
@@ -1,44 +1,58 @@
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
 // File:      SalomeApp_Module.cxx
 // Created:   10/25/2004 11:39:56 AM
 // Author:    Sergey LITONIN
-// Copyright (C) CEA 2004
 
 #include "SalomeApp_Module.h"
 #include "SalomeApp_DataModel.h"
 #include "SalomeApp_Application.h"
 #include "SalomeApp_Study.h"
+#include "SalomeApp_DataObject.h"
 
 #include "LightApp_Selection.h"
-#include "LightApp_Operation.h"
-#include "LightApp_Preferences.h"
-//#include "LightApp_Displayer.h"
 
 #include "CAM_DataModel.h"
 
-#include "OB_Browser.h"
+// temporary commented
+//#include "OB_Browser.h"
 
 #include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
 #include <SALOME_InteractiveObject.hxx>
-//#include <SALOME_Actor.h>
+          
+#include <LightApp_DataObject.h>
 
 #include <SUIT_Session.h>
-#include <SUIT_ViewModel.h>
-
-#include <SVTK_ViewWindow.h>
-//#include <SVTK_ViewModel.h>
-//#include <SVTK_MainWindow.h>
-//#include <SVTK_RenderWindowInteractor.h>
+#include <SUIT_DataBrowser.h>
+#include <SUIT_ViewManager.h>
+#include <SUIT_MessageBox.h>
+#include <SUIT_Desktop.h>
 
-#include <qstring.h>
-#include <qmap.h>
-
-//#include <vtkActorCollection.h>
-//#include <vtkRenderer.h>
+#include <QString>
 
 /*!Constructor.*/
 SalomeApp_Module::SalomeApp_Module( const QString& name )
-: LightApp_Module( name )
+  : LightApp_Module( name )
 {
 }
 
@@ -89,26 +103,26 @@ void SalomeApp_Module::extractContainers( const SALOME_ListIO& source, SALOME_Li
       _PTR(SObject) SO = study->studyDS()->FindObjectID( obj->getEntry() );
       if( SO && QString( SO->GetID().c_str() ) == SO->GetFatherComponent()->GetID().c_str() )
       { //component is selected
-	_PTR(SComponent) SC( SO->GetFatherComponent() );
-	_PTR(ChildIterator) anIter ( study->studyDS()->NewChildIterator( SC ) );
-	anIter->InitEx( true );
-	while( anIter->More() )
-	{
-	  _PTR(SObject) valSO ( anIter->Value() );
-	  _PTR(SObject) refSO;
-	  if( !valSO->ReferencedObject( refSO ) )
-	  {
-	    QString id = valSO->GetID().c_str(),
-	            comp = SC->ComponentDataType().c_str(),
-		    val = valSO->GetName().c_str();
-
-	    Handle( SALOME_InteractiveObject ) new_obj =
-	      new SALOME_InteractiveObject( id.latin1(), comp.latin1(), val.latin1() );
-	    dest.Append( new_obj );
-	  }
-	  anIter->Next();
-	}
-	continue;
+        _PTR(SComponent) SC( SO->GetFatherComponent() );
+        _PTR(ChildIterator) anIter ( study->studyDS()->NewChildIterator( SC ) );
+        anIter->InitEx( true );
+        while( anIter->More() )
+        {
+          _PTR(SObject) valSO ( anIter->Value() );
+          _PTR(SObject) refSO;
+          if( !valSO->ReferencedObject( refSO ) )
+          {
+            QString id = valSO->GetID().c_str(),
+                    comp = SC->ComponentDataType().c_str(),
+                    val = valSO->GetName().c_str();
+
+            Handle( SALOME_InteractiveObject ) new_obj =
+              new SALOME_InteractiveObject( id.toUtf8(), comp.toLatin1(), val.toLatin1() );
+            dest.Append( new_obj );
+          }
+          anIter->Next();
+        }
+        continue;
       }
     }
     dest.Append( obj );
@@ -119,7 +133,7 @@ void SalomeApp_Module::extractContainers( const SALOME_ListIO& source, SALOME_Li
  * \brief Virtual public
  *
  * This method is called just before the study document is saved, so the module has a possibility
- * to store visual parameters in AttributeParameter attribue(s)
+ * to store visual parameters in AttributeParameter attribut
  */
 void SalomeApp_Module::storeVisualParameters(int savePoint)
 {
@@ -134,4 +148,3 @@ void SalomeApp_Module::storeVisualParameters(int savePoint)
 void SalomeApp_Module::restoreVisualParameters(int savePoint)
 {
 }
-