Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -294,6 +294,16 @@ namespace Thermo.Active.Controllers.WebApi
|
||||
// update current live data!
|
||||
NcFileAdapter.SaveRecipeCurrent();
|
||||
|
||||
|
||||
// invio dati!
|
||||
DTORecipeStatus message = new DTORecipeStatus()
|
||||
{
|
||||
recipeName = NcAdapter.RecipeLiveData.RecipeName,
|
||||
hasChanged = NcAdapter.RecipeLiveData.hasChanged,
|
||||
forceSend = true
|
||||
};
|
||||
MessageServices.Current.Publish(SEND_THERMO_RECIPE_CHANGED, null, message);
|
||||
|
||||
CmsError libraryError = WriteCurrentRecipeToPlc();
|
||||
if (libraryError.IsError())
|
||||
{
|
||||
@@ -413,7 +423,7 @@ namespace Thermo.Active.Controllers.WebApi
|
||||
// e salvo su disco
|
||||
NcFileAdapter.SaveRecipe(newName, NcAdapter.RecipeLiveData);
|
||||
|
||||
// invio PRIMA invertendo campo modificata (x forzare invio)
|
||||
// invio dati
|
||||
DTORecipeStatus message = new DTORecipeStatus()
|
||||
{
|
||||
recipeName = NcAdapter.RecipeLiveData.RecipeName,
|
||||
|
||||
@@ -309,7 +309,6 @@ namespace Thermo.Active.Listeners.SignalR
|
||||
public static void SendThermoRecipeChangedData(object message)
|
||||
{
|
||||
DTORecipeStatus currMessage = message as DTORecipeStatus;
|
||||
|
||||
if (currMessage.hasChanged != recipeHasChanged || currMessage.forceSend)
|
||||
{
|
||||
// salvo update
|
||||
|
||||
@@ -30,4 +30,4 @@ using System.Runtime.InteropServices;
|
||||
//
|
||||
// You can specify all the values or you can default the Revision and Build Numbers
|
||||
// by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("0.16.90")]
|
||||
[assembly: AssemblyVersion("0.16.92")]
|
||||
@@ -34,7 +34,6 @@ export default class Numeric extends Vue {
|
||||
}
|
||||
|
||||
set Value(v: number) {
|
||||
debugger
|
||||
try {
|
||||
let scale = Math.pow(10, this.value.numDec ?? 0);
|
||||
let result = Math.round(v * scale) / scale;
|
||||
|
||||
@@ -159,7 +159,6 @@ export default class Dashboard extends Vue {
|
||||
}
|
||||
|
||||
sendSoftKey(id: string) {
|
||||
debugger
|
||||
var sk = this.allSoftKeys.find(s => s.refCallParam == id);
|
||||
if (sk)
|
||||
Hub.Current.sendUserSoftKey(sk.id);
|
||||
|
||||
+5
-1
@@ -36,7 +36,11 @@
|
||||
x="0"
|
||||
y="0"
|
||||
>
|
||||
<div class="body-header" @click="openModal()">{{value.label | localize(value.label)}}</div>
|
||||
<div
|
||||
class="body-header"
|
||||
@mousedown.stop.prevent
|
||||
@click="openModal()"
|
||||
>{{value.label | localize(value.label)}}</div>
|
||||
</foreignObject>
|
||||
<foreignObject
|
||||
:width="(duration - (showStatus && recipeValue?statusDuration:0)) * ganttOptions.secondSize"
|
||||
|
||||
-1
@@ -265,7 +265,6 @@ export default class Warmers extends Vue {
|
||||
let dk = maxk - mink;
|
||||
let dv = max - min;
|
||||
|
||||
debugger
|
||||
for (const i of Array.from(result.keys())) {
|
||||
let rv = Math.round(max - (((i - mink) * dv) / dk));
|
||||
rv = rv - rv % parseFloat(this.parameters.warmerAutocompStep.toString());
|
||||
|
||||
Reference in New Issue
Block a user