Initial test of matching

ui/OpticsPlotGui.py

@@ -39,57 +39,89 @@ class Ui_OpticsPlotGUI(object):
         self.verticalLayout_5.addWidget(self.label_31)
         self.gridLayout_4 = QtWidgets.QGridLayout()
         self.gridLayout_4.setObjectName("gridLayout_4")
-        self.PEtax = QtWidgets.QPushButton(self.widget_2)
-        self.PEtax.setCheckable(True)
-        self.PEtax.setObjectName("PEtax")
-        self.gridLayout_4.addWidget(self.PEtax, 2, 0, 1, 1)
-        self.PEtay = QtWidgets.QPushButton(self.widget_2)
-        self.PEtay.setCheckable(True)
-        self.PEtay.setObjectName("PEtay")
-        self.gridLayout_4.addWidget(self.PEtay, 2, 1, 1, 1)
-        self.PBetax = QtWidgets.QPushButton(self.widget_2)
-        self.PBetax.setCheckable(True)
-        self.PBetax.setChecked(True)
-        self.PBetax.setObjectName("PBetax")
-        self.gridLayout_4.addWidget(self.PBetax, 0, 0, 1, 1)
-        self.PR56 = QtWidgets.QPushButton(self.widget_2)
-        self.PR56.setCheckable(True)
-        self.PR56.setObjectName("PR56")
-        self.gridLayout_4.addWidget(self.PR56, 5, 0, 1, 1)
-        self.PMux = QtWidgets.QPushButton(self.widget_2)
-        self.PMux.setCheckable(True)
-        self.PMux.setObjectName("PMux")
-        self.gridLayout_4.addWidget(self.PMux, 4, 0, 1, 1)
-        self.PMuy = QtWidgets.QPushButton(self.widget_2)
-        self.PMuy.setCheckable(True)
-        self.PMuy.setObjectName("PMuy")
-        self.gridLayout_4.addWidget(self.PMuy, 4, 1, 1, 1)
-        self.PAlphax = QtWidgets.QPushButton(self.widget_2)
-        self.PAlphax.setCheckable(True)
-        self.PAlphax.setObjectName("PAlphax")
-        self.gridLayout_4.addWidget(self.PAlphax, 1, 0, 1, 1)
-        self.PBetay = QtWidgets.QPushButton(self.widget_2)
-        self.PBetay.setCheckable(True)
-        self.PBetay.setChecked(True)
-        self.PBetay.setObjectName("PBetay")
-        self.gridLayout_4.addWidget(self.PBetay, 0, 1, 1, 1)
+        self.PY = QtWidgets.QPushButton(self.widget_2)
+        self.PY.setCheckable(True)
+        self.PY.setObjectName("PY")
+        self.gridLayout_4.addWidget(self.PY, 3, 1, 1, 1)
+        self.PR22 = QtWidgets.QPushButton(self.widget_2)
+        self.PR22.setEnabled(False)
+        self.PR22.setObjectName("PR22")
+        self.gridLayout_4.addWidget(self.PR22, 7, 1, 1, 1)
+        self.PAlphay = QtWidgets.QPushButton(self.widget_2)
+        self.PAlphay.setCheckable(True)
+        self.PAlphay.setObjectName("PAlphay")
+        self.gridLayout_4.addWidget(self.PAlphay, 1, 1, 1, 1)
+        self.PR12 = QtWidgets.QPushButton(self.widget_2)
+        self.PR12.setEnabled(False)
+        self.PR12.setObjectName("PR12")
+        self.gridLayout_4.addWidget(self.PR12, 6, 1, 1, 1)
         self.PEnergy = QtWidgets.QPushButton(self.widget_2)
         self.PEnergy.setEnabled(True)
         self.PEnergy.setCheckable(True)
         self.PEnergy.setObjectName("PEnergy")
         self.gridLayout_4.addWidget(self.PEnergy, 5, 1, 1, 1)
