* system/fluents.py: Fixed a bug where the the application tried to load
a toolbar from None * system/plots.py: Fixed MainView.insert_view that was a no-op when in large view. * system/dataset.py: Changed __str__ of dataset to also show names of dimensions.
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
from system import logger
|
||||
from scipy import atleast_2d,asarray,ArrayType
|
||||
|
||||
|
||||
@@ -55,7 +54,6 @@ class Dataset:
|
||||
self.shape = array.shape
|
||||
if shape != None:
|
||||
if self.shape!=shape:
|
||||
#logger.log("debug","Dataset and input shape mismatch")
|
||||
raise ValueError, "Differing in array and provided. %s != %s" % (self.shape, shape)
|
||||
if identifiers!=None:
|
||||
self._set_identifiers(identifiers,all_dims)
|
||||
@@ -71,8 +69,8 @@ class Dataset:
|
||||
|
||||
self._all_dims = all_dims
|
||||
|
||||
def __str__self(self):
|
||||
return self._name
|
||||
def __str__(self):
|
||||
return self._name + ":" + self._dims.__str__()
|
||||
|
||||
def __iter__(self):
|
||||
"""Returns an iterator over dimensions of dataset."""
|
||||
@@ -193,7 +191,6 @@ class Dataset:
|
||||
reverse[value] = key
|
||||
return [self._map[dim][key] for key in idents]
|
||||
|
||||
|
||||
class CategoryDataset(Dataset):
|
||||
"""The category dataset class.
|
||||
|
||||
@@ -247,3 +244,4 @@ class Selection:
|
||||
"""Handles selected identifiers along each dimension of a dataset"""
|
||||
def __init__(self):
|
||||
self.current_selection={}
|
||||
|
||||
|
Reference in New Issue
Block a user