tab change updates plugin table ref

Author: dmnfarrell

CHANGES

@@ -1,5 +1,5 @@
 -----
-0.6.0
+0.5.1
 -----
 
 * fix to duplicate sheet bug

tablexplore/__init__.py

@@ -1,2 +1,2 @@
 from .core import *
-__version__='0.6.0'
+__version__='0.5.1'

tablexplore/app.py

@@ -102,6 +102,7 @@ def __init__(self, project_file=None, csv_file=None, excel_file=None):
         self.recent_files = ['']
         self.recent_urls = []
         self.scratch_items = {}
+        self.openplugins = {}
 
         self.loadSettings()
         self.setTheme()
@@ -210,6 +211,8 @@ def tabSelected(self, index):
         #print (table.pf)
         #get plot options and update widgets
         self.updatePlotWidgets(table)
+        #update any plugins to use the current table if needed
+        self.updatePlugins()
         return
 
     def updatePlotWidgets(self, table):
@@ -222,6 +225,15 @@ def updatePlotWidgets(self, table):
         table.pf.updateData()
         return
 
+    def updatePlugins(self):
+        """Update table for a plugin if it needs it"""
+
+        for o in self.openplugins:
+            print (o)
+            w = self.getCurrentTable()
+            self.openplugins[o].table = w
+        return
+
     def startLogging(self):
         """Logging"""
 
@@ -1283,9 +1295,9 @@ def loadPlugin(self, plugin):
         index = self.tabs.currentIndex()
         name = self.tabs.tabText(index)
         tablew = self.sheets[name]
-        if not hasattr(tablew, 'openplugins'):
-            tablew.openplugins = {}
-        openplugins = tablew.openplugins
+        if not hasattr(self, 'openplugins'):
+            self.openplugins = {}
+        openplugins = self.openplugins
 
         if plugin.name in openplugins:
             p = openplugins[plugin.name]

tablexplore/core.py

@@ -391,6 +391,7 @@ def createPlotViewer(self, parent=None):
 
         if self.pf == None:
             self.pf = plotting.PlotViewer(table=self.table, parent=parent)
+            #self.table.selectionModel().selectionChanged.connect(self.pf.updateSeries)
         if parent == None:
             self.pf.show()
         return self.pf

tablexplore/dialogs.py

@@ -320,7 +320,8 @@ def setColor(self, color):
         if self._color:
             self.setStyleSheet("background-color: %s;" % self._color)
         else:
-            self.setStyleSheet("")
+            self.setStyleSheet("")    
+        return
 
     def color(self):
         return self._color
@@ -721,7 +722,7 @@ def __init__(self, parent, title=None):
         self.setWindowTitle(title)
         self.setGeometry(QtCore.QRect(400, 300, 1000, 600))
         self.resize(500, 200)
-        self.layout = QVBoxLayout(self)        
+        self.layout = QVBoxLayout(self)
         self.show()
         return
 

tablexplore/plotting.py

@@ -52,6 +52,8 @@
 colormaps = sorted(m for m in plt.cm.datad if not m.endswith("_r"))
 markers = ['','o','.','^','v','>','<','s','+','x','p','d','h','*']
 linestyles = ['-','--','-.',':']
+plotkinds = ['line', 'bar', 'barh', 'scatter', 'pie', 'histogram', 'boxplot', 'violinplot', 'dotplot',
+             'heatmap', 'area', 'hexbin', 'scatter_matrix', 'density', 'radviz']
 valid_kwds = {'line': ['alpha', 'colormap', 'grid', 'legend', 'linestyle','ms',
                   'linewidth', 'marker', 'subplots', 'rotx', 'logx', 'logy',
                   'sharex','sharey', 'kind'],
@@ -139,7 +141,7 @@ def __init__(self, table, parent=None):
         self.table = table
         self.createWidgets()
         self.createOptions()
-        self.seriesopts = SeriesOptions(plotviewer=self)
+        #self.seriesopts = SeriesOptions(plotviewer=self)
         self.currentdir = os.path.expanduser('~')
         sizepolicy = QSizePolicy()
         self.setSizePolicy(QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding))
@@ -157,7 +159,7 @@ def addPlotWidget(self):
         self.toolbar = NavigationToolbar(self.canvas, layout)
 
         #add custom buttons
-        iconfile = os.path.join(iconpath,'plotseries.png')
+        #iconfile = os.path.join(iconpath,'plotseries.png')
         #a = QAction(QIcon(iconfile), "Customise Series", self)
         #a.triggered.connect(self.customiseSeries)
         #self.toolbar.addAction(a)
@@ -173,38 +175,68 @@ def addPlotWidget(self):
         vbox.addWidget(self.canvas)
         return
 
+    def updateSeries(self, event=None):
+        """Update series with new plots"""
+
+        data = self.table.getSelectedDataFrame()
+        self.seriesopts.series = self.getSeries(data)
+        return
+
     def customiseSeries(self):
         """
         Show custom options for current plot series. Allows plot types to
         be specified per series and uses a custom plot function.
         """
 
