migrate smaract to community driver, update ui-files

This commit is contained in:
2023-07-20 13:15:30 +02:00
parent 472a6fb7fc
commit de7285d542
7 changed files with 432 additions and 351 deletions

View File

@@ -53,17 +53,7 @@
</rect>
</property>
<property name="macro">
<string>
P=$(P),M=MOT_GIR_1;
P=$(P),M=MOT_GIR_2;
P=$(P),M=MOT_GIR_3;
P=$(P),M=MOT_GIR_4;
P=$(P),M=MOT_GIR_5;
P=$(P),M=MOT_GIR_X;
P=$(P),M=MOT_GIR_Y;
P=$(P),M=MOT_GIR_U;
P=$(P),M=MOT_GIR_V;
P=$(P),M=MOT_GIR_W</string>
<string>P=$(P),M=MOT_GIR_1;P=$(P),M=MOT_GIR_2;P=$(P),M=MOT_GIR_3;P=$(P),M=MOT_GIR_4;P=$(P),M=MOT_GIR_5;P=$(P),M=MOT_GIR_X;P=$(P),M=MOT_GIR_Y;P=$(P),M=MOT_GIR_U;P=$(P),M=MOT_GIR_V;P=$(P),M=MOT_GIR_W</string>
</property>
<property name="filename" stdset="0">
<string notr="true">ESB_MX_motor.ui</string>
@@ -228,7 +218,7 @@ P=$(P),M=MOT_GIR_W</string>
</property>
<property name="text">
<string>type motion code as:
'&amp;1;#1..5j/;cpx call15;abslinear X(1000)Y(0)U(0)V(0)W(0);call16'</string>
'&amp;1;#1..5j/;cpx abslinear X(1000)Y(0)U(0)V(0)W(0)'</string>
</property>
</widget>
<widget class="caFrame" name="caframe">
@@ -548,15 +538,15 @@ P=$(P),M=MOT_GIR_W</string>
<height>16</height>
</rect>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="text">
<string>M2</string>
</property>
<property name="alignment">
<set>Qt::AlignAbsolute|Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
</widget>
<widget class="caGraphics" name="cagraphics_5">
<property name="geometry">
@@ -772,15 +762,15 @@ P=$(P),M=MOT_GIR_W</string>
<height>16</height>
</rect>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="text">
<string>M3</string>
</property>
<property name="alignment">
<set>Qt::AlignAbsolute|Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
</widget>
<widget class="caGraphics" name="cagraphics_10">
<property name="geometry">
@@ -912,15 +902,15 @@ P=$(P),M=MOT_GIR_W</string>
<height>16</height>
</rect>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="text">
<string>M4</string>
</property>
<property name="alignment">
<set>Qt::AlignAbsolute|Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
</widget>
<widget class="caGraphics" name="cagraphics_7">
<property name="geometry">
@@ -1124,15 +1114,15 @@ P=$(P),M=MOT_GIR_W</string>
<height>16</height>
</rect>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="text">
<string>M5</string>
</property>
<property name="alignment">
<set>Qt::AlignAbsolute|Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
</widget>
<widget class="caGraphics" name="m4stop">
<property name="geometry">
@@ -1185,15 +1175,15 @@ P=$(P),M=MOT_GIR_W</string>
<height>16</height>
</rect>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="text">
<string>M1</string>
</property>
<property name="alignment">
<set>Qt::AlignAbsolute|Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
</widget>
<zorder>capolyline</zorder>
<zorder>m3move</zorder>
@@ -1251,111 +1241,6 @@ P=$(P),M=MOT_GIR_W</string>
<string notr="true">BrickLV.Reset=1;#1..8j/</string>
</property>
</widget>
<widget class="caMessageButton" name="caMessageButton_13">
<property name="geometry">
<rect>
<x>640</x>
<y>490</y>
<width>120</width>
<height>31</height>
</rect>
</property>
<property name="fontScaleMode">
<enum>EPushButton::WidthAndHeight</enum>
</property>
<property name="channel" stdset="0">
<string notr="true">$(P):MOVE_XYUVW</string>
</property>
<property name="label">
<string notr="true">MOVE XYUVW</string>
</property>
<property name="pressMessage">
<string>1</string>
</property>
<property name="colorMode">
<enum>caMessageButton::Static</enum>
</property>
</widget>
<widget class="QWidget" name="verticalLayoutWidget">
<property name="geometry">
<rect>
<x>450</x>
<y>370</y>
<width>171</width>
<height>151</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="caTextEntry" name="catextentry">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="channel" stdset="0">
<string notr="true">$(P):5CAM_X</string>
</property>
</widget>
</item>
<item>
<widget class="caTextEntry" name="catextentry_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="channel" stdset="0">
<string notr="true">$(P):5CAM_Y</string>
</property>
</widget>
</item>
<item>
<widget class="caTextEntry" name="catextentry_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="channel" stdset="0">
<string notr="true">$(P):5CAM_U</string>
</property>
</widget>
</item>
<item>
<widget class="caTextEntry" name="catextentry_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="channel" stdset="0">
<string notr="true">$(P):5CAM_V</string>
</property>
</widget>
</item>
<item>
<widget class="caTextEntry" name="catextentry_5">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="channel" stdset="0">
<string notr="true">$(P):5CAM_W</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
<customwidgets>
<customwidget>

