Added showval

This commit is contained in:
Lucio Maranta
2019-02-27 17:23:20 +01:00
parent 9116c198cc
commit f665316d04
8 changed files with 53 additions and 14 deletions
Binary file not shown.
+2 -2
View File
@@ -152,8 +152,8 @@ public static class ThreadsFunctions
sw.Stop();
// Update thread timer
ReadPowerOnTimer += sw.ElapsedMilliseconds;
ReadPowerOnTimes++;
ReadPowerOnTimer += sw.ElapsedMilliseconds;
ReadPowerOnTimes++;
// Wait
Thread.Sleep(CalcSleepTime(400, (int)sw.ElapsedMilliseconds));
+2 -1
View File
@@ -1391,7 +1391,8 @@ namespace Step.NC
IsNeeded = x.IsNeeded,
Message = x.Message,
Process = x.Process,
Type = x.Type.ToString()
Type = x.Type.ToString(),
Value = x.Value
}).ToList();
return NO_ERROR;
+9 -2
View File
@@ -92,12 +92,19 @@ namespace Step.Utils
NotifyUsers(error);
}
private static bool MessageBoxShow = false;
private static void NotifyUsers(ErrorMessageModel error)
{
if (error.ErrorLevel > (int)ERROR_LEVEL.WARNING)
{
// Notify user
MessageBox.Show(error.Message, error.Title, MessageBoxButtons.OK, MessageBoxIcon.Error);
if (!MessageBoxShow)
{
MessageBoxShow = true;
// Notify user
MessageBox.Show(error.Message, error.Title, MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
else
{
@@ -153,6 +153,16 @@
width: 100px;
}
}
.content-real-showval{
display: flex;
align-items: center;
span{
word-wrap: break-word;
}
input{
margin-left: auto;
}
}
.content-btn{
width: 592px;
box-shadow: 0 0px 3px 0 rgba(0, 0, 0, 0.4);
+10
View File
@@ -102,6 +102,16 @@
.modal.m155 .content-real span {
width: 100px;
}
.modal.m155 .content-real-showval {
display: flex;
align-items: center;
}
.modal.m155 .content-real-showval span {
word-wrap: break-word;
}
.modal.m155 .content-real-showval input {
margin-left: auto;
}
.modal.m155 .content-btn {
width: 592px;
box-shadow: 0 0px 3px 0 rgba(0, 0, 0, 0.4);
@@ -12,6 +12,10 @@ export default class M155Dialog extends Vue{
data = null;
value = 0;
MULTIPLE_BUTTONS = "MULTIPLE_BUTTONS";
REAL = "REAL";
SHOW_VAL = "SHOW_VAL"
mounted(){
this.data = ModalHelper.M155ModalData.data;
this.value = 0;
@@ -39,15 +43,16 @@ export default class M155Dialog extends Vue{
return this.value = k;
}
canSendAnswer(){
if(this.isReal)
if(this.getType == this.REAL)
return this.value != null && this.value != undefined;
else
return this.value && this.value != 0;
}
get isReal(){
get getType(){
if(this.data)
return this.data.type=="REAL";
return true;
return this.data.type
return ""
}
hide() {
ModalHelper.M155ModalData.data.toDisplay = false;
@@ -1,12 +1,18 @@
<template>
<modal :title="'modal_m155_title' | localize('Message from Process %d',process)" class="m155" :class="{'multiple':!isReal}" name="modal" >
<div v-if="data">
<h2>{{data.message}}</h2>
<div class="content-real" v-if="isReal">
<modal :title="'modal_m155_title' | localize('Message from Process %d',process)" class="m155" :class="{'multiple': getType != REAL}" name="modal" >
<div v-if="data">
<div class="content-real" v-if="getType == REAL">
<h2>{{data.message}}</h2>
<span>{{'modal_m155_value' | localize("Value: ")}}</span>
<input type="number" min="0" max="4294967295" v-model="value">
</div>
<div v-if="!isReal" >
<div class="content-real-showval" v-if="getType == SHOW_VAL">
<span>{{data.message}}</span>
<input type="number" min="0" max="4294967295" v-model="data.value" disabled="disabled">
</div>
<div v-if="getType != REAL" >
<div class="content-btn" v-for="(t,k) in data.buttons" :key="'m155_'+k" @click="check(k)">
<input type="radio" name="radio-group" :checked="ischecked(k)" >
<label for="datefixed">{{t}}</label>