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
/
PARAVIS_Gen_i.cc
diff --git
a/src/PVGUI/PARAVIS_Gen_i.cc
b/src/PVGUI/PARAVIS_Gen_i.cc
index e31a4f5202d68b144cbcb22d4269c1ea29d15d28..a340c019b2f88c71e3d217934b971052db94c2ff 100644
(file)
--- a/
src/PVGUI/PARAVIS_Gen_i.cc
+++ b/
src/PVGUI/PARAVIS_Gen_i.cc
@@
-1,9
+1,9
@@
-// Copyright (C) 2010-201
2
CEA/DEN, EDF R&D
+// Copyright (C) 2010-201
4
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
@@
-23,6
+23,7
@@
#include "PARAVIS_Gen_i.hh"
#include "PARAVIS_Gen_i.hh"
+#include "PARAVIS_version.h"
// IDL Headers
#include <omnithread.h>
// IDL Headers
#include <omnithread.h>
@@
-47,7
+48,10
@@
#include "QDir"
#include "QTextStream"
#include "QDir"
#include "QTextStream"
-#include "vtkWrapIDL.h"
+#ifdef PARAVIS_WITH_FULL_CORBA
+ // List of VTK classes wrapped into IDL:
+# include "vtkWrapIDL.h"
+#endif
#include <pqServer.h>
#include <pqServerResource.h>
#include <pqServer.h>
#include <pqServerResource.h>
@@
-592,6
+596,7
@@
namespace PARAVIS
return SALOMEDS::SObject::_nil();
}
return SALOMEDS::SObject::_nil();
}
+#ifdef PARAVIS_WITH_FULL_CORBA
//----------------------------------------------------------------------------
PARAVIS::string_array* PARAVIS_Gen_i::GetClassesList()
{
//----------------------------------------------------------------------------
PARAVIS::string_array* PARAVIS_Gen_i::GetClassesList()
{
@@
-610,6
+615,7
@@
namespace PARAVIS
PARAVIS::PARAVIS_Base_i* aClass = CreateInstance(NULL, QString(theClassName));
return aClass->_this();
}
PARAVIS::PARAVIS_Base_i* aClass = CreateInstance(NULL, QString(theClassName));
return aClass->_this();
}
+#endif
//----------------------------------------------------------------------------
void PARAVIS_Gen_i::GetConnectionParameters(CORBA::Long& theId,
//----------------------------------------------------------------------------
void PARAVIS_Gen_i::GetConnectionParameters(CORBA::Long& theId,
@@
-725,4
+731,13
@@
namespace PARAVIS
return SALOMEDS::Study::_duplicate(myStudyDocument);
}
return SALOMEDS::Study::_duplicate(myStudyDocument);
}
+ // Version information
+ char* PARAVIS_Gen_i::getVersion()
+ {
+#ifdef PARAVIS_DEVELOPMENT
+ return CORBA::string_dup( PARAVIS_VERSION_STR"dev" );
+#else
+ return CORBA::string_dup( PARAVIS_VERSION_STR );
+#endif
+ }
}
}