Commit ba48d576 authored by Gerhard Kirchmair's avatar Gerhard Kirchmair
Browse files

Fixed Update for Device Monitor

parent f94b2cbd
......@@ -7,7 +7,10 @@ plotting_utilities_module_version = '1.0.1'
import numpy as np
import pandas as pd
from IPython.display import display, Markdown
import matplotlib.pyplot as plt
try:
import matplotlib.pyplot as plt
except NotImplementedError:
pass
from bokeh.plotting import figure, show, gridplot, ColumnDataSource
from bokeh.models import HoverTool
from collections import OrderedDict
......
......@@ -7,8 +7,11 @@ import numpy as np
import bokeh.plotting as bp
from bokeh.layouts import row, column
from bokeh.models import Spacer
from matplotlib.pyplot import get_cmap
from matplotlib.colors import rgb2hex
try:
from matplotlib.pyplot import get_cmap
from matplotlib.colors import rgb2hex
except NotImplementedError:
pass
from bokeh.models import LinearColorMapper, LogColorMapper, BasicTicker
from bokeh.models import ColorBar
from .fit_functions import gaussian_2d_mult
......
......@@ -11,7 +11,10 @@ import holoviews as hv
import holoviews.operation.datashader as hd
import scipy.signal as sp_sig
import scipy.interpolate as sp_intp
import matplotlib.pyplot as plt
try:
import matplotlib.pyplot as plt
except NotImplementedError:
pass
import numpy as np
import xarray as xr
from .data_table import data_table
......
......@@ -12,7 +12,10 @@ from .plot_style import color_scheme, cc, check_color, color_labels
import holoviews as hv
import holoviews.operation.datashader as hd
import numpy as np
import matplotlib.pyplot as plt
try:
import matplotlib.pyplot as plt
except NotImplementedError:
pass
import bokeh.plotting as bp
from bokeh.models import HoverTool
import scipy.optimize as sp_opt
......
......@@ -6,7 +6,10 @@
"""
from DataModule.base import data_module_base
import numpy as np
import matplotlib.pyplot as plt
try:
import matplotlib.pyplot as plt
except NotImplementedError:
pass
import scipy.signal as sp_sig
import scipy.interpolate as sp_intp
from DataModule.fit_functions import mode_fit, lorentzian_fit
......@@ -640,7 +643,7 @@ class data_surface(data_module_base):
# Needs rethinking ############################################################
# Do we need this function?
def contourf(self, colormap=plt.cm.hsv, lev=10, norm=0, **args):
def contourf(self, colormap=None, lev=10, norm=0, **args):
'''contourf is a 2D plot with the color for the depth,
ToDo
......@@ -661,6 +664,8 @@ class data_surface(data_module_base):
NOTE: default interpolation is on
'''
if colormap is None:
colormap = plt.cm.hsv
zsel = self.return_zsel()
if norm is 0:
normal = plt.cm.colors.Normalize(vmax=np.abs(zsel).max(),
......
......@@ -19,8 +19,11 @@ from .data_complex import data_complex
from .data_grid import data_grid
from .data_table import data_table
from .data_IQ import data_IQ
import matplotlib.pyplot as plt
import matplotlib
try:
import matplotlib.pyplot as plt
import matplotlib
except NotImplementedError:
pass
from .version import __version__
import bokeh.plotting as bp
from .plot_style import color_scheme
......
#!/usr/bin/python
"""This file contains a normalized plot style for our group."""
import matplotlib.pyplot as plt
# Try to import matplotlib
try:
import matplotlib.pyplot as plt
except NotImplementedError:
pass
import builtins
import re
......
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