From a15480cedf6921759f3cbde11ff9e26b5a1b6d64 Mon Sep 17 00:00:00 2001
From: Philipp Schmidt <philipp.schmidt@xfel.eu>
Date: Wed, 28 Jun 2023 15:32:21 +0200
Subject: [PATCH] manager: Specify defaultValue and accessMode for all row
layouts
---
src/calng/CalibrationManager.py | 70 ++++++++++++++++++++++++---------
1 file changed, 52 insertions(+), 18 deletions(-)
diff --git a/src/calng/CalibrationManager.py b/src/calng/CalibrationManager.py
index 231a5660..3d337128 100644
--- a/src/calng/CalibrationManager.py
+++ b/src/calng/CalibrationManager.py
@@ -112,60 +112,88 @@ class DeviceIdsNode(Configurable):
class ModuleRow(Configurable):
virtualName = String(
- displayedName='Virtual name')
+ displayedName='Virtual name',
+ defaultValue='',
+ accessMode=AccessMode.RECONFIGURABLE)
group = UInt32(
- displayedName='Group')
+ displayedName='Group',
+ defaultValue=0,
+ accessMode=AccessMode.RECONFIGURABLE)
aggregator = String(
- displayedName='Aggregator name')
+ displayedName='Aggregator name',
+ defaultValue='',
+ accessMode=AccessMode.RECONFIGURABLE)
inputChannel = String(
- displayedName='Input channel')
+ displayedName='Input channel',
+ defaultValue='',
+ accessMode=AccessMode.RECONFIGURABLE)
inputSource = String(
- displayedName='Input source')
+ displayedName='Input source',
+ defaultValue='',
+ accessMode=AccessMode.RECONFIGURABLE)
class ModuleGroupRow(Configurable):
group = UInt32(
- displayedName='Group')
+ displayedName='Group',
+ defaultValue=0,
+ accessMode=AccessMode.RECONFIGURABLE)
deviceServer = String(
- displayedName='Device server')
+ displayedName='Device server',
+ defaultValue='',
+ accessMode=AccessMode.RECONFIGURABLE)
withBridge = Bool(
- displayedName='Include bridge?')
+ displayedName='Include bridge?',
+ defaultValue=False,
+ accessMode=AccessMode.RECONFIGURABLE)
bridgePort = UInt16(
displayedName='Bridge port',
defaultValue=47000,
minInc=1024,
- maxInc=65353)
+ maxInc=65353,
+ accessMode=AccessMode.RECONFIGURABLE)
bridgePattern = String(
displayedName='Bridge pattern',
options=['PUSH', 'REP', 'PUB'],
- defaultValue='PUSH')
+ defaultValue='PUSH',
+ accessMode=AccessMode.RECONFIGURABLE)
class PreviewLayerRow(Configurable):
layer = String(
- displayedName='Preview layer')
+ displayedName='Preview layer',
+ defaultValue='',
+ accessMode=AccessMode.RECONFIGURABLE)
outputPipeline = String(
- displayedName='Output pipeline')
+ displayedName='Output pipeline',
+ defaultValue='',
+ accessMode=AccessMode.RECONFIGURABLE)
deviceServer = String(
- displayedName='Device server')
+ displayedName='Device server',
+ defaultValue='',
+ accessMode=AccessMode.RECONFIGURABLE)
class DeviceServerRow(Configurable):
deviceServer = String(
- displayedName='Device server')
+ displayedName='Device server',
+ defaultValue='',
+ accessMode=AccessMode.RECONFIGURABLE)
webserverHost = String(
- displayedName='Webserver host')
+ displayedName='Webserver host',
+ defaultValue='http://',
+ accessMode=AccessMode.RECONFIGURABLE)
class WebserverApiNode(Configurable):
@@ -211,13 +239,19 @@ class WebserverApiNode(Configurable):
class RestoredConfigurationRow(Configurable):
enabled = Bool(
- displayedName='Enabled')
+ displayedName='Enabled',
+ defaultValue=False,
+ accessMode=AccessMode.RECONFIGURABLE)
memberPattern = String(
- displayedName='Member pattern')
+ displayedName='Member pattern',
+ defaultValue='',
+ accessMode=AccessMode.RECONFIGURABLE)
keyPattern = String(
- displayedName='Key pattern')
+ displayedName='Key pattern',
+ defaultValue='',
+ accessMode=AccessMode.RECONFIGURABLE)
class ManagedKeysNode(Configurable):
--
GitLab