Commits

Robert Kern committed 536db41

chaco2 -> chaco, etc.

Comments (0)

Files changed (5)

colormap_explorer/colormap_db.py

     """
 
     try:
-        from enthought.chaco2 import default_colormaps
-        from enthought.chaco2.data_range_1d import DataRange1D
+        from enthought.chaco import default_colormaps
+        from enthought.chaco.data_range_1d import DataRange1D
     except ImportError:
         warnings.warn("could not import Chaco to load colormaps")
         return
     ]
 
     for name, tags, mapper in names_tags_mappers:
-        description = "enthought.chaco2.default_colormaps.%s" % mapper.__name__
+        description = "enthought.chaco.default_colormaps.%s" % mapper.__name__
         yield ChacoColormap(name=name, tags=tags, description=description,
             color_mapper=mapper(DataRange1D(low=0.0, high=1.0)))
 
 
     try:
         from matplotlib.cm import datad
-        from enthought.chaco2.color_mapper import ColorMapper
-        from enthought.chaco2.data_range_1d import DataRange1D
+        from enthought.chaco.color_mapper import ColorMapper
+        from enthought.chaco.data_range_1d import DataRange1D
     except ImportError:
         warnings.warn("could not import matplotlib to load colormaps")
         return
     """
 
     try:
-        from enthought.chaco2.color_mapper import ColorMapper
-        from enthought.chaco2.data_range_1d import DataRange1D
+        from enthought.chaco.color_mapper import ColorMapper
+        from enthought.chaco.data_range_1d import DataRange1D
     except ImportError:
         warnings.warn("could not import Chaco to load colormaps")
         return

colormap_explorer/hcl_design.py

 
 import numpy as np
 
-from enthought.chaco2 import api as chaco
-from enthought.chaco2.tools import api as tools
-from enthought.chaco2.chaco2_plot_container_editor import PlotContainerEditor
-from enthought.enable2.api import black_color_trait, ColorTrait, LineStyle
+from enthought.chaco import api as chaco
+from enthought.chaco.tools import api as tools
+from enthought.enable.component_editor import ComponentEditor
+from enthought.enable.api import black_color_trait, ColorTrait, LineStyle
 from enthought.traits.api import (Any, Array, Enum, Event, Float, HasTraits,
     Instance, Int, Property, Str, on_trait_change)
 from enthought.traits.ui import api as tui
                     editor=tui.ButtonEditor(label='See Code')),
             ),
         ),
-        tui.Item('_colorbar', editor=PlotContainerEditor(), show_label=False, height=0.1),
-        tui.Item('_plot', editor=PlotContainerEditor(), show_label=False, height=0.8),
+        tui.Item('_colorbar', editor=ComponentEditor(), show_label=False, height=0.1),
+        tui.Item('_plot', editor=ComponentEditor(), show_label=False, height=0.8),
 
         width=800,
         height=800,
         template = textwrap.dedent("""\
             def %s(range, **traits):
                 from numpy import array
-                from enthought.chaco2.api import ColorMapper
+                from enthought.chaco.api import ColorMapper
                 cm = ColorMapper.from_palette_array(%s)
                 return cm
         """)

colormap_explorer/hcl_opt.py

 
 from enthought.traits.api import Float, HasTraits
 from enthought.traits.ui import api as tui
-from enthought.chaco2.shell import plot
-from enthought.chaco2 import api as chaco
+from enthought.chaco.shell import plot
+from enthought.chaco import api as chaco
 
 from colormap_explorer import conversion
 

colormap_explorer/pipelined_color_mapper.py

 import numpy as np
 
 # Enthought library imports.
-from enthought.chaco2.abstract_colormap import AbstractColormap
-from enthought.chaco2.color_mapper import ColorMapper
+from enthought.chaco.abstract_colormap import AbstractColormap
+from enthought.chaco.color_mapper import ColorMapper
 from enthought.traits.api import Any
 
 

colormap_explorer/plugin/views.py

 # Enthought library imports.
-from enthought.chaco2.chaco2_plot_container_editor import PlotContainerEditor
-from enthought.chaco2.api import ArrayPlotData, DataRange1D, Plot, gray
+from enthought.enable.component_editor import ComponentEditor
+from enthought.chaco.api import ArrayPlotData, DataRange1D, Plot, gray
 from enthought.pyface.workbench.api import TraitsUIView
 from enthought.pyface.api import ImageResource
 from enthought.traits.api import Any, Bool, Instance, Property, Str
                 editor=tui.EnumEditor(name='data_names')),
             tui.Item('diverging', label='Diverging colormap'),
         ),
-        tui.Item('container', editor=PlotContainerEditor(), show_label=False),
+        tui.Item('container', editor=ComponentEditor(), show_label=False),
 
         resizable=True,
         buttons=menu.NoButtons,