-        data = self.table.getSelectedDataFrame()
         if self.seriesopts.series == {}:
-            self.seriesopts.series = self.getSeries(data)
+            self.updateSeries()
         dlg = self.seriesopts.showDialog(self)
         dlg.exec_()
         return
 
     def customPlot(self):
         """plot custom series """
 
+        self.applyPlotoptions()
+        self.setStyle()
+        kwds = self.opts['general'].kwds
+        formatkwds = self.opts['format'].kwds
+        kwds.update(formatkwds)
+        axes_layout = kwds['axes_layout']
+        lkwds = self.opts['labels'].kwds.copy()
+        axkwds = self.opts['axes'].kwds
+
         data = self.table.getSelectedDataFrame()
         layout='single'
         self.clear()
         self.ax = self.fig.add_subplot(111)
         series = self.seriesopts.series
         for s in series:
             df = data[s]
-            kwds = series[s]
-            kind=kwds['kind']
-            color = kwds['color']
-            print (kwds)
-            df.plot(kind=kind,layout=layout,color=color,ax=self.ax)
+            skwds = series[s]
+            kind = skwds['kind']
+            #skwds = self.check_kwds(skwds, kind)
+            #print (skwds)
+            df.plot(layout=layout,ax=self.ax,**skwds)
         self.fig.legend()
+
+        axs=self.ax
+        lkwds.update(kwds)
+        self.setFigureOptions(axs, lkwds)
         self.canvas.draw()
         return
 
+    def check_kwds(self, kwds, kind):
+        return dict((k, kwds[k]) for k in valid_kwds[kind] if k in kwds)
+
+    def colorsfromColormap(self, df, cmap):
+        """Column colors from cmap"""
+
+        cols = df.columns
+        clrs = util.gen_colors(cmap,len(cols))
+        colordict = dict(zip(cols,clrs))
+        return colordict
+
     def showTools(self):
         """Show/hide tools dock"""
 
@@ -217,7 +249,6 @@ def showTools(self):
     def createWidgets(self):
         """Create widgets. Plot on left and dock for tools on right."""
 
-        #self.main = QSplitter(Qt.Horizontal, self)
         self.main = QWidget(self)
         hbox = QHBoxLayout(self)
         self.left = left = QWidget(self.main)
@@ -301,8 +332,7 @@ def replot(self, data=None):
             self.data = data
 
         self.applyPlotoptions()
-        #self.getSeries(data)
-
+        #self.updateSeries()
         self.setStyle()
         self.plotCurrent()
         return
@@ -325,13 +355,20 @@ def plotCurrent(self, redraw=True):
     def getSeries(self, data):
 
         kwds = self.opts['general'].kwds
-        ptype = kwds['kind']
+        fkwds = self.opts['format'].kwds
+        kwds.update(fkwds)
         self.series = series = {}
+        colordict = self.colorsfromColormap(data, fkwds['colormap'])
+        #print (colordict)
+        basekwds = ['kind','marker','ms','linestyle', 'linewidth', 'alpha']
+        skwds = {k:kwds[k] for k in basekwds}
+        #print (fkwds)
         for c in data.columns:
-            series[c] = {}
-            series[c]['kind'] = ptype
-            series[c]['color'] = ''
-        #print (self.series)
+            series[c] = skwds.copy()
+            #series[c]['kind'] = kind
+            series[c]['color'] = colordict[c]
+            print (series[c])
+        print (self.series)
         return series
 
     def applyPlotoptions(self):
