Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 63cc3f68e3 | |||
| 6fa7a82c26 |
@@ -1,20 +0,0 @@
|
|||||||
{
|
|
||||||
|
|
||||||
"Parameters":{
|
|
||||||
"drawLine" : {"flag" : 0, "data":{ "widget": "QHLine", "text" : "None", "value" : "None"}},
|
|
||||||
"delayRamp" : {"flag" : 1, "data":{ "widget": "QDoubleSpinBox", "text" : "Ramp delay (s):",
|
|
||||||
"value" : 0.1, "min": 0.00, "max": 0.20, "step": 0.01,
|
|
||||||
"tooltip":"Wait time between sending set point to each magnet in 'Restore'/'Standby' "}},
|
|
||||||
"drawLine2" : {"flag" : 0, "data":{ "widget": "QHLine", "text" : "None", "value" : "None"}}
|
|
||||||
|
|
||||||
},
|
|
||||||
"Expert":{
|
|
||||||
"debug": {"flag" : 0, "data":{ "widget": "None", "text" : "Debug", "value" : 0}},
|
|
||||||
"simulation": {"flag" : 1, "data":{ "widget": "None", "text" : "Dry run", "value" : 0}}
|
|
||||||
},
|
|
||||||
"IOC": {
|
|
||||||
"resultsTabTitle" : "IOC"
|
|
||||||
},
|
|
||||||
"headerMagnetSector": ["B1B2","G1","SH","G2","O2","PIF", "G3"],
|
|
||||||
"Master": "Controlroom"
|
|
||||||
}
|
|
||||||
@@ -17,5 +17,6 @@
|
|||||||
"resultsTabTitle" : "IOC"
|
"resultsTabTitle" : "IOC"
|
||||||
},
|
},
|
||||||
"headerMagnetSector": ["B1B2","G1","SH","G2","O2","PIF", "G3"],
|
"headerMagnetSector": ["B1B2","G1","SH","G2","O2","PIF", "G3"],
|
||||||
"Master": "Controlroom"
|
"Master": "Controlroom",
|
||||||
|
"Reset": "HUSH!"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -73,5 +73,6 @@
|
|||||||
"IOC": {
|
"IOC": {
|
||||||
"resultsTabTitle" : "IOC"
|
"resultsTabTitle" : "IOC"
|
||||||
},
|
},
|
||||||
"Master": "Controlroom
|
"Master": "Controlroom",
|
||||||
|
"Reset": "HUSH!"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,5 +14,6 @@
|
|||||||
"simulation": {"flag" : 1, "data":{ "widget": "None", "text" : "Dry run", "value" : 0}}
|
"simulation": {"flag" : 1, "data":{ "widget": "None", "text" : "Dry run", "value" : 0}}
|
||||||
},
|
},
|
||||||
"headerMagnetSector": ["G1"],
|
"headerMagnetSector": ["G1"],
|
||||||
"Master": "Gantry 1"
|
"Master": "Gantry 1",
|
||||||
|
"Reset": "HUSH!"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,5 +14,6 @@
|
|||||||
"simulation": {"flag" : 1, "data":{ "widget": "None", "text" : "Dry run", "value" : 0}}
|
"simulation": {"flag" : 1, "data":{ "widget": "None", "text" : "Dry run", "value" : 0}}
|
||||||
},
|
},
|
||||||
"headerMagnetSector": ["G2"],
|
"headerMagnetSector": ["G2"],
|
||||||
"Master": "Gantry 2"
|
"Master": "Gantry 2",
|
||||||
|
"Reset": "HUSH!"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,5 +14,6 @@
|
|||||||
"simulation": {"flag" : 1, "data":{ "widget": "None", "text" : "Dry run", "value" : 0}}
|
"simulation": {"flag" : 1, "data":{ "widget": "None", "text" : "Dry run", "value" : 0}}
|
||||||
},
|
},
|
||||||
"headerMagnetSector": ["PIF", "G3"],
|
"headerMagnetSector": ["PIF", "G3"],
|
||||||
"Master": "Gantry 3"
|
"Master": "Gantry 3",
|
||||||
|
"Reset": "HUSH!"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,5 +14,6 @@
|
|||||||
"simulation": {"flag" : 1, "data":{ "widget": "None", "text" : "Dry run", "value" : 0}}
|
"simulation": {"flag" : 1, "data":{ "widget": "None", "text" : "Dry run", "value" : 0}}
|
||||||
},
|
},
|
||||||
"headerMagnetSector": ["O2"],
|
"headerMagnetSector": ["O2"],
|
||||||
"Master": "OPTIS2"
|
"Master": "OPTIS2",
|
||||||
|
"Reset": "HUSH!"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,5 +14,6 @@
|
|||||||
"simulation": {"flag" : 1, "data":{ "widget": "None", "text" : "Dry run", "value" : 0}}
|
"simulation": {"flag" : 1, "data":{ "widget": "None", "text" : "Dry run", "value" : 0}}
|
||||||
},
|
},
|
||||||
"headerMagnetSector": ["PIF"],
|
"headerMagnetSector": ["PIF"],
|
||||||
"Master": "PIF"
|
"Master": "PIF",
|
||||||
|
"Reset": "HUSH!"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,30 +9,7 @@
|
|||||||
from PyQt5 import QtCore
|
from PyQt5 import QtCore
|
||||||
|
|
||||||
qt_resource_data = b"\
|
qt_resource_data = b"\
|
||||||
\x00\x00\x00\xa7\
|
\x00\x00\x23\xd6\
|
||||||
\x3c\
|
|
||||||
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
|
||||||
\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
|
|
||||||
\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
|
|
||||||
\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x33\x20\x6f\
|
|
||||||
\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
|
|
||||||
\x70\x3e\x0a\x3c\x70\x3e\x20\x20\x3c\x61\x20\x68\x72\x65\x66\x3d\
|
|
||||||
\x22\x70\x61\x67\x65\x34\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
|
|
||||||
\x78\x74\x3c\x2f\x61\x3e\x3c\x2f\x70\x3e\x0a\x3c\x70\x3e\x3c\x62\
|
|
||||||
\x3e\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\
|
|
||||||
\x2e\x2e\x3c\x2f\x70\x3e\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\
|
|
||||||
\x68\x74\x6d\x6c\x3e\x0a\
|
|
||||||
\x00\x00\x00\x80\
|
|
||||||
\x3c\
|
|
||||||
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
|
||||||
\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
|
|
||||||
\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
|
|
||||||
\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x35\x20\x6f\
|
|
||||||
\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
|
|
||||||
\x70\x3e\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x65\x74\x63\x2e\x2e\x2e\
|
|
||||||
\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x70\x3e\x0a\
|
|
||||||
\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\x68\x74\x6d\x6c\x3e\x0a\
|
|
||||||
\x00\x00\x23\xb9\
|
|
||||||
\x3c\
|
\x3c\
|
||||||
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
||||||
\x65\x3e\x48\x61\x6e\x64\x73\x6f\x6d\x65\x20\x50\x6f\x77\x65\x72\
|
\x65\x3e\x48\x61\x6e\x64\x73\x6f\x6d\x65\x20\x50\x6f\x77\x65\x72\
|
||||||
@@ -561,64 +538,76 @@ qt_resource_data = b"\
|
|||||||
\x63\x6f\x6d\x70\x6c\x69\x73\x68\x65\x64\x20\x74\x68\x72\x6f\x75\
|
\x63\x6f\x6d\x70\x6c\x69\x73\x68\x65\x64\x20\x74\x68\x72\x6f\x75\
|
||||||
\x67\x68\x20\x74\x68\x65\x20\x22\x52\x65\x73\x65\x74\x20\x41\x63\
|
\x67\x68\x20\x74\x68\x65\x20\x22\x52\x65\x73\x65\x74\x20\x41\x63\
|
||||||
\x63\x6f\x75\x6e\x74\x22\x20\x62\x75\x74\x74\x6f\x6e\x2e\x0a\x20\
|
\x63\x6f\x75\x6e\x74\x22\x20\x62\x75\x74\x74\x6f\x6e\x2e\x0a\x20\
|
||||||
\x20\x54\x68\x69\x73\x20\x61\x63\x74\x69\x6f\x6e\x20\x61\x6c\x73\
|
\x20\x54\x68\x69\x73\x20\x61\x63\x74\x69\x6f\x6e\x20\x69\x73\x20\
|
||||||
\x6f\x20\x72\x65\x63\x6f\x72\x64\x73\x20\x74\x68\x65\x20\x65\x6e\
|
\x70\x61\x73\x73\x77\x6f\x72\x64\x20\x70\x72\x6f\x74\x65\x63\x74\
|
||||||
\x65\x72\x67\x79\x20\x73\x61\x76\x65\x64\x20\x76\x61\x6c\x75\x65\
|
\x65\x64\x20\x28\x48\x55\x53\x48\x21\x29\x20\x54\x68\x65\x20\x65\
|
||||||
\x20\x69\x6e\x20\x65\x6c\x6f\x67\x62\x6f\x6f\x6b\x2e\x0a\x0a\x20\
|
\x6e\x65\x72\x67\x79\x20\x73\x61\x76\x65\x64\x20\x69\x73\x20\x61\
|
||||||
\x20\x20\x3c\x68\x33\x20\x73\x74\x79\x6c\x65\x3d\x22\x63\x6f\x6c\
|
\x6c\x73\x6f\x20\x72\x65\x63\x6f\x72\x64\x65\x64\x20\x69\x6e\x20\
|
||||||
\x6f\x72\x3a\x23\x37\x62\x36\x38\x65\x65\x3b\x22\x3e\x4c\x61\x73\
|
\x74\x68\x65\x20\x65\x6c\x6f\x67\x62\x6f\x6f\x6b\x2e\x20\x0a\x0a\
|
||||||
\x74\x20\x50\x6f\x77\x65\x72\x3c\x2f\x68\x33\x3e\x0a\x20\x20\x20\
|
\x20\x20\x20\x3c\x68\x33\x20\x73\x74\x79\x6c\x65\x3d\x22\x63\x6f\
|
||||||
\x54\x68\x69\x73\x20\x73\x75\x62\x2d\x70\x61\x6e\x65\x6c\x20\x61\
|
\x6c\x6f\x72\x3a\x23\x37\x62\x36\x38\x65\x65\x3b\x22\x3e\x4c\x61\
|
||||||
\x6c\x6c\x6f\x77\x73\x20\x74\x68\x65\x20\x65\x78\x70\x65\x72\x74\
|
\x73\x74\x20\x50\x6f\x77\x65\x72\x3c\x2f\x68\x33\x3e\x0a\x20\x20\
|
||||||
\x20\x75\x73\x65\x72\x20\x74\x6f\x20\x72\x65\x73\x65\x74\x20\x74\
|
\x20\x54\x68\x69\x73\x20\x73\x75\x62\x2d\x70\x61\x6e\x65\x6c\x20\
|
||||||
\x68\x65\x20\x49\x6e\x69\x74\x69\x61\x6c\x20\x50\x6f\x77\x65\x72\
|
\x61\x6c\x6c\x6f\x77\x73\x20\x74\x68\x65\x20\x65\x78\x70\x65\x72\
|
||||||
\x20\x69\x6e\x20\x22\x53\x61\x76\x69\x6e\x67\x73\x20\x4f\x76\x65\
|
\x74\x20\x75\x73\x65\x72\x20\x74\x6f\x20\x72\x65\x73\x65\x74\x20\
|
||||||
\x72\x76\x69\x65\x77\x22\x20\x66\x6f\x72\x20\x61\x20\x67\x69\x76\
|
\x74\x68\x65\x20\x49\x6e\x69\x74\x69\x61\x6c\x20\x50\x6f\x77\x65\
|
||||||
\x65\x6e\x20\x73\x65\x63\x74\x69\x6f\x6e\x20\x74\x6f\x20\x69\x74\
|
\x72\x20\x69\x6e\x20\x22\x53\x61\x76\x69\x6e\x67\x73\x20\x4f\x76\
|
||||||
\x73\x20\x64\x65\x66\x61\x75\x6c\x74\x20\x76\x61\x6c\x75\x65\x2c\
|
\x65\x72\x76\x69\x65\x77\x22\x20\x66\x6f\x72\x20\x61\x20\x67\x69\
|
||||||
\x20\x73\x68\x6f\x75\x6c\x64\x20\x73\x75\x63\x68\x20\x61\x20\x6e\
|
\x76\x65\x6e\x20\x73\x65\x63\x74\x69\x6f\x6e\x20\x74\x6f\x20\x69\
|
||||||
\x65\x65\x64\x20\x65\x76\x65\x72\x20\x68\x61\x70\x68\x61\x7a\x61\
|
\x74\x73\x20\x64\x65\x66\x61\x75\x6c\x74\x20\x76\x61\x6c\x75\x65\
|
||||||
\x72\x64\x6c\x79\x20\x61\x72\x69\x73\x65\x20\x77\x68\x69\x6c\x65\
|
\x2c\x20\x73\x68\x6f\x75\x6c\x64\x20\x73\x75\x63\x68\x20\x61\x20\
|
||||||
\x20\x74\x68\x65\x20\x73\x65\x63\x74\x69\x6f\x6e\x20\x69\x73\x20\
|
\x6e\x65\x65\x64\x20\x65\x76\x65\x72\x20\x68\x61\x70\x68\x61\x7a\
|
||||||
\x69\x6e\x20\x45\x6e\x65\x72\x67\x79\x20\x53\x61\x76\x69\x6e\x67\
|
\x61\x72\x64\x6c\x79\x20\x61\x72\x69\x73\x65\x20\x77\x68\x69\x6c\
|
||||||
\x20\x6d\x6f\x64\x65\x2c\x20\x61\x6e\x64\x20\x66\x6f\x72\x20\x77\
|
\x65\x20\x74\x68\x65\x20\x73\x65\x63\x74\x69\x6f\x6e\x20\x69\x73\
|
||||||
\x68\x69\x63\x68\x20\x74\x68\x65\x20\x22\x55\x70\x64\x61\x74\x65\
|
\x20\x69\x6e\x20\x45\x6e\x65\x72\x67\x79\x20\x53\x61\x76\x69\x6e\
|
||||||
\x22\x20\x62\x75\x74\x74\x6f\x6e\x20\x69\x6e\x20\x74\x68\x65\x20\
|
\x67\x20\x6d\x6f\x64\x65\x2c\x20\x61\x6e\x64\x20\x66\x6f\x72\x20\
|
||||||
\x4d\x61\x67\x6e\x65\x74\x20\x70\x61\x6e\x65\x6c\x20\x69\x73\x20\
|
\x77\x68\x69\x63\x68\x20\x74\x68\x65\x20\x22\x55\x70\x64\x61\x74\
|
||||||
\x64\x69\x73\x65\x6e\x61\x62\x6c\x65\x64\x2e\x0a\x0a\x3c\x68\x33\
|
\x65\x22\x20\x62\x75\x74\x74\x6f\x6e\x20\x69\x6e\x20\x74\x68\x65\
|
||||||
\x20\x73\x74\x79\x6c\x65\x3d\x22\x63\x6f\x6c\x6f\x72\x3a\x23\x37\
|
\x20\x4d\x61\x67\x6e\x65\x74\x20\x70\x61\x6e\x65\x6c\x20\x69\x73\
|
||||||
\x62\x36\x38\x65\x65\x3b\x22\x3e\x48\x55\x53\x48\x21\x20\x49\x6d\
|
\x20\x64\x69\x73\x65\x6e\x61\x62\x6c\x65\x64\x2e\x0a\x0a\x3c\x68\
|
||||||
\x61\x67\x65\x3c\x2f\x68\x33\x3e\x0a\x20\x3c\x74\x61\x62\x6c\x65\
|
\x33\x20\x73\x74\x79\x6c\x65\x3d\x22\x63\x6f\x6c\x6f\x72\x3a\x23\
|
||||||
\x3e\x0a\x20\x20\x20\x20\x20\x3c\x74\x72\x3e\x3c\x74\x64\x3e\x0a\
|
\x37\x62\x36\x38\x65\x65\x3b\x22\x3e\x48\x55\x53\x48\x21\x20\x49\
|
||||||
\x20\x20\x20\x3c\x69\x6d\x67\x20\x73\x72\x63\x3d\x22\x3a\x48\x75\
|
\x6d\x61\x67\x65\x3c\x2f\x68\x33\x3e\x0a\x20\x3c\x74\x61\x62\x6c\
|
||||||
\x73\x68\x2e\x6a\x70\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x39\x30\
|
\x65\x3e\x0a\x20\x20\x20\x20\x20\x3c\x74\x72\x3e\x3c\x74\x64\x3e\
|
||||||
\x20\x68\x65\x69\x67\x68\x74\x3d\x39\x30\x2f\x3e\x20\x26\x6e\x62\
|
\x0a\x20\x20\x20\x3c\x69\x6d\x67\x20\x73\x72\x63\x3d\x22\x3a\x48\
|
||||||
\x73\x70\x3b\x20\x3c\x2f\x74\x64\x3e\x3c\x74\x64\x3e\x0a\x20\x20\
|
\x75\x73\x68\x2e\x6a\x70\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x39\
|
||||||
\x20\x49\x6e\x73\x70\x69\x72\x65\x64\x20\x62\x79\x20\x44\x61\x64\
|
\x30\x20\x68\x65\x69\x67\x68\x74\x3d\x39\x30\x2f\x3e\x20\x26\x6e\
|
||||||
\x61\x20\x41\x6e\x74\x65\x20\x50\x6f\x72\x74\x61\x73\x2c\x20\x61\
|
\x62\x73\x70\x3b\x20\x3c\x2f\x74\x64\x3e\x3c\x74\x64\x3e\x0a\x20\
|
||||||
\x72\x67\x75\x61\x62\x6c\x79\x20\x53\x77\x69\x74\x7a\x65\x72\x6c\
|
\x20\x20\x49\x6e\x73\x70\x69\x72\x65\x64\x20\x62\x79\x20\x44\x61\
|
||||||
\x61\x6e\x64\x27\x73\x20\x67\x72\x65\x61\x74\x65\x73\x74\x20\x50\
|
\x64\x61\x20\x41\x6e\x74\x65\x20\x50\x6f\x72\x74\x61\x73\x2c\x20\
|
||||||
\x6f\x70\x2f\x52\x6f\x63\x6b\x20\x62\x61\x6e\x64\x21\x20\x44\x6f\
|
\x61\x72\x67\x75\x61\x62\x6c\x79\x20\x53\x77\x69\x74\x7a\x65\x72\
|
||||||
\x20\x67\x69\x76\x65\x20\x74\x68\x65\x6d\x20\x61\x20\x6c\x69\x73\
|
\x6c\x61\x6e\x64\x27\x73\x20\x67\x72\x65\x61\x74\x65\x73\x74\x20\
|
||||||
\x74\x65\x6e\x2e\x0a\x20\x20\x20\x54\x68\x65\x69\x72\x20\x6d\x75\
|
\x50\x6f\x70\x2f\x52\x6f\x63\x6b\x20\x62\x61\x6e\x64\x21\x20\x47\
|
||||||
\x73\x69\x63\x20\x61\x6e\x64\x20\x6c\x79\x72\x69\x63\x73\x20\x61\
|
\x69\x76\x65\x20\x27\x65\x6d\x20\x61\x20\x6c\x69\x73\x74\x65\x6e\
|
||||||
\x72\x65\x20\x61\x77\x65\x73\x6f\x6d\x65\x21\x3c\x2f\x74\x64\x3e\
|
\x2e\x0a\x20\x20\x20\x54\x68\x65\x69\x72\x20\x6d\x75\x73\x69\x63\
|
||||||
\x0a\x20\x20\x20\x3c\x2f\x74\x61\x62\x6c\x65\x3e\x0a\x3c\x70\x3e\
|
\x20\x61\x6e\x64\x20\x6c\x79\x72\x69\x63\x73\x20\x61\x72\x65\x20\
|
||||||
\x0a\x3c\x2f\x70\x3e\x0a\x20\x20\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\
|
\x61\x77\x65\x73\x6f\x6d\x65\x21\x3c\x2f\x74\x64\x3e\x0a\x20\x20\
|
||||||
\x3c\x2f\x68\x74\x6d\x6c\x3e\x0a\
|
\x20\x3c\x2f\x74\x61\x62\x6c\x65\x3e\x0a\x3c\x70\x3e\x0a\x3c\x2f\
|
||||||
|
\x70\x3e\x0a\x20\x20\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\x68\
|
||||||
|
\x74\x6d\x6c\x3e\x0a\
|
||||||
\x00\x00\x00\xa7\
|
\x00\x00\x00\xa7\
|
||||||
\x3c\
|
\x3c\
|
||||||
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
||||||
\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
|
\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
|
||||||
\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
|
\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
|
||||||
\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x31\x20\x6f\
|
\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x32\x20\x6f\
|
||||||
\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
|
\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
|
||||||
\x70\x3e\x0a\x3c\x70\x3e\x20\x20\x3c\x61\x20\x68\x72\x65\x66\x3d\
|
\x70\x3e\x0a\x3c\x70\x3e\x20\x20\x3c\x61\x20\x68\x72\x65\x66\x3d\
|
||||||
\x22\x70\x61\x67\x65\x32\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
|
\x22\x70\x61\x67\x65\x33\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
|
||||||
\x78\x74\x3c\x2f\x61\x3e\x3c\x2f\x70\x3e\x0a\x3c\x70\x3e\x3c\x62\
|
\x78\x74\x3c\x2f\x61\x3e\x3c\x2f\x70\x3e\x0a\x3c\x70\x3e\x3c\x62\
|
||||||
\x3e\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\
|
\x3e\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\
|
||||||
\x2e\x2e\x3c\x2f\x70\x3e\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\
|
\x2e\x2e\x3c\x2f\x70\x3e\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\
|
||||||
\x68\x74\x6d\x6c\x3e\x0a\
|
\x68\x74\x6d\x6c\x3e\x0a\
|
||||||
|
\x00\x00\x00\x80\
|
||||||
|
\x3c\
|
||||||
|
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
||||||
|
\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
|
||||||
|
\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
|
||||||
|
\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x35\x20\x6f\
|
||||||
|
\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
|
||||||
|
\x70\x3e\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x65\x74\x63\x2e\x2e\x2e\
|
||||||
|
\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x70\x3e\x0a\
|
||||||
|
\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\x68\x74\x6d\x6c\x3e\x0a\
|
||||||
\x00\x00\x00\xa7\
|
\x00\x00\x00\xa7\
|
||||||
\x3c\
|
\x3c\
|
||||||
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
||||||
@@ -637,10 +626,23 @@ qt_resource_data = b"\
|
|||||||
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
||||||
\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
|
\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
|
||||||
\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
|
\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
|
||||||
\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x32\x20\x6f\
|
\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x33\x20\x6f\
|
||||||
\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
|
\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
|
||||||
\x70\x3e\x0a\x3c\x70\x3e\x20\x20\x3c\x61\x20\x68\x72\x65\x66\x3d\
|
\x70\x3e\x0a\x3c\x70\x3e\x20\x20\x3c\x61\x20\x68\x72\x65\x66\x3d\
|
||||||
\x22\x70\x61\x67\x65\x33\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
|
\x22\x70\x61\x67\x65\x34\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
|
||||||
|
\x78\x74\x3c\x2f\x61\x3e\x3c\x2f\x70\x3e\x0a\x3c\x70\x3e\x3c\x62\
|
||||||
|
\x3e\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\
|
||||||
|
\x2e\x2e\x3c\x2f\x70\x3e\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\
|
||||||
|
\x68\x74\x6d\x6c\x3e\x0a\
|
||||||
|
\x00\x00\x00\xa7\
|
||||||
|
\x3c\
|
||||||
|
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
||||||
|
\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
|
||||||
|
\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
|
||||||
|
\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x31\x20\x6f\
|
||||||
|
\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
|
||||||
|
\x70\x3e\x0a\x3c\x70\x3e\x20\x20\x3c\x61\x20\x68\x72\x65\x66\x3d\
|
||||||
|
\x22\x70\x61\x67\x65\x32\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
|
||||||
\x78\x74\x3c\x2f\x61\x3e\x3c\x2f\x70\x3e\x0a\x3c\x70\x3e\x3c\x62\
|
\x78\x74\x3c\x2f\x61\x3e\x3c\x2f\x70\x3e\x0a\x3c\x70\x3e\x3c\x62\
|
||||||
\x3e\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\
|
\x3e\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\
|
||||||
\x2e\x2e\x3c\x2f\x70\x3e\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\
|
\x2e\x2e\x3c\x2f\x70\x3e\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\
|
||||||
@@ -649,56 +651,56 @@ qt_resource_data = b"\
|
|||||||
|
|
||||||
qt_resource_name = b"\
|
qt_resource_name = b"\
|
||||||
\x00\x0a\
|
\x00\x0a\
|
||||||
\x08\x6a\x34\x9c\
|
\x0c\xba\xf2\x7c\
|
||||||
|
\x00\x69\
|
||||||
|
\x00\x6e\x00\x64\x00\x65\x00\x78\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
||||||
|
\x00\x0a\
|
||||||
|
\x08\x5a\x34\x9c\
|
||||||
\x00\x70\
|
\x00\x70\
|
||||||
\x00\x61\x00\x67\x00\x65\x00\x33\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
\x00\x61\x00\x67\x00\x65\x00\x32\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
||||||
\x00\x0a\
|
\x00\x0a\
|
||||||
\x08\x8a\x34\x9c\
|
\x08\x8a\x34\x9c\
|
||||||
\x00\x70\
|
\x00\x70\
|
||||||
\x00\x61\x00\x67\x00\x65\x00\x35\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
\x00\x61\x00\x67\x00\x65\x00\x35\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
||||||
\x00\x0a\
|
\x00\x0a\
|
||||||
\x0c\xba\xf2\x7c\
|
|
||||||
\x00\x69\
|
|
||||||
\x00\x6e\x00\x64\x00\x65\x00\x78\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
|
||||||
\x00\x0a\
|
|
||||||
\x08\x4a\x34\x9c\
|
|
||||||
\x00\x70\
|
|
||||||
\x00\x61\x00\x67\x00\x65\x00\x31\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
|
||||||
\x00\x0a\
|
|
||||||
\x08\x7a\x34\x9c\
|
\x08\x7a\x34\x9c\
|
||||||
\x00\x70\
|
\x00\x70\
|
||||||
\x00\x61\x00\x67\x00\x65\x00\x34\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
\x00\x61\x00\x67\x00\x65\x00\x34\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
||||||
\x00\x0a\
|
\x00\x0a\
|
||||||
\x08\x5a\x34\x9c\
|
\x08\x6a\x34\x9c\
|
||||||
\x00\x70\
|
\x00\x70\
|
||||||
\x00\x61\x00\x67\x00\x65\x00\x32\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
\x00\x61\x00\x67\x00\x65\x00\x33\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
||||||
|
\x00\x0a\
|
||||||
|
\x08\x4a\x34\x9c\
|
||||||
|
\x00\x70\
|
||||||
|
\x00\x61\x00\x67\x00\x65\x00\x31\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
||||||
"
|
"
|
||||||
|
|
||||||
qt_resource_struct_v1 = b"\
|
qt_resource_struct_v1 = b"\
|
||||||
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x06\x00\x00\x00\x01\
|
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x06\x00\x00\x00\x01\
|
||||||
\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x24\xec\
|
\x00\x00\x00\x82\x00\x00\x00\x00\x00\x01\x00\x00\x26\x5f\
|
||||||
\x00\x00\x00\x82\x00\x00\x00\x00\x00\x01\x00\x00\x26\x42\
|
\x00\x00\x00\x1a\x00\x00\x00\x00\x00\x01\x00\x00\x23\xda\
|
||||||
|
\x00\x00\x00\x68\x00\x00\x00\x00\x00\x01\x00\x00\x25\xb4\
|
||||||
|
\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x25\x09\
|
||||||
|
\x00\x00\x00\x34\x00\x00\x00\x00\x00\x01\x00\x00\x24\x85\
|
||||||
\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
|
\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
|
||||||
\x00\x00\x00\x68\x00\x00\x00\x00\x00\x01\x00\x00\x25\x97\
|
|
||||||
\x00\x00\x00\x1a\x00\x00\x00\x00\x00\x01\x00\x00\x00\xab\
|
|
||||||
\x00\x00\x00\x34\x00\x00\x00\x00\x00\x01\x00\x00\x01\x2f\
|
|
||||||
"
|
"
|
||||||
|
|
||||||
qt_resource_struct_v2 = b"\
|
qt_resource_struct_v2 = b"\
|
||||||
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x06\x00\x00\x00\x01\
|
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x06\x00\x00\x00\x01\
|
||||||
\x00\x00\x00\x00\x00\x00\x00\x00\
|
\x00\x00\x00\x00\x00\x00\x00\x00\
|
||||||
\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x24\xec\
|
\x00\x00\x00\x82\x00\x00\x00\x00\x00\x01\x00\x00\x26\x5f\
|
||||||
\x00\x00\x01\x8d\xc6\x98\xaa\x4d\
|
\x00\x00\x01\x94\x50\x2e\x84\x4a\
|
||||||
\x00\x00\x00\x82\x00\x00\x00\x00\x00\x01\x00\x00\x26\x42\
|
\x00\x00\x00\x1a\x00\x00\x00\x00\x00\x01\x00\x00\x23\xda\
|
||||||
\x00\x00\x01\x8d\xc6\x98\xaa\x50\
|
\x00\x00\x01\x94\x50\x2e\x84\x4c\
|
||||||
|
\x00\x00\x00\x68\x00\x00\x00\x00\x00\x01\x00\x00\x25\xb4\
|
||||||
|
\x00\x00\x01\x94\x50\x2e\x84\x4d\
|
||||||
|
\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x25\x09\
|
||||||
|
\x00\x00\x01\x94\x50\x2e\x84\x4f\
|
||||||
|
\x00\x00\x00\x34\x00\x00\x00\x00\x00\x01\x00\x00\x24\x85\
|
||||||
|
\x00\x00\x01\x94\x50\x2e\x84\x51\
|
||||||
\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
|
\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
|
||||||
\x00\x00\x01\x8d\xc6\x98\xaa\x52\
|
\x00\x00\x01\x94\x50\x7b\xd3\x65\
|
||||||
\x00\x00\x00\x68\x00\x00\x00\x00\x00\x01\x00\x00\x25\x97\
|
|
||||||
\x00\x00\x01\x8d\xc6\x98\xaa\x54\
|
|
||||||
\x00\x00\x00\x1a\x00\x00\x00\x00\x00\x01\x00\x00\x00\xab\
|
|
||||||
\x00\x00\x01\x8d\xc6\x98\xaa\x55\
|
|
||||||
\x00\x00\x00\x34\x00\x00\x00\x00\x00\x01\x00\x00\x01\x2f\
|
|
||||||
\x00\x00\x01\x8d\xf0\x21\xc8\x6b\
|
|
||||||
"
|
"
|
||||||
|
|
||||||
qt_version = [int(v) for v in QtCore.qVersion().split('.')]
|
qt_version = [int(v) for v in QtCore.qVersion().split('.')]
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ Enumerated values for SEQ-STATE (not all states may have necessarily been implem
|
|||||||
The accounting of the energy saved for a given is year is to be recorded.
|
The accounting of the energy saved for a given is year is to be recorded.
|
||||||
At the end of the calendar year, the process variables holding the power
|
At the end of the calendar year, the process variables holding the power
|
||||||
saved values are to be reset to zero. This is accomplished through the "Reset Account" button.
|
saved values are to be reset to zero. This is accomplished through the "Reset Account" button.
|
||||||
This action also records the energy saved value in elogbook.
|
This action is password protected (HUSH!) The energy saved is also recorded in the elogbook.
|
||||||
|
|
||||||
<h3 style="color:#7b68ee;">Last Power</h3>
|
<h3 style="color:#7b68ee;">Last Power</h3>
|
||||||
This sub-panel allows the expert user to reset the Initial Power in "Savings Overview" for a given section to its default value, should such a need ever haphazardly arise while the section is in Energy Saving mode, and for which the "Update" button in the Magnet panel is disenabled.
|
This sub-panel allows the expert user to reset the Initial Power in "Savings Overview" for a given section to its default value, should such a need ever haphazardly arise while the section is in Energy Saving mode, and for which the "Update" button in the Magnet panel is disenabled.
|
||||||
@@ -108,7 +108,7 @@ Enumerated values for SEQ-STATE (not all states may have necessarily been implem
|
|||||||
<table>
|
<table>
|
||||||
<tr><td>
|
<tr><td>
|
||||||
<img src=":Hush.jpg" width=90 height=90/> </td><td>
|
<img src=":Hush.jpg" width=90 height=90/> </td><td>
|
||||||
Inspired by Dada Ante Portas, arguably Switzerland's greatest Pop/Rock band! Do give them a listen.
|
Inspired by Dada Ante Portas, arguably Switzerland's greatest Pop/Rock band! Give 'em a listen.
|
||||||
Their music and lyrics are awesome!</td>
|
Their music and lyrics are awesome!</td>
|
||||||
</table>
|
</table>
|
||||||
<p>
|
<p>
|
||||||
|
|||||||
@@ -127,5 +127,6 @@
|
|||||||
"resultsTabTitle" : "IOC"
|
"resultsTabTitle" : "IOC"
|
||||||
},
|
},
|
||||||
"headerMagnetSector": ["B1B2","G1","SH","G2","O2","PIF", "G3"],
|
"headerMagnetSector": ["B1B2","G1","SH","G2","O2","PIF", "G3"],
|
||||||
"Master": "Controlroom"
|
"Master": "Controlroom",
|
||||||
|
"Reset": "HUSH!"
|
||||||
}
|
}
|
||||||
|
|||||||
6
hush.sh
6
hush.sh
@@ -1,5 +1,5 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
cd /proscan/bd/applications/hush/hla/1.5.0
|
cd /proscan/bd/applications/hush/hla/1.6.0
|
||||||
|
|
||||||
# For use if script is sourced rather than executed
|
# For use if script is sourced rather than executed
|
||||||
appNameDefault="hush.sh"
|
appNameDefault="hush.sh"
|
||||||
@@ -60,10 +60,10 @@ echo "PYTHON_VERSION $PYTHON_VERSION"
|
|||||||
|
|
||||||
|
|
||||||
#C_EXT version
|
#C_EXT version
|
||||||
export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0
|
export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.13.0
|
||||||
|
|
||||||
if [ "${EXTRA_PYTHON_PATH_FLAG}" -gt "0" ] ; then
|
if [ "${EXTRA_PYTHON_PATH_FLAG}" -gt "0" ] ; then
|
||||||
export PYTHONPATH=$PYTHONPATH:/proscan/bd/applications/deps/apps4ops/v1.10.0/common/python${PYTHON_VERSION_DIR}
|
export PYTHONPATH=$PYTHONPATH:/proscan/bd/applications/deps/apps4ops/v1.13.0/common/python${PYTHON_VERSION_DIR}
|
||||||
fi
|
fi
|
||||||
echo $PYTHONPATH
|
echo $PYTHONPATH
|
||||||
|
|
||||||
|
|||||||
@@ -9,30 +9,7 @@
|
|||||||
from PyQt5 import QtCore
|
from PyQt5 import QtCore
|
||||||
|
|
||||||
qt_resource_data = b"\
|
qt_resource_data = b"\
|
||||||
\x00\x00\x00\xa7\
|
\x00\x00\x23\xd6\
|
||||||
\x3c\
|
|
||||||
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
|
||||||
\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
|
|
||||||
\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
|
|
||||||
\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x33\x20\x6f\
|
|
||||||
\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
|
|
||||||
\x70\x3e\x0a\x3c\x70\x3e\x20\x20\x3c\x61\x20\x68\x72\x65\x66\x3d\
|
|
||||||
\x22\x70\x61\x67\x65\x34\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
|
|
||||||
\x78\x74\x3c\x2f\x61\x3e\x3c\x2f\x70\x3e\x0a\x3c\x70\x3e\x3c\x62\
|
|
||||||
\x3e\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\
|
|
||||||
\x2e\x2e\x3c\x2f\x70\x3e\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\
|
|
||||||
\x68\x74\x6d\x6c\x3e\x0a\
|
|
||||||
\x00\x00\x00\x80\
|
|
||||||
\x3c\
|
|
||||||
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
|
||||||
\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
|
|
||||||
\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
|
|
||||||
\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x35\x20\x6f\
|
|
||||||
\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
|
|
||||||
\x70\x3e\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x65\x74\x63\x2e\x2e\x2e\
|
|
||||||
\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x70\x3e\x0a\
|
|
||||||
\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\x68\x74\x6d\x6c\x3e\x0a\
|
|
||||||
\x00\x00\x23\xb9\
|
|
||||||
\x3c\
|
\x3c\
|
||||||
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
||||||
\x65\x3e\x48\x61\x6e\x64\x73\x6f\x6d\x65\x20\x50\x6f\x77\x65\x72\
|
\x65\x3e\x48\x61\x6e\x64\x73\x6f\x6d\x65\x20\x50\x6f\x77\x65\x72\
|
||||||
@@ -561,64 +538,76 @@ qt_resource_data = b"\
|
|||||||
\x63\x6f\x6d\x70\x6c\x69\x73\x68\x65\x64\x20\x74\x68\x72\x6f\x75\
|
\x63\x6f\x6d\x70\x6c\x69\x73\x68\x65\x64\x20\x74\x68\x72\x6f\x75\
|
||||||
\x67\x68\x20\x74\x68\x65\x20\x22\x52\x65\x73\x65\x74\x20\x41\x63\
|
\x67\x68\x20\x74\x68\x65\x20\x22\x52\x65\x73\x65\x74\x20\x41\x63\
|
||||||
\x63\x6f\x75\x6e\x74\x22\x20\x62\x75\x74\x74\x6f\x6e\x2e\x0a\x20\
|
\x63\x6f\x75\x6e\x74\x22\x20\x62\x75\x74\x74\x6f\x6e\x2e\x0a\x20\
|
||||||
\x20\x54\x68\x69\x73\x20\x61\x63\x74\x69\x6f\x6e\x20\x61\x6c\x73\
|
\x20\x54\x68\x69\x73\x20\x61\x63\x74\x69\x6f\x6e\x20\x69\x73\x20\
|
||||||
\x6f\x20\x72\x65\x63\x6f\x72\x64\x73\x20\x74\x68\x65\x20\x65\x6e\
|
\x70\x61\x73\x73\x77\x6f\x72\x64\x20\x70\x72\x6f\x74\x65\x63\x74\
|
||||||
\x65\x72\x67\x79\x20\x73\x61\x76\x65\x64\x20\x76\x61\x6c\x75\x65\
|
\x65\x64\x20\x28\x48\x55\x53\x48\x21\x29\x20\x54\x68\x65\x20\x65\
|
||||||
\x20\x69\x6e\x20\x65\x6c\x6f\x67\x62\x6f\x6f\x6b\x2e\x0a\x0a\x20\
|
\x6e\x65\x72\x67\x79\x20\x73\x61\x76\x65\x64\x20\x69\x73\x20\x61\
|
||||||
\x20\x20\x3c\x68\x33\x20\x73\x74\x79\x6c\x65\x3d\x22\x63\x6f\x6c\
|
\x6c\x73\x6f\x20\x72\x65\x63\x6f\x72\x64\x65\x64\x20\x69\x6e\x20\
|
||||||
\x6f\x72\x3a\x23\x37\x62\x36\x38\x65\x65\x3b\x22\x3e\x4c\x61\x73\
|
\x74\x68\x65\x20\x65\x6c\x6f\x67\x62\x6f\x6f\x6b\x2e\x20\x0a\x0a\
|
||||||
\x74\x20\x50\x6f\x77\x65\x72\x3c\x2f\x68\x33\x3e\x0a\x20\x20\x20\
|
\x20\x20\x20\x3c\x68\x33\x20\x73\x74\x79\x6c\x65\x3d\x22\x63\x6f\
|
||||||
\x54\x68\x69\x73\x20\x73\x75\x62\x2d\x70\x61\x6e\x65\x6c\x20\x61\
|
\x6c\x6f\x72\x3a\x23\x37\x62\x36\x38\x65\x65\x3b\x22\x3e\x4c\x61\
|
||||||
\x6c\x6c\x6f\x77\x73\x20\x74\x68\x65\x20\x65\x78\x70\x65\x72\x74\
|
\x73\x74\x20\x50\x6f\x77\x65\x72\x3c\x2f\x68\x33\x3e\x0a\x20\x20\
|
||||||
\x20\x75\x73\x65\x72\x20\x74\x6f\x20\x72\x65\x73\x65\x74\x20\x74\
|
\x20\x54\x68\x69\x73\x20\x73\x75\x62\x2d\x70\x61\x6e\x65\x6c\x20\
|
||||||
\x68\x65\x20\x49\x6e\x69\x74\x69\x61\x6c\x20\x50\x6f\x77\x65\x72\
|
\x61\x6c\x6c\x6f\x77\x73\x20\x74\x68\x65\x20\x65\x78\x70\x65\x72\
|
||||||
\x20\x69\x6e\x20\x22\x53\x61\x76\x69\x6e\x67\x73\x20\x4f\x76\x65\
|
\x74\x20\x75\x73\x65\x72\x20\x74\x6f\x20\x72\x65\x73\x65\x74\x20\
|
||||||
\x72\x76\x69\x65\x77\x22\x20\x66\x6f\x72\x20\x61\x20\x67\x69\x76\
|
\x74\x68\x65\x20\x49\x6e\x69\x74\x69\x61\x6c\x20\x50\x6f\x77\x65\
|
||||||
\x65\x6e\x20\x73\x65\x63\x74\x69\x6f\x6e\x20\x74\x6f\x20\x69\x74\
|
\x72\x20\x69\x6e\x20\x22\x53\x61\x76\x69\x6e\x67\x73\x20\x4f\x76\
|
||||||
\x73\x20\x64\x65\x66\x61\x75\x6c\x74\x20\x76\x61\x6c\x75\x65\x2c\
|
\x65\x72\x76\x69\x65\x77\x22\x20\x66\x6f\x72\x20\x61\x20\x67\x69\
|
||||||
\x20\x73\x68\x6f\x75\x6c\x64\x20\x73\x75\x63\x68\x20\x61\x20\x6e\
|
\x76\x65\x6e\x20\x73\x65\x63\x74\x69\x6f\x6e\x20\x74\x6f\x20\x69\
|
||||||
\x65\x65\x64\x20\x65\x76\x65\x72\x20\x68\x61\x70\x68\x61\x7a\x61\
|
\x74\x73\x20\x64\x65\x66\x61\x75\x6c\x74\x20\x76\x61\x6c\x75\x65\
|
||||||
\x72\x64\x6c\x79\x20\x61\x72\x69\x73\x65\x20\x77\x68\x69\x6c\x65\
|
\x2c\x20\x73\x68\x6f\x75\x6c\x64\x20\x73\x75\x63\x68\x20\x61\x20\
|
||||||
\x20\x74\x68\x65\x20\x73\x65\x63\x74\x69\x6f\x6e\x20\x69\x73\x20\
|
\x6e\x65\x65\x64\x20\x65\x76\x65\x72\x20\x68\x61\x70\x68\x61\x7a\
|
||||||
\x69\x6e\x20\x45\x6e\x65\x72\x67\x79\x20\x53\x61\x76\x69\x6e\x67\
|
\x61\x72\x64\x6c\x79\x20\x61\x72\x69\x73\x65\x20\x77\x68\x69\x6c\
|
||||||
\x20\x6d\x6f\x64\x65\x2c\x20\x61\x6e\x64\x20\x66\x6f\x72\x20\x77\
|
\x65\x20\x74\x68\x65\x20\x73\x65\x63\x74\x69\x6f\x6e\x20\x69\x73\
|
||||||
\x68\x69\x63\x68\x20\x74\x68\x65\x20\x22\x55\x70\x64\x61\x74\x65\
|
\x20\x69\x6e\x20\x45\x6e\x65\x72\x67\x79\x20\x53\x61\x76\x69\x6e\
|
||||||
\x22\x20\x62\x75\x74\x74\x6f\x6e\x20\x69\x6e\x20\x74\x68\x65\x20\
|
\x67\x20\x6d\x6f\x64\x65\x2c\x20\x61\x6e\x64\x20\x66\x6f\x72\x20\
|
||||||
\x4d\x61\x67\x6e\x65\x74\x20\x70\x61\x6e\x65\x6c\x20\x69\x73\x20\
|
\x77\x68\x69\x63\x68\x20\x74\x68\x65\x20\x22\x55\x70\x64\x61\x74\
|
||||||
\x64\x69\x73\x65\x6e\x61\x62\x6c\x65\x64\x2e\x0a\x0a\x3c\x68\x33\
|
\x65\x22\x20\x62\x75\x74\x74\x6f\x6e\x20\x69\x6e\x20\x74\x68\x65\
|
||||||
\x20\x73\x74\x79\x6c\x65\x3d\x22\x63\x6f\x6c\x6f\x72\x3a\x23\x37\
|
\x20\x4d\x61\x67\x6e\x65\x74\x20\x70\x61\x6e\x65\x6c\x20\x69\x73\
|
||||||
\x62\x36\x38\x65\x65\x3b\x22\x3e\x48\x55\x53\x48\x21\x20\x49\x6d\
|
\x20\x64\x69\x73\x65\x6e\x61\x62\x6c\x65\x64\x2e\x0a\x0a\x3c\x68\
|
||||||
\x61\x67\x65\x3c\x2f\x68\x33\x3e\x0a\x20\x3c\x74\x61\x62\x6c\x65\
|
\x33\x20\x73\x74\x79\x6c\x65\x3d\x22\x63\x6f\x6c\x6f\x72\x3a\x23\
|
||||||
\x3e\x0a\x20\x20\x20\x20\x20\x3c\x74\x72\x3e\x3c\x74\x64\x3e\x0a\
|
\x37\x62\x36\x38\x65\x65\x3b\x22\x3e\x48\x55\x53\x48\x21\x20\x49\
|
||||||
\x20\x20\x20\x3c\x69\x6d\x67\x20\x73\x72\x63\x3d\x22\x3a\x48\x75\
|
\x6d\x61\x67\x65\x3c\x2f\x68\x33\x3e\x0a\x20\x3c\x74\x61\x62\x6c\
|
||||||
\x73\x68\x2e\x6a\x70\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x39\x30\
|
\x65\x3e\x0a\x20\x20\x20\x20\x20\x3c\x74\x72\x3e\x3c\x74\x64\x3e\
|
||||||
\x20\x68\x65\x69\x67\x68\x74\x3d\x39\x30\x2f\x3e\x20\x26\x6e\x62\
|
\x0a\x20\x20\x20\x3c\x69\x6d\x67\x20\x73\x72\x63\x3d\x22\x3a\x48\
|
||||||
\x73\x70\x3b\x20\x3c\x2f\x74\x64\x3e\x3c\x74\x64\x3e\x0a\x20\x20\
|
\x75\x73\x68\x2e\x6a\x70\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x39\
|
||||||
\x20\x49\x6e\x73\x70\x69\x72\x65\x64\x20\x62\x79\x20\x44\x61\x64\
|
\x30\x20\x68\x65\x69\x67\x68\x74\x3d\x39\x30\x2f\x3e\x20\x26\x6e\
|
||||||
\x61\x20\x41\x6e\x74\x65\x20\x50\x6f\x72\x74\x61\x73\x2c\x20\x61\
|
\x62\x73\x70\x3b\x20\x3c\x2f\x74\x64\x3e\x3c\x74\x64\x3e\x0a\x20\
|
||||||
\x72\x67\x75\x61\x62\x6c\x79\x20\x53\x77\x69\x74\x7a\x65\x72\x6c\
|
\x20\x20\x49\x6e\x73\x70\x69\x72\x65\x64\x20\x62\x79\x20\x44\x61\
|
||||||
\x61\x6e\x64\x27\x73\x20\x67\x72\x65\x61\x74\x65\x73\x74\x20\x50\
|
\x64\x61\x20\x41\x6e\x74\x65\x20\x50\x6f\x72\x74\x61\x73\x2c\x20\
|
||||||
\x6f\x70\x2f\x52\x6f\x63\x6b\x20\x62\x61\x6e\x64\x21\x20\x44\x6f\
|
\x61\x72\x67\x75\x61\x62\x6c\x79\x20\x53\x77\x69\x74\x7a\x65\x72\
|
||||||
\x20\x67\x69\x76\x65\x20\x74\x68\x65\x6d\x20\x61\x20\x6c\x69\x73\
|
\x6c\x61\x6e\x64\x27\x73\x20\x67\x72\x65\x61\x74\x65\x73\x74\x20\
|
||||||
\x74\x65\x6e\x2e\x0a\x20\x20\x20\x54\x68\x65\x69\x72\x20\x6d\x75\
|
\x50\x6f\x70\x2f\x52\x6f\x63\x6b\x20\x62\x61\x6e\x64\x21\x20\x47\
|
||||||
\x73\x69\x63\x20\x61\x6e\x64\x20\x6c\x79\x72\x69\x63\x73\x20\x61\
|
\x69\x76\x65\x20\x27\x65\x6d\x20\x61\x20\x6c\x69\x73\x74\x65\x6e\
|
||||||
\x72\x65\x20\x61\x77\x65\x73\x6f\x6d\x65\x21\x3c\x2f\x74\x64\x3e\
|
\x2e\x0a\x20\x20\x20\x54\x68\x65\x69\x72\x20\x6d\x75\x73\x69\x63\
|
||||||
\x0a\x20\x20\x20\x3c\x2f\x74\x61\x62\x6c\x65\x3e\x0a\x3c\x70\x3e\
|
\x20\x61\x6e\x64\x20\x6c\x79\x72\x69\x63\x73\x20\x61\x72\x65\x20\
|
||||||
\x0a\x3c\x2f\x70\x3e\x0a\x20\x20\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\
|
\x61\x77\x65\x73\x6f\x6d\x65\x21\x3c\x2f\x74\x64\x3e\x0a\x20\x20\
|
||||||
\x3c\x2f\x68\x74\x6d\x6c\x3e\x0a\
|
\x20\x3c\x2f\x74\x61\x62\x6c\x65\x3e\x0a\x3c\x70\x3e\x0a\x3c\x2f\
|
||||||
|
\x70\x3e\x0a\x20\x20\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\x68\
|
||||||
|
\x74\x6d\x6c\x3e\x0a\
|
||||||
\x00\x00\x00\xa7\
|
\x00\x00\x00\xa7\
|
||||||
\x3c\
|
\x3c\
|
||||||
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
||||||
\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
|
\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
|
||||||
\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
|
\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
|
||||||
\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x31\x20\x6f\
|
\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x32\x20\x6f\
|
||||||
\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
|
\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
|
||||||
\x70\x3e\x0a\x3c\x70\x3e\x20\x20\x3c\x61\x20\x68\x72\x65\x66\x3d\
|
\x70\x3e\x0a\x3c\x70\x3e\x20\x20\x3c\x61\x20\x68\x72\x65\x66\x3d\
|
||||||
\x22\x70\x61\x67\x65\x32\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
|
\x22\x70\x61\x67\x65\x33\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
|
||||||
\x78\x74\x3c\x2f\x61\x3e\x3c\x2f\x70\x3e\x0a\x3c\x70\x3e\x3c\x62\
|
\x78\x74\x3c\x2f\x61\x3e\x3c\x2f\x70\x3e\x0a\x3c\x70\x3e\x3c\x62\
|
||||||
\x3e\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\
|
\x3e\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\
|
||||||
\x2e\x2e\x3c\x2f\x70\x3e\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\
|
\x2e\x2e\x3c\x2f\x70\x3e\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\
|
||||||
\x68\x74\x6d\x6c\x3e\x0a\
|
\x68\x74\x6d\x6c\x3e\x0a\
|
||||||
|
\x00\x00\x00\x80\
|
||||||
|
\x3c\
|
||||||
|
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
||||||
|
\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
|
||||||
|
\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
|
||||||
|
\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x35\x20\x6f\
|
||||||
|
\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
|
||||||
|
\x70\x3e\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x65\x74\x63\x2e\x2e\x2e\
|
||||||
|
\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x70\x3e\x0a\
|
||||||
|
\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\x68\x74\x6d\x6c\x3e\x0a\
|
||||||
\x00\x00\x00\xa7\
|
\x00\x00\x00\xa7\
|
||||||
\x3c\
|
\x3c\
|
||||||
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
||||||
@@ -637,10 +626,23 @@ qt_resource_data = b"\
|
|||||||
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
||||||
\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
|
\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
|
||||||
\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
|
\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
|
||||||
\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x32\x20\x6f\
|
\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x33\x20\x6f\
|
||||||
\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
|
\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
|
||||||
\x70\x3e\x0a\x3c\x70\x3e\x20\x20\x3c\x61\x20\x68\x72\x65\x66\x3d\
|
\x70\x3e\x0a\x3c\x70\x3e\x20\x20\x3c\x61\x20\x68\x72\x65\x66\x3d\
|
||||||
\x22\x70\x61\x67\x65\x33\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
|
\x22\x70\x61\x67\x65\x34\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
|
||||||
|
\x78\x74\x3c\x2f\x61\x3e\x3c\x2f\x70\x3e\x0a\x3c\x70\x3e\x3c\x62\
|
||||||
|
\x3e\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\
|
||||||
|
\x2e\x2e\x3c\x2f\x70\x3e\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\
|
||||||
|
\x68\x74\x6d\x6c\x3e\x0a\
|
||||||
|
\x00\x00\x00\xa7\
|
||||||
|
\x3c\
|
||||||
|
\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
|
||||||
|
\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
|
||||||
|
\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
|
||||||
|
\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x31\x20\x6f\
|
||||||
|
\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
|
||||||
|
\x70\x3e\x0a\x3c\x70\x3e\x20\x20\x3c\x61\x20\x68\x72\x65\x66\x3d\
|
||||||
|
\x22\x70\x61\x67\x65\x32\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
|
||||||
\x78\x74\x3c\x2f\x61\x3e\x3c\x2f\x70\x3e\x0a\x3c\x70\x3e\x3c\x62\
|
\x78\x74\x3c\x2f\x61\x3e\x3c\x2f\x70\x3e\x0a\x3c\x70\x3e\x3c\x62\
|
||||||
\x3e\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\
|
\x3e\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\
|
||||||
\x2e\x2e\x3c\x2f\x70\x3e\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\
|
\x2e\x2e\x3c\x2f\x70\x3e\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\
|
||||||
@@ -649,56 +651,56 @@ qt_resource_data = b"\
|
|||||||
|
|
||||||
qt_resource_name = b"\
|
qt_resource_name = b"\
|
||||||
\x00\x0a\
|
\x00\x0a\
|
||||||
\x08\x6a\x34\x9c\
|
\x0c\xba\xf2\x7c\
|
||||||
|
\x00\x69\
|
||||||
|
\x00\x6e\x00\x64\x00\x65\x00\x78\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
||||||
|
\x00\x0a\
|
||||||
|
\x08\x5a\x34\x9c\
|
||||||
\x00\x70\
|
\x00\x70\
|
||||||
\x00\x61\x00\x67\x00\x65\x00\x33\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
\x00\x61\x00\x67\x00\x65\x00\x32\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
||||||
\x00\x0a\
|
\x00\x0a\
|
||||||
\x08\x8a\x34\x9c\
|
\x08\x8a\x34\x9c\
|
||||||
\x00\x70\
|
\x00\x70\
|
||||||
\x00\x61\x00\x67\x00\x65\x00\x35\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
\x00\x61\x00\x67\x00\x65\x00\x35\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
||||||
\x00\x0a\
|
\x00\x0a\
|
||||||
\x0c\xba\xf2\x7c\
|
|
||||||
\x00\x69\
|
|
||||||
\x00\x6e\x00\x64\x00\x65\x00\x78\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
|
||||||
\x00\x0a\
|
|
||||||
\x08\x4a\x34\x9c\
|
|
||||||
\x00\x70\
|
|
||||||
\x00\x61\x00\x67\x00\x65\x00\x31\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
|
||||||
\x00\x0a\
|
|
||||||
\x08\x7a\x34\x9c\
|
\x08\x7a\x34\x9c\
|
||||||
\x00\x70\
|
\x00\x70\
|
||||||
\x00\x61\x00\x67\x00\x65\x00\x34\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
\x00\x61\x00\x67\x00\x65\x00\x34\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
||||||
\x00\x0a\
|
\x00\x0a\
|
||||||
\x08\x5a\x34\x9c\
|
\x08\x6a\x34\x9c\
|
||||||
\x00\x70\
|
\x00\x70\
|
||||||
\x00\x61\x00\x67\x00\x65\x00\x32\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
\x00\x61\x00\x67\x00\x65\x00\x33\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
||||||
|
\x00\x0a\
|
||||||
|
\x08\x4a\x34\x9c\
|
||||||
|
\x00\x70\
|
||||||
|
\x00\x61\x00\x67\x00\x65\x00\x31\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
|
||||||
"
|
"
|
||||||
|
|
||||||
qt_resource_struct_v1 = b"\
|
qt_resource_struct_v1 = b"\
|
||||||
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x06\x00\x00\x00\x01\
|
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x06\x00\x00\x00\x01\
|
||||||
\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x24\xec\
|
\x00\x00\x00\x82\x00\x00\x00\x00\x00\x01\x00\x00\x26\x5f\
|
||||||
\x00\x00\x00\x82\x00\x00\x00\x00\x00\x01\x00\x00\x26\x42\
|
\x00\x00\x00\x1a\x00\x00\x00\x00\x00\x01\x00\x00\x23\xda\
|
||||||
|
\x00\x00\x00\x68\x00\x00\x00\x00\x00\x01\x00\x00\x25\xb4\
|
||||||
|
\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x25\x09\
|
||||||
|
\x00\x00\x00\x34\x00\x00\x00\x00\x00\x01\x00\x00\x24\x85\
|
||||||
\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
|
\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
|
||||||
\x00\x00\x00\x68\x00\x00\x00\x00\x00\x01\x00\x00\x25\x97\
|
|
||||||
\x00\x00\x00\x1a\x00\x00\x00\x00\x00\x01\x00\x00\x00\xab\
|
|
||||||
\x00\x00\x00\x34\x00\x00\x00\x00\x00\x01\x00\x00\x01\x2f\
|
|
||||||
"
|
"
|
||||||
|
|
||||||
qt_resource_struct_v2 = b"\
|
qt_resource_struct_v2 = b"\
|
||||||
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x06\x00\x00\x00\x01\
|
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x06\x00\x00\x00\x01\
|
||||||
\x00\x00\x00\x00\x00\x00\x00\x00\
|
\x00\x00\x00\x00\x00\x00\x00\x00\
|
||||||
\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x24\xec\
|
\x00\x00\x00\x82\x00\x00\x00\x00\x00\x01\x00\x00\x26\x5f\
|
||||||
\x00\x00\x01\x8d\xc6\x98\xaa\x4d\
|
\x00\x00\x01\x94\x50\x2e\x84\x4a\
|
||||||
\x00\x00\x00\x82\x00\x00\x00\x00\x00\x01\x00\x00\x26\x42\
|
\x00\x00\x00\x1a\x00\x00\x00\x00\x00\x01\x00\x00\x23\xda\
|
||||||
\x00\x00\x01\x8d\xc6\x98\xaa\x50\
|
\x00\x00\x01\x94\x50\x2e\x84\x4c\
|
||||||
|
\x00\x00\x00\x68\x00\x00\x00\x00\x00\x01\x00\x00\x25\xb4\
|
||||||
|
\x00\x00\x01\x94\x50\x2e\x84\x4d\
|
||||||
|
\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x25\x09\
|
||||||
|
\x00\x00\x01\x94\x50\x2e\x84\x4f\
|
||||||
|
\x00\x00\x00\x34\x00\x00\x00\x00\x00\x01\x00\x00\x24\x85\
|
||||||
|
\x00\x00\x01\x94\x50\x2e\x84\x51\
|
||||||
\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
|
\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
|
||||||
\x00\x00\x01\x8d\xc6\x98\xaa\x52\
|
\x00\x00\x01\x94\x50\x7b\xd3\x65\
|
||||||
\x00\x00\x00\x68\x00\x00\x00\x00\x00\x01\x00\x00\x25\x97\
|
|
||||||
\x00\x00\x01\x8d\xc6\x98\xaa\x54\
|
|
||||||
\x00\x00\x00\x1a\x00\x00\x00\x00\x00\x01\x00\x00\x00\xab\
|
|
||||||
\x00\x00\x01\x8d\xc6\x98\xaa\x55\
|
|
||||||
\x00\x00\x00\x34\x00\x00\x00\x00\x00\x01\x00\x00\x01\x2f\
|
|
||||||
\x00\x00\x01\x8d\xf0\x21\xc8\x6b\
|
|
||||||
"
|
"
|
||||||
|
|
||||||
qt_version = [int(v) for v in QtCore.qVersion().split('.')]
|
qt_version = [int(v) for v in QtCore.qVersion().split('.')]
|
||||||
|
|||||||
24
src/gui.py
24
src/gui.py
@@ -12,9 +12,9 @@ from qtpy.QtGui import QColor, QPixmap
|
|||||||
from qtpy.QtCore import __version__ as QT_VERSION_STR
|
from qtpy.QtCore import __version__ as QT_VERSION_STR
|
||||||
from qtpy.QtCore import QEventLoop, Qt, QTimer, Slot
|
from qtpy.QtCore import QEventLoop, Qt, QTimer, Slot
|
||||||
from qtpy.QtWidgets import (
|
from qtpy.QtWidgets import (
|
||||||
QApplication, QFrame, QGridLayout, QGroupBox, QHBoxLayout, QLabel,
|
QApplication, QFrame, QGridLayout, QGroupBox, QHBoxLayout, QInputDialog,
|
||||||
QMessageBox, QPushButton, QSpacerItem, QTabBar, QTabWidget,
|
QLabel, QLineEdit, QMessageBox, QPushButton, QSpacerItem, QTabBar,
|
||||||
QTableWidgetItem, QTextEdit, QWidget)
|
QTabWidget, QTableWidgetItem, QTextEdit, QWidget)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import elog
|
import elog
|
||||||
@@ -1327,6 +1327,7 @@ class AppGui(QWidget):
|
|||||||
def clear_saving(self, sector_prefix_list: list = None):
|
def clear_saving(self, sector_prefix_list: list = None):
|
||||||
if not sector_prefix_list:
|
if not sector_prefix_list:
|
||||||
return
|
return
|
||||||
|
'''
|
||||||
qm = QMessageBox()
|
qm = QMessageBox()
|
||||||
mess = ("This action will reset the energy saving account to zero. \n" +
|
mess = ("This action will reset the energy saving account to zero. \n" +
|
||||||
"This is typically undertaken at the end of the calendar " +
|
"This is typically undertaken at the end of the calendar " +
|
||||||
@@ -1338,7 +1339,22 @@ class AppGui(QWidget):
|
|||||||
|
|
||||||
if reply == QMessageBox.No:
|
if reply == QMessageBox.No:
|
||||||
return
|
return
|
||||||
|
'''
|
||||||
|
|
||||||
|
qd = QInputDialog(self)
|
||||||
|
#pwedit = QLineEdit()
|
||||||
|
mess = ("To execute the reset,\nplease enter the password:")
|
||||||
|
text, ok = qd.getText(None, "Reset Account", mess,
|
||||||
|
QLineEdit.Password)
|
||||||
|
if ok and text:
|
||||||
|
if text.upper()!= self.settings.data["Reset"]:
|
||||||
|
qmb = QMessageBox(qd)
|
||||||
|
mess = "Incorrect password!\nTry Reset Account once again."
|
||||||
|
qmb.information(self, "Reset Account", mess)
|
||||||
|
return
|
||||||
|
else:
|
||||||
|
return
|
||||||
|
|
||||||
self.parent.prepare_elog_message()
|
self.parent.prepare_elog_message()
|
||||||
print("message", self.parent.message)
|
print("message", self.parent.message)
|
||||||
print("logbook", self.parent.logbook, flush=True)
|
print("logbook", self.parent.logbook, flush=True)
|
||||||
|
|||||||
Reference in New Issue
Block a user