Copyright update: 2016

+ clean-up

diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5156eaf4f72c33968bf854b8aeb01911d90dbb57..98219881f8ab04e683bbb2b1d5bd6401da0983dd 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  OPEN CASCADE

 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/INSTALL b/INSTALL
deleted file mode 100644 (file)
index 343a6db..0000000
--- a/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-SALOME2 : LIGHT module (sample)

diff --git a/LIGHT_version.h.in b/LIGHT_version.h.in
index 1e5a67f64124ecb3c58fd51255b30dc02b28dac4..0a0b12874ab718943349dc2e219c7c4429fa21ee 100644 (file)
--- a/LIGHT_version.h.in
+++ b/LIGHT_version.h.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2015  OPEN CASCADE
+// Copyright (C) 2005-2016  OPEN CASCADE

 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/NEWS b/NEWS
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/README b/README
index 87cab7a8ee79200e29037321cd388ab03dc86c93..d4e4c0ef4826b33390ee1365bd0de09d1d10408f 100755 (executable)
--- a/README
+++ b/README
@@ -1,29 +1,17 @@
---------------------------------------
-LIGHT module : README file
---------------------------------------
+*************************
+About SALOME LIGHT sample
+*************************

 
 

-Contents:
+SALOME LIGHT module presents example of a simple SALOME module, implemented
+with C++, without CORBA-engine; such type of module is called "light" in SALOME.
+This sample demonstrates a way to create a modules which have only GUI library
+but nevertheless can be integrated into SALOME platform.

 
 

-1. General description
-2. Functionality
-3. Implementation
-4. Building
-5. Launching
+This sample module is a simple text file reader. Each empty line read from the
+file is presented in the data tree as the beginning of new paragraph; paragraph
+can be empty. Non-empty line presents a "leaf" in the data tree.

 
 

-----------------------
-1. General description
-----------------------
-
-The LIGHT module presents a simple no-CORBA-engine SALOME 3 compliant module.
-This module proposes a way how to create a modules which have only GUI library but nevertheless
-should be integrated into SALOME 3 CORBA-based architecture.
-
-The LIGHT module uses default SALOMEDS-based persistence mechanism provided by SALOME GUI library
-in order to store/load it's data.
-
-This sample module is a simple text file reader. Each empty line in the file read from the file
-is presented in the data tree as the beginning of new paragraph. Paragraphs can be empty.
-So the data tree hierarchy has tree levels:
+Thus, the data tree hierarchy has tree levels:

 
 Root
   |__ Paragraph
 
 Root
   |__ Paragraph


@@ -36,130 +24,151 @@ Root
   |        |____ ...
   |__ ...
 
   |        |____ ...
   |__ ...
 

+For more information about SALOME platform please visit the SALOME web site:

 
 

-----------------------
-2. Functionality
-----------------------
+  <http://www.salome-platform.org/>

 
 

-The module functionality includes the following user actions:
+=======
+License
+=======

 
 

-- "File" menu:
+SALOME platform is distributed under the GNU Lesser General Public License.
+See COPYING file for more details.

 
 

-  - "Load text file"       : reads and loads the contents of text file to the data model;
-                             the previous contents of data model is erased.
+Also, additional information can be found at SALOME platform web site:

 
 

-  - "Save text flie"       : dumps the contents of the data model to the text file.
+  <http://www.salome-platform.org/downloads/license/>

 
 

-- "LIGHT" menu:
+============
+Installation
+============

 
 

-  - "Edit selected line"   : allows user to edit the selected text line.
+--------------
+Pre-requisites
+--------------

 
 

-  - "Insert new text line" : inserts the new text line entered by the user before the selected one;
-                             if there is no selection, new line is added to the end of the data tree.
+SALOME platform relies on a set of third-party softwares; some of them are needed
+at build time only, while other ones are needed in runtime also.

 
 

-  - "Remove line"          : removes the selected line.
+For more information about the pre-requisites please visit SALOME platform web
+site:

 
 

-  - "Clear all"            : clears all the contents of the data model.
+* Check Release Notes and Software Requirements of the latest SALOME release at
+
+  <http://www.salome-platform.org/downloads/current-version/>
+
+* Pre-requisites page at SALOME web site:
+
+  <http://www.salome-platform.org/downloads/license/>
+
+Note: SALOME LIGHT needs SALOME KERNEL and SALOME GUI as pre-requisites.
+
+------------------
+Basic Installation
+------------------
+
+The build procedure of the SALOME platform is implemented with CMake.
+In order to build the module you have to do the following actions:
+
+1. Set up environment for pre-requisites (see "Pre-requisites" section above).

 
 

+2. Create a build directory:

 
 

-All these actions except saving of the text file change the structure of the underlying text file, so the data tree is 
-rebuilt correspondingly.
-Some of these commands are also avaiable via the context popup menu for the selected in the Object Browser data objects.
+   % mkdir LIGHT_BUILD

 
 

-Saving/restoring of the data is performed by using of default SALOMEDS-based persistence mechanism provided by SALOME GUI
-via embedded SalomeApp engine.
-Note: immediately after opening of the sudy file the LIGHT module data are not displayed in the Object Browser. To see it
-you should activate the module. Such behaviour takes place because the LIGHT module does not publish any data in the SALOMEDS study.
+3. Configure the build procedure:

 
 

-----------------------
-3. Implementation
-----------------------
+   % cd LIGHT_BUILD
+   % cmake -DCMAKE_BUILD_TYPE=<mode> -DCMAKE_INSTALL_PREFIX=<installation_directory> <path_to_src_dir>

 
 

-Here below is a short description of classes implemented in this package.
+   where
+   - <mode> is either Release or Debug (default: Release);
+   - <installation_directory> is a destination folder to install SALOME LIGHT
+     module (default: /usr);
+   - <path_to_src_dir> is a path to the SALOME LIGHT sources directory.

 
 

-* LIGHTGUI.h + LIGHTGUI.cxx :
+   Note: by default (if CMAKE_INSTALL_PREFIX option is not given), SALOME LIGHT
+   module will be configured for installation to the /usr directory that requires
+   root permissions to complete the installation.

 
 

