Changeset d0869f in git

Timestamp:

Mar 4, 2010, 5:12:57 PM (13 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

7030440734b67f0c17c06d82bb3f51131c25ba89

Parents:

cff3f3df4ef642dfd7e474c8e5293cc98ee2929d

Message:

fixes for plot and surfer in Windows OS

git-svn-id: file:///usr/local/Singular/svn/trunk@12593 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/LIB/surf.lib (modified) (7 diffs)

Singular/LIB/surf.lib

@@ -72 +72 @@
 {
   string extra_surf_opts=" -x --auto-resize "; // remove this line for surf 0.9
-  string l = "/tmp/surf"+string(system("pid"));
+  string l = "/tmp/surf" + string(system("pid"));
   string err_mes; // string containing error messages
   def base=basering;
@@ -105 +105 @@
     write(":w "+l,"clip=none;");
       write(l, "width=500; height=500; set_size; do_background=yes;
-background_red=255; background_green=255; background_blue=255;");
+               background_red=255; background_green=255;
+               background_blue=255;");
     write(l,
     "root_finder=d_chain_bisection;epsilon=0.0000000001;iterations=20000;");
@@ -138 +139 @@
     }
   }
+
   string surf_call;
-  surf_call = "surf ";
-  if (defined(extra_surf_opts))
-  {
-    surf_call = surf_call + " " + extra_surf_opts;
-  }
-  surf_call =surf_call + l + " >/dev/null 2>&1";
-
-  "Press q to exit from 'surf'";
-  if ("ppcMac-darwin" != system("uname"))
-  {
-     i=system("sh", surf_call);
+
+  if (isWindows())
+  {
+    surf_call = "((xwin -multiwindow -clipboard -silent-dup-error";
+    surf_call = surf_call + " >/dev/null 2>&1 &) && sleep 5 && (surf";
+    if (defined(extra_surf_opts))
+    {
+      surf_call = surf_call + " " + extra_surf_opts;
+    }
+    surf_call = surf_call + l + ">/dev/null 2>&1))";
+    surf_call = surf_call + "&& /bin/rm " + l;
+    "Press q to exit from 'surf'.";
+    "(You may leave the XServer running for further invocations"
+    + " of 'plot'.)";
+    i = system("sh", surf_call);
   }
   else
   {
-     surf_call = surf_call + " || " + "singularsurf "
-                 + extra_surf_opts + " " + l +" >/dev/null 2>&1";
-     i = system("sh", surf_call);
+    surf_call = "surf ";
+    if (defined(extra_surf_opts))
+    {
+      surf_call = surf_call + " " + extra_surf_opts;
+    }
+    surf_call = surf_call + l + " >/dev/null 2>&1";
+  
+    if ("ppcMac-darwin" == system("uname"))
+    {
+       surf_call = surf_call + " || " + "singularsurf "
+                   + extra_surf_opts + " " + l + " >/dev/null 2>&1";
+    }
+
+    "Press q to exit from 'surf'";
+    i = system("sh", surf_call);
+    system("sh", "/bin/rm " + l);
   }
 
   if (i != 0)
   {
-    err_mes = "calling `surf` failed. (the shell return the error code "
-          + string(i) + ")." + newline +
-          "probably the executable `surf` is not found.";
-    ERROR(err_mes);
-  }
-  i = system("sh", "/bin/rm "+l);
+    err_mes = "calling `surf` failed" + newline
+              + " (The shell returned the error code "
+              + string(i) + "." + newline
+              + "Probably, the executable `surf` was not found.)";
+    ERROR(err_mes);
+  }
 }
 example
@@ -206 +225 @@
 "
 {
-  string l = "/tmp/surf"+string(system("pid"));
+  string l = "./surfer" + string(system("pid"));
   string err_mes; // string containing error messages
   def base=basering;
@@ -237 +256 @@
   if (ncols(I)==1 and (n==3 or nvars(base)==3)) // surface
   {
-    write(":w " + l, "surface=",I[1],";");
+    write(":w " + l, "surface=" + string(I[1]) + ";");
   }
   else
@@ -246 +265 @@
   }
   string surf_call;
-  surf_call ="surfer " + l + " >/dev/null 2>&1";
-
+  
+  surf_call = "surfer";
+  if (isWindows())
+  {
+    surf_call = surf_call + ".exe";
+  }
+  surf_call = surf_call + " " + l; // + " >/dev/null 2>&1";
   "Close window to exit from 'surfer'";
-  i=system("sh", surf_call);
+  i = system("sh", surf_call);
+  system("sh", "/bin/rm " + l);
 
   if (i != 0)
   {
-    err_mes = "calling `surfer` failed. (the shell return the error code "
-          + string(i) + ")." + newline +
-          "probably the executable `surfer` is not found.";
-    ERROR(err_mes);
-  }
-  i = system("sh", "/bin/rm "+l);
+    err_mes = "calling `surfer` failed" + newline
+              + " (The shell returned the error code "
+              + string(i) + "." + newline
+              + "Probably, the executable `surfer` was not found.)";
+    ERROR(err_mes);
+  }
 }
 example
@@ -277 +302 @@
 
 }
+proc isWindows()
+"returns 1 if this SINGULAR instance runs under (some) Windows OS;
+0 otherwise"
+{
+  string s = system("uname");
+  for (int i = 1; i <= size(s)-2; i = i + 1)
+  {
+    if (s[i] == "W")
+    {
+      if (s[i+1] == "i")
+      {
+        if (s[i+2] == "n")
+        {
+          return (1);
+        }
+      }
+    }
+  }
+  return (0);
+}
 ///////////////////////////////////////////////////////////////////////////////