From f34a09b5407f9a0e43bd5e448acbc3b4d11c0923 Mon Sep 17 00:00:00 2001 From: h_vogt Date: Sat, 2 Jan 2010 15:24:03 +0000 Subject: [PATCH] gnuplot update --- ChangeLog | 6 ++++++ src/frontend/plotting/gnuplot.c | 7 +++++-- src/winmain.c | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b9c19812..1f981381c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-01-01 Holger Vogt + * winmain.c: internal system() no longer needed, its available + in mingw and MS Visual Studio. + gnuplot.c: small update, call to gnuplot tested up to ver. 4.2.6, + does not work for Windows and gnuplot 4.4. + 2010-01-01 Holger Vogt * spinit.in: Small update gnuplot.c: calling gnuplot via xterm diff --git a/src/frontend/plotting/gnuplot.c b/src/frontend/plotting/gnuplot.c index a494f8358..0234c1ae2 100644 --- a/src/frontend/plotting/gnuplot.c +++ b/src/frontend/plotting/gnuplot.c @@ -209,10 +209,13 @@ ft_gnuplot(double *xlims, double *ylims, char *filename, char *title, char *xlab (void) fclose( file_data ); #if defined(__MINGW32__) || defined(_MSC_VER) - (void) sprintf( buf, "start /B wgnuplot %s -" , filename_plt ); + /* for external fcn system() */ +// (void) sprintf( buf, "start /B wgnuplot %s -" , filename_plt ); + (void) sprintf( buf, "start /B wgnuplot -persist %s " , filename_plt ); _flushall(); #else - (void) sprintf( buf, "xterm -e gnuplot %s - &", filename_plt ); + /* for external fcn system() from LINUX environment */ + (void) sprintf( buf, "xterm -e gnuplot %s - &", filename_plt ); #endif err = system( buf ); diff --git a/src/winmain.c b/src/winmain.c index e33e0a4c8..0fa236be2 100644 --- a/src/winmain.c +++ b/src/winmain.c @@ -1338,7 +1338,7 @@ size_t _memavl(void) sum = ms.dwAvailPhys + ms.dwAvailPageFile; return (size_t) sum; } -*/ + // -------------------------------------------- #ifndef _MSC_VER int system( const char * command) @@ -1386,7 +1386,7 @@ int system( const char * command) return 0; } // system Windows95 #endif - +*/ /* Strip leading spaces, return a copy of s */ char* rlead(char *s) {