Skip to content

Commit bce2cf3

Browse files
committed
Version update, minor bugfixes
1 parent 9266a65 commit bce2cf3

File tree

7 files changed

+10
-8
lines changed

7 files changed

+10
-8
lines changed

docs/changelog.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ you can write
2525
2626
2727
28-
1.0.0a
28+
1.0.0
2929
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3030

3131
There have been too many alterations to list here comprehensively. Below is the list of the largest changes.

pylablib/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

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

10+
__version__=module_utils.get_package_version("pylablib") or module_utils.get_package_version("pylablib-lightweight")
11+
1012
def reload_all(from_load_path=True, keep_parameters=True):
1113
"""
1214
Reload all loaded modules.

pylablib/core/gui/widgets/param_table.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,9 @@ def add_combo_box(self, name, value=None, options=None, index_values=None, label
457457
if index_values is not None:
458458
widget.set_index_values(index_values)
459459
if value is not None:
460-
widget.setCurrentIndex(value)
460+
widget.set_value(value)
461+
else:
462+
widget.set_value(index_values[0] if index_values else 0)
461463
return self.add_simple_widget(name,widget,label=label,add_indicator=add_indicator,location=location,tooltip=tooltip,add_change_event=add_change_event)
462464

463465
def add_spacer(self, height=0, width=0, stretch_height=False, stretch_width=False, location="next"):

pylablib/devices/Thorlabs/misc.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from ...core.devio import SCPI, interface
2-
from .base import ThorlabsError, ThorlabsBackendError
1+
# from ...core.devio import SCPI, interface
2+
# from .base import ThorlabsError, ThorlabsBackendError
33

4-
import collections
4+
# import collections
55

66
# TPM100DeviceInfo=collections.namedtuple("TDeviceInfo",["name","serial","firmware"])
77
# TPM100SensorInfo=collections.namedtuple("TSensorInfo",["name","serial","calibration","type","subtype","flags"])

pylablib/devices/uc480/uc480.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from inspect import FrameInfo
21
from . import uc480_defs
32
from .uc480_lib import lib, uc480Error, uc480LibError
43

pylablib/gui/widgets/plotters/trace_plotter.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
from ....core.gui.widgets.param_table import ParamTable
1111
from ....core.thread import controller
1212
from ....core.gui import value_handling
13-
from ....core.utils import funcargparse, dictionary
1413
from ....core.dataproc import utils as trace_utils
1514
from ....thread.stream.table_accum import TableAccumulator, TableAccumulatorThread
1615

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
setup(
2424
name='pylablib',
2525
# name='pylablib-lightweight',
26-
version='1.0.0a',
26+
version='1.0.0',
2727
description='Collection of Python code for using in lab environment: experiment automation, data acquisition, device communication',
2828
long_description=long_description,
2929
long_description_content_type="text/x-rst",

0 commit comments

Comments
 (0)