Browse Source

fix 3D rendering in animation tool (#293)

Broken because of ea51ed82995, color_map needs to be always present.
Anna Petrasova 5 năm trước cách đây
mục cha
commit
f853428c58

+ 1 - 1
gui/wxpython/animation/nviztask.py

@@ -297,7 +297,7 @@ class NvizTask:
             self.task.set_param(paramName, value)
             self.task.set_param(paramName, value)
             # FIXME: we assume we want always default color map
             # FIXME: we assume we want always default color map
             if paramName == 'elevation_map':
             if paramName == 'elevation_map':
-                self.task.set_param('color_map', '')
+                self.task.set_param('color_map', self.task.get_param(paramName)['value'])
             if paramName == 'volume':
             if paramName == 'volume':
                 self.task.set_param('isosurf_color_map', '')
                 self.task.set_param('isosurf_color_map', '')
             self.task.set_flag('overwrite', True)
             self.task.set_flag('overwrite', True)

+ 2 - 2
gui/wxpython/animation/provider.py

@@ -26,7 +26,7 @@ import wx
 import tempfile
 import tempfile
 from multiprocessing import Process, Queue
 from multiprocessing import Process, Queue
 
 
-from core.gcmd import RunCommand, GException
+from core.gcmd import RunCommand, GException, DecodeString
 from core.settings import UserSettings
 from core.settings import UserSettings
 from core.debug import Debug
 from core.debug import Debug
 from core.utils import autoCropImageFromFile
 from core.utils import autoCropImageFromFile
@@ -821,7 +821,7 @@ def read2_command(*args, **kwargs):
     kwargs['stderr'] = gcore.PIPE
     kwargs['stderr'] = gcore.PIPE
     ps = gcore.start_command(*args, **kwargs)
     ps = gcore.start_command(*args, **kwargs)
     stdout, stderr = ps.communicate()
     stdout, stderr = ps.communicate()
-    return ps.returncode, stdout, stderr
+    return ps.returncode, DecodeString(stdout), DecodeString(stderr)
 
 
 
 
 def test():
 def test():