Skip to content

Commit 82c82b1

Browse files
committed
gui corrections
1 parent 4b5ccef commit 82c82b1

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

src/main/resources/resource/WebGui/app/service/js/RemoteSpeechGui.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ angular.module("mrlapp.service.RemoteSpeechGui", []).controller("RemoteSpeechGui
2929
}
3030

3131
$scope.setType = function () {
32-
msg.send("setSpeechType", $scope.speechType)
32+
msg.send("setSpeechType", $scope.service.config.speechType)
3333
}
3434

3535
$scope.speak = function (text) {
@@ -42,6 +42,12 @@ angular.module("mrlapp.service.RemoteSpeechGui", []).controller("RemoteSpeechGui
4242
}
4343

4444
$scope.getEndpoint = function (key) {
45+
if (!$scope.service.config.speechType){
46+
return null
47+
}
48+
if (!key){
49+
return null
50+
}
4551
return $scope.service.config.speechTypes[$scope.service.config.speechType][key]
4652
}
4753

@@ -69,7 +75,7 @@ angular.module("mrlapp.service.RemoteSpeechGui", []).controller("RemoteSpeechGui
6975
$scope.editableVerb = $scope.getVerb($scope.service)
7076
$scope.editableTemplate = $scope.getTemplate($scope.service)
7177
$scope.editableAuthToken = $scope.getAuthToken($scope.service)
72-
$scope.editableSpeechType = $scope.speechType
78+
$scope.editableSpeechType = $scope.service.config.speechType
7379
}
7480
}
7581

@@ -92,9 +98,11 @@ angular.module("mrlapp.service.RemoteSpeechGui", []).controller("RemoteSpeechGui
9298
//$scope.service.config.endpoint.class = "org.myrobotlab.service.config.RemoteSpeechConfig$Endpoint"
9399

94100
// Update the speechType and send the updated type to the backend
95-
$scope.speechType = $scope.editableSpeechType
96-
msg.send("addSpeechType", $scope.speechType, newEndpoint)
101+
$scope.service.config.speechType = $scope.editableSpeechType
102+
msg.send("addSpeechType", $scope.service.config.speechType, newEndpoint)
97103
$scope.setType()
104+
msg.send("save")
105+
msg.send("broadcastState")
98106

99107
// Toggle back to view mode
100108
$scope.isEditing = false

src/main/resources/resource/WebGui/app/service/views/RemoteSpeechGui.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div ng-show="!isEditing">
55
<b>type</b>
66
<br />
7-
<select ng-model="speechType" ng-change="setType()" class="form-control"
7+
<select ng-model="service.config.speechType" ng-change="setType()" class="form-control"
88
title="select a type of local voice control">
99
<option ng-repeat="(key, value) in service.config.speechTypes" ng-value="key">
1010
{{ key }}
@@ -78,4 +78,4 @@
7878
<button class="btn btn-default" ng-click="speak(text)">Speak</button>
7979
<button class="btn btn-default" ng-click="text=''">Clear</button>
8080
</div>
81-
</div>
81+
</div>

0 commit comments

Comments
 (0)