Minor v1.1.0 adjustments

AlexShkarin · Jun 27, 2021 · 1bf940b · 1bf940b
1 parent 7f9ef1d
commit 1bf940b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 54 deletions.
diff --git a/docs/.apidoc/pylablib.devices.IMAQ.rst b/docs/.apidoc/pylablib.devices.IMAQ.rst
@@ -13,15 +13,6 @@ pylablib.devices.IMAQ.IMAQ module
     :undoc-members:
     :show-inheritance:
 
-pylablib.devices.IMAQ.camfile module
-------------------------------------
-
-.. automodule:: pylablib.devices.IMAQ.camfile
-    :members:
-    :inherited-members:
-    :undoc-members:
-    :show-inheritance:
-
 pylablib.devices.IMAQ.niimaq\_attrtypes module
 ----------------------------------------------
 

diff --git a/docs/.apidoc/pylablib.devices.Rigol.rst b/docs/.apidoc/pylablib.devices.Rigol.rst
diff --git a/docs/.apidoc/pylablib.devices.interface.rst b/docs/.apidoc/pylablib.devices.interface.rst
@@ -13,15 +13,6 @@ pylablib.devices.interface.camera module
     :undoc-members:
     :show-inheritance:
 
-pylablib.devices.interface.pixel\_format module
------------------------------------------------
-
-.. automodule:: pylablib.devices.interface.pixel_format
-    :members:
-    :inherited-members:
-    :undoc-members:
-    :show-inheritance:
-
 pylablib.devices.interface.stage module
 ---------------------------------------
 

diff --git a/docs/.apidoc/pylablib.devices.rst b/docs/.apidoc/pylablib.devices.rst
@@ -27,7 +27,6 @@ Subpackages
     pylablib.devices.PCO
     pylablib.devices.Pfeiffer
     pylablib.devices.PhotonFocus
-    pylablib.devices.Rigol
     pylablib.devices.SiliconSoftware
     pylablib.devices.SmarAct
     pylablib.devices.Tektronix

diff --git a/pylablib/devices/NI/daq.py b/pylablib/devices/NI/daq.py
@@ -214,11 +214,14 @@ def get_export_clock_terminal(self):
         term=self.ai_task.export_signals.samp_clk_output_term
         return self._strip_channel_name(term) if term else None
 
-    _voltage_input_terminal_cfgs={  "default":nidaqmx.constants.TerminalConfiguration.DEFAULT,
-                                    "rse":nidaqmx.constants.TerminalConfiguration.RSE,
-                                    "nrse":nidaqmx.constants.TerminalConfiguration.NRSE,
-                                    "diff":nidaqmx.constants.TerminalConfiguration.DIFFERENTIAL,
-                                    "pseudodiff":nidaqmx.constants.TerminalConfiguration.PSEUDODIFFERENTIAL}
+    if nidaqmx is not None:
+        _voltage_input_terminal_cfgs={  "default":nidaqmx.constants.TerminalConfiguration.DEFAULT,
+                                        "rse":nidaqmx.constants.TerminalConfiguration.RSE,
+                                        "nrse":nidaqmx.constants.TerminalConfiguration.NRSE,
+                                        "diff":nidaqmx.constants.TerminalConfiguration.DIFFERENTIAL,
+                                        "pseudodiff":nidaqmx.constants.TerminalConfiguration.PSEUDODIFFERENTIAL}
+    else:
+        _voltage_input_terminal_cfgs={}
     _p_voltage_input_terminal_cfg=interface.EnumParameterClass("voltage_input_terminal_cfg",_voltage_input_terminal_cfgs)
     @reraise
     @interface.use_parameters(terminal_cfg="voltage_input_terminal_cfg")

diff --git a/pylablib/gui/widgets/plotters/trace_plotter.py b/pylablib/gui/widgets/plotters/trace_plotter.py
@@ -12,7 +12,6 @@
 from ....core.gui.widgets.layout_manager import QLayoutManagedWidget
 from ....core.thread import controller
 from ....core.dataproc import utils as trace_utils
-from ....thread.stream.table_accum import TableAccumulator, TableAccumulatorThread
 
 import pyqtgraph
 
@@ -236,11 +235,7 @@ def setup_data_source(self, src=None):
         The source is used to automatically grab channel data and receive reset commands.
         Not necessary, if the data is provided explicitly to :meth:`update_plot`.
         """
-        if isinstance(src,TableAccumulator):
-            self.data_src_kind="accum"
-        elif isinstance(src,TableAccumulatorThread):
-            self.data_src_kind="accum_thread"
-        elif src is None:
+        if src is None:
             self.data_src_kind=None
         else:
             raise ValueError("unrecognized data source: {}".format(src))