175
qt/ESB_MX_SmarAct.ui Normal file
View File

@@ -0,0 +1,175 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Form</class>
<widget class="QWidget" name="Form">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>797</width>
<height>673</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<widget class="caLabel" name="caLabel_0">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>781</width>
<height>26</height>
</rect>
</property>
<property name="statusTip">
<string>Expert</string>
</property>
<property name="text">
<string>Smaract Controller $(S):$(M)</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading</set>
</property>
<property name="foreground">
<color>
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</property>
<property name="background">
<color alpha="0">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</property>
<property name="colorMode">
<enum>caLabel::Default</enum>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
</widget>
<widget class="caInclude" name="cainclude_3">
<property name="geometry">
<rect>
<x>5</x>
<y>53</y>
<width>784</width>
<height>612</height>
</rect>
</property>
<property name="macro">
<string>S=$(S),T=$(T),M=$(M)1;S=$(S),T=$(T),M=$(M)2;S=$(S),T=$(T),M=$(M)3;S=$(S),T=$(T),M=$(M)4;S=$(S),T=$(T),M=$(M)5;S=$(S),T=$(T),M=$(M)6;S=$(S),T=$(T),M=$(M)7;S=$(S),T=$(T),M=$(M)8;S=$(S),T=$(T),M=$(M)9;S=$(S),T=$(T),M=$(M)10;S=$(S),T=$(T),M=$(M)11;S=$(S),T=$(T),M=$(M)12;S=$(S),T=$(T),M=$(M)13;S=$(S),T=$(T),M=$(M)14;S=$(S),T=$(T),M=$(M)15</string>
</property>
<property name="filename" stdset="0">
<string notr="true">MCS_stage.ui</string>
</property>
<property name="numberOfItems" stdset="0">
<number>15</number>
</property>
<property name="verticalSpacing" stdset="0">
<number>3</number>
</property>
<property name="frameShape">
<enum>caInclude::NoFrame</enum>
</property>
</widget>
<widget class="QLabel" name="label_5">
<property name="geometry">
<rect>
<x>640</x>
<y>30</y>
<width>80</width>
<height>20</height>
</rect>
</property>
<property name="font">
<font>
<family>URW Gothic L</family>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>satus bits</string>
</property>
</widget>
<widget class="QLabel" name="label_6">
<property name="geometry">
<rect>
<x>215</x>
<y>30</y>
<width>80</width>
<height>20</height>
</rect>
</property>
<property name="font">
<font>
<family>URW Gothic L</family>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>Position</string>
</property>
</widget>
<widget class="QLabel" name="label_7">
<property name="geometry">
<rect>
<x>7</x>
<y>30</y>
<width>80</width>
<height>20</height>
</rect>
</property>
<property name="font">
<font>
<family>URW Gothic L</family>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>Motor</string>
</property>
</widget>
<widget class="QLabel" name="label_8">
<property name="geometry">
<rect>
<x>346</x>
<y>30</y>
<width>100</width>
<height>20</height>
</rect>
</property>
<property name="font">
<font>
<family>URW Gothic L</family>
<pointsize>12</pointsize>
<kerning>true</kerning>
</font>
</property>
<property name="text">
<string>Absolute</string>
</property>
</widget>
</widget>
<customwidgets>
<customwidget>
<class>caLabel</class>
<extends>QLabel</extends>
<header>caLabel</header>
</customwidget>
<customwidget>
<class>caInclude</class>
<extends>QWidget</extends>
<header>caInclude</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>776</width>
<height>706</height>
<height>640</height>
</rect>
</property>
<property name="windowTitle">
@@ -194,9 +194,9 @@
<widget class="caMessageButton" name="camessagebutton">
<property name="geometry">
<rect>
<x>20</x>
<y>620</y>
<width>121</width>
<x>140</x>
<y>590</y>
<width>120</width>
<height>22</height>
</rect>
</property>
@@ -213,39 +213,10 @@
<string notr="true">enable plc 1</string>
</property>
</widget>
<widget class="caRelatedDisplay" name="carelateddisplay">
<property name="geometry">
<rect>
<x>160</x>
<y>620</y>
<width>121</width>
<height>24</height>
</rect>
</property>
<property name="label">
<string notr="true">Smaract</string>
</property>
<property name="background">
<color>
<red>128</red>
<green>136</green>
<blue>255</blue>
</color>
</property>
<property name="labels">
<string>Smaract</string>
</property>
<property name="files">
<string>ESB_MX_SmarAct_main.ui</string>
</property>
<property name="args">
<string>P=SARES30-ESBMX</string>
</property>
</widget>
<widget class="caToggleButton" name="catogglebutton">
<property name="geometry">
<rect>
<x>170</x>
<x>360</x>
<y>590</y>
<width>100</width>
<height>22</height>
@@ -267,9 +238,9 @@
<widget class="caMessageButton" name="camessagebutton_2">
<property name="geometry">
<rect>
<x>30</x>
<y>650</y>
<width>100</width>
<x>260</x>
<y>590</y>
<width>90</width>
<height>22</height>
</rect>
</property>
@@ -288,7 +259,7 @@
<rect>
<x>20</x>
<y>590</y>
<width>121</width>
<width>120</width>
<height>22</height>
</rect>
</property>
@@ -305,143 +276,17 @@
<string notr="true">enable plc 1</string>
</property>
</widget>
<widget class="caRelatedDisplay" name="caRelatedDisplay_9">
<property name="geometry">
<rect>
<x>160</x>
<y>650</y>
<width>151</width>
<height>30</height>
</rect>
</property>
<property name="label">
<string notr="true">-ESB_MX Girder</string>
</property>
<property name="foreground">
<color>
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</property>
<property name="background">
<color>
<red>89</red>
<green>126</green>
<blue>225</blue>
</color>
</property>
<property name="labels">
<string>HEXGIR</string>
</property>
<property name="files">
<string>ESB_MX_5cam.ui</string>
</property>
<property name="args">
<string>P=$(P)</string>
</property>
<property name="stackingMode" stdset="0">
<enum>caRowColMenu::Menu</enum>
</property>
<property name="removeParent" stdset="0">
<string>false;false;false;false;false;false;false;false;false;false;false;false;false;false;false;false</string>
</property>
</widget>
<widget class="caRelatedDisplay" name="caRelatedDisplay_10">
<property name="geometry">
<rect>
<x>340</x>
<y>650</y>
<width>151</width>
<height>30</height>
</rect>
</property>
<property name="label">
<string notr="true">-ESB_MX Girder(old)</string>
</property>
<property name="foreground">
<color>
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</property>
<property name="background">
<color>
<red>89</red>
<green>126</green>
<blue>225</blue>
</color>
</property>
<property name="labels">
<string>HEXGIR</string>
</property>
<property name="files">
<string>S_CS_HEXGIR_5Dbasic.ui</string>
</property>
<property name="args">
<string>NAME=$(P), NAME1=$(P)</string>
</property>
<property name="stackingMode" stdset="0">
<enum>caRowColMenu::Menu</enum>
</property>
<property name="removeParent" stdset="0">
<string>false;false;false;false;false;false;false;false;false;false;false;false;false;false;false;false</string>
</property>
</widget>
<widget class="caRelatedDisplay" name="caRelatedDisplay_11">
<property name="geometry">
<rect>
<x>340</x>
<y>610</y>
<width>151</width>
<height>30</height>
</rect>
</property>
<property name="label">
<string notr="true">-ESB_MX EVR</string>
</property>
<property name="foreground">
<color>
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</property>
<property name="background">
<color>
<red>89</red>
<green>126</green>
<blue>225</blue>
</color>
</property>
<property name="labels">
<string>EVR</string>
</property>
<property name="files">
<string>G_EVR_main.ui</string>
</property>
<property name="args">
<string>SYS=$(P),DEVICE=EVR0,FF=PCIe</string>
</property>
<property name="stackingMode" stdset="0">
<enum>caRowColMenu::Menu</enum>
</property>
<property name="removeParent" stdset="0">
<string>false;false;false;false;false;false;false;false;false;false;false;false;false;false;false;false</string>
</property>
</widget>
<widget class="caRelatedDisplay" name="caRelatedDisplay_12">
<property name="geometry">
<rect>
<x>510</x>
<y>610</y>
<width>151</width>
<height>30</height>
<x>560</x>
<y>590</y>
<width>180</width>
<height>31</height>
</rect>
</property>
<property name="label">
<string notr="true">-ESB_MX EVR VME</string>
<string notr="true">-related panels</string>
</property>
<property name="foreground">
<color>
@@ -458,13 +303,13 @@
</color>
</property>
<property name="labels">
<string>EVR;EVR-simple</string>
<string>SmarAct;SmarAct (old);Girder;EVR;EVR-simple</string>
</property>
<property name="files">
<string>G_EVR_main.ui;S_LAS-TMAIN.ui</string>
<string>ESB_MX_SmarAct.ui;ESB_MX_SmarAct_main.ui;ESB_MX_5cam.ui;G_EVR_main.ui;S_LAS-TMAIN.ui</string>
</property>
<property name="args">
<string>SYS=SAR-CVME,DEVICE=EVR0,FF=VME-300;SYS=SAR-CVME,IOC=SAR-CVME-EVR0,DEVICE=EVR0</string>
<string>S=SARES30-SMX,M=MCS,T=MCS;P=SARES30-ESBMX;P=$(P);SYS=SAR-CVME,DEVICE=EVR0,FF=VME-300;SYS=SAR-CVME,IOC=SAR-CVME-EVR0,DEVICE=EVR0</string>
</property>
<property name="stackingMode" stdset="0">
<enum>caRowColMenu::Menu</enum>