-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016 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
// 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
// File : SalomePy.cxx
// Author : Paul RASCLE, EDF
//
-#ifdef WNT
+#ifdef WIN32
// E.A. : On windows with python 2.6, there is a conflict
// E.A. : between pymath.h and Standard_math.h which define
// E.A. : some same symbols : acosh, asinh, ...
In case of any error these methods return None object to the Python.
*/
+#ifdef WIN32
+ #if defined SALOMEPY_EXPORTS || defined SalomePy_EXPORTS
+ #define SALOMEPY_EXPORT __declspec( dllexport )
+ #else
+ #define SALOMEPY_EXPORT __declspec( dllimport )
+ #endif
+#else
+ #define SALOMEPY_EXPORT
+#endif
+
+
#define PUBLISH_ENUM(i) \
{ \
PyObject *w; \
\param theClassName Python class name
\return Python class object or None object if class is not found
*/
-static PyObject* GetPyClass( const char* theClassName )
+static PyTypeObject* GetPyClass( const char* theClassName )
{
static PyObject* aVTKModule = 0;
PyObject* aPyClass = 0;
if ( aVTKModule ) {
PyObject* aVTKDict = PyModule_GetDict( aVTKModule );
aPyClass = PyDict_GetItemString(aVTKDict, const_cast<char*>( theClassName ) );
+ if (!PyType_Check(aPyClass))
+ return 0;
}
- return aPyClass;
+ return (PyTypeObject *)aPyClass;
}
/*!
\return VTK window renderer object
*/
-class TGetRendererEvent: public SALOME_Event
+class SALOMEPY_EXPORT TGetRendererEvent: public SALOME_Event
{
public:
typedef PyObject* TResult;
: myResult( Py_None ), myCreate( toCreate ) {}
virtual void Execute()
{
- PyObject* aPyClass = ::GetPyClass( "vtkRenderer" );
+ PyTypeObject* aPyClass = ::GetPyClass( "vtkRenderer" );
SVTK_ViewWindow* aVTKViewWindow =
::GetVTKViewWindow( myCreate ? __Create : __FindOrCreate );
if( aVTKViewWindow && aPyClass ) {
#if VTK_XVERSION < 50700
myResult = PyVTKObject_New( aPyClass, aVTKObject );
#else
- myResult = PyVTKObject_New( aPyClass, NULL, aVTKObject );
+ myResult = PyVTKObject_FromPointer( aPyClass, NULL, aVTKObject );
#endif
}
}
};
-extern "C" PyObject* libSalomePy_getRenderer( PyObject* self, PyObject* args )
+extern "C" SALOMEPY_EXPORT PyObject* libSalomePy_getRenderer( PyObject* self, PyObject* args )
{
PyObject* aResult = Py_None;
int toCreate = 0;
\return VTK window render window object
*/
-class TGetRenderWindowEvent: public SALOME_Event
+class SALOMEPY_EXPORT TGetRenderWindowEvent: public SALOME_Event
{
public:
typedef PyObject* TResult;
: myResult( Py_None ), myCreate( toCreate ) {}
virtual void Execute()
{
- PyObject* aPyClass = ::GetPyClass( "vtkRenderWindow" );
+ PyTypeObject* aPyClass = ::GetPyClass( "vtkRenderWindow" );
SVTK_ViewWindow* aVTKViewWindow =
::GetVTKViewWindow( myCreate ? __Create : __FindOrCreate );
if( aVTKViewWindow && aPyClass ) {
#if VTK_XVERSION < 50700
myResult = PyVTKObject_New( aPyClass, aVTKObject );
#else
- myResult = PyVTKObject_New( aPyClass, NULL, aVTKObject );
+ myResult = PyVTKObject_FromPointer( aPyClass, NULL, aVTKObject );
#endif
}
}
};
-extern "C" PyObject* libSalomePy_getRenderWindow( PyObject* self, PyObject* args )
+extern "C" SALOMEPY_EXPORT PyObject* libSalomePy_getRenderWindow( PyObject* self, PyObject* args )
{
PyObject* aResult = Py_None;
int toCreate = 0;
\return VTK window render window interactor object
*/
-class TGetRenderWindowInteractorEvent: public SALOME_Event
+class SALOMEPY_EXPORT TGetRenderWindowInteractorEvent: public SALOME_Event
{
public:
typedef PyObject* TResult;
: myResult( Py_None ), myCreate( toCreate ) {}
virtual void Execute()
{
- PyObject* aPyClass = ::GetPyClass( "vtkRenderWindowInteractor" );
+ PyTypeObject* aPyClass = ::GetPyClass( "vtkRenderWindowInteractor" );
SVTK_ViewWindow* aVTKViewWindow =
::GetVTKViewWindow( myCreate ? __Create : __FindOrCreate );
if( aVTKViewWindow && aPyClass ) {
#if VTK_XVERSION < 50700
myResult = PyVTKObject_New( aPyClass, aVTKObject );
#else
- myResult = PyVTKObject_New( aPyClass, NULL, aVTKObject );
+ myResult = PyVTKObject_FromPointer( aPyClass, NULL, aVTKObject );
#endif
}
}
};
-extern "C" PyObject* libSalomePy_getRenderWindowInteractor( PyObject* self, PyObject* args )
+extern "C" SALOMEPY_EXPORT PyObject* libSalomePy_getRenderWindowInteractor( PyObject* self, PyObject* args )
{
PyObject* aResult = Py_None;
int toCreate = 0;
\return nothing (Py_None)
*/
-extern "C" PyObject* libSalomePy_showTrihedron( PyObject* self, PyObject* args )
+extern "C" SALOMEPY_EXPORT PyObject* libSalomePy_showTrihedron( PyObject* self, PyObject* args )
{
class TEvent: public SALOME_Event
{
{
if( SVTK_ViewWindow* aVTKViewWindow = GetVTKViewWindow( __Find ) ) {
if ( aVTKViewWindow->isTrihedronDisplayed() != myShow )
- aVTKViewWindow->onViewTrihedron();
+ aVTKViewWindow->onViewTrihedron(myShow);
}
}
};
\return nothing (Py_None)
*/
-extern "C" PyObject* libSalomePy_fitAll( PyObject* self, PyObject* args )
+extern "C" SALOMEPY_EXPORT PyObject* libSalomePy_fitAll( PyObject* self, PyObject* args )
{
class TEvent: public SALOME_Event
{
\return nothing (Py_None)
*/
-extern "C" PyObject* libSalomePy_setView( PyObject* self, PyObject* args )
+extern "C" SALOMEPY_EXPORT PyObject* libSalomePy_setView( PyObject* self, PyObject* args )
{
class TEvent: public SALOME_Event
{
case ViewLeft:
aVTKViewWindow->onLeftView(); break;
default:
- PyErr_Format(PyExc_ValueError,"setView%: wrong parameter value; must be between %d and %d", ViewFront, ViewLeft );
+ PyErr_Format(PyExc_ValueError,"setView: wrong parameter value; must be between %d and %d", ViewFront, ViewLeft );
break;
}
}
\return nothing (Py_None)
*/
-extern "C" PyObject* libSalomePy_resetView( PyObject* self, PyObject* args )
+extern "C" SALOMEPY_EXPORT PyObject* libSalomePy_resetView( PyObject* self, PyObject* args )
{
class TEvent: public SALOME_Event
{
\brief Python module initialization.
\internal
*/
-extern "C" void initlibSalomePy()
+extern "C" SALOMEPY_EXPORT void initlibSalomePy()
{
static char* modulename = (char*)"libSalomePy";
