Join modifications from branch OCC_development_for_3_2_0a2

[modules/superv.git] / src / GraphBase / DataFlowBase_XmlHandler.hxx

diff --git a/src/GraphBase/DataFlowBase_XmlHandler.hxx b/src/GraphBase/DataFlowBase_XmlHandler.hxx
index 5bfcdb983edb17660b66bd9979f263763bd2b6f4..a5c628b3e089e49b135523f3a932a6741c206cec 100755 (executable)
--- a/src/GraphBase/DataFlowBase_XmlHandler.hxx
+++ b/src/GraphBase/DataFlowBase_XmlHandler.hxx
@@ -29,6 +29,8 @@
 #define  INCLUDE_MENUITEM_DEF 
 #define QT_ALTERNATE_QTSMANIP
 
+#include "DataFlowBase_Graph.hxx"
+
 #include <qxml.h>
 #include <qstringlist.h>
 #include <qaction.h>
@@ -37,7 +39,6 @@
 //#include <SALOMEconfig.h>
 //#include CORBA_CLIENT_HEADER(SALOME_SuperVision)
 
-#include "DataFlowBase_Graph.hxx"
 
 #define maxlevel 7
 
@@ -61,6 +62,7 @@ namespace GraphBase {
     GraphBase::SLink aLink ;
 //    SALOME_SuperVisionBase::ServicesParameterValue aLinkValue ;
     CORBA::Any aLinkValue ;
+    CORBA::Any const *aLinkDoubleValue ;
     int X ;
     int Y ;
     int VXSize ;
@@ -68,7 +70,8 @@ namespace GraphBase {
     vector<int > VY ;
     QString     errorProt;
 
-    GraphBase::SGraph aDataFlow ;
+    int GraphsNumber ;
+    GraphBase::ListOfSGraphs aListOfDataFlows ;
 
   public:
 
@@ -76,23 +79,24 @@ namespace GraphBase {
     XmlHandler( CORBA::ORB_ptr Orb , const bool aConstructor );
     virtual ~XmlHandler();
 
-    GraphBase::SGraph & GetDataFlow() {
-           return aDataFlow ; } ;
+    GraphBase::ListOfSGraphs & ListOfDataFlows() {
+                               return aListOfDataFlows ; } ;
 
     // return the error protocol if parsing failed
     QString errorProtocol();
   
     // overloaded handler functions
-    bool startDocument();
+    bool startDocument() ;
+    bool endDocument() ;
     bool startElement( const QString& namespaceURI, const QString& localName, 
-                      const QString& qName, const QXmlAttributes& atts );
+                      const QString& qName, const QXmlAttributes& atts ) ;
     bool endElement( const QString& namespaceURI, const QString& localName,
-                     const QString& qName );
-    bool characters( const QString& ch );
+                     const QString& qName ) ;
+    bool characters( const QString& ch ) ;
   
     QString errorString();
   
-    bool fatalError   (const QXmlParseException& exception);
+    bool fatalError( const QXmlParseException& exception);
 
     SUPERV::SDate StringToDate( QString& qstrDate) const;