From c2f8441e8b17aa972995b303e279f4f3c8762977 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Mon, 27 Apr 2020 14:49:56 +0200
Subject: [PATCH] general fixes

---
 .../wwwroot/assets/styles/base/ciclo.less     |  11 +-
 .../assets/styles/base/estrazione.less        |  20 ++-
 .../wwwroot/assets/styles/base/pirometro.less | 149 +++++++++---------
 .../assets/styles/base/quote-velocita.less    |  17 +-
 .../wwwroot/assets/styles/base/setup.less     |  13 ++
 Thermo.Active/wwwroot/assets/styles/style.css |  76 ++++-----
 .../SVG-Components/SVGcaricatore.ts           |   6 +-
 .../SVG-Components/SVGcaricatore.vue          |   8 +-
 .../base-components/estrazione-principale.vue |   2 +-
 .../SVG_Components/SVG-termo-superiore.ts     |  17 ++
 .../SVG_Components/SVG-termo-superiore.vue    |  14 +-
 .../SVG_Components/quote-velocita.ts          |   9 +-
 .../SVG_Components/quote-velocita.vue         |  27 ++--
 .../components/SVG_Components/stampo.ts       |   9 +-
 .../components/SVG_Components/stampo.vue      |  35 ++--
 .../SVG_Components/svgcontrostampo.ts         |   8 +-
 .../SVG_Components/svgcontrostampo.vue        |  22 ++-
 17 files changed, 229 insertions(+), 214 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/styles/base/ciclo.less b/Thermo.Active/wwwroot/assets/styles/base/ciclo.less
index c0863f3a..3c7a79af 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/ciclo.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/ciclo.less
@@ -50,26 +50,27 @@
 
             .circle1{
               position: relative;
-              top: 130px;
+              top: 200px;
               right: 25px;
             }
 
             .circle2{
               position: relative;
-              top: 180px;
+              top: 400px;
               right: 25px;
             }
 
             .circle3{
+              width: 135px;
               position: relative;
-              top: 175px;
+              top: 545px;
               right: 410px;
             }
 
             .circle4{
               position: relative;
-              top: 60px;
-              right: 180px;
+              top: 585px;
+              right: 200px;
             }
 
           }
