From: vsr <vsr@opencascade.com>
Date: Thu, 13 Dec 2012 12:37:06 +0000 (+0000)
Subject: Merge from V6_main 13/12/2012
X-Git-Tag: V7_1_0_pre
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FV7_siman;p=samples%2Fpycalculator.git

Merge from V6_main 13/12/2012
---

diff --git a/src/PYCALCULATOR/PYCALCULATOR.py b/src/PYCALCULATOR/PYCALCULATOR.py
index 06c530d..50e6373 100755
--- a/src/PYCALCULATOR/PYCALCULATOR.py
+++ b/src/PYCALCULATOR/PYCALCULATOR.py
@@ -46,6 +46,10 @@ class PYCALCULATOR (PYCALCULATOR_ORB__POA.PYCALCULATOR_Gen, SALOME_ComponentPy.S
 	self._naming_service=SALOME_ComponentPy.SALOME_NamingServicePy_i(self._orb)
         print "End of PYCALCULATOR::__init__" 
 
+    def getVersion( self ):
+        import salome_version
+        return salome_version.getVersion("PYCALCULATOR", True)
+
     def Add(self, field1, field2):
         print "Begin of PYCALCULATOR::Add"
         print "pointeur on first argument : ",field1