Debut de l'utilisation de daStudy dans les schemas

diff --git a/resources/DATASSIMSchemaCatalog.xml b/resources/DATASSIMSchemaCatalog.xml
index 8984357bcff40941df90dbe654ad54c1f895ee68..eee86ad6bd5d3b14429a4008c37546056373b7cb 100644 (file)
--- a/resources/DATASSIMSchemaCatalog.xml
+++ b/resources/DATASSIMSchemaCatalog.xml
@@ -62,6 +62,8 @@ else:
   print "ObservationOperator is", ObservationOperator
   print "ObservationOperatorType is", ObservationOperatorType
 
+from daYacsIntegration.daStudy import *
+assim_study = daStudy(Name, Algorithm)
 ]]>
 
 </code></script>

diff --git a/src/daComposant/daAlgorithms/Blue.py b/src/daComposant/daAlgorithms/Blue.py
index 3e5704da7b766e5d723cb0cf126fa35d62f82fa2..5dad7c33f615067073b513110f3f63de1da5b5c1 100644 (file)
--- a/src/daComposant/daAlgorithms/Blue.py
+++ b/src/daComposant/daAlgorithms/Blue.py
@@ -23,11 +23,11 @@ __doc__ = """
 """
 __author__ = "Jean-Philippe ARGAUD - Mars 2008"
 
-import sys ; sys.path.insert(0, "../daCore")
+import sys
 import logging
-import Persistence
-from BasicObjects import Algorithm
-import PlatformInfo ; m = PlatformInfo.SystemUsage()
+from daCore import Persistence
+from daCore.BasicObjects import Algorithm
+from daCore import PlatformInfo ; m = PlatformInfo.SystemUsage()
 
 # ==============================================================================
 class ElementaryAlgorithm(Algorithm):

diff --git a/src/daComposant/daCore/__init__.py b/src/daComposant/daCore/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/daSalome/daYacsIntegration/adStudy.py b/src/daSalome/daYacsIntegration/adStudy.py
deleted file mode 100644 (file)
index be70026..0000000
--- a/src/daSalome/daYacsIntegration/adStudy.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#-*-coding:iso-8859-1-*-
-
-from AssimilationStudy import AssimilationStudy
-
-class adStudy:
-
-  def __init__(self, name, algorithm):
-
-    self.ADD = AssimilationStudy(name)
-    self.ADD.setControls()
-    self.ADD.setAlgorithm(choice="Blue")
-
-  def getAssimilationStudy():
-    return self.ADD

diff --git a/src/daSalome/daYacsIntegration/daStudy.py b/src/daSalome/daYacsIntegration/daStudy.py
new file mode 100644 (file)
index 0000000..6b8beb1
--- /dev/null
+++ b/src/daSalome/daYacsIntegration/daStudy.py
@@ -0,0 +1,14 @@
+#-*-coding:iso-8859-1-*-
+
+from daCore.AssimilationStudy import AssimilationStudy
+
+class daStudy:
+
+  def __init__(self, name, algorithm):
+
+    self.ADD = AssimilationStudy(name)
+    self.ADD.setControls()
+    self.ADD.setAlgorithm(choice="Blue")
+
+  def getAssimilationStudy():
+    return self.ADD