diff --git a/Thermo.Active/wwwroot/assets/styles/base/estrazione.less b/Thermo.Active/wwwroot/assets/styles/base/estrazione.less
index b869d1b1..d32bebe1 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/estrazione.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/estrazione.less
@@ -7,16 +7,24 @@
 .@{modal}.estrazione-info {
     width: 1820px;
     height: 785px;
- .specific { 
- justify-content: flex-end;
-.box{
- background-color: #e5f3ff;   
-}
 
-} 
+    section.body{
 
+        section{
 
+            .specific { 
+                justify-content: flex-end;
+                padding-left: 10px;
+        
+                .box{
+                    margin:0;
+                    background-color: #e5f3ff;   
+                }
 
+            }
 
+        }
+
+    } 
 
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/assets/styles/base/pirometro.less b/Thermo.Active/wwwroot/assets/styles/base/pirometro.less
index ddd84787..acaa83b1 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/pirometro.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/pirometro.less
@@ -10,83 +10,84 @@
   width: 1820px;
   height: 980px;
 
-  section{
-
-    .specific{
-      width: 470px;
-      @{pirometro-margin}:37%;
-    }
-
-    .termospecific{
-      @{pirometro-margin}:0%;
-
-      .svg-area{
-        padding-left: 90px;
-        width: 1270px;
-        height: 800px;
-
-        .disegnoTermoSuperiore{
-          flex-shrink: 0;
-          width: 1100px;
-          height: 750px;
-        }
-
-        .border-termo-superiore{
-
-          .circle1{
-            position: relative;
-            top: 135px;
-            right: 1150px;
-          }
-
-          .circle2{
-            position: relative;
-            top: 355px;
-            right: 1150px;
-          }
-
-          .circle3{
-            position: relative;
-            top: 425px;
-            right: 1150px;
-          }
-
-          .circle4{
-            position: relative;
-            top: 470px;
-            right: 635px;
-          }
-
-          .circle5{
-            position: relative;
-            top: 400px;
-            right: 255px;
-          }
-
-          .circle6{
-            width: 64px;
-            height: 20px;
-            color:white;
-            object-fit: contain;
-            background-color: #c03d58;
-            position: relative;
-            top: 95px;
-            right: 125px;
-          }
-
-        }
+  section.body{
+    
+    section{
 
+      .specific{
+        width: 470px;
+        @{pirometro-margin}:37%;
       }
 
-      button{
-        margin-left: 5px;
-        width: 48px;
-        height: 48px;
-        object-fit: contain;
-        border-radius: 2px;
-        box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5);
-        border: solid 1px #001e48;
-        background-image: linear-gradient(to bottom, #1756ad, #002680);
+      .termospecific{
+        @{pirometro-margin}:0%;
+
+        .svg-area{
+          padding-left: 90px;
+          width: 1270px;
+          height: 800px;
+
+          .disegnoTermoSuperiore{
+            flex-shrink: 0;
+            width: 1100px;
+            height: 750px;
+          }
+
+          .border-termo-superiore{
+
+            .circle1{
+              position: relative;
+              top: 135px;
+              right: 1150px;
+            }
+
+            .circle2{
+              position: relative;
+              top: 355px;
+              right: 1150px;
+            }
+
+            .circle3{
+              position: relative;
+              top: 425px;
+              right: 1150px;
+            }
+
+            .circle4{
+              position: relative;
+              top: 470px;
+              right: 635px;
+            }
+
+            .circle5{
+              position: relative;
+              top: 400px;
+              right: 255px;
+            }
+
+            .circle6{
+              width: 100px;
+              background-color: #c03d58;
+              position: relative;
+              top: 87px;
+              right: 150px;
+            }
+
+          }
+
+        }
+
+        button{
+          margin-left: 5px;
+          width: 48px;
+          height: 48px;
+          object-fit: contain;
+          border-radius: 2px;
+          box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5);
+          border: solid 1px #001e48;
+          background-image: linear-gradient(to bottom, #1756ad, #002680);
+        }
+
       }
 
     }
diff --git a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less
index 07a8cc55..7dc7a3b9 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less
@@ -57,19 +57,6 @@
 
                 .input-circles{
 
-                    span{
-                        object-fit: contain;
-                        font-size: 22px;
-                        font-weight: 500;
-                        font-stretch: normal;
-                        font-style: normal;
-                        line-height: normal;
-                        letter-spacing: normal;
-                        text-align: center;
-                        color: white;
-                        background-color: #979797;
-                    }
-
                     .circle{
                         width: 147px;
                         height: 60px;
@@ -187,13 +174,13 @@
 
                     .circle-stampo-10{
                         position: relative;
-                        bottom: 557px;
+                        bottom: 560px;
                         right: 769px;
                     }
 
                     .circle-stampo-11{
                         position: relative;
-                        top: 38px;
+                        top: 35px;
                         right: 781px;                  
                     }
 
diff --git a/Thermo.Active/wwwroot/assets/styles/base/setup.less b/Thermo.Active/wwwroot/assets/styles/base/setup.less
index 8bb94f45..039de21d 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/setup.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/setup.less
@@ -76,6 +76,19 @@
               display: flex;
               flex-direction: column;
 
+              span{
+                object-fit: contain;
+                font-size: 22px;
+                font-weight: 500;
+                font-stretch: normal;
+                font-style: normal;
+                line-height: normal;
+                letter-spacing: normal;
+                text-align: center;
+                color: white;
+                background-color: #979797;
+              }
+
               .circle {
                 width: 141px;
                 height: 60px;
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index c26d7bc4..c7db5ca9 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -3674,59 +3674,56 @@
   width: 1820px;
   height: 980px;
 }
-.modal.pirometro-info section .specific {
+.modal.pirometro-info section.body section .specific {
   width: 470px;
   margin-left: 37%;
 }
-.modal.pirometro-info section .termospecific {
+.modal.pirometro-info section.body section .termospecific {
   margin-left: 0%;
 }
-.modal.pirometro-info section .termospecific .svg-area {
+.modal.pirometro-info section.body section .termospecific .svg-area {
   padding-left: 90px;
   width: 1270px;
   height: 800px;
 }
-.modal.pirometro-info section .termospecific .svg-area .disegnoTermoSuperiore {
+.modal.pirometro-info section.body section .termospecific .svg-area .disegnoTermoSuperiore {
   flex-shrink: 0;
   width: 1100px;
   height: 750px;
 }
-.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle1 {
+.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle1 {
   position: relative;
   top: 135px;
   right: 1150px;
 }
-.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle2 {
+.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle2 {
   position: relative;
   top: 355px;
   right: 1150px;
 }
-.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle3 {
+.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle3 {
   position: relative;
   top: 425px;
   right: 1150px;
 }
-.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle4 {
+.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle4 {
   position: relative;
   top: 470px;
   right: 635px;
 }
-.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle5 {
+.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle5 {
   position: relative;
   top: 400px;
   right: 255px;
 }
-.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle6 {
-  width: 64px;
-  height: 20px;
-  color: white;
-  object-fit: contain;
+.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle6 {
+  width: 100px;
   background-color: #c03d58;
   position: relative;
-  top: 95px;
-  right: 125px;
+  top: 87px;
+  right: 150px;
 }
-.modal.pirometro-info section .termospecific button {
+.modal.pirometro-info section.body section .termospecific button {
   margin-left: 5px;
   width: 48px;
   height: 48px;
@@ -4142,6 +4139,18 @@
   display: flex;
   flex-direction: column;
 }
+.setup .modal section.body section .specific .svg-area .input-circles span {
+  object-fit: contain;
+  font-size: 22px;
+  font-weight: 500;
+  font-stretch: normal;
+  font-style: normal;
+  line-height: normal;
+  letter-spacing: normal;
+  text-align: center;
+  color: white;
+  background-color: #979797;
+}
 .setup .modal section.body section .specific .svg-area .input-circles .circle {
   width: 141px;
   height: 60px;
@@ -4460,23 +4469,24 @@
 }
 .modal.ciclo-info section .specific .svg-area .input-circles .circle1 {
   position: relative;
-  top: 130px;
+  top: 200px;
   right: 25px;
 }
 .modal.ciclo-info section .specific .svg-area .input-circles .circle2 {
   position: relative;
-  top: 180px;
+  top: 400px;
   right: 25px;
 }
 .modal.ciclo-info section .specific .svg-area .input-circles .circle3 {
+  width: 135px;
   position: relative;
-  top: 175px;
+  top: 545px;
   right: 410px;
 }
 .modal.ciclo-info section .specific .svg-area .input-circles .circle4 {
   position: relative;
-  top: 60px;
-  right: 180px;
+  top: 585px;
+  right: 200px;
 }
 .modal.ciclo-info section .specific .box {
   margin-bottom: 10px;
@@ -4765,18 +4775,6 @@
   width: 1156px;
   height: 800px;
 }
-.modal.quote-velocita-info section .specific .svg-area .input-circles span {
-  object-fit: contain;
-  font-size: 22px;
-  font-weight: 500;
-  font-stretch: normal;
-  font-style: normal;
-  line-height: normal;
-  letter-spacing: normal;
-  text-align: center;
-  color: white;
-  background-color: #979797;
-}
 .modal.quote-velocita-info section .specific .svg-area .input-circles .circle {
   width: 147px;
   height: 60px;
@@ -4874,12 +4872,12 @@
 }
 .modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-10 {
   position: relative;
-  bottom: 557px;
+  bottom: 560px;
   right: 769px;
 }
 .modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-11 {
   position: relative;
-  top: 38px;
+  top: 35px;
   right: 781px;
 }
 .modal.quote-velocita-info section .specific .svg-area .input-circles .circle-controstampo-1 {
@@ -5002,10 +5000,12 @@
   width: 1820px;
   height: 785px;
 }
-.modal.estrazione-info .specific {
+.modal.estrazione-info section.body section .specific {
   justify-content: flex-end;
+  padding-left: 10px;
 }
-.modal.estrazione-info .specific .box {
+.modal.estrazione-info section.body section .specific .box {
+  margin: 0;
   background-color: #e5f3ff;
 }
 .scheda .body {
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.ts
index 52cac898..7d90dad4 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.ts
@@ -6,11 +6,11 @@ import {Prop} from 'vue-property-decorator';
 export default class SVGCaricatore extends Vue{
     @Prop({default:1600})
     dxalto:number;
-    @Prop({default:0})
+    @Prop({default:610})
     dxbasso:number;
-    @Prop({default:0})
+    @Prop({default:1030})
     basso:number;
-    @Prop({default:0})
+    @Prop({default:1360})
     volante:number;
 
     minoreuguale:string="<=";
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue
index 6d2957e1..746e216d 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue
@@ -2,10 +2,10 @@
     <div class="svg-area">
         <img class="disegnoCaricatore" src="assets/icons/svg/disegno-caricatore.svg">
         <div class="input-circles">
-            <label class="circle1">{{dxalto}} mm</label>
-            <label class="circle2">{{dxbasso}} mm</label>
-            <label class="circle3">{{minoreuguale}} {{basso}} mm</label>
-            <label class="circle4">{{volante}} mm</label>
+            <span class="circle1">{{dxalto}} mm</span>
+            <span class="circle2">{{dxbasso}} mm</span>
+            <span class="circle3">{{minoreuguale}} {{basso}} mm</span>
+            <span class="circle4">{{volante}} mm</span>
         </div>
     </div>
 </template>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue
index a5faf581..9a5ad91f 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue
@@ -18,7 +18,7 @@
         </aside>
         <hr>
         <div class="specific">
-        <scheda></scheda>
+            <scheda></scheda>
         </div>   
     </section>
 </template>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.ts
index 97d5b38c..1fd94220 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.ts
@@ -5,4 +5,21 @@ import {Prop} from 'vue-property-decorator';
 @Component({name:'svgtermosuperiore'})
 export default class SVGTermoregolazioneSuperiore extends Vue{
 
+    @Prop({default:0})
+    max:number;
+    @Prop({default:0})
+    min:number;
+    @Prop({default:0})
+    inizio:number;
+    @Prop({default:0})
+    fine:number;
+    @Prop({default:0})
+    perc_riposo:number;
+
+    mock_max:number=this.max
+    mock_min:number=this.min
+    mock_inizio:number=this.inizio
+    mock_fine:number=this.fine
+    mock_perc_riposo:number=this.perc_riposo
+
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue
index ce52f6e2..4c0d97e5 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue
@@ -3,30 +3,28 @@
         <img class="disegnoTermoSuperiore" src="assets/icons/svg/disegno-termosuperiore.svg">
         <div class="input-circles border-termo-superiore">
                 <div class="circle circle1">
-                    <!-- <input v-model=""> -->
+                    <input v-model="mock_max">
                     <label>%</label>
                 </div>
                 <div class="circle circle2">
-                    <!-- <input v-model=""> -->
+                    <input v-model="mock_min">
                     <label>%</label>
                 </div>
                 <div class="circle circle3">
-                    <!-- <input v-model=""> -->
+                    <input v-model="mock_perc_riposo">
                     <label>%</label>
                 </div>
                 <div class="circle circle4">
                     <img src="assets/icons/png/temperatura.png">
-                    <!-- <input v-model=""> -->
+                    <input v-model="mock_inizio">
                     <label>°C</label>
                 </div>
                 <div class="circle circle5">
                     <img src="assets/icons/png/temperatura.png">
-                    <!-- <input v-model=""> -->
+                    <input v-model="mock_fine">
                     <label>°C</label>
                 </div>
-                <div class="circle6">
-                    270 °C
-                </div>
+                <span class="circle6">270 °C</span>
         </div>
     </div>
 </template>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.ts
index b2739e23..a46ade44 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.ts
@@ -4,11 +4,14 @@ import {Prop} from 'vue-property-decorator';
 
 @Component({})
 export default class QuoteVelocita extends Vue{
+    
     @Prop({default:0})
-    x:number;
+    corsa:number;
     @Prop({default:0})
-    y:number;
+    vel_salita:number;
     @Prop({default:0})
-    spes:number;
+    vel_salita_lenta:number;
+    @Prop({default:0})
+    rall_salita:number;
 
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue
index 1a547277..0bc1cbe2 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue
@@ -5,72 +5,67 @@
             <div class="circle circle1">
                 <div>
                     <img src="assets/icons/png/salita.png">
-				    <input v-model="spes">
+                    <input v-model="rall_salita">
                     <label>mm</label>                   
                 </div>
                 <div>
                     <img src="assets/icons/png/bassa.png">
-                    <!-- <label>486 mm/s</label>
-                    <input v-model=""> -->
+                    <input v-model="vel_salita_lenta">
                     <label>mm/s</label>                  
                 </div>
             </div>
             <div class="circle circle2">
                 <div>
                     <img src="assets/icons/png/salita.png">
-				    <input v-model="x">
+				    <input v-model="corsa">
                     <label>mm</label>                   
                 </div>
                 <div>
                     <img src="assets/icons/png/alta.png">
-                    <!-- <label>486 mm/s</label>
-                    <input v-model=""> -->
+                    <input v-model="vel_salita">
                     <label>mm/s</label>                  
                 </div>
             </div>
             <div class="circle circle3">
                 <div>
                     <img src="assets/icons/png/discesa.png">
-				    <input v-model="y">
+                    <!-- <input v-model="">  mancante -->
                     <label>mm</label>                   
                 </div>
                 <div>
                     <img src="assets/icons/png/alta.png">
-                    <!-- <label>486 mm/s</label>
-                    <input v-model=""> -->
+                    <!-- <input v-model="">  mancante -->
                     <label>mm/s</label>                  
                 </div>
             </div>
             <div class="circle circle4">
                 <div>
                     <img src="assets/icons/png/quota.png">
-				    <input v-model="y">
+                    <!-- <input v-model="">  mancante -->
                     <label>mm</label>                
                 </div>
             </div>
             <div class="circle circle5">
                 <div>
                     <img src="assets/icons/png/discesa.png">
-				    <input v-model="y">
+                    <!-- <input v-model="">  mancante -->
                     <label>mm</label>                
                 </div>
                 <div>
                     <img src="assets/icons/png/alta.png">
-                    <!-- <label>486 mm/s</label>
-                    <input v-model=""> -->
+                    <!-- <input v-model="">  mancante -->
                     <label>mm/s</label>  
                 </div>
             </div>
             <div class="circle circle6">
                 <div>
                     <img src="assets/icons/png/discesa.png">
-				    <input v-model="y">
+                    <!-- <input v-model="">  mancante -->
                     <label>mm</label>                
                 </div>
                 <div>
                     <img src="assets/icons/png/bassa.png">
-                    <!-- <label>486 mm/s</label>
-                    <input v-model=""> -->
+                    <!-- <input v-model="">  mancante -->
                     <label>mm/s</label>                  
                 </div>
             </div>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.ts
index b2739e23..a46ade44 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.ts
@@ -4,11 +4,14 @@ import {Prop} from 'vue-property-decorator';
 
 @Component({})
 export default class QuoteVelocita extends Vue{
+    
     @Prop({default:0})
-    x:number;
+    corsa:number;
     @Prop({default:0})
-    y:number;
+    vel_salita:number;
     @Prop({default:0})
-    spes:number;
+    vel_salita_lenta:number;
+    @Prop({default:0})
+    rall_salita:number;
 
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue
index 7f393e60..ec7de234 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue
@@ -5,92 +5,83 @@
             <div class="circle circle-stampo-1">
                 <div>
                     <img src="assets/icons/png/salita.png">
-				    <input v-model="spes">
+				    <input v-model="rall_salita">
                     <label>mm</label>                
                 </div>
                 <div>
                     <img src="assets/icons/png/bassa.png">
-                    <!-- <label>30 mm/s</label>
-                    <input v-model=""> -->
+                    <input v-model="vel_salita_lenta"> 
                     <label>mm/s</label>                 
                 </div>
             </div>
             <div class="circle circle-stampo-2">
                 <div>
                     <img src="assets/icons/png/salita.png">
-				    <input v-model="x">
+				    <input v-model="corsa">
                     <label>mm</label>                
                 </div>
                 <div>
                     <img src="assets/icons/png/alta.png">
-                    <!-- <label>100 mm/s</label>
-                    <input v-model=""> -->
+                    <input v-model="vel_salita">
                     <label>mm/s</label>                 
                 </div>
             </div>
             <div class="circle circle-stampo-3">
                 <div>
                     <img src="assets/icons/png/discesa.png">
-				    <input v-model="y">
+                    <!-- <input v-model=""> mancante -->
                     <label>mm</label>                
                 </div>
                 <div>
                     <img src="assets/icons/png/alta.png">
-                    <!-- <label>30 mm/s</label>
-                    <input v-model=""> -->
+                    <!-- <input v-model=""> mancante -->
                     <label>mm/s</label>                 
                 </div>
             </div>
             <div class="circle circle-stampo-4">
                 <div>
                     <img src="assets/icons/png/quota.png">
-                    <!-- <label>64 mm/s</label>
-                    <input v-model=""> -->
+                    <!-- <input v-model=""> mancante -->
                     <label>mm</label>                 
                 </div>
             </div>
             <div class="circle circle-stampo-5">
                 <div>
                     <img src="assets/icons/png/discesa.png">
-				    <input v-model="y">
+                    <!-- <input v-model=""> mancante -->
                     <label>mm</label>                
                 </div>
                 <div>
                     <img src="assets/icons/png/alta.png">
-                    <!-- <label>100 mm/s</label>
-                    <input v-model=""> -->
+                    <!-- <input v-model=""> mancante -->
                     <label>mm/s</label>                 
                 </div>
             </div>
             <div class="circle circle-stampo-6">
                 <div>
                     <img src="assets/icons/png/quota.png">
-                    <!-- <label>486 mm/s</label>
-                    <input v-model=""> -->
+                    <!-- <input v-model=""> mancante -->
                     <label>mm</label>                 
                 </div>
             </div>
             <div class="circle circle-stampo-7">
                 <div>
                     <img src="assets/icons/png/quota.png">
-                    <!-- <label>70 mm/s</label>
-                    <input v-model=""> -->
+                    <!-- <input v-model=""> mancante -->
                     <label>mm</label>                 
                 </div>
             </div>
             <div class="circle circle-stampo-8">
                 <div>
                     <img src="assets/icons/png/quota.png">
-                    <!-- <label>214 mm/s</label>
-                    <input v-model=""> -->
+                    <!-- <input v-model=""> mancante -->
                     <label>mm</label>                 
                 </div>
             </div>
             <div class="circle circle-stampo-9">
                 <div>
                     <img src="assets/icons/png/quota.png">
-                    <!-- <label>50 mm/s</label>
-                    <input v-model=""> -->
+                    <!-- <input v-model=""> mancante -->
                     <label>mm</label>                 
                 </div>
             </div>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.ts
index 05f3ce2b..13cdd1e2 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.ts
@@ -5,10 +5,12 @@ import {Prop} from 'vue-property-decorator';
 @Component({})
 export default class Controstamposvg extends Vue{
     @Prop({default:0})
-    x:number;
+    corsa:number;
     @Prop({default:0})
-    y:number;
+    vel_discesa:number;
     @Prop({default:0})
-    spes:number;
+    vel_discesa_lenta:number;
+    @Prop({default:0})
+    rall_discesa:number;
 
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.vue
index a896ff1c..f1cc3430 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.vue
@@ -5,59 +5,55 @@ e<template>
             <div class="circle circle-controstampo-1">
                 <div>
                     <img src="assets/icons/png/salita.png">
-				    <input v-model="spes">
+                    <!-- <input v-model="">  mancante -->
                     <label>mm</label>                
                 </div>
                 <div>
                     <img src="assets/icons/png/alta.png">
-                    <!-- <label>30 mm/s</label>
-                    <input v-model=""> -->
+                    <!-- <input v-model=""> mancante -->
                     <label>mm/s</label>
                 </div>
             </div>
             <div class="circle circle-controstampo-2">
                 <div>
                     <img src="assets/icons/png/salita.png">
-				    <input v-model="x">
+                    <!-- <input v-model="">  mancante -->
                     <label>mm</label>                
                 </div>
                 <div>
                     <img src="assets/icons/png/bassa.png">
-                    <!-- <label>100 mm/s</label>
-                    <input v-model=""> -->
+                    <!-- <input v-model="">  mancante -->
                     <label>mm/s</label>                
                 </div>
             </div>
             <div class="circle circle-controstampo-3">
                 <div>
                     <img src="assets/icons/png/discesa.png">
-				    <input v-model="y">
+				    <input v-model="rall_discesa">
                     <label>mm</label>                 
                 </div>
                 <div>
                     <img src="assets/icons/png/bassa.png">
-                    <!-- <label>100 mm/s</label>
-                    <input v-model=""> -->
+                    <input v-model="vel_discesa_lenta">
                     <label>mm/s</label>                  
                 </div>
             </div>
             <div class="circle circle-controstampo-4">
                 <div>
                     <img src="assets/icons/png/discesa.png">
-				    <input v-model="y">
+				    <input v-model="corsa">
                     <label>mm</label>                
                 </div>
                 <div>
                     <img src="assets/icons/png/alta.png">
-                    <!-- <label>8 mm/s</label>
-                    <input v-model=""> -->
+                    <input v-model="vel_discesa">
                     <label>mm/s</label>  
                 </div>
             </div>
             <div class="circle circle-controstampo-5">
                 <div>
                     <img src="assets/icons/png/quota.png">
-				    <input v-model="y">
+                    <!-- <input v-model="">  mancante -->
                     <label>mm</label>                
                 </div>
             </div>