-        self.PAlphay = QtWidgets.QPushButton(self.widget_2)
-        self.PAlphay.setCheckable(True)
-        self.PAlphay.setObjectName("PAlphay")
-        self.gridLayout_4.addWidget(self.PAlphay, 1, 1, 1, 1)
+        self.PMux = QtWidgets.QPushButton(self.widget_2)
+        self.PMux.setCheckable(True)
+        self.PMux.setObjectName("PMux")
+        self.gridLayout_4.addWidget(self.PMux, 4, 0, 1, 1)
+        self.PBetax = QtWidgets.QPushButton(self.widget_2)
+        self.PBetax.setCheckable(True)
+        self.PBetax.setChecked(True)
+        self.PBetax.setObjectName("PBetax")
+        self.gridLayout_4.addWidget(self.PBetax, 0, 0, 1, 1)
+        self.PAlphax = QtWidgets.QPushButton(self.widget_2)
+        self.PAlphax.setCheckable(True)
+        self.PAlphax.setObjectName("PAlphax")
+        self.gridLayout_4.addWidget(self.PAlphax, 1, 0, 1, 1)
+        self.PR56 = QtWidgets.QPushButton(self.widget_2)
+        self.PR56.setCheckable(True)
+        self.PR56.setObjectName("PR56")
+        self.gridLayout_4.addWidget(self.PR56, 5, 0, 1, 1)
+        self.PR33 = QtWidgets.QPushButton(self.widget_2)
+        self.PR33.setEnabled(False)
+        self.PR33.setObjectName("PR33")
+        self.gridLayout_4.addWidget(self.PR33, 8, 0, 1, 1)
+        self.PR34 = QtWidgets.QPushButton(self.widget_2)
+        self.PR34.setEnabled(False)
+        self.PR34.setObjectName("PR34")
+        self.gridLayout_4.addWidget(self.PR34, 8, 1, 1, 1)
+        self.PEtax = QtWidgets.QPushButton(self.widget_2)
+        self.PEtax.setCheckable(True)
+        self.PEtax.setObjectName("PEtax")
+        self.gridLayout_4.addWidget(self.PEtax, 2, 0, 1, 1)
         self.PX = QtWidgets.QPushButton(self.widget_2)
         self.PX.setCheckable(True)
         self.PX.setObjectName("PX")
         self.gridLayout_4.addWidget(self.PX, 3, 0, 1, 1)
-        self.PY = QtWidgets.QPushButton(self.widget_2)
-        self.PY.setCheckable(True)
-        self.PY.setObjectName("PY")
-        self.gridLayout_4.addWidget(self.PY, 3, 1, 1, 1)
+        self.PEtay = QtWidgets.QPushButton(self.widget_2)
+        self.PEtay.setCheckable(True)
+        self.PEtay.setObjectName("PEtay")
+        self.gridLayout_4.addWidget(self.PEtay, 2, 1, 1, 1)
+        self.PR11 = QtWidgets.QPushButton(self.widget_2)
+        self.PR11.setEnabled(False)
+        self.PR11.setObjectName("PR11")
+        self.gridLayout_4.addWidget(self.PR11, 6, 0, 1, 1)
+        self.PBetay = QtWidgets.QPushButton(self.widget_2)
+        self.PBetay.setCheckable(True)
+        self.PBetay.setChecked(True)
+        self.PBetay.setObjectName("PBetay")
+        self.gridLayout_4.addWidget(self.PBetay, 0, 1, 1, 1)
+        self.PR21 = QtWidgets.QPushButton(self.widget_2)
+        self.PR21.setEnabled(False)
+        self.PR21.setObjectName("PR21")
+        self.gridLayout_4.addWidget(self.PR21, 7, 0, 1, 1)
+        self.PMuy = QtWidgets.QPushButton(self.widget_2)
+        self.PMuy.setCheckable(True)
+        self.PMuy.setObjectName("PMuy")
+        self.gridLayout_4.addWidget(self.PMuy, 4, 1, 1, 1)
+        self.PR43 = QtWidgets.QPushButton(self.widget_2)
+        self.PR43.setEnabled(False)
+        self.PR43.setObjectName("PR43")
+        self.gridLayout_4.addWidget(self.PR43, 9, 0, 1, 1)
+        self.PR44 = QtWidgets.QPushButton(self.widget_2)
+        self.PR44.setEnabled(False)
+        self.PR44.setObjectName("PR44")
+        self.gridLayout_4.addWidget(self.PR44, 9, 1, 1, 1)
         self.verticalLayout_5.addLayout(self.gridLayout_4)
         self.gridLayout_5 = QtWidgets.QGridLayout()
         self.gridLayout_5.setObjectName("gridLayout_5")
