Merge from V5_1_main 14/05/2010

[modules/visu.git] / src / VISU_I / VISU_Gen_i.hh

diff --git a/src/VISU_I/VISU_Gen_i.hh b/src/VISU_I/VISU_Gen_i.hh
index 32eec815397bb2a4119dd0bd7eb361887f4326cb..70e3833f647b012598dbac0db2a433dfcadeb285 100644 (file)
--- a/src/VISU_I/VISU_Gen_i.hh
+++ b/src/VISU_I/VISU_Gen_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  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
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_Gen_i.hh
 //  Author : Alexey Petrov
 //  Module : VISU
@@ -34,10 +35,16 @@
 #include "VISU_ColoredPrs3d_i.hh"
 #include "VISU_ClippingPlaneMgr.hxx"
 
+#include <VTKViewer_MarkerDef.h>
+
+#include <map>
 #include <string>
 
 namespace VISU
 {
+  //----------------------------------------------------------------------------
+  typedef std::map<int, VTK::MarkerMap> StudyId2MarkerMap;
+
   //----------------------------------------------------------------------------
   class VISU_Gen_i : public virtual POA_VISU::VISU_Gen,
                     public virtual ::Engines_Component_i,
@@ -46,6 +53,8 @@ namespace VISU
     SALOMEDS::Study_var myStudyDocument;
     VISU_ClippingPlaneMgr myClippingPlaneMgr;
 
+    StudyId2MarkerMap myMarkerMap;
+
     VISU_Gen_i(const VISU::VISU_Gen_i &);
   public:
     VISU_Gen_i(CORBA::ORB_ptr theORB,
@@ -78,7 +87,7 @@ namespace VISU
 
     virtual
     SALOMEDS::SObject_ptr
-    ImportTables(const char* theFileName);
+    ImportTables(const char* theFileName, bool theFirstStrAsTitle = false);
 
     virtual
     CORBA::Boolean
@@ -265,12 +274,21 @@ namespace VISU
     CreateCurve(Table_ptr theTable, 
                CORBA::Long theHRow, 
                CORBA::Long theVRow);
+
     virtual
     Curve_ptr
     CreateCurveWithZ(Table_ptr theTable, 
-               CORBA::Long theHRow, 
-               CORBA::Long theVRow,
-               CORBA::Long theZRow);
+                     CORBA::Long theHRow, 
+                     CORBA::Long theVRow,
+                     CORBA::Long theZRow);
+
+    virtual
+    Curve_ptr
+    CreateCurveWithZExt(Table_ptr theTable, 
+                        CORBA::Long theHRow, 
+                        CORBA::Long theVRow,
+                        CORBA::Long theZRow,
+                        CORBA::Boolean theIsV2);
 
     virtual
     Container_ptr 
@@ -413,6 +431,10 @@ namespace VISU
            const char* theMeshName,
            const VISU::double_array& theTStamps);
 
+    /* Load texture from file */
+    virtual CORBA::Long LoadTexture(const char* theTextureFile);
+
+    StudyId2MarkerMap& GetMarkerMap() { return myMarkerMap; }
   };
 }