@@ -838,7 +875,7 @@ def _doplot(self, data, ax, kind, axes_layout, errorbars, useindex, bw, yerr,
                 return
             #adjust colormap to avoid white lines
             if cmap != None:
-                cmap = util.adjustColorMap(cmap, 0.15,1.0)
+                #cmap = util.adjustColorMap(cmap, 0.15,1.0)
                 del kwargs['colormap']
             if kind == 'barh':
                 kwargs['xerr']=yerr
@@ -1456,8 +1493,6 @@ class MPLBaseOptions(BaseOptions):
     """Class to provide a dialog for matplotlib options and returning
         the selected prefs"""
 
-    kinds = ['line', 'bar', 'barh', 'scatter', 'pie', 'histogram', 'boxplot', 'violinplot', 'dotplot',
-             'heatmap', 'area', 'hexbin', 'scatter_matrix', 'density', 'radviz']
     legendlocs = ['best','upper right','upper left','lower left','lower right','right','center left',
                 'center right','lower center','upper center','center']
 
@@ -1484,7 +1519,7 @@ def __init__(self):
                 'sharex':{'type':'checkbox','default':0,'label':'share x'},
                 'sharey':{'type':'checkbox','default':0,'label':'share y'},
                 'legend':{'type':'checkbox','default':1,'label':'legend'},
-                'kind':{'type':'combobox','default':'line','items':self.kinds,'label':'plot type'},
+                'kind':{'type':'combobox','default':'line','items':plotkinds,'label':'plot type'},
                 'stacked':{'type':'checkbox','default':0,'label':'stacked'},
                 'axes_layout':{'type':'combobox','default':'single','items':layouts,'label':'axes layout'},
                 'bins':{'type':'spinbox','default':20,'width':5},
@@ -1686,27 +1721,33 @@ def createSeriesWidgets(self, parent):
 
         l = parent.layout
         l.setAlignment(QtCore.Qt.AlignTop)
-        kinds= ['line','bar','scatter']
+
         row = QWidget()
         l.addWidget(row)
         l2 = QHBoxLayout(row)
-        l2.addWidget(QLabel('name'))
-        l2.addWidget(QLabel('kind'))
-        l2.addWidget(QLabel('color'))
-        l2.addWidget(QLabel('linestyle'))
+        for i in ['name','kind','color','line style','marker','marker size','alpha']:
+            w=QLabel(i)
+            l2.addWidget(w)
+            #w.setFixedWidth(100)
+        kinds = ['line','bar']
         self.widgets = {}
         for s in self.series:
             self.widgets[s] = {}
             opt=self.series[s]
             row = QWidget()
             l.addWidget(row)
             l2 = QHBoxLayout(row)
-            l2.addWidget(QLabel(s))
+            w=QLabel(s)
+            w.setFixedWidth(100)
+            l2.addWidget(w)
             w=QComboBox()
             w.addItems(kinds)
             val = self.series[s]['kind']
             index = w.findText(val)
             w.setCurrentIndex(index)
+            w.setFixedWidth(80)
+            if val not in ['line','bar']:
+                w.setEnabled(False)
             l2.addWidget(w)
             self.widgets[s]['kind'] = w
             w = ColorButton()
@@ -1716,8 +1757,36 @@ def createSeriesWidgets(self, parent):
             self.widgets[s]['color'] = w
             w=QComboBox()
             w.addItems(linestyles)
+            val = self.series[s]['linestyle']
+            index = w.findText(val)
+            w.setCurrentIndex(index)
             l2.addWidget(w)
             self.widgets[s]['linestyle'] = w
+            w=QSpinBox()
+            val = self.series[s]['linewidth']
+            w.setValue(int(val))
+            l2.addWidget(w)
+            self.widgets[s]['linewidth'] = w
+            w=QComboBox()
+            w.addItems(markers)
+            val = self.series[s]['marker']
+            index = w.findText(val)
+            w.setCurrentIndex(index)
+            self.widgets[s]['marker'] = w
+            l2.addWidget(w)
+            w=QSpinBox()
+            val = self.series[s]['ms']
+            w.setValue(int(val))
+            l2.addWidget(w)
+            self.widgets[s]['ms'] = w
+            w=QDoubleSpinBox()
+            val = self.series[s]['alpha']
+            w.setValue(val)
+            w.setRange(0,1)
+            w.setSingleStep(0.1)
+            l2.addWidget(w)
+            self.widgets[s]['alpha'] = w
+
         return
 
     def update(self, event=None):
@@ -1727,37 +1796,12 @@ def update(self, event=None):
             for i in self.widgets[s]:
                 w = self.widgets[s][i]
                 val = getWidgetValue(w)
-                #print (val)
+                #print (s,i,val)
                 self.series[s][i] = val
-        print (self.series)
+        #print (self.series)
         self.plotviewer.customPlot()
         return
 
     def close(self):
         self.dlg.destroy()
         return
-
-class CustomiseDialog(QDialog):
-    """Preferences dialog from config parser options"""
-
-    def __init__(self, parent, options={}):
-
-        super(CustomiseDialog, self).__init__(parent)
-        self.parent = parent
-        self.setWindowTitle('Custom plot')
-        self.resize(400, 200)
-        self.setGeometry(QtCore.QRect(300,300, 600, 200))
-        self.setMaximumWidth(600)
-        self.setMaximumHeight(300)
-        self.show()
-        return
-
-    def createWidgets(self):
-        """create widgets"""
-
-        self.tabs = QTabWidget()
-        l = self.layout = QVBoxLayout(self)
-        l.addWidget(self.tabs)
-        w = QWidget()
-        idx = self.tabs.addTab(w, 'legend')
-        return

tablexplore/plugins/colormaps.py

@@ -123,7 +123,8 @@ def loadCustom(self):
         return
 
     def showColorMaps(self):
-
+        """Show sample colormaps"""
+        
         cmaps = sorted(m for m in plt.cm.datad if not m.endswith("_r"))
         pf = self.table.pf
         n=20

tablexplore/plugins/example.py

@@ -44,7 +44,6 @@ def __init__(self, parent=None, table=None):
             return
         self.parent = parent
         self.table = table
-        self.ID = 'Example Plugin'
         self.createWidgets()
         return