Added developer mode handing from /etc/stratux.conf instead, then this allows options in the status and settings pages. Would like to add a menu option for this in the future though

pull/504/head
Jim Jacobsen 2016-10-01 19:59:41 -05:00
rodzic 8929116f00
commit 9f1fd88485
5 zmienionych plików z 32 dodań i 7 usunięć

Wyświetl plik

@ -100,7 +100,6 @@ type ReadCloser interface {
io.Closer
}
var developerMode bool
type msg struct {
MessageClass uint
@ -1301,7 +1300,8 @@ func main() {
// replayESFilename := flag.String("eslog", "none", "ES Log filename")
replayUATFilename := flag.String("uatlog", "none", "UAT Log filename")
develFlag := flag.Bool("developer", false, "Developer mode")
// Removed here, but may replace later
// develFlag := flag.Bool("developer", false, "Developer mode")
replayFlag := flag.Bool("replay", false, "Replay file flag")
replaySpeed := flag.Int("speed", 1, "Replay speed multiplier")
stdinFlag := flag.Bool("uatin", false, "Process UAT messages piped to stdin")
@ -1311,11 +1311,6 @@ func main() {
timeStarted = time.Now()
runtime.GOMAXPROCS(runtime.NumCPU()) // redundant with Go v1.5+ compiler
if *develFlag == true {
log.Printf("Developer mode flag true!\n")
developerMode = true
}
// Duplicate log.* output to debugLog.
fp, err := os.OpenFile(debugLogf, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
if err != nil {
@ -1350,6 +1345,10 @@ func main() {
globalSettings.ReplayLog = true
}
if globalSettings.DeveloperMode == true {
log.Printf("Developer mode set\n")
}
//FIXME: Only do this if data logging is enabled.
initDataLog()

Wyświetl plik

@ -33,6 +33,7 @@ function SettingsCtrl($rootScope, $scope, $state, $location, $window, $http) {
$scope.PPM = settings.PPM;
$scope.WatchList = settings.WatchList;
$scope.OwnshipModeS = settings.OwnshipModeS;
$scope.DeveloperMode = settings.DeveloperMode;
}
function getSettings() {

Wyświetl plik

@ -101,6 +101,7 @@ function StatusCtrl($rootScope, $scope, $state, $http, $interval) {
$http.get(URL_SETTINGS_GET).
then(function (response) {
settings = angular.fromJson(response.data);
$scope.developerMode = settings.DeveloperMode;
$scope.visible_uat = settings.UAT_Enabled;
$scope.visible_es = settings.ES_Enabled;
$scope.visible_ping = settings.Ping_Enabled;

Wyświetl plik

@ -134,6 +134,19 @@
</div>
</div>
<!-- Developer mode area -->
<div class="col-sm-12">
<div ng-show="DeveloperMode" class="panel-group col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">Developer Options</div>
<div class="panel-body">
<div class="col-xs-12">
<p>Coming soon</p>
</div>
</div>
</div>
</div>
</div>
<!--

Wyświetl plik

@ -17,6 +17,7 @@
<span class="panel_label">Status</span>
<span ng-show="ConnectState == 'Connected'" class="label label-success">{{ConnectState}}</span>
<span ng-hide="ConnectState == 'Connected'" class="label label-danger">{{ConnectState}}</span>
<span ng-show="developerMode == true" class="label label-warning">Developer Mode</span>
</div>
<div class="panel-body">
<div class="form-horizontal">
@ -132,6 +133,16 @@
</div>
</div>
</div>
<div class="row" ng-class="{'section_invisible': !developerMode}">
<div class="separator"></div>
<div class="row"><span class="col-xs-1">&nbsp;</span></div>
<div class="separator"></div>
<div class="row">
<div class="col-sm-4 label_adj">
<span class="col-xs-5"><strong>Developer</strong></span>
<span class="col-xs-7">Info Here</span>
</div>
</div>
</div>
</div>
</div>