From 6ccf596162c473901566e78ea80a52f2ef0c1bd8 Mon Sep 17 00:00:00 2001 From: Pete Jemian Date: Thu, 24 Aug 2017 07:20:21 -0500 Subject: [PATCH 1/2] additional panels used by USAXS --- motorApp/op/ui/motor2xU.ui | 60 ++++++++++++++ motorApp/op/ui/motor3xU.ui | 76 ++++++++++++++++++ motorApp/op/ui/motor4xU.ui | 92 ++++++++++++++++++++++ motorApp/op/ui/motor5xU.ui | 108 +++++++++++++++++++++++++ motorApp/op/ui/motor6xU.ui | 124 +++++++++++++++++++++++++++++ motorApp/op/ui/motor7xU.ui | 140 +++++++++++++++++++++++++++++++++ motorApp/op/ui/motor8xU.ui | 156 +++++++++++++++++++++++++++++++++++++ 7 files changed, 756 insertions(+) create mode 100644 motorApp/op/ui/motor2xU.ui create mode 100644 motorApp/op/ui/motor3xU.ui create mode 100644 motorApp/op/ui/motor4xU.ui create mode 100644 motorApp/op/ui/motor5xU.ui create mode 100644 motorApp/op/ui/motor6xU.ui create mode 100644 motorApp/op/ui/motor7xU.ui create mode 100644 motorApp/op/ui/motor8xU.ui diff --git a/motorApp/op/ui/motor2xU.ui b/motorApp/op/ui/motor2xU.ui new file mode 100644 index 00000000..826a681c --- /dev/null +++ b/motorApp/op/ui/motor2xU.ui @@ -0,0 +1,60 @@ + + + MainWindow + + + + 0 + 0 + 352 + 282 + + + + MainWindow + + + + + + 0 + 0 + 176 + 282 + + + + P=$(P),M=$(M1) + + + motorxU.ui + + + + + + 176 + 0 + 176 + 282 + + + + P=$(P),M=$(M2) + + + motorxU.ui + + + + + + + caInclude + QWidget +
caInclude
+ + + + + diff --git a/motorApp/op/ui/motor3xU.ui b/motorApp/op/ui/motor3xU.ui new file mode 100644 index 00000000..13cee664 --- /dev/null +++ b/motorApp/op/ui/motor3xU.ui @@ -0,0 +1,76 @@ + + + MainWindow + + + + 0 + 0 + 528 + 282 + + + + MainWindow + + + + + + 0 + 0 + 176 + 282 + + + + P=$(P),M=$(M1) + + + motorxU.ui + + + + + + 176 + 0 + 176 + 282 + + + + P=$(P),M=$(M2) + + + motorxU.ui + + + + + + 352 + 0 + 176 + 282 + + + + P=$(P),M=$(M3) + + + motorxU.ui + + + + + + + caInclude + QWidget +
caInclude
+ + + + + diff --git a/motorApp/op/ui/motor4xU.ui b/motorApp/op/ui/motor4xU.ui new file mode 100644 index 00000000..147d9e81 --- /dev/null +++ b/motorApp/op/ui/motor4xU.ui @@ -0,0 +1,92 @@ + + + MainWindow + + + + 0 + 0 + 704 + 282 + + + + MainWindow + + + + + + 0 + 0 + 176 + 282 + + + + P=$(P),M=$(M1) + + + motorxU.ui + + + + + + 176 + 0 + 176 + 282 + + + + P=$(P),M=$(M2) + + + motorxU.ui + + + + + + 352 + 0 + 176 + 282 + + + + P=$(P),M=$(M3) + + + motorxU.ui + + + + + + 528 + 0 + 176 + 282 + + + + P=$(P),M=$(M4) + + + motorxU.ui + + + + + + + caInclude + QWidget +
caInclude
+ + + + + diff --git a/motorApp/op/ui/motor5xU.ui b/motorApp/op/ui/motor5xU.ui new file mode 100644 index 00000000..ca45d7d4 --- /dev/null +++ b/motorApp/op/ui/motor5xU.ui @@ -0,0 +1,108 @@ + + + MainWindow + + + + 0 + 0 + 880 + 282 + + + + MainWindow + + + + + + 0 + 0 + 176 + 282 + + + + P=$(P),M=$(M1) + + + motorxU.ui + + + + + + 176 + 0 + 176 + 282 + + + + P=$(P),M=$(M2) + + + motorxU.ui + + + + + + 352 + 0 + 176 + 282 + + + + P=$(P),M=$(M3) + + + motorxU.ui + + + + + + 528 + 0 + 176 + 282 + + + + P=$(P),M=$(M5) + + + motorxU.ui + + + + + + 704 + 0 + 176 + 282 + + + + P=$(P),M=$(M5) + + + motorxU.ui + + + + + + + caInclude + QWidget +
caInclude
+ + + + + diff --git a/motorApp/op/ui/motor6xU.ui b/motorApp/op/ui/motor6xU.ui new file mode 100644 index 00000000..2de5181c --- /dev/null +++ b/motorApp/op/ui/motor6xU.ui @@ -0,0 +1,124 @@ + + + MainWindow + + + + 0 + 0 + 528 + 564 + + + + MainWindow + + + + + + 0 + 0 + 176 + 282 + + + + P=$(P),M=$(M1) + + + motorxU.ui + + + + + + 176 + 0 + 176 + 282 + + + + P=$(P),M=$(M2) + + + motorxU.ui + + + + + + 352 + 0 + 176 + 282 + + + + P=$(P),M=$(M3) + + + motorxU.ui + + + + + + 0 + 282 + 176 + 282 + + + + P=$(P),M=$(M4) + + + motorxU.ui + + + + + + 176 + 282 + 176 + 282 + + + + P=$(P),M=$(M5) + + + motorxU.ui + + + + + + 352 + 282 + 176 + 282 + + + + P=$(P),M=$(M6) + + + motorxU.ui + + + + + + + caInclude + QWidget +
caInclude
+ + + + + diff --git a/motorApp/op/ui/motor7xU.ui b/motorApp/op/ui/motor7xU.ui new file mode 100644 index 00000000..f29081c9 --- /dev/null +++ b/motorApp/op/ui/motor7xU.ui @@ -0,0 +1,140 @@ + + + MainWindow + + + + 0 + 0 + 704 + 564 + + + + MainWindow + + + + + + 0 + 0 + 176 + 282 + + + + P=$(P),M=$(M1) + + + motorxU.ui + + + + + + 176 + 0 + 176 + 282 + + + + P=$(P),M=$(M2) + + + motorxU.ui + + + + + + 352 + 0 + 176 + 282 + + + + P=$(P),M=$(M3) + + + motorxU.ui + + + + + + 528 + 0 + 176 + 282 + + + + P=$(P),M=$(M4) + + + motorxU.ui + + + + + + 0 + 282 + 176 + 282 + + + + P=$(P),M=$(M5) + + + motorxU.ui + + + + + + 176 + 282 + 176 + 282 + + + + P=$(P),M=$(M6) + + + motorxU.ui + + + + + + 352 + 282 + 176 + 282 + + + + P=$(P),M=$(M7) + + + motorxU.ui + + + + + + + caInclude + QWidget +
caInclude
+ + + + + diff --git a/motorApp/op/ui/motor8xU.ui b/motorApp/op/ui/motor8xU.ui new file mode 100644 index 00000000..8a6d0447 --- /dev/null +++ b/motorApp/op/ui/motor8xU.ui @@ -0,0 +1,156 @@ + + + MainWindow + + + + 0 + 0 + 704 + 564 + + + + MainWindow + + + + + + 0 + 0 + 176 + 282 + + + + P=$(P),M=$(M1) + + + motorxU.ui + + + + + + 176 + 0 + 176 + 282 + + + + P=$(P),M=$(M2) + + + motorxU.ui + + + + + + 352 + 0 + 176 + 282 + + + + P=$(P),M=$(M3) + + + motorxU.ui + + + + + + 528 + 0 + 176 + 282 + + + + P=$(P),M=$(M4) + + + motorxU.ui + + + + + + 0 + 282 + 176 + 282 + + + + P=$(P),M=$(M5) + + + motorxU.ui + + + + + + 176 + 282 + 176 + 282 + + + + P=$(P),M=$(M6) + + + motorxU.ui + + + + + + 352 + 282 + 176 + 282 + + + + P=$(P),M=$(M7) + + + motorxU.ui + + + + + + 528 + 282 + 176 + 282 + + + + P=$(P),M=$(M8) + + + motorxU.ui + + + + + + + caInclude + QWidget +
caInclude
+ + + + + From 468a96c5064d428a30a4215237a6389f21968194 Mon Sep 17 00:00:00 2001 From: Pete Jemian Date: Thu, 24 Aug 2017 10:43:45 -0500 Subject: [PATCH 2/2] fixes #73 --- motorApp/op/ui/{ => autoconvert}/16motor_form.ui | 0 motorApp/op/ui/{ => autoconvert}/4motor_form.ui | 0 motorApp/op/ui/{ => autoconvert}/8motor_form.ui | 0 motorApp/op/ui/{ => autoconvert}/ACRAux.ui | 0 motorApp/op/ui/{ => autoconvert}/ACRTop.ui | 0 motorApp/op/ui/{ => autoconvert}/EnsemblePSOFly.ui | 0 motorApp/op/ui/{ => autoconvert}/EnsemblePSOFly_graphic.ui | 0 motorApp/op/ui/{ => autoconvert}/EnsemblePSOFly_more.ui | 0 motorApp/op/ui/{ => autoconvert}/EnsemblePVErr.ui | 0 motorApp/op/ui/{ => autoconvert}/HXP.ui | 0 motorApp/op/ui/{ => autoconvert}/HXP_coordSys.ui | 0 motorApp/op/ui/{ => autoconvert}/HXP_extra.ui | 0 motorApp/op/ui/{ => autoconvert}/HXP_motors.ui | 0 motorApp/op/ui/{ => autoconvert}/HXP_moveAll.ui | 0 motorApp/op/ui/{ => autoconvert}/MAX_trajectoryPlot.ui | 0 motorApp/op/ui/{ => autoconvert}/MAX_trajectoryPlot2.ui | 0 motorApp/op/ui/{ => autoconvert}/MAX_trajectoryScan.ui | 0 motorApp/op/ui/{ => autoconvert}/MAX_trajectoryScan1.ui | 0 motorApp/op/ui/{ => autoconvert}/MAX_trajectoryScan2.ui | 0 motorApp/op/ui/{ => autoconvert}/MAX_trajectoryScanDebug.ui | 0 motorApp/op/ui/{ => autoconvert}/MAX_trajectoryScanSpeed.ui | 0 motorApp/op/ui/{ => autoconvert}/PSOarrayPlot.ui | 0 motorApp/op/ui/{ => autoconvert}/XPSAux.ui | 0 motorApp/op/ui/{ => autoconvert}/XPSAuxBi_more.ui | 0 motorApp/op/ui/{ => autoconvert}/XPSAuxTest.ui | 0 motorApp/op/ui/{ => autoconvert}/XPSExtra.ui | 0 motorApp/op/ui/{ => autoconvert}/XPSTest.ui | 0 motorApp/op/ui/{ => autoconvert}/XPSTop.ui | 0 motorApp/op/ui/{ => autoconvert}/motor2x.ui | 0 motorApp/op/ui/{ => autoconvert}/motor3x.ui | 0 motorApp/op/ui/{ => autoconvert}/motor4x.ui | 0 motorApp/op/ui/{ => autoconvert}/motor5x.ui | 0 motorApp/op/ui/{ => autoconvert}/motor6x.ui | 0 motorApp/op/ui/{ => autoconvert}/motor8x.ui | 0 motorApp/op/ui/{ => autoconvert}/motorStatus104.ui | 0 motorApp/op/ui/{ => autoconvert}/motorStatus16.ui | 0 motorApp/op/ui/{ => autoconvert}/motorStatus24.ui | 0 motorApp/op/ui/{ => autoconvert}/motorStatus32.ui | 0 motorApp/op/ui/{ => autoconvert}/motorStatus40.ui | 0 motorApp/op/ui/{ => autoconvert}/motorStatus48.ui | 0 motorApp/op/ui/{ => autoconvert}/motorStatus56.ui | 0 motorApp/op/ui/{ => autoconvert}/motorStatus64.ui | 0 motorApp/op/ui/{ => autoconvert}/motorStatus72.ui | 0 motorApp/op/ui/{ => autoconvert}/motorStatus8.ui | 0 motorApp/op/ui/{ => autoconvert}/motorStatus80.ui | 0 motorApp/op/ui/{ => autoconvert}/motorStatus88.ui | 0 motorApp/op/ui/{ => autoconvert}/motors.ui | 0 motorApp/op/ui/{ => autoconvert}/motors_s.ui | 0 motorApp/op/ui/{ => autoconvert}/motorx.ui | 0 motorApp/op/ui/{ => autoconvert}/motorxU.ui | 0 motorApp/op/ui/{ => autoconvert}/motorx_all.ui | 0 motorApp/op/ui/{ => autoconvert}/motorx_bare.ui | 0 motorApp/op/ui/{ => autoconvert}/motorx_help.ui | 0 motorApp/op/ui/{ => autoconvert}/motorx_more.ui | 0 motorApp/op/ui/{ => autoconvert}/motorx_msta_detail.ui | 0 motorApp/op/ui/{ => autoconvert}/motorx_setup.ui | 0 motorApp/op/ui/{ => autoconvert}/motorx_tiny.ui | 0 motorApp/op/ui/{ => autoconvert}/profileMove.ui | 0 motorApp/op/ui/{ => autoconvert}/profileMoveXPS.ui | 0 motorApp/op/ui/{ => autoconvert}/topMotors4.ui | 0 motorApp/op/ui/{ => autoconvert}/topMotors8.ui | 0 motorApp/op/ui/{ => autoconvert}/topMotors8_more.ui | 0 motorApp/op/ui/{ => autoconvert}/trajectoryPlot.ui | 0 motorApp/op/ui/{ => autoconvert}/trajectoryScan.ui | 0 motorApp/op/ui/{ => autoconvert}/trajectoryScanDebug.ui | 0 motorApp/op/ui/{ => autoconvert}/trajectoryScan_Ensemble.ui | 0 motorApp/op/ui/{ => autoconvert}/trajectoryScan_MAXv.ui | 0 67 files changed, 0 insertions(+), 0 deletions(-) rename motorApp/op/ui/{ => autoconvert}/16motor_form.ui (100%) rename motorApp/op/ui/{ => autoconvert}/4motor_form.ui (100%) rename motorApp/op/ui/{ => autoconvert}/8motor_form.ui (100%) rename motorApp/op/ui/{ => autoconvert}/ACRAux.ui (100%) rename motorApp/op/ui/{ => autoconvert}/ACRTop.ui (100%) rename motorApp/op/ui/{ => autoconvert}/EnsemblePSOFly.ui (100%) rename motorApp/op/ui/{ => autoconvert}/EnsemblePSOFly_graphic.ui (100%) rename motorApp/op/ui/{ => autoconvert}/EnsemblePSOFly_more.ui (100%) rename motorApp/op/ui/{ => autoconvert}/EnsemblePVErr.ui (100%) rename motorApp/op/ui/{ => autoconvert}/HXP.ui (100%) rename motorApp/op/ui/{ => autoconvert}/HXP_coordSys.ui (100%) rename motorApp/op/ui/{ => autoconvert}/HXP_extra.ui (100%) rename motorApp/op/ui/{ => autoconvert}/HXP_motors.ui (100%) rename motorApp/op/ui/{ => autoconvert}/HXP_moveAll.ui (100%) rename motorApp/op/ui/{ => autoconvert}/MAX_trajectoryPlot.ui (100%) rename motorApp/op/ui/{ => autoconvert}/MAX_trajectoryPlot2.ui (100%) rename motorApp/op/ui/{ => autoconvert}/MAX_trajectoryScan.ui (100%) rename motorApp/op/ui/{ => autoconvert}/MAX_trajectoryScan1.ui (100%) rename motorApp/op/ui/{ => autoconvert}/MAX_trajectoryScan2.ui (100%) rename motorApp/op/ui/{ => autoconvert}/MAX_trajectoryScanDebug.ui (100%) rename motorApp/op/ui/{ => autoconvert}/MAX_trajectoryScanSpeed.ui (100%) rename motorApp/op/ui/{ => autoconvert}/PSOarrayPlot.ui (100%) rename motorApp/op/ui/{ => autoconvert}/XPSAux.ui (100%) rename motorApp/op/ui/{ => autoconvert}/XPSAuxBi_more.ui (100%) rename motorApp/op/ui/{ => autoconvert}/XPSAuxTest.ui (100%) rename motorApp/op/ui/{ => autoconvert}/XPSExtra.ui (100%) rename motorApp/op/ui/{ => autoconvert}/XPSTest.ui (100%) rename motorApp/op/ui/{ => autoconvert}/XPSTop.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motor2x.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motor3x.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motor4x.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motor5x.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motor6x.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motor8x.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motorStatus104.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motorStatus16.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motorStatus24.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motorStatus32.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motorStatus40.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motorStatus48.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motorStatus56.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motorStatus64.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motorStatus72.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motorStatus8.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motorStatus80.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motorStatus88.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motors.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motors_s.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motorx.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motorxU.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motorx_all.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motorx_bare.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motorx_help.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motorx_more.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motorx_msta_detail.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motorx_setup.ui (100%) rename motorApp/op/ui/{ => autoconvert}/motorx_tiny.ui (100%) rename motorApp/op/ui/{ => autoconvert}/profileMove.ui (100%) rename motorApp/op/ui/{ => autoconvert}/profileMoveXPS.ui (100%) rename motorApp/op/ui/{ => autoconvert}/topMotors4.ui (100%) rename motorApp/op/ui/{ => autoconvert}/topMotors8.ui (100%) rename motorApp/op/ui/{ => autoconvert}/topMotors8_more.ui (100%) rename motorApp/op/ui/{ => autoconvert}/trajectoryPlot.ui (100%) rename motorApp/op/ui/{ => autoconvert}/trajectoryScan.ui (100%) rename motorApp/op/ui/{ => autoconvert}/trajectoryScanDebug.ui (100%) rename motorApp/op/ui/{ => autoconvert}/trajectoryScan_Ensemble.ui (100%) rename motorApp/op/ui/{ => autoconvert}/trajectoryScan_MAXv.ui (100%) diff --git a/motorApp/op/ui/16motor_form.ui b/motorApp/op/ui/autoconvert/16motor_form.ui similarity index 100% rename from motorApp/op/ui/16motor_form.ui rename to motorApp/op/ui/autoconvert/16motor_form.ui diff --git a/motorApp/op/ui/4motor_form.ui b/motorApp/op/ui/autoconvert/4motor_form.ui similarity index 100% rename from motorApp/op/ui/4motor_form.ui rename to motorApp/op/ui/autoconvert/4motor_form.ui diff --git a/motorApp/op/ui/8motor_form.ui b/motorApp/op/ui/autoconvert/8motor_form.ui similarity index 100% rename from motorApp/op/ui/8motor_form.ui rename to motorApp/op/ui/autoconvert/8motor_form.ui diff --git a/motorApp/op/ui/ACRAux.ui b/motorApp/op/ui/autoconvert/ACRAux.ui similarity index 100% rename from motorApp/op/ui/ACRAux.ui rename to motorApp/op/ui/autoconvert/ACRAux.ui diff --git a/motorApp/op/ui/ACRTop.ui b/motorApp/op/ui/autoconvert/ACRTop.ui similarity index 100% rename from motorApp/op/ui/ACRTop.ui rename to motorApp/op/ui/autoconvert/ACRTop.ui diff --git a/motorApp/op/ui/EnsemblePSOFly.ui b/motorApp/op/ui/autoconvert/EnsemblePSOFly.ui similarity index 100% rename from motorApp/op/ui/EnsemblePSOFly.ui rename to motorApp/op/ui/autoconvert/EnsemblePSOFly.ui diff --git a/motorApp/op/ui/EnsemblePSOFly_graphic.ui b/motorApp/op/ui/autoconvert/EnsemblePSOFly_graphic.ui similarity index 100% rename from motorApp/op/ui/EnsemblePSOFly_graphic.ui rename to motorApp/op/ui/autoconvert/EnsemblePSOFly_graphic.ui diff --git a/motorApp/op/ui/EnsemblePSOFly_more.ui b/motorApp/op/ui/autoconvert/EnsemblePSOFly_more.ui similarity index 100% rename from motorApp/op/ui/EnsemblePSOFly_more.ui rename to motorApp/op/ui/autoconvert/EnsemblePSOFly_more.ui diff --git a/motorApp/op/ui/EnsemblePVErr.ui b/motorApp/op/ui/autoconvert/EnsemblePVErr.ui similarity index 100% rename from motorApp/op/ui/EnsemblePVErr.ui rename to motorApp/op/ui/autoconvert/EnsemblePVErr.ui diff --git a/motorApp/op/ui/HXP.ui b/motorApp/op/ui/autoconvert/HXP.ui similarity index 100% rename from motorApp/op/ui/HXP.ui rename to motorApp/op/ui/autoconvert/HXP.ui diff --git a/motorApp/op/ui/HXP_coordSys.ui b/motorApp/op/ui/autoconvert/HXP_coordSys.ui similarity index 100% rename from motorApp/op/ui/HXP_coordSys.ui rename to motorApp/op/ui/autoconvert/HXP_coordSys.ui diff --git a/motorApp/op/ui/HXP_extra.ui b/motorApp/op/ui/autoconvert/HXP_extra.ui similarity index 100% rename from motorApp/op/ui/HXP_extra.ui rename to motorApp/op/ui/autoconvert/HXP_extra.ui diff --git a/motorApp/op/ui/HXP_motors.ui b/motorApp/op/ui/autoconvert/HXP_motors.ui similarity index 100% rename from motorApp/op/ui/HXP_motors.ui rename to motorApp/op/ui/autoconvert/HXP_motors.ui diff --git a/motorApp/op/ui/HXP_moveAll.ui b/motorApp/op/ui/autoconvert/HXP_moveAll.ui similarity index 100% rename from motorApp/op/ui/HXP_moveAll.ui rename to motorApp/op/ui/autoconvert/HXP_moveAll.ui diff --git a/motorApp/op/ui/MAX_trajectoryPlot.ui b/motorApp/op/ui/autoconvert/MAX_trajectoryPlot.ui similarity index 100% rename from motorApp/op/ui/MAX_trajectoryPlot.ui rename to motorApp/op/ui/autoconvert/MAX_trajectoryPlot.ui diff --git a/motorApp/op/ui/MAX_trajectoryPlot2.ui b/motorApp/op/ui/autoconvert/MAX_trajectoryPlot2.ui similarity index 100% rename from motorApp/op/ui/MAX_trajectoryPlot2.ui rename to motorApp/op/ui/autoconvert/MAX_trajectoryPlot2.ui diff --git a/motorApp/op/ui/MAX_trajectoryScan.ui b/motorApp/op/ui/autoconvert/MAX_trajectoryScan.ui similarity index 100% rename from motorApp/op/ui/MAX_trajectoryScan.ui rename to motorApp/op/ui/autoconvert/MAX_trajectoryScan.ui diff --git a/motorApp/op/ui/MAX_trajectoryScan1.ui b/motorApp/op/ui/autoconvert/MAX_trajectoryScan1.ui similarity index 100% rename from motorApp/op/ui/MAX_trajectoryScan1.ui rename to motorApp/op/ui/autoconvert/MAX_trajectoryScan1.ui diff --git a/motorApp/op/ui/MAX_trajectoryScan2.ui b/motorApp/op/ui/autoconvert/MAX_trajectoryScan2.ui similarity index 100% rename from motorApp/op/ui/MAX_trajectoryScan2.ui rename to motorApp/op/ui/autoconvert/MAX_trajectoryScan2.ui diff --git a/motorApp/op/ui/MAX_trajectoryScanDebug.ui b/motorApp/op/ui/autoconvert/MAX_trajectoryScanDebug.ui similarity index 100% rename from motorApp/op/ui/MAX_trajectoryScanDebug.ui rename to motorApp/op/ui/autoconvert/MAX_trajectoryScanDebug.ui diff --git a/motorApp/op/ui/MAX_trajectoryScanSpeed.ui b/motorApp/op/ui/autoconvert/MAX_trajectoryScanSpeed.ui similarity index 100% rename from motorApp/op/ui/MAX_trajectoryScanSpeed.ui rename to motorApp/op/ui/autoconvert/MAX_trajectoryScanSpeed.ui diff --git a/motorApp/op/ui/PSOarrayPlot.ui b/motorApp/op/ui/autoconvert/PSOarrayPlot.ui similarity index 100% rename from motorApp/op/ui/PSOarrayPlot.ui rename to motorApp/op/ui/autoconvert/PSOarrayPlot.ui diff --git a/motorApp/op/ui/XPSAux.ui b/motorApp/op/ui/autoconvert/XPSAux.ui similarity index 100% rename from motorApp/op/ui/XPSAux.ui rename to motorApp/op/ui/autoconvert/XPSAux.ui diff --git a/motorApp/op/ui/XPSAuxBi_more.ui b/motorApp/op/ui/autoconvert/XPSAuxBi_more.ui similarity index 100% rename from motorApp/op/ui/XPSAuxBi_more.ui rename to motorApp/op/ui/autoconvert/XPSAuxBi_more.ui diff --git a/motorApp/op/ui/XPSAuxTest.ui b/motorApp/op/ui/autoconvert/XPSAuxTest.ui similarity index 100% rename from motorApp/op/ui/XPSAuxTest.ui rename to motorApp/op/ui/autoconvert/XPSAuxTest.ui diff --git a/motorApp/op/ui/XPSExtra.ui b/motorApp/op/ui/autoconvert/XPSExtra.ui similarity index 100% rename from motorApp/op/ui/XPSExtra.ui rename to motorApp/op/ui/autoconvert/XPSExtra.ui diff --git a/motorApp/op/ui/XPSTest.ui b/motorApp/op/ui/autoconvert/XPSTest.ui similarity index 100% rename from motorApp/op/ui/XPSTest.ui rename to motorApp/op/ui/autoconvert/XPSTest.ui diff --git a/motorApp/op/ui/XPSTop.ui b/motorApp/op/ui/autoconvert/XPSTop.ui similarity index 100% rename from motorApp/op/ui/XPSTop.ui rename to motorApp/op/ui/autoconvert/XPSTop.ui diff --git a/motorApp/op/ui/motor2x.ui b/motorApp/op/ui/autoconvert/motor2x.ui similarity index 100% rename from motorApp/op/ui/motor2x.ui rename to motorApp/op/ui/autoconvert/motor2x.ui diff --git a/motorApp/op/ui/motor3x.ui b/motorApp/op/ui/autoconvert/motor3x.ui similarity index 100% rename from motorApp/op/ui/motor3x.ui rename to motorApp/op/ui/autoconvert/motor3x.ui diff --git a/motorApp/op/ui/motor4x.ui b/motorApp/op/ui/autoconvert/motor4x.ui similarity index 100% rename from motorApp/op/ui/motor4x.ui rename to motorApp/op/ui/autoconvert/motor4x.ui diff --git a/motorApp/op/ui/motor5x.ui b/motorApp/op/ui/autoconvert/motor5x.ui similarity index 100% rename from motorApp/op/ui/motor5x.ui rename to motorApp/op/ui/autoconvert/motor5x.ui diff --git a/motorApp/op/ui/motor6x.ui b/motorApp/op/ui/autoconvert/motor6x.ui similarity index 100% rename from motorApp/op/ui/motor6x.ui rename to motorApp/op/ui/autoconvert/motor6x.ui diff --git a/motorApp/op/ui/motor8x.ui b/motorApp/op/ui/autoconvert/motor8x.ui similarity index 100% rename from motorApp/op/ui/motor8x.ui rename to motorApp/op/ui/autoconvert/motor8x.ui diff --git a/motorApp/op/ui/motorStatus104.ui b/motorApp/op/ui/autoconvert/motorStatus104.ui similarity index 100% rename from motorApp/op/ui/motorStatus104.ui rename to motorApp/op/ui/autoconvert/motorStatus104.ui diff --git a/motorApp/op/ui/motorStatus16.ui b/motorApp/op/ui/autoconvert/motorStatus16.ui similarity index 100% rename from motorApp/op/ui/motorStatus16.ui rename to motorApp/op/ui/autoconvert/motorStatus16.ui diff --git a/motorApp/op/ui/motorStatus24.ui b/motorApp/op/ui/autoconvert/motorStatus24.ui similarity index 100% rename from motorApp/op/ui/motorStatus24.ui rename to motorApp/op/ui/autoconvert/motorStatus24.ui diff --git a/motorApp/op/ui/motorStatus32.ui b/motorApp/op/ui/autoconvert/motorStatus32.ui similarity index 100% rename from motorApp/op/ui/motorStatus32.ui rename to motorApp/op/ui/autoconvert/motorStatus32.ui diff --git a/motorApp/op/ui/motorStatus40.ui b/motorApp/op/ui/autoconvert/motorStatus40.ui similarity index 100% rename from motorApp/op/ui/motorStatus40.ui rename to motorApp/op/ui/autoconvert/motorStatus40.ui diff --git a/motorApp/op/ui/motorStatus48.ui b/motorApp/op/ui/autoconvert/motorStatus48.ui similarity index 100% rename from motorApp/op/ui/motorStatus48.ui rename to motorApp/op/ui/autoconvert/motorStatus48.ui diff --git a/motorApp/op/ui/motorStatus56.ui b/motorApp/op/ui/autoconvert/motorStatus56.ui similarity index 100% rename from motorApp/op/ui/motorStatus56.ui rename to motorApp/op/ui/autoconvert/motorStatus56.ui diff --git a/motorApp/op/ui/motorStatus64.ui b/motorApp/op/ui/autoconvert/motorStatus64.ui similarity index 100% rename from motorApp/op/ui/motorStatus64.ui rename to motorApp/op/ui/autoconvert/motorStatus64.ui diff --git a/motorApp/op/ui/motorStatus72.ui b/motorApp/op/ui/autoconvert/motorStatus72.ui similarity index 100% rename from motorApp/op/ui/motorStatus72.ui rename to motorApp/op/ui/autoconvert/motorStatus72.ui diff --git a/motorApp/op/ui/motorStatus8.ui b/motorApp/op/ui/autoconvert/motorStatus8.ui similarity index 100% rename from motorApp/op/ui/motorStatus8.ui rename to motorApp/op/ui/autoconvert/motorStatus8.ui diff --git a/motorApp/op/ui/motorStatus80.ui b/motorApp/op/ui/autoconvert/motorStatus80.ui similarity index 100% rename from motorApp/op/ui/motorStatus80.ui rename to motorApp/op/ui/autoconvert/motorStatus80.ui diff --git a/motorApp/op/ui/motorStatus88.ui b/motorApp/op/ui/autoconvert/motorStatus88.ui similarity index 100% rename from motorApp/op/ui/motorStatus88.ui rename to motorApp/op/ui/autoconvert/motorStatus88.ui diff --git a/motorApp/op/ui/motors.ui b/motorApp/op/ui/autoconvert/motors.ui similarity index 100% rename from motorApp/op/ui/motors.ui rename to motorApp/op/ui/autoconvert/motors.ui diff --git a/motorApp/op/ui/motors_s.ui b/motorApp/op/ui/autoconvert/motors_s.ui similarity index 100% rename from motorApp/op/ui/motors_s.ui rename to motorApp/op/ui/autoconvert/motors_s.ui diff --git a/motorApp/op/ui/motorx.ui b/motorApp/op/ui/autoconvert/motorx.ui similarity index 100% rename from motorApp/op/ui/motorx.ui rename to motorApp/op/ui/autoconvert/motorx.ui diff --git a/motorApp/op/ui/motorxU.ui b/motorApp/op/ui/autoconvert/motorxU.ui similarity index 100% rename from motorApp/op/ui/motorxU.ui rename to motorApp/op/ui/autoconvert/motorxU.ui diff --git a/motorApp/op/ui/motorx_all.ui b/motorApp/op/ui/autoconvert/motorx_all.ui similarity index 100% rename from motorApp/op/ui/motorx_all.ui rename to motorApp/op/ui/autoconvert/motorx_all.ui diff --git a/motorApp/op/ui/motorx_bare.ui b/motorApp/op/ui/autoconvert/motorx_bare.ui similarity index 100% rename from motorApp/op/ui/motorx_bare.ui rename to motorApp/op/ui/autoconvert/motorx_bare.ui diff --git a/motorApp/op/ui/motorx_help.ui b/motorApp/op/ui/autoconvert/motorx_help.ui similarity index 100% rename from motorApp/op/ui/motorx_help.ui rename to motorApp/op/ui/autoconvert/motorx_help.ui diff --git a/motorApp/op/ui/motorx_more.ui b/motorApp/op/ui/autoconvert/motorx_more.ui similarity index 100% rename from motorApp/op/ui/motorx_more.ui rename to motorApp/op/ui/autoconvert/motorx_more.ui diff --git a/motorApp/op/ui/motorx_msta_detail.ui b/motorApp/op/ui/autoconvert/motorx_msta_detail.ui similarity index 100% rename from motorApp/op/ui/motorx_msta_detail.ui rename to motorApp/op/ui/autoconvert/motorx_msta_detail.ui diff --git a/motorApp/op/ui/motorx_setup.ui b/motorApp/op/ui/autoconvert/motorx_setup.ui similarity index 100% rename from motorApp/op/ui/motorx_setup.ui rename to motorApp/op/ui/autoconvert/motorx_setup.ui diff --git a/motorApp/op/ui/motorx_tiny.ui b/motorApp/op/ui/autoconvert/motorx_tiny.ui similarity index 100% rename from motorApp/op/ui/motorx_tiny.ui rename to motorApp/op/ui/autoconvert/motorx_tiny.ui diff --git a/motorApp/op/ui/profileMove.ui b/motorApp/op/ui/autoconvert/profileMove.ui similarity index 100% rename from motorApp/op/ui/profileMove.ui rename to motorApp/op/ui/autoconvert/profileMove.ui diff --git a/motorApp/op/ui/profileMoveXPS.ui b/motorApp/op/ui/autoconvert/profileMoveXPS.ui similarity index 100% rename from motorApp/op/ui/profileMoveXPS.ui rename to motorApp/op/ui/autoconvert/profileMoveXPS.ui diff --git a/motorApp/op/ui/topMotors4.ui b/motorApp/op/ui/autoconvert/topMotors4.ui similarity index 100% rename from motorApp/op/ui/topMotors4.ui rename to motorApp/op/ui/autoconvert/topMotors4.ui diff --git a/motorApp/op/ui/topMotors8.ui b/motorApp/op/ui/autoconvert/topMotors8.ui similarity index 100% rename from motorApp/op/ui/topMotors8.ui rename to motorApp/op/ui/autoconvert/topMotors8.ui diff --git a/motorApp/op/ui/topMotors8_more.ui b/motorApp/op/ui/autoconvert/topMotors8_more.ui similarity index 100% rename from motorApp/op/ui/topMotors8_more.ui rename to motorApp/op/ui/autoconvert/topMotors8_more.ui diff --git a/motorApp/op/ui/trajectoryPlot.ui b/motorApp/op/ui/autoconvert/trajectoryPlot.ui similarity index 100% rename from motorApp/op/ui/trajectoryPlot.ui rename to motorApp/op/ui/autoconvert/trajectoryPlot.ui diff --git a/motorApp/op/ui/trajectoryScan.ui b/motorApp/op/ui/autoconvert/trajectoryScan.ui similarity index 100% rename from motorApp/op/ui/trajectoryScan.ui rename to motorApp/op/ui/autoconvert/trajectoryScan.ui diff --git a/motorApp/op/ui/trajectoryScanDebug.ui b/motorApp/op/ui/autoconvert/trajectoryScanDebug.ui similarity index 100% rename from motorApp/op/ui/trajectoryScanDebug.ui rename to motorApp/op/ui/autoconvert/trajectoryScanDebug.ui diff --git a/motorApp/op/ui/trajectoryScan_Ensemble.ui b/motorApp/op/ui/autoconvert/trajectoryScan_Ensemble.ui similarity index 100% rename from motorApp/op/ui/trajectoryScan_Ensemble.ui rename to motorApp/op/ui/autoconvert/trajectoryScan_Ensemble.ui diff --git a/motorApp/op/ui/trajectoryScan_MAXv.ui b/motorApp/op/ui/autoconvert/trajectoryScan_MAXv.ui similarity index 100% rename from motorApp/op/ui/trajectoryScan_MAXv.ui rename to motorApp/op/ui/autoconvert/trajectoryScan_MAXv.ui