Skip to content

Commit

Permalink
Version update, minor bugfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexShkarin committed May 28, 2021
1 parent 9266a65 commit bce2cf3
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ you can write
1.0.0a
1.0.0
~~~~~~~~~~~~~~~~~~~~~~~~~~~~

There have been too many alterations to list here comprehensively. Below is the list of the largest changes.
Expand Down
2 changes: 2 additions & 0 deletions pylablib/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

_load_path=os.path.abspath(os.curdir)

__version__=module_utils.get_package_version("pylablib") or module_utils.get_package_version("pylablib-lightweight")

def reload_all(from_load_path=True, keep_parameters=True):
"""
Reload all loaded modules.
Expand Down
4 changes: 3 additions & 1 deletion pylablib/core/gui/widgets/param_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,9 @@ def add_combo_box(self, name, value=None, options=None, index_values=None, label
if index_values is not None:
widget.set_index_values(index_values)
if value is not None:
widget.setCurrentIndex(value)
widget.set_value(value)
else:
widget.set_value(index_values[0] if index_values else 0)
return self.add_simple_widget(name,widget,label=label,add_indicator=add_indicator,location=location,tooltip=tooltip,add_change_event=add_change_event)

def add_spacer(self, height=0, width=0, stretch_height=False, stretch_width=False, location="next"):
Expand Down
6 changes: 3 additions & 3 deletions pylablib/devices/Thorlabs/misc.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from ...core.devio import SCPI, interface
from .base import ThorlabsError, ThorlabsBackendError
# from ...core.devio import SCPI, interface
# from .base import ThorlabsError, ThorlabsBackendError

import collections
# import collections

# TPM100DeviceInfo=collections.namedtuple("TDeviceInfo",["name","serial","firmware"])
# TPM100SensorInfo=collections.namedtuple("TSensorInfo",["name","serial","calibration","type","subtype","flags"])
Expand Down
1 change: 0 additions & 1 deletion pylablib/devices/uc480/uc480.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from inspect import FrameInfo
from . import uc480_defs
from .uc480_lib import lib, uc480Error, uc480LibError

Expand Down
1 change: 0 additions & 1 deletion pylablib/gui/widgets/plotters/trace_plotter.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
from ....core.gui.widgets.param_table import ParamTable
from ....core.thread import controller
from ....core.gui import value_handling
from ....core.utils import funcargparse, dictionary
from ....core.dataproc import utils as trace_utils
from ....thread.stream.table_accum import TableAccumulator, TableAccumulatorThread

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
setup(
name='pylablib',
# name='pylablib-lightweight',
version='1.0.0a',
version='1.0.0',
description='Collection of Python code for using in lab environment: experiment automation, data acquisition, device communication',
long_description=long_description,
long_description_content_type="text/x-rst",
Expand Down

0 comments on commit bce2cf3

Please sign in to comment.