*** empty log message ***

diff --git a/bin/Makefile.am b/bin/Makefile.am
index da76a6844e4dd405d4a32ec5fffb501fcac371f4..f0f18a9f0eb4e03bf2ee9506c8d97e9967d702ee 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -28,6 +28,7 @@ nodist_salomescript_DATA = VERSION
 
 # python files
 dist_salomescript_PYTHON = \
+       addvars2notebook_GEOM.py \
        geom_setenv.py
 
 # distributed files

diff --git a/bin/addvars2notebook_GEOM.py b/bin/addvars2notebook_GEOM.py
new file mode 100644 (file)
index 0000000..01c37c5
--- /dev/null
+++ b/bin/addvars2notebook_GEOM.py
@@ -0,0 +1,50 @@
+
+def addvars2notebook(filename, vars_and_values):
+    stream = open(filename)
+    lines = stream.readlines()
+    stream.close()
+    newlines = []
+    for line in lines:
+        if line.find("= geompy.") >= 0:
+            name = line.split('=')[0]
+            name = name.strip()
+            vals = line
+            fields = vals.split("(")
+            if len(fields) == 2:
+                begin = fields[0] + "("
+                vals = fields[1]
+                fields = vals.split(")")
+                if len(fields) == 2:
+                    vals = fields[0]
+                    end = ")" + fields[1]
+                    vals = vals.split(',')
+                    newline  = begin
+                    newvals = []
+                    for i in range(len(vals)):
+                        valname = name + "_val_%s"%(i+1)
+                        val = vals[i]
+                        vvv = val.strip()
+                        try:
+                            iii = int(vvv)
+                            vars_and_values.append([valname, val])
+                            val = val.replace(vvv, valname.__repr__())
+                        except ValueError:
+                            try:
+                                fff = float(vvv)
+                                vars_and_values.append([valname, val])
+                                val = val.replace(vvv, valname.__repr__())
+                            except ValueError:
+                                pass
+                            pass
+                        newvals.append(val)
+                        pass
+                    newline += ','.join(newvals)
+                    newline += end
+                    line = newline
+                    pass
+                pass
+            pass
+        newlines.append(line)
+        pass
+    content = "".join(newlines)
+    return content