Commit 5711d89f authored by Aleksei's avatar Aleksei
Browse files

removed datashaders from datamodule, bugfix in AWGSIGD and DIGSIGD

parent 6f9b9eac
......@@ -862,7 +862,7 @@ class Awgsigd(object):
self.load_waves_in_AWG_memory()
for i in range(4):
if (Channel_mask>>i)%2:
self.setfunc(i,False)
setfunc(i,False)
def start_multiple(self,ChannelMask = 0xF):
"""Before starting any acquisition, the channel must be started. After
......
......@@ -630,7 +630,7 @@ class Digsigd(object):
for i in range(4):
if (Channel_mask>>i)%2:
self.setfunc(i+1)
setfunc(i+1)
......
......@@ -8,7 +8,7 @@ Powered by xarray (xarray.pydata.org)
"""
from .base import data_module_base
import holoviews as hv
import holoviews.operation.datashader as hd
#import holoviews.operation.datashader as hd
import scipy.signal as sp_sig
import scipy.interpolate as sp_intp
import matplotlib.pyplot as plt
......@@ -269,6 +269,7 @@ class data_grid(data_module_base):
df = self.df[self.x_min:self.x_max, self.y_min:self.y_max].rename('z')
# Create dataset
ds = hv.Dataset(df)
'''
# Create HoloObject
if mode == 'QuadMesh':
holo_object = hd.regrid(ds.to(hv.QuadMesh, [x_vals, y_vals]))
......@@ -277,6 +278,7 @@ class data_grid(data_module_base):
# Rescale
holo_object = holo_object.redim.range(z=(z_min, z_max))
return holo_object
'''
def pcolormesh(self):
"""Simple color plot without options. Quick and light"""
......
......@@ -10,7 +10,7 @@ from .base import data_module_base
import pandas as pd
from .plot_style import color_scheme, cc, check_color, color_labels
import holoviews as hv
import holoviews.operation.datashader as hd
#import holoviews.operation.datashader as hd
import numpy as np
import matplotlib.pyplot as plt
import bokeh.plotting as bp
......@@ -181,9 +181,10 @@ class data_table(data_module_base):
ignore_index=True)
pass
"""
def plot_hv(self, x=None, y=None, height=400, width=800,
title='', color=None):
"""Plot table with Holoviews
'''Plot table with Holoviews
Parameters
-----------
......@@ -199,7 +200,7 @@ class data_table(data_module_base):
Title of plot
color : str
Color for plot
"""
'''
if x is None:
x_val = self.name_x
else:
......@@ -222,7 +223,7 @@ class data_table(data_module_base):
return scatter_plots.opts(plot=dict(height=height, width=width,
show_grid=True))
"""
# Plotting #################################################################
def plot(self, style='-o', x_col=None, y_col=None, color=None, xscale=1,
yscale=1,
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment