X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPython%2FlibBatch_Swig.i;h=8755a6b9ed1fe1c6a691c420018a32465576c634;hb=b4e59846fd2eaf893548f182645e7162da4ad731;hp=9dd95f94f3d03b9b1249443c0f2c01dd13f88f33;hpb=f52e8524c7f4ba4849499d6fd1ec99b372acc0f0;p=tools%2Flibbatch.git

diff --git a/src/Python/libBatch_Swig.i b/src/Python/libBatch_Swig.i
index 9dd95f9..8755a6b 100644
--- a/src/Python/libBatch_Swig.i
+++ b/src/Python/libBatch_Swig.i
@@ -1,23 +1,23 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021  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
+// 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.
+// 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, 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
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 /*
  * libBatch_Swig.i : 
@@ -32,7 +32,7 @@
 	 ==========
 	 Certaines classes ont des methodes surchargees et SWIG ne gere pas bien
 	 ces surcharges, d'ou un probleme d'utilisation en Python de celles-ci.
-	 En bref, �a ne marche pas et il faudra corriger le probleme...
+	 En bref, ca ne marche pas et il faudra corriger le probleme...
 
 	 TODO : corriger le probleme de surcharge des methodes en Python
 
@@ -41,11 +41,14 @@
 
 
 /* Le nom du module Python tel qu'il est importe */
-%module libBatch_Swig
+%module libbatch
 
 /* generate docstrings with types */
 %feature("autodoc", "1");
 
+/* Include std::string conversion */
+%include std_string.i
+
 /* Inclusion des conversions de type */
 %include libBatch_Swig_typemap.i
 
@@ -53,26 +56,36 @@
 %include libBatch_Swig_exception.i
 
 %{
-#include "Batch_Defines.hxx"
-#include "Batch_Job.hxx"
-#include "Batch_JobId.hxx"
-#include "Batch_JobInfo.hxx"
-
-#include "Batch_BatchManager.hxx"
-#include "Batch_BatchManagerCatalog.hxx"
-#include "Batch_FactBatchManager.hxx"
+#include "Defines.hxx"
+#include "Constants.hxx"
+#include "Job.hxx"
+#include "JobId.hxx"
+#include "JobInfo.hxx"
+
+#include "CommunicationProtocol.hxx"
+
+#include "BatchManager.hxx"
+#include "BatchManagerCatalog.hxx"
+#include "FactBatchManager.hxx"
 %}
 
 /* Les classes exportees en Python */
-%include Batch_Defines.hxx
-%include Batch_Job.hxx
-%include Batch_JobId.hxx
-%include Batch_JobInfo.hxx
+%ignore Batch::JobId::operator=;
+%ignore operator<<(std::ostream & os, const Job & job);
+%ignore operator<<(std::ostream & os, const JobInfo & ji);
+
+%include Defines.hxx
+%include Job.hxx
+%include JobId.hxx
+%include JobInfo.hxx
+
+%include CommunicationProtocol.hxx
 
-%include Batch_BatchManager.hxx
-%include Batch_BatchManagerCatalog.hxx
-%include Batch_FactBatchManager.hxx
+%include BatchManager.hxx
+%include BatchManagerCatalog.hxx
+%include FactBatchManager.hxx
 
+%include Constants.hxx
 
 
 /* Les methodes alterJob (surchargees et mal gerees en Python) sont