From: vsv <vitaly.smetannikov@opencascade.com>
Date: Tue, 27 Jan 2015 17:12:17 +0000 (+0300)
Subject: Merge branch 'Dev_0.7.1' of newgeom:newgeom into Dev_0.7.1
X-Git-Tag: V_1.0.0~17^2~1^2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=67a7fe404a60e872f2012cfd0e9a621b99d9883a;p=modules%2Fshaper.git

Merge branch 'Dev_0.7.1' of newgeom:newgeom into Dev_0.7.1

Conflicts:
	doc/Modules.doc
---

67a7fe404a60e872f2012cfd0e9a621b99d9883a
diff --cc doc/Modules.doc
index bd6433925,91d2026f7..e0772eefe
--- a/doc/Modules.doc
+++ b/doc/Modules.doc
@@@ -34,33 -34,15 +34,46 @@@
   *
   */
  
 +/**
 + * \defgroup GUI GUI of the application
 + *
 + * \brief Classes for griphic user interface definition
 + * 
 + * Classes of application windows definition, operations launching, 
 + * and objects presentations. It consists of two packages:
 + * - ModuleBase - level for modules definition
 + * - XGUI - implementation of Application GUI.
 + */
 +
 +/**
 + * \defgroup Salome A Salome connector
 + * 
 + * \brief A set of classes which provide wrapping of 
 + * OpenParts application as SALOME module
 + */
 +
 +/** 
 + * \defgroup Desktop Classes for standalone application
 + * 
 + * \brief This group contains classes for launching the application 
 + * in standalone desktop (without SALOME)
 + */
 +
 +/** 
 + * \defgroup Modules Modules
 + * 
 + * \brief Definition of a module as a set of classes for plugins management
-  */
++ */
++
+ /**
+  * \defgroup Validators Validators
+  *
+  * \brief Implementation of internal logic of the feature
+  * 
+  * Validators are used for checking validity of the feature: each argument, 
+  * dependencies between the arguments. Validators are defined in the 
+  * configuration files and may be also used for selection filters (ModuleBase_SelectionValidator),
+  * passing configurable parameters from XML file to the feature implementation 
+  * (like in ExchangePlugin_ImportFormatValidator).
+  *
+  */