#279: completed refactoring of time -> load except for JSON files keys

DARMA-tasking · Oct 23, 2022 · 535761d · 535761d
1 parent 77a576a
commit 535761d
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/src/lbaf/IO/lbsMeshBasedVisualizer.py b/src/lbaf/IO/lbsMeshBasedVisualizer.py
@@ -519,17 +519,10 @@ def create_rendering_pipeline(self, iteration: int, pid: int, edge_width: int, g
             glyph_actor.SetMapper(glyph_mapper)
             renderer.AddActor(glyph_actor)
 
-<<<<<<< HEAD
         # Create and add unique scalar bar for object load
         load_actor = self.create_scalar_bar_actor(
             glyph_mapper, "Object Load", 0.55, 0.05)
         renderer.AddActor2D(load_actor)
-=======
-        # Create and add unique scalar bar for object time
-        time_actor = self.create_scalar_bar_actor(
-            glyph_mapper, "Object Load", 0.55, 0.05)
-        renderer.AddActor2D(time_actor)
->>>>>>> Replace object Time with Load
 
         # Create text actor to indicate iteration
         text_actor = vtk.vtkTextActor()