-LIGHTGUI class                : This class presents a GUI module itself, exported by the static function.
-inherits SalomeApp_Module     : SALOME GUI application loads it when user activates the module by clicking the
-                              : corresponding button on the components toolbar.
-                              : The LIGHTGUI class is responsible for the creation of the data model. It creates
-                              : user actions and then dispatches them to the corresponding slots.
-                              : Method engineIOR() of this class returns empty string which means that this 
-                              : module uses default persistence mechanism provided by the SALOME GUI via SalomeApp 
-                              : engine (ensure that your configuration file SalomeApp.xml or .SalomeApprc.3.x.x
-                              : includes "SalomeAppEngine" module in the <embedded> parameter of the <launch> section.
+4. Build and install:

 
 

-* LIGHTGUI_DataModel.h + LIGHTGUI_DataModel.cxx :
+   % make
+   % make install

 
 

-LIGHTGUI_DataModel class     : This class defines an internal organization of the module's data and the way how these
-inherits SalomeApp_DataModel : data should be presented in the study (e.g. in the Object Browser). In addition this class
-                             : includes methods which modify the data tree: loading/saving of the text file,
-                             : inserting/removing of the text line, etc.
+   This will install SALOME LIGHT module to the <installation_directory>
+   specified to cmake command on the previous step.

 
 

-* LIGHTGUI_DataObject.h + LIGHTGUI_DataObject.cxx :
+-------------------
+Custom installation
+-------------------

 
 

-LIGHTGUI_DataObject class    : This class presents an elementary unit of the data model. It includes presentation methods
-inherits CAM_DataObject      : like: name(), icon(), toolTip(), etc.
-                             : Take an attention on the virtual inheritance of this class.
+SALOME LIGHT module supports a set of advanced configuration options;
+for more details learn CMakeLists.txt file in the root source directory.

 
 

-LIGHTGUI_ModuleObject class  : This class presents a root object of the module's data tree.
-inherits LIGHTGUI_DataObject,: LIGHTGUI_ModuleObject inherits SUIT_DataObject through the different branches, so virtual
-         CAM_RootObject      : inheritance is needed here (see above).
+You can also use other options of cmake command to customize your installation.
+Learn more about available options by typing

 
 

-* LIGHTGUI_DataOwner.h + LIGHTGUI_DataOwner.cxx :
+   % cmake --help

 
 

-LIGHTGUI_DataOwner class     : The instances of this class are engaged in the selection mechanism allowing the identification
-inherits SUIT_DataOwner      : of the data objects.
+=============
+Functionality
+=============
+
+The module functionality includes the following user actions:
+
+* "File" menu:
+
+  - "Load text file"       : reads and loads the contents of text file to the
+                             data model; the previous contents of data model
+                             is erased.
+
+  - "Save text flie"       : dumps the contents of the data model to the text
+                             file.
+
+* "LIGHT" menu:
+
+  - "Edit selected line"   : allows user to edit the selected text line.
+
+  - "Insert new text line" : inserts the new text line entered by the user before
+                             the selected one; if there is no selection, new line
+                             is added to the end of the data tree.
+
+  - "Remove line"          : removes the selected line.
+
+  - "Clear all"            : clears all the contents of the data model.

 
 

-* LIGHTGUI_OBSelector.h + LIGHTGUI_OBSelector.cxx :

 
 

-LIGHTGUI_OBSelector class    : This class allows the interacting with the LIGHT module's data objects in the Object Browser.
-inherits SUIT_Selector       : When activating the LIGHT module replaces the Object Browser selector by it's own one and 
-                             : restores the previous selector back when deactivating. The main goal of this class is to pick up
-                             : selected objects and notify the application when selection is changed by the user.
+Most of these actions change the contents of the internal data model, so the data
+tree is rebuilt correspondingly.
+Some of these commands are also avaiable via the context popup menu in the Object
+Browser.

 
 

-* LIGHTGUI_Selection.h + LIGHTGUI_Selection.cxx
+Saving/restoring of the data is performed by using of default SALOMEDS-based
+persistence mechanism provided by SALOME GUI via embedded SalomeApp engine.

 
 

-LIGHTGUI_Selection class     : This class provides the methods of defining the context popup menu contents for the selected
-inherits Selection           : objects by using of popup menu manager from the Qtx library.
-         from QtxPopupMgr    : 
+Note: after opening of the sudy file the LIGHT module data is not
+immediately displayed in the Object Browser. To see it, you should activate the
+module. Such behaviour takes place because the LIGHT module does not publish any
+data directly in the SALOMEDS study - this is typical behavior of any "lighy"
+SALOME module, imposed by limitation of SALOME platform.

 
 

-* LIGHT_msg_en.po + LIGHT_images.po :
-                             : Text and graphic resources of the module..  
+=====
+Usage
+=====

 
 

-----------------------
-4. Building
-----------------------
+Run SALOME with LIGHT module:

 
 

-The building process of the LIGHT module is inherited from standard SALOME packages and includes the following steps:
- mkdir build_dir 
- mkdir instal_dir
- cd build_dir
- cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=instal_dir ../src_dir
- make
- make install
+- In full, CORBA-based session:

 
 

-----------------------
-5. Launching
-----------------------
+runSalome --modules=LIGHT

 
 

-Set the LIGHT_ROOT_DIR environment variable to point to your LIGHT module binary distribution.
-Then append the following parameters in your configuration file (SalomeApp.xml in ${GUI_ROOT_DIR}/share/salome/resources/gui
-folder or .SalomeApprc.3.x.x in your home directory, where 3.x.x is a your SALOME distribution version number):
+- In "light" session:

 
 

-...
-<section name="launch" >
-  <parameter name="modules" value="LIGHT" />
-</section>
-<section name="resources" >
-  <parameter name="LIGHT" value="${LIGHT_ROOT_DIR}/share/salome/resources/light" />
-</section>
-<section name="LIGHT" >
-  <parameter name="name" value="Light" />
-  <parameter name="icon" value="LIGHT.png" />
-</section>
-...
+runLightSalome.sh --modules=LIGHT

 
 

-The launch SALOME in a usual way:
+===============
+Troubleshooting
+===============

 
 

-${KERNEL_ROOT_DIR}/bin/salome/runSalome
+Please, send a mail to webmaster.salome@opencascade.com.

diff --git a/SalomeLIGHTConfig.cmake.in b/SalomeLIGHTConfig.cmake.in
index 5c540f9ea034759f62b3626f041f7951785c99d4..412311bfcbc1666afb6d4a67e1806d8943305991 100644 (file)
--- a/SalomeLIGHTConfig.cmake.in
+++ b/SalomeLIGHTConfig.cmake.in
@@ -5,7 +5,7 @@
 #
 
 ###############################################################
 #
 
 ###############################################################

-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  OPEN CASCADE

 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/CMakeLists.txt b/adm_local/CMakeLists.txt
index 6e8e91cd1b9925b4d7e446c7dd95851bc5666b99..b01f446d8f3a42e34c7b4f0a50f57a279a857113 100755 (executable)
--- a/adm_local/CMakeLists.txt
+++ b/adm_local/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  OPEN CASCADE

 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt
index c57f6d010cbba38428270cd1e7791e3ab5d69fcb..ee484df4402eb63e009f5fd1a11d93133f54b058 100755 (executable)
--- a/adm_local/cmake_files/CMakeLists.txt
+++ b/adm_local/cmake_files/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  OPEN CASCADE

 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/cmake_files/FindSalomeLIGHT.cmake b/adm_local/cmake_files/FindSalomeLIGHT.cmake
index 6e786a4f1521feff39e40df20c64364825fa477d..b24a454f9db562f63ff746e9c760fa5470ef1bed 100644 (file)
--- a/adm_local/cmake_files/FindSalomeLIGHT.cmake
+++ b/adm_local/cmake_files/FindSalomeLIGHT.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  OPEN CASCADE

 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/unix/CMakeLists.txt b/adm_local/unix/CMakeLists.txt
index 800c376f7a696c39348708878c0fd1c927aa820e..cdd76ebbc08f3ecd44d6800c470fe4e6663849fb 100755 (executable)
--- a/adm_local/unix/CMakeLists.txt
+++ b/adm_local/unix/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  OPEN CASCADE

 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/unix/config_files/CMakeLists.txt b/adm_local/unix/config_files/CMakeLists.txt
index 0856c118562bfe72e966a6b6824fdccd60a75cfb..8ee602d461d8affdfdf169c54af6921b8d675c48 100755 (executable)
--- a/adm_local/unix/config_files/CMakeLists.txt
+++ b/adm_local/unix/config_files/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  OPEN CASCADE

 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/unix/config_files/check_LIGHT.m4 b/adm_local/unix/config_files/check_LIGHT.m4
index 8832921d127550aba9bd10d6ab72937493ed28a0..8f3cb4360934fa7cab2dc79a2ffdb5edf71a1384 100755 (executable)
--- a/adm_local/unix/config_files/check_LIGHT.m4
+++ b/adm_local/unix/config_files/check_LIGHT.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2005-2015  OPEN CASCADE
+dnl Copyright (C) 2005-2016  OPEN CASCADE

 dnl
 dnl This library is free software; you can redistribute it and/or
 dnl modify it under the terms of the GNU Lesser General Public
 dnl
 dnl This library is free software; you can redistribute it and/or
 dnl modify it under the terms of the GNU Lesser General Public

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index c7f711cc05ac05a4b7cdd4a3dc2799c4cc9e2851..9466426cc0551deee64fab976808cf676f3b1f93 100755 (executable)
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  OPEN CASCADE

 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index cbcc12ecf1b084b7ce5327ca2d73092877cec2bc..59a0211bf91cb1300f2ab3e452b70ef093ad297b 100755 (executable)
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  OPEN CASCADE

 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/resources/LightApp.xml b/resources/LightApp.xml
index 52aa61577852cf562e2dc6a4c6215e05cf09c358..a6182d7bfa9c3f6ab972a9c2a886ac31784b7dc8 100644 (file)
--- a/resources/LightApp.xml
+++ b/resources/LightApp.xml
@@ -1,5 +1,5 @@
 <!--
 <!--

-  Copyright (C) 2005-2015  OPEN CASCADE
+  Copyright (C) 2005-2016  OPEN CASCADE

 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index d2792b52f40f1a60dd7b8b848c5d77b6dd19b74f..df74375c315abfb03946a3098110bd4b201f773c 100644 (file)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -1,5 +1,5 @@
 <!--
 <!--

-  Copyright (C) 2005-2015  OPEN CASCADE
+  Copyright (C) 2005-2016  OPEN CASCADE

 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 19bd05a8d994affdc4cc4cb72716d535ed8474af..172797ac3534dc5d5b7ff9dbeb0720e8a135f303 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  OPEN CASCADE

 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/LIGHTGUI/CMakeLists.txt b/src/LIGHTGUI/CMakeLists.txt
index 9a01b780f37c43ba5e581434a3b1c0eaac9b3b03..0c7ec970cc9eab13a9dce2bdde180d5457b791ea 100644 (file)
--- a/src/LIGHTGUI/CMakeLists.txt
+++ b/src/LIGHTGUI/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  OPEN CASCADE

 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public


@@ -53,10 +53,10 @@ SET(_moc_HEADERS
 
 # header files / no moc processing
 SET(_other_HEADERS
 
 # header files / no moc processing
 SET(_other_HEADERS

-  LIGHTGUI_Selection.h

   LIGHTGUI_DataObject.h
   LIGHTGUI_DataObject.h

-  LIGHTGUI_TextPrs.hxx
-  LIGHTGUI_Exports.hxx 
+  LIGHTGUI_Exports.h
+  LIGHTGUI_Selection.h
+  LIGHTGUI_TextPrs.h

 )
 
 # header files / to install
 )
 
 # header files / to install


@@ -70,9 +70,9 @@ QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
 # sources / static
 SET(_other_SOURCES
   LIGHTGUI.cxx
 # sources / static
 SET(_other_SOURCES
   LIGHTGUI.cxx

-  LIGHTGUI_Selection.cxx
-  LIGHTGUI_DataObject.cxx

   LIGHTGUI_DataModel.cxx
   LIGHTGUI_DataModel.cxx

+  LIGHTGUI_DataObject.cxx
+  LIGHTGUI_Selection.cxx

   LIGHTGUI_TextPrs.cxx
 )
 
   LIGHTGUI_TextPrs.cxx
 )
 

diff --git a/src/LIGHTGUI/LIGHTGUI.cxx b/src/LIGHTGUI/LIGHTGUI.cxx
index b369a2e72a1d49faf77b0678a53242c089f9dff4..df4ca39048b436eb8aa3a5573dfa23ee2cf736ad 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI.cxx
+++ b/src/LIGHTGUI/LIGHTGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2015  OPEN CASCADE
+// Copyright (C) 2005-2016  OPEN CASCADE

 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public


@@ -16,46 +16,50 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //

-
-// LIGHT : sample (no-corba-engine) SALOME module

 // File   : LIGHTGUI.cxx
 // Author : Julia DOROVSKIKH
 // File   : LIGHTGUI.cxx
 // Author : Julia DOROVSKIKH

-//
-#include "LIGHTGUI.h"

 
 

-#include <LIGHT_version.h>
-
-#include "LIGHTGUI_Selection.h"
+#include "LIGHTGUI.h"

 #include "LIGHTGUI_DataModel.h"
 #include "LIGHTGUI_DataModel.h"

-#include "LightApp_DataOwner.h"
-#include "LIGHTGUI_TextPrs.hxx"
+#include "LIGHTGUI_Selection.h"
+#include "LIGHTGUI_TextPrs.h"
+#include "LIGHT_version.h"

 
 

-#include <SUIT_MessageBox.h>
-#include <SUIT_Desktop.h>

 #include <LightApp_Application.h>
 #include <LightApp_Application.h>

+#include <LightApp_DataOwner.h>

 #include <LightApp_SelectionMgr.h>
 #include <LightApp_SelectionMgr.h>

-#include <LightApp_Selection.h>

 #include <OCCViewer_ViewManager.h>
 #include <OCCViewer_ViewManager.h>

-#include <SOCC_ViewModel.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_MessageBox.h>

 #include <SOCC_Prs.h>
 #include <SOCC_Prs.h>

+#include <SOCC_ViewModel.h>

 
 

+#include <QIcon>

 #include <QInputDialog>
 #include <QStringList>
 #include <QInputDialog>
 #include <QStringList>

-#include <QMenu>
-#include <QIcon>
-#include <QString>

 
 /*!
   \class LIGHTGUI
 
 /*!
   \class LIGHTGUI

-  \brief Implementation of the sample light (no-CORBA-engine) 
-         SALOME module.
+  \brief Implementation of the sample light (no-CORBA-engine) SALOME module.
+
+  This class represents a GUI module itself; the instance of the class is
+  created and exported by the static function, which is automatically invoked
+  from SALOME GUI; SALOME GUI application loads the module when user activates
+  it via the "Components" toolbar.
+  
+  The LIGHTGUI class is responsible for the creation of the data model.
+  It dispatches user actions to the corresponding slots.
+
+  Method engineIOR() of this class returns empty string which means that this 
+  module uses default persistence mechanism provided by the SALOME GUI via
+  the SalomeApp embedded engine (SalomeAppEngine class).

 */
 
 /*!
   \brief Constructor. Sets the default name for the module.
 */
 LIGHTGUI::LIGHTGUI()
 */
 
 /*!
   \brief Constructor. Sets the default name for the module.
 */
 LIGHTGUI::LIGHTGUI()

-: LightApp_Module( "LIGHTGUI" )
+  : LightApp_Module( "LIGHTGUI" )

 {
 }
 
 {
 }
 


@@ -634,6 +638,12 @@ bool LIGHTGUI::renameObject( const QString& entry, const QString& name )
   \return new created instance of the module
 */
 
   \return new created instance of the module
 */
 

+/*!
+  \fn char* getModuleVersion();
+  \brief Get version of this module.
+  \return version information
+*/
+

 extern "C" {
   LIGHT_EXPORT CAM_Module* createModule() {
     return new LIGHTGUI();
 extern "C" {
   LIGHT_EXPORT CAM_Module* createModule() {
     return new LIGHTGUI();

diff --git a/src/LIGHTGUI/LIGHTGUI.h b/src/LIGHTGUI/LIGHTGUI.h
index 61ff90d86511f87ce07f60a37127dc55c8b908b9..88491bf0c8b2297f036e8998bf4a18f84a7404ac 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI.h
+++ b/src/LIGHTGUI/LIGHTGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2015  OPEN CASCADE
+// Copyright (C) 2005-2016  OPEN CASCADE

 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public


@@ -16,20 +16,15 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //

-
-// LIGHT : sample (no-corba-engine) SALOME module

 // File   : LIGHTGUI.h
 // Author : Julia DOROVSKIKH
 // File   : LIGHTGUI.h
 // Author : Julia DOROVSKIKH

-//
+

 #ifndef LIGHTGUI_H
 #define LIGHTGUI_H
 
 #ifndef LIGHTGUI_H
 #define LIGHTGUI_H
 

-#include "LIGHTGUI_Exports.hxx"
-#include <LightApp_Module.h>
+#include "LIGHTGUI_Exports.h"

 
 

-class QMenu;
-class LightApp_Selection;
-class LightApp_SelectionMgr;
+#include <LightApp_Module.h>

 
 class LIGHT_EXPORT LIGHTGUI: public LightApp_Module
 {
 
 class LIGHT_EXPORT LIGHTGUI: public LightApp_Module
 {

diff --git a/src/LIGHTGUI/LIGHTGUI_DataModel.cxx b/src/LIGHTGUI/LIGHTGUI_DataModel.cxx
index 6f01617e0cdbf4f2f8e6c06029acdbc6e5b80326..9f953ac1bb84657004d7c48fdc26ce30ac827492 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_DataModel.cxx
+++ b/src/LIGHTGUI/LIGHTGUI_DataModel.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2015  OPEN CASCADE
+// Copyright (C) 2005-2016  OPEN CASCADE

 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public


@@ -16,28 +16,30 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //

-
-// LIGHT : sample (no-corba-engine) SALOME module

 // File   : LIGHTGUI_DataModel.cxx
 // Author : Julia DOROVSKIKH
 // File   : LIGHTGUI_DataModel.cxx
 // Author : Julia DOROVSKIKH

-//
+

 #include "LIGHTGUI_DataModel.h"
 #include "LIGHTGUI_DataObject.h"
 
 #include "LIGHTGUI_DataModel.h"
 #include "LIGHTGUI_DataObject.h"
 

-#include <LightApp_Study.h>
-#include <CAM_Module.h>

 #include <CAM_Application.h>
 #include <CAM_Application.h>

-#include <SUIT_Tools.h>
+#include <CAM_Module.h>
+#include <LightApp_Study.h>

 #include <SUIT_DataObjectIterator.h>
 #include <SUIT_DataObjectIterator.h>

+#include <SUIT_Tools.h>

 
 

-#include <QString>

 #include <QFile>
 #include <QTextStream>
 #include <QFile>
 #include <QTextStream>

-#include <QStringList>

 
 /*!
   \class LIGHTGUI_DataModel
   \brief LIGHT module data model.
 
 /*!
   \class LIGHTGUI_DataModel
   \brief LIGHT module data model.

+
+  This class defines an internal organization of the module's data and the way
+  how these data are presented in the study (e.g. in the Object Browser).
+
+  In addition, this class includes methods which modify the data tree:
+  load/save text file, insert/remove text line, etc.

 */
 
 /*!
 */
 
 /*!


@@ -284,8 +286,8 @@ bool LIGHTGUI_DataModel::setLineText( const int id, const QString& txt )
 {
   LIGHTGUI_DataObject* obj = findObject( id );
   if ( obj ) {
 {
   LIGHTGUI_DataObject* obj = findObject( id );
   if ( obj ) {

-    if ( txt.trimmed().isEmpty() && !obj->lineText().trimmed().isEmpty() ||
-       !txt.trimmed().isEmpty() &&  obj->lineText().trimmed().isEmpty() ) {
+    if ( (  txt.trimmed().isEmpty() && !obj->lineText().trimmed().isEmpty() ) ||
+         ( !txt.trimmed().isEmpty() &&  obj->lineText().trimmed().isEmpty() ) ) {

       if ( obj->lineText().trimmed().isEmpty() ) {
        // paragraph becomes a text line
        SUIT_DataObject* newParent = obj->prevBrother();
       if ( obj->lineText().trimmed().isEmpty() ) {
        // paragraph becomes a text line
        SUIT_DataObject* newParent = obj->prevBrother();

diff --git a/src/LIGHTGUI/LIGHTGUI_DataModel.h b/src/LIGHTGUI/LIGHTGUI_DataModel.h
index 7c8836b0cbfeca4b508535c1ff32fbd0645ee27c..73f5349b0c480a71f9879d06fd1888d255c1ceb9 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_DataModel.h
+++ b/src/LIGHTGUI/LIGHTGUI_DataModel.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2015  OPEN CASCADE
+// Copyright (C) 2005-2016  OPEN CASCADE

 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public


@@ -16,21 +16,16 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //

-
-// LIGHT : sample (no-corba-engine) SALOME module

 // File   : LIGHTGUI_DataModel.h
 // Author : Julia DOROVSKIKH
 // File   : LIGHTGUI_DataModel.h
 // Author : Julia DOROVSKIKH

-//
+

 #ifndef LIGHTGUI_DATAMODEL_H
 #define LIGHTGUI_DATAMODEL_H
 
 #ifndef LIGHTGUI_DATAMODEL_H
 #define LIGHTGUI_DATAMODEL_H
 

-#include "LIGHTGUI_Exports.hxx"
+#include "LIGHTGUI_Exports.h"

 
 #include <LightApp_DataModel.h>
 
 
 #include <LightApp_DataModel.h>
 

-class CAM_Module;
-class LightApp_Study;
-class LightApp_DataObject;

 class LIGHTGUI_DataObject;
 
 class LIGHT_EXPORT LIGHTGUI_DataModel : public LightApp_DataModel
 class LIGHTGUI_DataObject;
 
 class LIGHT_EXPORT LIGHTGUI_DataModel : public LightApp_DataModel

diff --git a/src/LIGHTGUI/LIGHTGUI_DataObject.cxx b/src/LIGHTGUI/LIGHTGUI_DataObject.cxx
index 7bbfbd2b3e09f865af9d922276cf9002b2e2afbf..02af984b9b66bf1d2d7394f542f293718c80b36e 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_DataObject.cxx
+++ b/src/LIGHTGUI/LIGHTGUI_DataObject.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2015  OPEN CASCADE
+// Copyright (C) 2005-2016  OPEN CASCADE

 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public


@@ -16,21 +16,21 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //

-
-// LIGHT : sample (no-corba-engine) SALOME module

 // File   : LIGHTGUI_DataObject.cxx
 // Author : Julia DOROVSKIKH
 // File   : LIGHTGUI_DataObject.cxx
 // Author : Julia DOROVSKIKH

-//
+

 #include "LIGHTGUI_DataObject.h"
 #include "LIGHTGUI_DataModel.h"
 
 #include "LIGHTGUI_DataObject.h"
 #include "LIGHTGUI_DataModel.h"
 

-#include <SUIT_Session.h>

 #include <SUIT_ResourceMgr.h>
 #include <SUIT_ResourceMgr.h>

-#include <QString>
+#include <SUIT_Session.h>

 
 /*!
   \class LIGHTGUI_DataObject
   \brief LIGHT module data object.
 
 /*!
   \class LIGHTGUI_DataObject
   \brief LIGHT module data object.

+
+  This class presents an elementary unit of the data model.
+  It includes presentation methods like: name(), icon(), toolTip(), etc.

 */
 
 /*!
 */
 
 /*!


@@ -38,14 +38,17 @@
   \param id line identifier
   \param txt text line corresponding to the data object
   \param parent parent data object
   \param id line identifier
   \param txt text line corresponding to the data object
   \param parent parent data object

+
+  \note Due to virtual inheritance, the constructor explicitly
+  invokes constructor of all base classes

 */
 LIGHTGUI_DataObject::LIGHTGUI_DataObject( const int id, 
                                          const QString& txt, 
                                          SUIT_DataObject* parent )
 : CAM_DataObject( parent ),
   LightApp_DataObject( parent ),
 */
 LIGHTGUI_DataObject::LIGHTGUI_DataObject( const int id, 
                                          const QString& txt, 
                                          SUIT_DataObject* parent )
 : CAM_DataObject( parent ),
   LightApp_DataObject( parent ),

-  myLineTxt( txt ),
-  myId( id )
+  myId( id ),
+  myLineTxt( txt )

 {
 }
 
 {
 }
 

diff --git a/src/LIGHTGUI/LIGHTGUI_DataObject.h b/src/LIGHTGUI/LIGHTGUI_DataObject.h
index fc964ece2202b2bb8f0f85e6d0cb812d162f47dd..c75cbc1d75b0e3a62987c47b16f02e7381be27de 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_DataObject.h
+++ b/src/LIGHTGUI/LIGHTGUI_DataObject.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2015  OPEN CASCADE
+// Copyright (C) 2005-2016  OPEN CASCADE

 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public


@@ -16,20 +16,17 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //

-
-// LIGHT : sample (no-corba-engine) SALOME module

 // File   : LIGHTGUI_DataObject.h
 // Author : Julia DOROVSKIKH
 // File   : LIGHTGUI_DataObject.h
 // Author : Julia DOROVSKIKH

-//
+

 #ifndef LIGHTGUI_DATAOBJECT_H
 #define LIGHTGUI_DATAOBJECT_H
 
 #ifndef LIGHTGUI_DATAOBJECT_H
 #define LIGHTGUI_DATAOBJECT_H
 

-#include "LIGHTGUI_Exports.hxx"
+#include "LIGHTGUI_Exports.h"

 
 #include <LightApp_DataObject.h>
 
 #include <LightApp_DataObject.h>

-#include <QString>

 
 

-class LIGHT_EXPORT LIGHTGUI_DataObject : public virtual LightApp_DataObject
+class LIGHT_EXPORT LIGHTGUI_DataObject : public LightApp_DataObject

 {
 public:
   LIGHTGUI_DataObject( const int, const QString&, SUIT_DataObject* = 0 );
 {
 public:
   LIGHTGUI_DataObject( const int, const QString&, SUIT_DataObject* = 0 );

diff --git a/src/LIGHTGUI/LIGHTGUI_Exports.h b/src/LIGHTGUI/LIGHTGUI_Exports.h
new file mode 100755 (executable)
index 0000000..f7c5240
--- /dev/null
+++ b/src/LIGHTGUI/LIGHTGUI_Exports.h
@@ -0,0 +1,35 @@
+// Copyright (C) 2005-2016  OPEN CASCADE
+//
+// 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   : LIGHTGUI_Exports.h
+// Author : Roman NIKOLAEV
+
+#ifndef LIGHTGUI_EXPORTS_H
+#define LIGHTGUI_EXPORTS_H
+
+#ifdef WIN32
+ #if defined LIGHT_EXPORTS ||  defined Light_EXPORTS
+  #define LIGHT_EXPORT __declspec( dllexport )
+ #else
+  #define LIGHT_EXPORT __declspec( dllimport ) 
+ #endif
+#else
+  #define LIGHT_EXPORT
+#endif
+
+#endif // LIGHTGUI_EXPORTS_H

diff --git a/src/LIGHTGUI/LIGHTGUI_Exports.hxx b/src/LIGHTGUI/LIGHTGUI_Exports.hxx
deleted file mode 100755 (executable)
index c9d7c48..0000000
--- a/src/LIGHTGUI/LIGHTGUI_Exports.hxx
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (C) 2005-2015  OPEN CASCADE
-//
-// 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
-//
-
-// LIGHT : sample (no-corba-engine) SALOME module
-// File   : LIGHTGUI_Exports.h
-// Author : Roman NIKOLAEV
-
-#ifndef _LIGHTGUI_EXPORTS_HXX_
-#define _LIGHTGUI_EXPORTS_HXX_
-#ifdef WIN32
- #if defined LIGHT_EXPORTS ||  defined Light_EXPORTS
-  #define LIGHT_EXPORT __declspec( dllexport )
- #else
-  #define LIGHT_EXPORT __declspec( dllimport ) 
- #endif
-#else
-  #define LIGHT_EXPORT
-#endif
-
-#endif //_LIGHTGUI_EXPORTS_HXX_
-

diff --git a/src/LIGHTGUI/LIGHTGUI_Selection.cxx b/src/LIGHTGUI/LIGHTGUI_Selection.cxx
index 1dbcd6f300a90dee7c0716d1567623dd0781d65f..1c238f080aa0dba39894e6b793c2580f0b8a3b10 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_Selection.cxx
+++ b/src/LIGHTGUI/LIGHTGUI_Selection.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2015  OPEN CASCADE
+// Copyright (C) 2005-2016  OPEN CASCADE

 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public


@@ -16,27 +16,27 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //

-
-// LIGHT : sample (no-corba-engine) SALOME module

 // File   : LIGHTGUI_Selection.cxx
 // Author : Julia DOROVSKIKH
 // File   : LIGHTGUI_Selection.cxx
 // Author : Julia DOROVSKIKH

-//
+

 #include "LIGHTGUI_Selection.h"
 #include "LIGHTGUI_DataModel.h"
 #include "LIGHTGUI.h"
 
 #include <LightApp_Application.h>
 #include <LightApp_Study.h>
 #include "LIGHTGUI_Selection.h"
 #include "LIGHTGUI_DataModel.h"
 #include "LIGHTGUI.h"
 
 #include <LightApp_Application.h>
 #include <LightApp_Study.h>

-#include <LightApp_DataOwner.h>
-#include <LightApp_SelectionMgr.h>
+#include <SALOME_InteractiveObject.hxx>

 #include <SOCC_ViewModel.h>
 #include <SUIT_ViewManager.h>
 #include <SOCC_ViewModel.h>
 #include <SUIT_ViewManager.h>

-#include <QtxPopupMgr.h>

 
 /*!
   \class LIGHTGUI_Selection
   \brief Handles the data selection, builds the rules to be used in the
          popup menu.
 
 /*!
   \class LIGHTGUI_Selection
   \brief Handles the data selection, builds the rules to be used in the
          popup menu.

+
+  This class provides the methods of defining the context popup menu
+  contents for the selected objects by using of popup menu manager
+  from the Qtx library.

 */
 
 /*!
 */
 
 /*!

diff --git a/src/LIGHTGUI/LIGHTGUI_Selection.h b/src/LIGHTGUI/LIGHTGUI_Selection.h
index c3541e8d6e399f0a0f5a1e6e81b6f3015adf95a6..e2e24fe6f50905849a6f05c2898c996cef31d7c4 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_Selection.h
+++ b/src/LIGHTGUI/LIGHTGUI_Selection.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2015  OPEN CASCADE
+// Copyright (C) 2005-2016  OPEN CASCADE

 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public


@@ -16,20 +16,15 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //

-
-// LIGHT : sample (no-corba-engine) SALOME module

 // File   : LIGHTGUI_Selection.h
 // Author : Julia DOROVSKIKH
 // File   : LIGHTGUI_Selection.h
 // Author : Julia DOROVSKIKH

-//
+

 #ifndef LIGHTGUI_SELECTION_H
 #define LIGHTGUI_SELECTION_H
 
 #ifndef LIGHTGUI_SELECTION_H
 #define LIGHTGUI_SELECTION_H
 

-#include "LIGHTGUI_Exports.hxx"
+#include "LIGHTGUI_Exports.h"

 
 #include <LightApp_Selection.h>
 
 #include <LightApp_Selection.h>

-#include <QVariant>
-
-class LightApp_SelectionMgr;

 
 class LIGHT_EXPORT LIGHTGUI_Selection : public LightApp_Selection
 {
 
 class LIGHT_EXPORT LIGHTGUI_Selection : public LightApp_Selection
 {

diff --git a/src/LIGHTGUI/LIGHTGUI_TextPrs.cxx b/src/LIGHTGUI/LIGHTGUI_TextPrs.cxx
index 50a4aed3de2f51ba5dd0dfb23d14847786c986c6..9575bb66bf41b86c20138484361920edabe98431 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_TextPrs.cxx
+++ b/src/LIGHTGUI/LIGHTGUI_TextPrs.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2015  OPEN CASCADE
+// Copyright (C) 2005-2016  OPEN CASCADE

 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public


@@ -16,29 +16,24 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //

-
-// LIGHT : sample (no-corba-engine) SALOME module

 // File   : LIGHTGUI_TextPrs.cxx
 // Author : Natalia DONIS
 // File   : LIGHTGUI_TextPrs.cxx
 // Author : Natalia DONIS

-//
-#include "LIGHTGUI_TextPrs.hxx"

 
 

-#include <Prs3d_Root.hxx>
+#include "LIGHTGUI_TextPrs.h"
+
+#include <Graphic3d_ArrayOfPoints.hxx>

 #include <Graphic3d_Group.hxx>
 #include <Graphic3d_Vertex.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Graphic3d_Vertex.hxx>

-#include <SelectMgr_Selection.hxx>
-#include <SelectMgr_EntityOwner.hxx>
+#include <Prs3d_Root.hxx>

 #include <Select3D_SensitivePoint.hxx>
 #include <Select3D_SensitivePoint.hxx>

-
-#include <Basics_OCCTVersion.hxx>
-
-#if OCC_VERSION_LARGE > 0x060505
-#include <Graphic3d_ArrayOfPoints.hxx>
-#endif
+#include <SelectMgr_EntityOwner.hxx>
+#include <SelectMgr_Selection.hxx>

 
 /*!
   \class LIGHTGUI_TextPrs
   \brief Presentation object for the string line.
 
 /*!
   \class LIGHTGUI_TextPrs
   \brief Presentation object for the string line.

+
+  This class is used to display a text line in the OCC 3D viewer.

 */
 
 IMPLEMENT_STANDARD_HANDLE( LIGHTGUI_TextPrs, AIS_InteractiveObject )
 */
 
 IMPLEMENT_STANDARD_HANDLE( LIGHTGUI_TextPrs, AIS_InteractiveObject )


@@ -85,24 +80,12 @@ void LIGHTGUI_TextPrs::Compute( const Handle(PrsMgr_PresentationManager3d)& /*pr
                                 const Standard_Integer /*mode*/ )
 {
   Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup( thePrs );
                                 const Standard_Integer /*mode*/ )
 {
   Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup( thePrs );

-#if OCC_VERSION_LARGE <= 0x060504
-  aGroup->BeginPrimitives();
-#endif

   Graphic3d_Vertex aTextPos;
   Graphic3d_Vertex aTextPos;

-  //  aTextPos.SetCoord( myPos.X(), aPos.Y(), aPos.Z() );

   aTextPos.SetCoord( myPos.X(), myPos.Y(), myPos.Z() );
   aTextPos.SetCoord( myPos.X(), myPos.Y(), myPos.Z() );

-#if OCC_VERSION_LARGE <= 0x060505
-  aGroup->Marker( aTextPos );
-#else

   Handle(Graphic3d_ArrayOfPoints) anArrayOfPoints = new Graphic3d_ArrayOfPoints (1);
   anArrayOfPoints->AddVertex(myPos.X(), myPos.Y(), myPos.Z());
   aGroup->AddPrimitiveArray(anArrayOfPoints);
   Handle(Graphic3d_ArrayOfPoints) anArrayOfPoints = new Graphic3d_ArrayOfPoints (1);
   anArrayOfPoints->AddVertex(myPos.X(), myPos.Y(), myPos.Z());
   aGroup->AddPrimitiveArray(anArrayOfPoints);

-#endif
-  //  aGroup->Text( aNodeIter.Value().ToCString(), aTextPos, aCharSize );

   aGroup->Text( myString, aTextPos, aCharSize );
   aGroup->Text( myString, aTextPos, aCharSize );

-#if OCC_VERSION_LARGE <= 0x060504
-  aGroup->EndPrimitives();
-#endif

 }
 
 /*!
 }
 
 /*!


@@ -116,7 +99,5 @@ void LIGHTGUI_TextPrs::ComputeSelection( const Handle(SelectMgr_Selection)& theS
   Handle(SelectMgr_EntityOwner) eown = new SelectMgr_EntityOwner(this);
   eown -> SelectBasics_EntityOwner::Set( aCharSize );
   Handle(Select3D_SensitivePoint) seg = new Select3D_SensitivePoint(eown, myPos);
   Handle(SelectMgr_EntityOwner) eown = new SelectMgr_EntityOwner(this);
   eown -> SelectBasics_EntityOwner::Set( aCharSize );
   Handle(Select3D_SensitivePoint) seg = new Select3D_SensitivePoint(eown, myPos);

-  //  Handle(Select3D_SensitiveSegment) seg = new Select3D_SensitiveSegment(eown, myPos, 
-  //                                myPos.Translated( gp_Vec( strlen( myString ) * aCharSize, 0, 0 ) ) );

   theSelection->Add(seg);
 }
   theSelection->Add(seg);
 }

diff --git a/src/LIGHTGUI/LIGHTGUI_TextPrs.h b/src/LIGHTGUI/LIGHTGUI_TextPrs.h
new file mode 100644 (file)
index 0000000..1a41ec5
--- /dev/null
+++ b/src/LIGHTGUI/LIGHTGUI_TextPrs.h
@@ -0,0 +1,58 @@
+// Copyright (C) 2005-2016  OPEN CASCADE
+//
+// 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   : LIGHTGUI_TextPrs.h
+// Author : Natalia DONIS
+
+#ifndef LIGHTGUI_TEXTPRS_H
+#define LIGHTGUI_TEXTPRS_H
+
+#include <AIS_InteractiveObject.hxx>
+#include <gp_Pnt.hxx>
+#include <PrsMgr_PresentationManager3d.hxx>
+#include <Prs3d_Presentation.hxx>
+#include <SelectMgr_Selection.hxx>
+#include <Standard_DefineHandle.hxx>
+
+class LIGHTGUI_TextPrs: public AIS_InteractiveObject
+{
+public:
+  Standard_EXPORT LIGHTGUI_TextPrs( const char*, const gp_Pnt& );
+  Standard_EXPORT ~LIGHTGUI_TextPrs();
+
+  static int                   TextSize();
+
+private:
+  Standard_EXPORT void         Compute( const Handle(PrsMgr_PresentationManager3d)&,
+                                        const Handle(Prs3d_Presentation)&,
+                                        const Standard_Integer = 0 );
+
+  Standard_EXPORT virtual void ComputeSelection( const Handle(SelectMgr_Selection)&,
+                                                 const Standard_Integer );
+
+private:
+  char*              myString;
+  gp_Pnt             myPos;
+
+public:
+  DEFINE_STANDARD_RTTI(LIGHTGUI_TextPrs)
+};
+
+DEFINE_STANDARD_HANDLE( LIGHTGUI_TextPrs, AIS_InteractiveObject )
+
+#endif // LIGHTGUI_TEXTPRS_H

diff --git a/src/LIGHTGUI/LIGHTGUI_TextPrs.hxx b/src/LIGHTGUI/LIGHTGUI_TextPrs.hxx
deleted file mode 100644 (file)
index 5e111ed..0000000
--- a/src/LIGHTGUI/LIGHTGUI_TextPrs.hxx
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (C) 2005-2015  OPEN CASCADE
-//
-// 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
-//
-
-// LIGHT : sample (no-corba-engine) SALOME module
-// File   : LIGHTGUI_TextPrs.hxx
-// Author : Natalia DONIS
-//
-#ifndef LIGHTGUI_TEXTPRS_HXX
-#define LIGHTGUI_TEXTPRS_HXX
-
-#include <AIS_InteractiveObject.hxx>
-#include <gp_Pnt.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
-#include <Prs3d_Presentation.hxx>
-#include <SelectMgr_Selection.hxx>
-#include <Standard_DefineHandle.hxx>
-
-class LIGHTGUI_TextPrs: public AIS_InteractiveObject
-{
-public:
-  Standard_EXPORT LIGHTGUI_TextPrs( const char*, const gp_Pnt& );
-  Standard_EXPORT ~LIGHTGUI_TextPrs();
-
-  static int                   TextSize();
-
-private:
-  Standard_EXPORT void         Compute( const Handle(PrsMgr_PresentationManager3d)&,
-                                        const Handle(Prs3d_Presentation)&,
-                                        const Standard_Integer = 0 );
-
-  Standard_EXPORT virtual void ComputeSelection( const Handle(SelectMgr_Selection)&,
-                                                 const Standard_Integer );
-
-private:
-  char*              myString;
-  gp_Pnt             myPos;
-
-public:
-  DEFINE_STANDARD_RTTI(LIGHTGUI_TextPrs)
-};
-
-DEFINE_STANDARD_HANDLE( LIGHTGUI_TextPrs, AIS_InteractiveObject )
-
-#endif // LIGHTGUI_TEXTPRS_HXX