Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions chaco/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion chaco/cmap_image_plot.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
1 change: 0 additions & 1 deletion chaco/legend.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
1 change: 0 additions & 1 deletion chaco/multi_array_data_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 0 additions & 5 deletions chaco/plot_containers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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__()
Expand Down
1 change: 0 additions & 1 deletion chaco/plotscrollbar.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
35 changes: 0 additions & 35 deletions chaco/subdivision_mapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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
2 changes: 0 additions & 2 deletions chaco/tools/cursor_tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion chaco/tools/line_segment_tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

#------------------------------------------------------------------------
Expand Down
3 changes: 0 additions & 3 deletions chaco/tools/pan_tool2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 """
Expand Down
1 change: 0 additions & 1 deletion chaco/tools/range_selection.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down