Skip to content

Commit 5d53adc

Browse files
FgerthoffertFgerthoffert
committed
Updated with new phidgets parameters for camera reboot
1 parent e39a117 commit 5d53adc

File tree

116 files changed

+53515
-33846
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+53515
-33846
lines changed

‎Sencha/App6.0/workspace/Desktop/app/controller/sourcesconfiguration/phidgets/Phidgets.js‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ Ext.define("WPAKD.controller.sourcesconfiguration.phidgets.Phidgets", {
1414
, "sourcesconfiguration.phidgets.graphs.Cfgphidgetsensorsgraph"
1515

1616
, "sourcesconfiguration.phidgets.relays.Main"
17-
, "sourcesconfiguration.phidgets.relays.Cfgphidgetcameraport"
18-
, "sourcesconfiguration.phidgets.relays.Cfgphidgeterroractivate"
19-
, "sourcesconfiguration.phidgets.relays.Cfgphidgetfailure"
17+
, "sourcesconfiguration.phidgets.relays.Cfgphidgetcamerarelayport"
18+
, "sourcesconfiguration.phidgets.relays.Cfgphidgetcameraactivate"
19+
, "sourcesconfiguration.phidgets.relays.Cfgphidgetcamerafailure"
20+
, "sourcesconfiguration.phidgets.relays.Cfgphidgetcamerapause"
21+
, "sourcesconfiguration.phidgets.relays.Cfgphidgetcamerasensorport"
2022

2123
, "sourcesconfiguration.phidgets.sensors.Main"
2224
, "sourcesconfiguration.phidgets.sensors.PhidgetsPortsList"
@@ -44,10 +46,12 @@ Ext.define("WPAKD.controller.sourcesconfiguration.phidgets.Phidgets", {
4446
refs: [
4547
{ref: "sourcesconfigurationphidgetsmain", selector: "sourcesconfigurationphidgetsmain" }
4648

47-
, {ref: "sourcesconfigurationphidgetsrelaysmain", selector: "sourcesconfigurationphidgetsrelaysmain" }
48-
, {ref: "sourcesconfigurationphidgetsrelayscfgphidgeterroractivate", selector: "sourcesconfigurationphidgetsrelayscfgphidgeterroractivate" }
49-
, {ref: "sourcesconfigurationphidgetsrelayscfgphidgetfailure", selector: "sourcesconfigurationphidgetsrelayscfgphidgetfailure" }
50-
, {ref: "sourcesconfigurationphidgetsrelayscfgphidgetcameraport", selector: "sourcesconfigurationphidgetsrelayscfgphidgetcameraport" }
49+
, {ref: "sourcesconfigurationphidgetsrelaysmain", selector: "sourcesconfigurationphidgetsrelaysmain" }
50+
, {ref: "sourcesconfigurationphidgetsrelayscfgphidgetcameraactivate", selector: "sourcesconfigurationphidgetsrelayscfgphidgetcameraactivate" }
51+
, {ref: "sourcesconfigurationphidgetsrelayscfgphidgetcamerafailure", selector: "sourcesconfigurationphidgetsrelayscfgphidgetcamerafailure" }
52+
, {ref: "sourcesconfigurationphidgetsrelayscfgphidgetcamerarelayport", selector: "sourcesconfigurationphidgetsrelayscfgphidgetcamerarelayport" }
53+
, {ref: "sourcesconfigurationphidgetsrelayscfgphidgetcamerasensorport", selector: "sourcesconfigurationphidgetsrelayscfgphidgetcamerasensorport" }
54+
, {ref: "sourcesconfigurationphidgetsrelayscfgphidgetcamerapause", selector: "sourcesconfigurationphidgetsrelayscfgphidgetcamerapause" }
5155

5256
, {ref: "sourcesconfigurationphidgetsgraphsmain", selector: "sourcesconfigurationphidgetsgraphsmain" }
5357
, {ref: "sourcesconfigurationphidgetsgraphscfgphidgetsensorsgraph", selector: "sourcesconfigurationphidgetsgraphscfgphidgetsensorsgraph" }
@@ -122,12 +126,16 @@ Ext.define("WPAKD.controller.sourcesconfiguration.phidgets.Phidgets", {
122126
configObj[configName] = rec.get("VALUE");
123127
});
124128

125-
if(configObj.hasOwnProperty("cfgphidgeterroractivate")){this.getSourcesconfigurationphidgetsrelayscfgphidgeterroractivate().setValue(configObj["cfgphidgeterroractivate"]);
126-
} else {this.getSourcesconfigurationphidgetsrelayscfgphidgeterroractivate().setVisible(false);}
127-
if(configObj.hasOwnProperty("cfgphidgetfailure")){this.getSourcesconfigurationphidgetsrelayscfgphidgetfailure().setValue(configObj["cfgphidgetfailure"]);
128-
} else {this.getSourcesconfigurationphidgetsrelayscfgphidgetfailure().setVisible(false);}
129-
if(configObj.hasOwnProperty("cfgphidgetcameraport")){this.getSourcesconfigurationphidgetsrelayscfgphidgetcameraport().setValue(configObj["cfgphidgetcameraport"]);
130-
} else {this.getSourcesconfigurationphidgetsrelayscfgphidgetcameraport().setVisible(false);}
129+
if(configObj.hasOwnProperty("cfgphidgetcameraactivate")){this.getSourcesconfigurationphidgetsrelayscfgphidgetcameraactivate().setValue(configObj["cfgphidgetcameraactivate"]);
130+
} else {this.getSourcesconfigurationphidgetsrelayscfgphidgetcameraactivate().setVisible(false);}
131+
if(configObj.hasOwnProperty("cfgphidgetcamerafailure")){this.getSourcesconfigurationphidgetsrelayscfgphidgetcamerafailure().setValue(configObj["cfgphidgetcamerafailure"]);
132+
} else {this.getSourcesconfigurationphidgetsrelayscfgphidgetcamerafailure().setVisible(false);}
133+
if(configObj.hasOwnProperty("cfgphidgetcamerarelayport")){this.getSourcesconfigurationphidgetsrelayscfgphidgetcamerarelayport().setValue(configObj["cfgphidgetcamerarelayport"]);
134+
} else {this.getSourcesconfigurationphidgetsrelayscfgphidgetcamerarelayport().setVisible(false);}
135+
if(configObj.hasOwnProperty("cfgphidgetcamerasensorport")){this.getSourcesconfigurationphidgetsrelayscfgphidgetcamerasensorport().setValue(configObj["cfgphidgetcamerasensorport"]);
136+
} else {this.getSourcesconfigurationphidgetsrelayscfgphidgetcamerasensorport().setVisible(false);}
137+
if(configObj.hasOwnProperty("cfgphidgetcamerapause")){this.getSourcesconfigurationphidgetsrelayscfgphidgetcamerapause().setValue(configObj["cfgphidgetcamerapause"]);
138+
} else {this.getSourcesconfigurationphidgetsrelayscfgphidgetcamerapause().setVisible(false);}
131139

132140
if(configObj.hasOwnProperty("cfgphidgetsensorsgraph")){this.getSourcesconfigurationphidgetsgraphscfgphidgetsensorsgraph().setValue(configObj["cfgphidgetsensorsgraph"]);
133141
} else {this.getSourcesconfigurationphidgetsgraphscfgphidgetsensorsgraph().setVisible(false);}

Sencha/App6.0/workspace/Desktop/app/view/sourcesconfiguration/phidgets/relays/Cfgphidgeterroractivate.js renamed to Sencha/App6.0/workspace/Desktop/app/view/sourcesconfiguration/phidgets/relays/Cfgphidgetcameraactivate.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
/*global Ext, i18n*/
22
//<debug>
3-
console.log(new Date().toLocaleTimeString() + ": Log: Load: WPAKD.view.sourcesconfiguration.phidgets.relays.Cfgphidgeterroractivate");
3+
console.log(new Date().toLocaleTimeString() + ": Log: Load: WPAKD.view.sourcesconfiguration.phidgets.relays.Cfgphidgetcameraactivate");
44
//</debug>
5-
Ext.define("WPAKD.view.sourcesconfiguration.phidgets.relays.Cfgphidgeterroractivate", {
5+
Ext.define("WPAKD.view.sourcesconfiguration.phidgets.relays.Cfgphidgetcameraactivate", {
66
extend: "Ext.form.field.Checkbox"
7-
, alias: "widget.sourcesconfigurationphidgetsrelayscfgphidgeterroractivate"
7+
, alias: "widget.sourcesconfigurationphidgetsrelayscfgphidgetcameraactivate"
88

9-
, fieldLabel: i18n.gettext("Powercycle camera in case of failure")
9+
, fieldLabel: i18n.gettext("Activate")
1010
, uncheckedValue: "off"
1111
, inputValue: "on"
1212
, listeners : {
1313
change : function(scope, newValue, oldValue) {
1414
if (newValue === true) {newValue = "yes";} else {newValue = "no";}
1515
if (oldValue === true) {oldValue = "yes";} else {oldValue = "no";}
16-
this.fireEvent("WPAKD.controller.sourcesconfiguration.phidgets.Phidgets.updateStoreValue", newValue, oldValue, "cfgphidgeterroractivate");
16+
this.fireEvent("WPAKD.controller.sourcesconfiguration.phidgets.Phidgets.updateStoreValue", newValue, oldValue, "cfgphidgetcameraactivate");
1717
}
1818
}
1919
});

‎Sencha/App6.0/workspace/Desktop/app/view/sourcesconfiguration/phidgets/relays/Cfgphidgetcamerafailure.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/*global Ext, i18n*/
2+
//<debug>
3+
console.log(new Date().toLocaleTimeString() + ": Log: Load: WPAKD.view.sourcesconfiguration.phidgets.relays.Cfgphidgetcamerafailure");
4+
//</debug>
5+
Ext.define("WPAKD.view.sourcesconfiguration.phidgets.relays.Cfgphidgetcamerafailure", {
6+
extend: "Ext.form.field.Number"
7+
, alias: "widget.sourcesconfigurationphidgetsrelayscfgphidgetcamerafailure"
8+
9+
, fieldLabel: i18n.gettext("Failures before cycle")
10+
, allowBlank: false
11+
, minValue:0
12+
, listeners : {
13+
change : function(scope, newValue, oldValue) {
14+
this.fireEvent("WPAKD.controller.sourcesconfiguration.phidgets.Phidgets.updateStoreValue", newValue, oldValue, "cfgphidgetcamerafailure");
15+
}
16+
}
17+
});

Sencha/App6.0/workspace/Desktop/app/view/sourcesconfiguration/phidgets/relays/Cfgphidgetcameraport.js renamed to Sencha/App6.0/workspace/Desktop/app/view/sourcesconfiguration/phidgets/relays/Cfgphidgetcamerapause.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
/*global Ext, i18n*/
22
//<debug>
3-
console.log(new Date().toLocaleTimeString() + ": Log: Load: WPAKD.view.sourcesconfiguration.phidgets.relays.Cfgphidgetcameraport");
3+
console.log(new Date().toLocaleTimeString() + ": Log: Load: WPAKD.view.sourcesconfiguration.phidgets.relays.Cfgphidgetcamerapause");
44
//</debug>
5-
Ext.define("WPAKD.view.sourcesconfiguration.phidgets.relays.Cfgphidgetcameraport", {
5+
Ext.define("WPAKD.view.sourcesconfiguration.phidgets.relays.Cfgphidgetcamerapause", {
66
extend: "Ext.form.field.Number"
7-
, alias: "widget.sourcesconfigurationphidgetsrelayscfgphidgetcameraport"
7+
, alias: "widget.sourcesconfigurationphidgetsrelayscfgphidgetcamerapause"
88

9-
, fieldLabel: i18n.gettext("Phidget camera port")
9+
, fieldLabel: i18n.gettext("Pause between states")
1010
, allowBlank: false
1111
, minValue:0
1212
, listeners : {
1313
change : function(scope, newValue, oldValue) {
14-
this.fireEvent("WPAKD.controller.sourcesconfiguration.phidgets.Phidgets.updateStoreValue", newValue, oldValue, "cfgphidgetcameraport");
14+
this.fireEvent("WPAKD.controller.sourcesconfiguration.phidgets.Phidgets.updateStoreValue", newValue, oldValue, "cfgphidgetcamerapause");
1515
}
1616
}
1717
});

Sencha/App6.0/workspace/Desktop/app/view/sourcesconfiguration/phidgets/relays/Cfgphidgetfailure.js renamed to Sencha/App6.0/workspace/Desktop/app/view/sourcesconfiguration/phidgets/relays/Cfgphidgetcamerarelayport.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
/*global Ext, i18n*/
22
//<debug>
3-
console.log(new Date().toLocaleTimeString() + ": Log: Load: WPAKD.view.sourcesconfiguration.phidgets.relays.Cfgphidgetfailure");
3+
console.log(new Date().toLocaleTimeString() + ": Log: Load: WPAKD.view.sourcesconfiguration.phidgets.relays.Cfgphidgetcamerarelayport");
44
//</debug>
5-
Ext.define("WPAKD.view.sourcesconfiguration.phidgets.relays.Cfgphidgetfailure", {
5+
Ext.define("WPAKD.view.sourcesconfiguration.phidgets.relays.Cfgphidgetcamerarelayport", {
66
extend: "Ext.form.field.Number"
7-
, alias: "widget.sourcesconfigurationphidgetsrelayscfgphidgetfailure"
7+
, alias: "widget.sourcesconfigurationphidgetsrelayscfgphidgetcamerarelayport"
88

9-
, fieldLabel: i18n.gettext("Number of failure before camera powercycle")
9+
, fieldLabel: i18n.gettext("Relay port")
1010
, allowBlank: false
1111
, minValue:0
1212
, listeners : {
1313
change : function(scope, newValue, oldValue) {
14-
this.fireEvent("WPAKD.controller.sourcesconfiguration.phidgets.Phidgets.updateStoreValue", newValue, oldValue, "cfgphidgetfailure");
14+
this.fireEvent("WPAKD.controller.sourcesconfiguration.phidgets.Phidgets.updateStoreValue", newValue, oldValue, "cfgphidgetcamerarelayport");
1515
}
1616
}
1717
});

‎Sencha/App6.0/workspace/Desktop/app/view/sourcesconfiguration/phidgets/relays/Cfgphidgetcamerasensorport.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/*global Ext, i18n*/
2+
//<debug>
3+
console.log(new Date().toLocaleTimeString() + ": Log: Load: WPAKD.view.sourcesconfiguration.phidgets.relays.Cfgphidgetcamerasensorport");
4+
//</debug>
5+
Ext.define("WPAKD.view.sourcesconfiguration.phidgets.relays.Cfgphidgetcamerasensorport", {
6+
extend: "Ext.form.field.Number"
7+
, alias: "widget.sourcesconfigurationphidgetsrelayscfgphidgetcamerasensorport"
8+
9+
, fieldLabel: i18n.gettext("Sensor port")
10+
, allowBlank: false
11+
, minValue:0
12+
, listeners : {
13+
change : function(scope, newValue, oldValue) {
14+
this.fireEvent("WPAKD.controller.sourcesconfiguration.phidgets.Phidgets.updateStoreValue", newValue, oldValue, "cfgphidgetcamerasensorport");
15+
}
16+
}
17+
});

‎Sencha/App6.0/workspace/Desktop/app/view/sourcesconfiguration/phidgets/relays/Main.js‎

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,44 @@ Ext.define("WPAKD.view.sourcesconfiguration.phidgets.relays.Main", {
66
extend: "Ext.form.FieldSet"
77
, alias: "widget.sourcesconfigurationphidgetsrelaysmain"
88

9-
, title: i18n.gettext("Relays")
10-
9+
, title: i18n.gettext("Power-cycle camera")
1110
, padding: 5
1211
, layout: "fit"
13-
, defaults: {labelWidth: 320}
12+
, defaults: {labelWidth: 170}
1413
, items: [
15-
{xtype: "sourcesconfigurationphidgetsrelayscfgphidgeterroractivate"}
16-
, {xtype: "sourcesconfigurationphidgetsrelayscfgphidgetfailure"}
17-
, {xtype: "sourcesconfigurationphidgetsrelayscfgphidgetcameraport"}
14+
{xtype: "sourcesconfigurationphidgetsrelayscfgphidgetcameraactivate"}
15+
, {
16+
xtype: "container"
17+
, layout: {type:"hbox", align: "stretch", pack: "start"}
18+
, items : [{
19+
xtype: "sourcesconfigurationphidgetsrelayscfgphidgetcamerarelayport"
20+
, labelWidth: 170
21+
, flex: 1
22+
}, {
23+
xtype: "container"
24+
, width: 10
25+
}, {
26+
xtype: "sourcesconfigurationphidgetsrelayscfgphidgetcamerasensorport"
27+
, labelWidth: 170
28+
, flex: 1
29+
}]
30+
}
31+
, {
32+
xtype: "container"
33+
, layout: {type:"hbox", align: "stretch", pack: "start"}
34+
, items : [{
35+
xtype: "sourcesconfigurationphidgetsrelayscfgphidgetcamerafailure"
36+
, labelWidth: 170
37+
, flex: 1
38+
}, {
39+
xtype: "container"
40+
, width: 10
41+
}, {
42+
xtype: "sourcesconfigurationphidgetsrelayscfgphidgetcamerapause"
43+
, labelWidth: 170
44+
, flex: 1
45+
}]
46+
}
1847
]
1948
});
2049

‎Sencha/App6.0/workspace/Desktop/bootstrap.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
* to the most recently built CSS file for the application to allow index.html
66
* in the development directory to load properly (i.e., "dev mode").
77
*/
8-
@import '../build/production/WPAKD/resources/WPAKD-all.css';
8+
@import '../build/testing/WPAKD/resources/WPAKD-all.css';
99

0 commit comments

Comments
 (0)