@@ -289,18 +321,26 @@ class Ui_OpticsPlotGUI(object):
         _translate = QtCore.QCoreApplication.translate
         OpticsPlotGUI.setWindowTitle(_translate("OpticsPlotGUI", "SwissFEL Optics"))
         self.label_31.setText(_translate("OpticsPlotGUI", "Plotting"))
-        self.PEtax.setText(_translate("OpticsPlotGUI", "Etax"))
-        self.PEtay.setText(_translate("OpticsPlotGUI", "Etay"))
-        self.PBetax.setText(_translate("OpticsPlotGUI", "Betax"))
-        self.PR56.setText(_translate("OpticsPlotGUI", "R56"))
-        self.PMux.setText(_translate("OpticsPlotGUI", "Mux"))
-        self.PMuy.setText(_translate("OpticsPlotGUI", "Muy"))
-        self.PAlphax.setText(_translate("OpticsPlotGUI", "Alphax"))
-        self.PBetay.setText(_translate("OpticsPlotGUI", "Betay"))
-        self.PEnergy.setText(_translate("OpticsPlotGUI", "Energy"))
-        self.PAlphay.setText(_translate("OpticsPlotGUI", "AlphaY"))
-        self.PX.setText(_translate("OpticsPlotGUI", "X"))
         self.PY.setText(_translate("OpticsPlotGUI", "Y"))
+        self.PR22.setText(_translate("OpticsPlotGUI", "R22"))
+        self.PAlphay.setText(_translate("OpticsPlotGUI", "AlphaY"))
+        self.PR12.setText(_translate("OpticsPlotGUI", "R12"))
+        self.PEnergy.setText(_translate("OpticsPlotGUI", "Energy"))
+        self.PMux.setText(_translate("OpticsPlotGUI", "Mux"))
+        self.PBetax.setText(_translate("OpticsPlotGUI", "Betax"))
+        self.PAlphax.setText(_translate("OpticsPlotGUI", "Alphax"))
+        self.PR56.setText(_translate("OpticsPlotGUI", "R56"))
+        self.PR33.setText(_translate("OpticsPlotGUI", "R33"))
+        self.PR34.setText(_translate("OpticsPlotGUI", "R34"))
+        self.PEtax.setText(_translate("OpticsPlotGUI", "Etax"))
+        self.PX.setText(_translate("OpticsPlotGUI", "X"))
+        self.PEtay.setText(_translate("OpticsPlotGUI", "Etay"))
+        self.PR11.setText(_translate("OpticsPlotGUI", "R11"))
+        self.PBetay.setText(_translate("OpticsPlotGUI", "Betay"))
+        self.PR21.setText(_translate("OpticsPlotGUI", "R21"))
+        self.PMuy.setText(_translate("OpticsPlotGUI", "Muy"))
+        self.PR43.setText(_translate("OpticsPlotGUI", "R43"))
+        self.PR44.setText(_translate("OpticsPlotGUI", "R44"))
         self.label_22.setText(_translate("OpticsPlotGUI", "Plot Start"))
         self.PStart.setText(_translate("OpticsPlotGUI", "0"))
         self.label_21.setText(_translate("OpticsPlotGUI", "Plot End"))

ui/OpticsPlotGui.ui

@@ -43,20 +43,63 @@
            </item>
            <item>
             <layout class="QGridLayout" name="gridLayout_4">
-             <item row="2" column="0">
-              <widget class="QPushButton" name="PEtax">
+             <item row="3" column="1">
+              <widget class="QPushButton" name="PY">
                <property name="text">
-                <string>Etax</string>
+                <string>Y</string>
                </property>
                <property name="checkable">
                 <bool>true</bool>
                </property>
               </widget>
              </item>
