dolfin team mailing list archive

[Anders Logg <logg@xxxxxxxxx>]

On Wed, Sep 03, 2008 at 09:14:24AM +0200, Johannes Ring wrote:
> Hello,
> 
> I had some problems with the C++ code for plotting in Windows, especially
> with generating temporary files, and I have made a patch that fixes these.
> I have included the patch here if you want to have a look at it or should
> I just go ahead and apply it myself?
> 
> Johannes

> # HG changeset patch
> # User Johannes Ring <johannr@xxxxxxxxx>
> # Date 1220425937 -7200
> # Node ID 9eb9e7a90ab18e7289dd71979559fb4d951780f3
> # Parent  36f4401bb0a96fd171c0473f7f207c425882817e
> Fix for plotting on Windows.
> 
> diff -r 36f4401bb0a9 -r 9eb9e7a90ab1 dolfin/plot/plot.cpp
> --- a/dolfin/plot/plot.cpp	Tue Sep 02 11:05:15 2008 +0200
> +++ b/dolfin/plot/plot.cpp	Wed Sep 03 09:12:17 2008 +0200
> @@ -14,8 +14,11 @@
>  #include <dolfin/io/File.h>
>  #include "plot.h"
>  
> +#ifdef __WIN32__
> +#include <windows.h>  // neccessary to create temporary files on Windows
> +#endif
> +
>  using namespace dolfin;
> -
>  namespace dolfin
>  {
>  
> @@ -25,11 +28,33 @@
>      message("Plotting %s, press q to continue...", class_name.c_str());
>      
>      // Open temporary script file
> +#ifdef __WIN32__
> +    char buffer[MAX_PATH];
> +    std::string tmppath;
> +    if (GetTempPath(512, buffer) == 0) 
> +      tmppath = ".";  // use current directory instead
> +    else
> +      tmppath = std::string(buffer);
> +    std::string script_name;
> +    if (GetTempFileName(tmppath.c_str(), "", 0, buffer) == 0) 
> +      error("Unable to create temporary plotting script in %s.", tmppath.c_str());
> +    else
> +      script_name = std::string(buffer) + ".py";
> +#else
>      std::string script_name = std::string(tmpnam(0)) + ".py";
> +#endif
>      FILE* script_file = fopen(script_name.c_str(), "w");
>      
>      // Save data to temporary file
> +#ifdef __WIN32__
> +    std::string data_name;
> +    if (GetTempFileName(tmppath.c_str(), "", 0, buffer) == 0)
> +      error("Unable to create temporary xml file in %s.", tmppath.c_str());
> +    else
> +      data_name = std::string(buffer) + ".xml";
> +#else
>      std::string data_name = std::string(tmpnam(0)) + ".xml";
> +#endif
>      dolfin_set("output destination", "silent");
>      File file(data_name);
>      file << t;
> @@ -38,7 +63,7 @@
>      // Write script file
>      fprintf(script_file, "try:\n");
>      fprintf(script_file, "    from dolfin import *\n\n");
> -    fprintf(script_file, "    object = %s(\"%s\")\n", class_name.c_str(), data_name.c_str());
> +    fprintf(script_file, "    object = %s(r\"%s\")\n", class_name.c_str(), data_name.c_str());
>      if (mode == "")
>        fprintf(script_file, "    plot(object)\n");
>      else
> @@ -50,7 +75,11 @@
>      fclose(script_file);
>      
>      // Run script
> +#ifdef __WIN32__
> +    std::string command = "python " + script_name + " > nul";
> +#else
>      std::string command = "python " + script_name + " > /dev/null";
> +#endif
>      if ( system(command.c_str()) != 0 )
>        message("Unable to plot (PyDOLFIN or Viper plotter not available).");
>    }
> _______________________________________________
> DOLFIN-dev mailing list
> DOLFIN-dev@xxxxxxxxxx
> http://www.fenics.org/mailman/listinfo/dolfin-dev

Looks fine, just apply it!

-- 
Anders

Attachment: signature.asc
Description: Digital signature