Changeset b7a600 in git

Timestamp:

Feb 13, 2017, 9:36:57 AM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

c881d2b553a7c6f261ea2ee679a13bee8509daa9

Parents:

7d44dd5555e888e65ba7e20c25fc77d0d98f0db197f6de6a93916b73681b340f749daec35ab96a72

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2017-02-13 09:36:57+01:00

git-committer:

GitHub <noreply@github.com>2017-02-13 09:36:57+01:00

Message:

Merge pull request #815 from YueRen/plotInteractiveShell

fix: plot in InteractiveShell

File:

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

Singular/LIB/surf.lib

@@ -141 +141 @@
 
   string surf_call; i = 0;
+  if (isInteractiveShell())
+  {
+    surf_call = "surf-alggeo ";
+    surf_call = surf_call + l + " >/dev/null 2>&1";
+    "plotting with surf, image will appear in pop-up.";
+
+    i = system("sh", surf_call);
+    ">>SPECIAL_EVENT_START>>/tmp/surf.jpg<<SPECIAL_EVENT_END<<";
+    return();
+  }
   if (isWindows())
   {
@@ -432 +442 @@
 }
 
+static proc isInteractiveShell()
+"returns 1 if this SINGULAR instance runs in some container inside interactive shell;
+0 otherwise"
+{
+  string s = getShellOutput("whoami");
+  return (s=="singularUser");
+}
+
 static proc getShellOutput(string shellCommand)
 "returns the console output when executing the given shellCommand"