-             <item row="2" column="1">
-              <widget class="QPushButton" name="PEtay">
+             <item row="7" column="1">
+              <widget class="QPushButton" name="PR22">
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
                <property name="text">
-                <string>Etay</string>
+                <string>R22</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QPushButton" name="PAlphay">
+               <property name="text">
+                <string>AlphaY</string>
+               </property>
+               <property name="checkable">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="6" column="1">
+              <widget class="QPushButton" name="PR12">
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
+               <property name="text">
+                <string>R12</string>
+               </property>
+              </widget>
+             </item>
+             <item row="5" column="1">
+              <widget class="QPushButton" name="PEnergy">
+               <property name="enabled">
+                <bool>true</bool>
+               </property>
+               <property name="text">
+                <string>Energy</string>
+               </property>
+               <property name="checkable">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="4" column="0">
+              <widget class="QPushButton" name="PMux">
+               <property name="text">
+                <string>Mux</string>
                </property>
                <property name="checkable">
                 <bool>true</bool>
@@ -76,36 +119,6 @@
                </property>
               </widget>
              </item>
-             <item row="5" column="0">
-              <widget class="QPushButton" name="PR56">
-               <property name="text">
-                <string>R56</string>
-               </property>
-               <property name="checkable">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-             <item row="4" column="0">
-              <widget class="QPushButton" name="PMux">
-               <property name="text">
-                <string>Mux</string>
-               </property>
-               <property name="checkable">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-             <item row="4" column="1">
-              <widget class="QPushButton" name="PMuy">
-               <property name="text">
-                <string>Muy</string>
-               </property>
-               <property name="checkable">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
              <item row="1" column="0">
               <widget class="QPushButton" name="PAlphax">
                <property name="text">
@@ -116,36 +129,40 @@
                </property>
               </widget>
              </item>
-             <item row="0" column="1">
-              <widget class="QPushButton" name="PBetay">
+             <item row="5" column="0">
+              <widget class="QPushButton" name="PR56">
                <property name="text">
-                <string>Betay</string>
+                <string>R56</string>
                </property>
                <property name="checkable">
                 <bool>true</bool>
                </property>
-               <property name="checked">
-                <bool>true</bool>
-               </property>
               </widget>
              </item>
-             <item row="5" column="1">
-              <widget class="QPushButton" name="PEnergy">
+             <item row="8" column="0">
+              <widget class="QPushButton" name="PR33">
                <property name="enabled">
-                <bool>true</bool>
+                <bool>false</bool>
                </property>
                <property name="text">
-                <string>Energy</string>
-               </property>
-               <property name="checkable">
-                <bool>true</bool>
+                <string>R33</string>
                </property>
               </widget>
              </item>
-             <item row="1" column="1">
-              <widget class="QPushButton" name="PAlphay">
+             <item row="8" column="1">
+              <widget class="QPushButton" name="PR34">
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
                <property name="text">
-                <string>AlphaY</string>
+                <string>R34</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0">
+              <widget class="QPushButton" name="PEtax">
+               <property name="text">
+                <string>Etax</string>
                </property>
                <property name="checkable">
                 <bool>true</bool>
@@ -162,16 +179,79 @@
                </property>
               </widget>
              </item>
-             <item row="3" column="1">
-              <widget class="QPushButton" name="PY">
+             <item row="2" column="1">
+              <widget class="QPushButton" name="PEtay">
                <property name="text">
-                <string>Y</string>
+                <string>Etay</string>
                </property>
                <property name="checkable">
                 <bool>true</bool>
                </property>
               </widget>
              </item>
+             <item row="6" column="0">
+              <widget class="QPushButton" name="PR11">
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
+               <property name="text">
+                <string>R11</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QPushButton" name="PBetay">
+               <property name="text">
+                <string>Betay</string>
+               </property>
+               <property name="checkable">
+                <bool>true</bool>
+               </property>
+               <property name="checked">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="7" column="0">
+              <widget class="QPushButton" name="PR21">
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
+               <property name="text">
+                <string>R21</string>
+               </property>
+              </widget>
+             </item>
+             <item row="4" column="1">
+              <widget class="QPushButton" name="PMuy">
+               <property name="text">
+                <string>Muy</string>
+               </property>
+               <property name="checkable">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="9" column="0">
+              <widget class="QPushButton" name="PR43">
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
+               <property name="text">
+                <string>R43</string>
+               </property>
+              </widget>
+             </item>
+             <item row="9" column="1">
+              <widget class="QPushButton" name="PR44">
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
+               <property name="text">
+                <string>R44</string>
+               </property>
+              </widget>
+             </item>
             </layout>
            </item>
            <item>

