fixups

Change-Id: Ibbae99d1c51edcbf251f43cd75f21e448825139c

etc/amagnet.cfg

@@ -35,7 +35,7 @@ tangodevice=tango://amagnet.antares.frm2:10000/box/plc/_polarity
 value.datatype=["enum", {'+1':1,'0':0,'-1':-1}]
 target.datatype=["enum", {'+1':1,'0':0,'-1':-1}]
 .description=polarity (+/-) switch
-	
+	.
 	there is an interlock in the plc:
 	if there is current, switching polarity is forbidden
 	if polarity is short, powersupply is disabled
@@ -49,7 +49,7 @@ tangodevice=tango://amagnet.antares.frm2:10000/box/plc/_symmetric
 value.datatype=["enum",{'symmetric':1,'short':0, 'asymmetric':-1}]
 target.datatype=["enum",{'symmetric':1,'short':0, 'asymmetric':-1}]
 .description=par/ser switch selecting (a)symmetric mode
-	
+	.
 	symmetric is ser, asymmetric is par
 .visibility=advanced
 
@@ -58,28 +58,28 @@ class=secop_mlz.entangle.AnalogInput
 tangodevice=tango://amagnet.antares.frm2:10000/box/plc/_t1
 .description=Temperature1 of the coils system
 #warnlimits=(0, 50)
-#unit=degC
+value.unit='degC'
 
 [device T2]
 class=secop_mlz.entangle.AnalogInput
 tangodevice=tango://amagnet.antares.frm2:10000/box/plc/_t2
 .description=Temperature2 of the coils system
 #warnlimits=(0, 50)
-#unit=degC
+value.unit='degC'
 
 [device T3]
 class=secop_mlz.entangle.AnalogInput
 tangodevice=tango://amagnet.antares.frm2:10000/box/plc/_t3
 .description=Temperature3 of the coils system
 #warnlimits=(0, 50)
-#unit=degC
+value.unit='degC'
 
 [device T4]
 class=secop_mlz.entangle.AnalogInput
 tangodevice=tango://amagnet.antares.frm2:10000/box/plc/_t4
 .description=Temperature4 of the coils system
 #warnlimits=(0, 50)
-#unit=degC
+value.unit='degC'
 
 [device currentsource]
 class=secop_mlz.entangle.PowerSupply
@@ -101,7 +101,8 @@ subdev_currentsource=currentsource
 subdev_enable=enable
 subdev_polswitch=polarity
 subdev_symmetry=symmetry
-#unit=T
+target.unit='T'
+value.unit='T'
 userlimits=(-0.35, 0.35)
 calibrationtable={'symmetric':[0.00186517, 0.0431937, -0.185956, 0.0599757, 0.194042],
 	'short': [0.0, 0.0, 0.0, 0.0, 0.0],
@@ -110,4 +111,4 @@ calibrationtable={'symmetric':[0.00186517, 0.0431937, -0.185956, 0.0599757, 0.19
 .priority=100
 .visibility=user
 
-abslimits.default=0,0.4
+abslimits.default=-0.4,0.4

etc/cryo.cfg

@@ -47,3 +47,5 @@ p.group='pid'
 i.group='pid'
 d.group='pid'
 
+value.unit='K'
+

secop/gui/nodectrl.py

@@ -133,7 +133,10 @@ class NodeCtrl(QWidget):
         row = 0
         for modname in sorted(self._node.modules):
             modprops = self._node.getModuleProperties(modname)
-            interfaces = modprops['interface_class']
+            if 'interface_class' in modprops:
+                interfaces = modprops['interface_class']
+            else:
+                interfaces = modprops['interfaces']
             description = modprops['description']
             unit = self._node.getProperties(modname, 'value').get('unit', '')
 
@@ -144,7 +147,8 @@ class NodeCtrl(QWidget):
             label = QLabel(labelstr)
             label.setFont(labelfont)
 
-            if 'Drivable' in interfaces:
+            # fallback: allow (now) invalid 'Driveable'
+            if 'Drivable' in interfaces or 'Driveable' in interfaces:
                 widget = DrivableWidget(self._node, modname, self)
             elif 'Readable' in interfaces:
                 widget = ReadableWidget(self._node, modname, self)

secop/gui/ui/nodectrl.ui

@@ -170,17 +170,32 @@ p, li { white-space: pre-wrap; }
              </property>
             </widget>
            </item>
+           <item row="5" column="0">
+            <spacer name="verticalSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
            <item row="4" column="0" colspan="2">
             <widget class="QLabel" name="nodeDescriptionLabel">
+             <property name="enabled">
+              <bool>true</bool>
+             </property>
              <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
                <horstretch>0</horstretch>
-               <verstretch>1</verstretch>
+               <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="text">
-              <string>aaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaa</string>
+              <string>description</string>
              </property>
              <property name="wordWrap">
               <bool>true</bool>
@@ -190,9 +205,29 @@ aaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaa</string
              </property>
             </widget>
            </item>
+           <item row="5" column="0" colspan="2">
+            <widget class="QLabel" name="label55">
+             <property name="enabled">
+              <bool>true</bool>
+             </property>
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+               <horstretch>0</horstretch>
+               <verstretch>1</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
           </layout>
+          <zorder>label</zorder>
+          <zorder>contactPointLabel</zorder>
+          <zorder>equipmentIdLabel</zorder>
+          <zorder>label_3</zorder>
+          <zorder>protocolVersionLabel</zorder>
+          <zorder>label_5</zorder>
+          <zorder>nodeDescriptionLabel</zorder>
           <zorder>label_2</zorder>
-          <zorder>gridLayoutWidget</zorder>
+          <zorder>verticalSpacer</zorder>
          </widget>
         </widget>
        </item>