got a multiple color animation test to work.

Author: ChrisBarker-NOAA

py_gd/color_ramp.py

@@ -42,13 +42,13 @@ def __init__(self,
             self.start_index = len(base_colorscheme)
         except TypeError:  # it should be an integer now
             self.start_index = base_colorscheme
-        # else:
-        #     self.start_index = len(base_colorscheme)
 
         self._num_colors = 256 - self.start_index if num_colors is None else num_colors
         self._delta = (self.max_value - self.min_value) / self._num_colors
 
+        self.name = 'custom'
         if isinstance(colors, str):
+            self.name = colors
             colors = [c[1] for c in colorschemes[colors]]
             # otherwise assume it's in the right form
         if reversed:
@@ -104,7 +104,11 @@ def colorlist(self):
         """
         returns a list of colors as needed by Image.add_colors
         """
-        def make_str(color):
-            return str(color)
-        return [(make_str(c), tuple(c)) for c in self.color_index]
+        colorlist = [(f"{self.name}-{i}", tuple(int(i) for i in c)) for i, c in enumerate(self.color_index)]
 
+        # for i, c in enumerate(self.color_index):
+        #     values = tuple(int(i) for i in c)
+        #     name = f"{self.name}-{i}"
+        #     colorlist.append((name, values))
+
+        return colorlist

py_gd/py_gd.pyx

@@ -1503,7 +1503,7 @@ cdef class Animation:
         else:
             if self.prev_frame is not None:
                 prev = self.prev_frame._image
-            # really wierd gd flag values!
+            # really weird gd flag values!
             local_colormap = 0 if self._global_colormap == 1 else 1
             gdImageGifAnimAdd(self.cur_frame._image,
                               self._fp,

py_gd/test/test_animation.py

@@ -113,15 +113,22 @@ def test_animation_multi_images_colors():
 
     cr = ColorRamp('viridis', 0, 36, base_colorscheme=existing_colors)
     ramp_colors = cr.colorlist
-    print(ramp_colors)
-    print(len(ramp_colors))
-    print(len(set(ramp_colors)))
 
     first_frame.add_colors(ramp_colors)
 
-    # Initial frame:
-    # file_name, delay=50, global_colormap=1
-    anim = Animation(outfile("test_animation_multi_colors.gif"), delay=100, global_colormap=0)
+    # Initial frame: file_name, delay=50, global_colormap=1
+
+    # fixme: this could use a global colormap, but we'd need to make sure to
+    #        copy it correctly. From the ligd docs:
+
+    # gdImageGifAnimAdd
+    # Setting the LocalCM flag to 1 adds a local palette for this image to the
+    # animation.  Otherwise the global palette is assumed and the user must
+    # make sure the palettes match.  Use gdImagePaletteCopy to do that.
+
+    anim = Animation(outfile("test_animation_multi_colors.gif"),
+                     delay=20,
+                     global_colormap=0)
 
     anim.begin_anim(first_frame, 0)
 
@@ -136,7 +143,7 @@ def test_animation_multi_images_colors():
 
     last_frame = Image(200, 200, preset_colors='BW')
     last_frame.add_colors(ramp_colors)
-    last_frame.draw_line(np.array((0, 100)), np.array((200, 100)), 'green')
+    last_frame.draw_line(np.array((0, 100)), np.array((200, 100)), cr.get_color_indices([count+1])[0])
     anim.add_frame(last_frame)
     count += 1
 

py_gd/test/test_color_ramp.py

@@ -92,10 +92,15 @@ def test_colorlist():
 
     colorlist = cr.colorlist
 
+    print(colorlist)
+
     for c in colorlist:
         assert isinstance(c[0], str)
         assert len(c[1]) == 3
 
+    # make sure there aren't any duplicates
+    # Image doesn't let you add duplicate color names
+    assert len(set(colorlist)) == len(colorlist)
 
 def test_image_with_colorramp():
     """