ui/OpticsToolsGui.py

@@ -389,34 +389,58 @@ class Ui_OpticsGUI(object):
         self.label_17 = QtWidgets.QLabel(self.tab_2)
         self.label_17.setObjectName("label_17")
         self.gridLayout_5.addWidget(self.label_17, 1, 0, 1, 1)
+        self.UIMatchSequence = QtWidgets.QLineEdit(self.tab_2)
+        self.UIMatchSequence.setObjectName("UIMatchSequence")
+        self.gridLayout_5.addWidget(self.UIMatchSequence, 3, 1, 1, 1)
         self.UIMatchLabel = QtWidgets.QLineEdit(self.tab_2)
         self.UIMatchLabel.setObjectName("UIMatchLabel")
         self.gridLayout_5.addWidget(self.UIMatchLabel, 0, 1, 1, 1)
+        self.label_11 = QtWidgets.QLabel(self.tab_2)
+        self.label_11.setObjectName("label_11")
+        self.gridLayout_5.addWidget(self.label_11, 3, 0, 1, 1)
         self.label_16 = QtWidgets.QLabel(self.tab_2)
         self.label_16.setObjectName("label_16")
         self.gridLayout_5.addWidget(self.label_16, 0, 0, 1, 1)
         self.UIMatchStart = QtWidgets.QLineEdit(self.tab_2)
         self.UIMatchStart.setObjectName("UIMatchStart")
         self.gridLayout_5.addWidget(self.UIMatchStart, 1, 1, 1, 1)
+        self.label_12 = QtWidgets.QLabel(self.tab_2)
+        self.label_12.setObjectName("label_12")
+        self.gridLayout_5.addWidget(self.label_12, 2, 0, 1, 1)
+        self.UIMatchEnd = QtWidgets.QLineEdit(self.tab_2)
+        self.UIMatchEnd.setObjectName("UIMatchEnd")
+        self.gridLayout_5.addWidget(self.UIMatchEnd, 2, 1, 1, 1)
         self.verticalLayout_7.addLayout(self.gridLayout_5)
         self.label_19 = QtWidgets.QLabel(self.tab_2)
         self.label_19.setObjectName("label_19")
         self.verticalLayout_7.addWidget(self.label_19)
-        self.UIMatchKnobs = QtWidgets.QListWidget(self.tab_2)
+        self.UIMatchKnobs = QtWidgets.QTableWidget(self.tab_2)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.UIMatchKnobs.sizePolicy().hasHeightForWidth())
         self.UIMatchKnobs.setSizePolicy(sizePolicy)
         self.UIMatchKnobs.setObjectName("UIMatchKnobs")
