diff --git a/chaco/api.py b/chaco/api.py index e600bdee1..40b60d8b9 100644 --- a/chaco/api.py +++ b/chaco/api.py @@ -111,10 +111,6 @@ # Grid from .grid import PlotGrid -# Style stuff -#from stylable import Stylable -#from stylesheets import Style, StyleSheet - # Tools from .abstract_controller import AbstractController diff --git a/chaco/cmap_image_plot.py b/chaco/cmap_image_plot.py index 55df2ce9d..60c374576 100644 --- a/chaco/cmap_image_plot.py +++ b/chaco/cmap_image_plot.py @@ -41,7 +41,6 @@ class CMapImagePlot(ImagePlot): #: active selection fade_alpha = Float(0.3) - #fade_background = Tuple((255,255,255)) #: RGB color to use to fade out unselected points. fade_background = Tuple((0,0,0)) diff --git a/chaco/legend.py b/chaco/legend.py index ce86622a4..2e76909f6 100644 --- a/chaco/legend.py +++ b/chaco/legend.py @@ -280,7 +280,6 @@ def _draw_as_overlay(self, gc, view_bounds=None, mode="normal"): # Try to render the icon icon_y = y + (label_height - icon_height) / 2 - #plots = self.plots[label_name] plots = self._cached_visible_plots[i] render_args = (gc, icon_x, icon_y, icon_width, icon_height) diff --git a/chaco/multi_array_data_source.py b/chaco/multi_array_data_source.py index b4d8bc801..b1b4092f2 100644 --- a/chaco/multi_array_data_source.py +++ b/chaco/multi_array_data_source.py @@ -66,7 +66,6 @@ def __init__(self, data=array([]), sort_order="ascending", **traits): super(MultiArrayDataSource, self).__init__(**traits) self._set_data(data) self.sort_order = sort_order - #self._compute_bounds() self.data_changed = True return diff --git a/chaco/plot_containers.py b/chaco/plot_containers.py index 95b14b0c2..a57d52036 100644 --- a/chaco/plot_containers.py +++ b/chaco/plot_containers.py @@ -213,13 +213,9 @@ def _do_stack_layout(self, components, align): # If the component is resizable in the other dimension or it exceeds the # container bounds, set it to the maximum size of the container - #component.set_outer_position(other_ndx, 0) - #component.set_outer_bounds(other_ndx, size[other_ndx]) position[other_ndx] = 0 bounds[other_ndx] = size[other_ndx] else: - #component.set_outer_position(other_ndx, 0) - #old_coord = component.outer_position[other_ndx] position[other_ndx] = 0 if align == "min": pass @@ -283,7 +279,6 @@ def _do_layout(self): return self._do_stack_layout(components, align) ### Persistence ########################################################### - #_pickles = ("stack_order", "spacing") def __getstate__(self): state = super(HPlotContainer,self).__getstate__() diff --git a/chaco/plotscrollbar.py b/chaco/plotscrollbar.py index 89a8b269a..ac7dd6c32 100644 --- a/chaco/plotscrollbar.py +++ b/chaco/plotscrollbar.py @@ -88,7 +88,6 @@ def _handle_dataspace_update(self): dmin = min(mins) dmax = max(maxes) - #import pdb; pdb.set_trace() view = float(range.high - range.low) # Take into account the range's current low/high and the data bounds diff --git a/chaco/subdivision_mapper.py b/chaco/subdivision_mapper.py index b7030a4bd..8bf2f9667 100644 --- a/chaco/subdivision_mapper.py +++ b/chaco/subdivision_mapper.py @@ -205,8 +205,6 @@ def _cells_to_rects(self, cells): # extract the column indices, we need to sort them before # passing them to find_runs(). grid_column_indices = sort(y_sorted[start:end][:,0]) - #pdb.set_trace() - #print grid_column_indices.shape for span in find_runs(grid_column_indices): x = self._cell_lefts[span[0]] y = self._cell_bottoms[rownum] @@ -215,41 +213,8 @@ def _cells_to_rects(self, cells): rects.append((x,y,w,h)) return rects - #~ def _array_insertion(self, celltype): - #~ # use searchsorted() to determine where the borders split the - #~ # data array - #~ x_bins = searchsorted(data[:,0], self._cell_lefts[1:]) - #~ x_bins_rshift = right_shift(x_bins, 0) - #~ grid_x = 0 - #~ for x_index_range in zip(x_bins_rshift, x_bins): - #~ # now do the same thing in y; the tricky part is remembering - #~ # to use axis=1 since everything happens on the y-coordinate - #~ columnpoints = data[x_index_range[0] : x_index_range[1]] - #~ columnpoints = take(columnpoints, argsort(columnpoints[:,1])) - - #~ # use searchsorted() to determine where the cell bottoms split the - #~ # set of column points. - #~ y_bins = searchsorted(columnpoints[:,1], self._cell_bottoms) - #~ y_bins_rshift = right_shift(y_bins, 0) - #~ grid_y = 0 - #~ for startndx, endndx in zip(y_bins_rshift, y_bins): - #~ if startndx != endndx: - #~ cell = self._cellgrid[grid_x, grid_y] - #~ cellpts = columnpoints[startndx:endndx] - #~ if cell.sort_order == 'none': - #~ cell.points = cellpts - #~ elif cell.sort_order == 'ascending': - #~ cell.points = find_runs(sort_points(cellpts)) - #~ elif cell.sort_order == 'descending': - #~ cell.points = find_runs(sort_points(cellpts)[::-1], 'descending') - #~ else: - #~ raise RuntimeError("Invalid sort_order: " + cell.sort_order) - #~ return class SubdivisionLineDataMapper(SubdivisionDataMapper): """ A subdivision data mapper that uses ranged cells. """ celltype = RangedCell - - -#EOF diff --git a/chaco/tools/cursor_tool.py b/chaco/tools/cursor_tool.py index a0f30e38d..a1957afd9 100644 --- a/chaco/tools/cursor_tool.py +++ b/chaco/tools/cursor_tool.py @@ -102,8 +102,6 @@ def _draw_marker(self, gc, sx, sy): # The second fastest method - draw the path into a compiled path, then # draw the compiled path at each point elif hasattr(gc, 'draw_path_at_points'): - #if debug: - # import pdb; pdb.set_trace() path = gc.get_empty_path() marker.add_to_path(path, marker_size) mode = marker.draw_mode diff --git a/chaco/tools/line_segment_tool.py b/chaco/tools/line_segment_tool.py index 81ecfaeff..8e1105dda 100644 --- a/chaco/tools/line_segment_tool.py +++ b/chaco/tools/line_segment_tool.py @@ -118,7 +118,6 @@ def _deactivate(self, component=None): Called by a PlotComponent when this is no longer the active tool. """ self.reset() - #self.component.window.set_pointer("arrow") return #------------------------------------------------------------------------ diff --git a/chaco/tools/pan_tool2.py b/chaco/tools/pan_tool2.py index 025e33934..38e2c6015 100644 --- a/chaco/tools/pan_tool2.py +++ b/chaco/tools/pan_tool2.py @@ -58,9 +58,6 @@ class PanTool(DragTool): # The tool is not visible (overrides BaseTool). visible = False - # The possible event states of this tool (overrides enable.Interactor). - #event_state = Enum("normal", "panning") - def drag_start(self, event): """ Called when the drag operation starts """ diff --git a/chaco/tools/range_selection.py b/chaco/tools/range_selection.py index b5b2f314a..4b911d6da 100644 --- a/chaco/tools/range_selection.py +++ b/chaco/tools/range_selection.py @@ -431,7 +431,6 @@ def selecting_mouse_move(self, event): tmp = self._get_axis_coord(event) if tmp >= low and tmp <= high: new_edge = self.mapper.map_data(self._get_axis_coord(event)) - #new_edge = self._map_data(self._get_axis_coord(event)) if self._drag_edge == "high": low_val = self.selection[0] if new_edge >= low_val: