Salome HOME
projects
/
modules
/
paravis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/abn/guifix' into V7_5_BR
[modules/paravis.git]
/
src
/
PVGUI
/
PVGUI_Tools.h
diff --git
a/src/PVGUI/PVGUI_Tools.h
b/src/PVGUI/PVGUI_Tools.h
index 7b929c849e12984a3d7b05324ee74faed6adc821..c7346796fadaf7073cccd566d949ebaea3433721 100644
(file)
--- a/
src/PVGUI/PVGUI_Tools.h
+++ b/
src/PVGUI/PVGUI_Tools.h
@@
-1,12
+1,11
@@
// PARAVIS : ParaView wrapper SALOME module
//
// PARAVIS : ParaView wrapper SALOME module
//
-// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2010-2014 CEA/DEN, EDF R&D
//
// 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
//
// 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.
+// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-26,15
+25,23
@@
#ifndef PVGUI_Tools_H
#define PVGUI_Tools_H
#ifndef PVGUI_Tools_H
#define PVGUI_Tools_H
-#include "PARAVIS_Gen_i.hh"
+#ifdef PARAVIS_WITH_FULL_CORBA
+# include "PARAVIS_Gen_i.hh"
+#endif
+
+#include "SALOMEDSClient_Study.hxx"
+
+#define PVSTATEID 15555
class CAM_Module;
namespace PARAVIS
{
class CAM_Module;
namespace PARAVIS
{
-
+#ifdef PARAVIS_WITH_FULL_CORBA
PARAVIS_Gen_i* GetParavisGen(const CAM_Module* theModule);
PARAVIS_Gen_i* GetParavisGen(const CAM_Module* theModule);
+#endif
+ _PTR(Study) GetCStudy(const CAM_Module* theModule);
};
#endif // PVGUI_Tools_H
};
#endif // PVGUI_Tools_H