+        self.UIMatchKnobs.setColumnCount(3)
+        self.UIMatchKnobs.setRowCount(0)
+        item = QtWidgets.QTableWidgetItem()
+        self.UIMatchKnobs.setHorizontalHeaderItem(0, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.UIMatchKnobs.setHorizontalHeaderItem(1, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.UIMatchKnobs.setHorizontalHeaderItem(2, item)
         self.verticalLayout_7.addWidget(self.UIMatchKnobs)
         self.label_20 = QtWidgets.QLabel(self.tab_2)
         self.label_20.setObjectName("label_20")
         self.verticalLayout_7.addWidget(self.label_20)
         self.UIMatchTargets = QtWidgets.QTableWidget(self.tab_2)
         self.UIMatchTargets.setObjectName("UIMatchTargets")
-        self.UIMatchTargets.setColumnCount(0)
+        self.UIMatchTargets.setColumnCount(2)
         self.UIMatchTargets.setRowCount(0)
+        item = QtWidgets.QTableWidgetItem()
+        self.UIMatchTargets.setHorizontalHeaderItem(0, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.UIMatchTargets.setHorizontalHeaderItem(1, item)
         self.verticalLayout_7.addWidget(self.UIMatchTargets)
         self.horizontalLayout_9.addLayout(self.verticalLayout_7)
         spacerItem2 = QtWidgets.QSpacerItem(242, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
@@ -603,9 +627,21 @@ class Ui_OpticsGUI(object):
         self.UIMatchRandom.setText(_translate("OpticsGUI", "Random Initialization"))
         self.label_21.setText(_translate("OpticsGUI", "Matching Point"))
         self.label_17.setText(_translate("OpticsGUI", "Start"))
+        self.label_11.setText(_translate("OpticsGUI", "Sequence"))
         self.label_16.setText(_translate("OpticsGUI", "Match"))
+        self.label_12.setText(_translate("OpticsGUI", "End"))
         self.label_19.setText(_translate("OpticsGUI", "Knobs"))
+        item = self.UIMatchKnobs.horizontalHeaderItem(0)
+        item.setText(_translate("OpticsGUI", "Parameter"))
+        item = self.UIMatchKnobs.horizontalHeaderItem(1)
+        item.setText(_translate("OpticsGUI", "Value"))
+        item = self.UIMatchKnobs.horizontalHeaderItem(2)
+        item.setText(_translate("OpticsGUI", "Limit"))
         self.label_20.setText(_translate("OpticsGUI", "Target"))
+        item = self.UIMatchTargets.horizontalHeaderItem(0)
+        item.setText(_translate("OpticsGUI", "Location"))
+        item = self.UIMatchTargets.horizontalHeaderItem(1)
+        item.setText(_translate("OpticsGUI", "Condition"))
         self.TabMaster.setTabText(self.TabMaster.indexOf(self.tab_2), _translate("OpticsGUI", "Matching"))
         self.menuFile.setTitle(_translate("OpticsGUI", "File"))
         self.menuHelp.setTitle(_translate("OpticsGUI", "Help"))

ui/OpticsToolsGui.ui

@@ -642,9 +642,19 @@
               </property>
              </widget>
             </item>
+            <item row="3" column="1">
+             <widget class="QLineEdit" name="UIMatchSequence"/>
+            </item>
             <item row="0" column="1">
              <widget class="QLineEdit" name="UIMatchLabel"/>
             </item>
+            <item row="3" column="0">
+             <widget class="QLabel" name="label_11">
+              <property name="text">
+               <string>Sequence</string>
+              </property>
+             </widget>
+            </item>
             <item row="0" column="0">
              <widget class="QLabel" name="label_16">
               <property name="text">
@@ -655,6 +665,16 @@
             <item row="1" column="1">
              <widget class="QLineEdit" name="UIMatchStart"/>
             </item>
+            <item row="2" column="0">
+             <widget class="QLabel" name="label_12">
+              <property name="text">
+               <string>End</string>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1">
+             <widget class="QLineEdit" name="UIMatchEnd"/>
+            </item>
            </layout>
           </item>
           <item>
@@ -665,13 +685,28 @@
            </widget>
           </item>
           <item>
-           <widget class="QListWidget" name="UIMatchKnobs">
+           <widget class="QTableWidget" name="UIMatchKnobs">
             <property name="sizePolicy">
              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <column>
+             <property name="text">
+              <string>Parameter</string>
+             </property>
+            </column>
+            <column>
+             <property name="text">
+              <string>Value</string>
+             </property>
+            </column>
+            <column>
+             <property name="text">
+              <string>Limit</string>
+             </property>
+            </column>
            </widget>
           </item>
           <item>
@@ -682,7 +717,18 @@
            </widget>
           </item>
           <item>
-           <widget class="QTableWidget" name="UIMatchTargets"/>
+           <widget class="QTableWidget" name="UIMatchTargets">
+            <column>
+             <property name="text">
+              <string>Location</string>
+             </property>
+            </column>
+            <column>
+             <property name="text">
+              <string>Condition</string>
+             </property>
+            </column>
+           </widget>
           </item>
          </layout>
         </item>