Fix riscaldi (comportamento)

Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/resistance.ts

@@ -94,21 +94,24 @@ export default class Resistance extends Vue {
   }
 
   get currentColor() {
-    if (this.selected) return this.currentSelectedColor;
-    return this.currentStandardColor;
-  }
-
-  get currentColorTemp() {
-    if (this.selected) return this.currentSelectedTempColor;
-    return this.currentStandardTempColor;
+    if(!this.isThermoProphet)
+    {
+      if (this.selected) return this.currentSelectedColor;
+      return this.currentStandardColor;
+    }
+    else
+    {
+      if (this.selected) return this.currentSelectedTempColor;
+      return this.currentStandardTempColor;
+    }
   }
 
   getBoard(id) {
-    return Math.floor((id - 1) / 16);
+    return Math.floor((id - 1) / 16) + 1;
   }
 
   getOutput(id) {
-    return Math.floor((id - 1) % 16);
+    return Math.floor((id - 1) % 16) + 1;
   }
 
   get currentSelectedColor() {

Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/resistance.vue

@@ -15,6 +15,14 @@
 		v-on:touchend="click"
 		:style="{backgroundColor:`rgb(${currentColor})`}"
 	>{{channel.tCamTempSet}}&nbsp;°C</div>
+	<div
+		class="resistance"
+		:key="selected"
+		v-else-if="mode == 4"
+		@click="click"
+		v-on:touchend="click"
+		:style="{backgroundColor:`rgb(${currentColor})`}"
+	>{{channel.actualCurrent}}&nbsp;W</div>
 	<div
 		class="resistance id"
 		:class="{'disabled':!editable}"
@@ -22,7 +30,7 @@
 		@click="click"
 		v-on:touchend="click"
 		v-else
-		:style="{backgroundColor:`rgb(${currentColorTemp})`}"
+		:style="{backgroundColor:`rgb(${currentColor})`}"
 	>
 		<span>ID: {{getOutput(channel.idChannel)}}</span>
 		<small>Bo: {{getBoard(channel.idChannel)}}</small>

Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-inferiori.ts

@@ -17,7 +17,7 @@ export default class RiscaldiInferiori extends Vue {
 
   selectedChannelIds: number[] = [];
   uniformChannelValue = 0;
-  resistanceMode = 0;
+  resistanceMode = 1;
 
   beforeMount() {
     this.uniformChannelValue = -1;

Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-inferiori.vue

@@ -102,21 +102,22 @@
 				:id-reflector="1"
 				@select="selectionChanged"
 				@methodChanged="m => selectionMethod = m"
+				:isThermoProphet="false"
 			></warmers>
 			<div class="right-controls">
-				<div class="um-buttons">
-					<button
-						@click="resistanceMode=0"
-						:class="{selected: resistanceMode ==0}"
-					>{{'um-c' | localize('°C')}}</button>
+				<div class="um-buttons">					
 					<button
 						@click="resistanceMode=1"
 						:class="{selected: resistanceMode ==1}"
-					>{{'um-perc' | localize('%%')}}</button>
+					>%</button>					
+					<button
+						@click="resistanceMode=4"
+						:class="{selected: resistanceMode ==4}"
+					>W</button>
 					<button
 						@click="resistanceMode=2"
 						:class="{selected: resistanceMode ==2}"
-					>{{'um-id' | localize('ID')}}</button>
+					>ID</button>
 				</div>
 
 				<div class="buttons">

Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.ts

@@ -16,7 +16,7 @@ export default class RiscaldiSuperiori extends Vue {
 
   selectedChannelIds: number[] = [];
   uniformChannelValue: number = -1;
-  resistanceMode = 0;
+  resistanceMode = 1;
 
   beforeMount() {
     this.uniformChannelValue = -1;

Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.vue

@@ -104,22 +104,23 @@
 				@select="selectionChanged"
 				@methodChanged="m => selectionMethod = m"
 				:recipe="recipe"
+				:isThermoProphet="false"
 			></warmers>
 
 			<div class="right-controls">
 				<div class="um-buttons">
-					<button
-						@click="resistanceMode=0"
-						:class="{selected: resistanceMode ==0}"
-					>{{'um-c' | localize('°C')}}</button>
 					<button
 						@click="resistanceMode=1"
 						:class="{selected: resistanceMode ==1}"
-					>{{'um-perc' | localize('%%')}}</button>
+					>%</button>					
+					<button
+						@click="resistanceMode=4"
+						:class="{selected: resistanceMode ==4}"
+					>W</button>
 					<button
 						@click="resistanceMode=2"
 						:class="{selected: resistanceMode ==2}"
-					>{{'um-id' | localize('ID')}}</button>
+					>ID</button>
 				</div>
 
 				<div class="buttons">

Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermocamera.vue

@@ -114,7 +114,7 @@
 				thermoImage="/thermoprophet/colored/_last.jpg"
 				:thermoImageVisible="thermocameraModeBTN"
 				:thermoImageOpacity="thermoImageOpacity"
-				:isThermoProphet="thermocameraModeBTN"
+				:isThermoProphet="true"
 			></warmers>
 
 			<div class="right-controls">
@@ -122,15 +122,15 @@
 					<button
 						@click="resistanceMode=0"
 						:class="{selected: resistanceMode ==0}"
-					>{{'um-c' | localize('°C')}}</button>
+					>°C</button>
 					<button
 						@click="resistanceMode=1"
 						:class="{selected: resistanceMode ==1}"
-					>{{'um-perc' | localize('%%')}}</button>
+					>%</button>
 					<button
 						@click="resistanceMode=2"
 						:class="{selected: resistanceMode ==2}"
-					>{{'um-id' | localize('ID')}}</button>
+					>ID</button>
 				</div>
 
 				<div class="tm-controls">