Merge remote-tracking branch 'origin/develop' into featue/Axes

This commit is contained in:
Samuele E. Locatelli
2020-09-24 08:49:35 +02:00
4 changed files with 3 additions and 17 deletions
+1 -1
View File
@@ -603,7 +603,7 @@ public static class ThreadsFunctions
if (libraryError.IsError())
ManageLibraryError(libraryError);
//MessageServices.Current.Publish(SEND_THERMO_GAUGE_DATA, null, currentLiveProd);
MessageServices.Current.Publish(SEND_THERMO_GAUGE_DATA, null, currentLiveProd);
}
else
RestoreConnection();
+1 -1
View File
@@ -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.18.96")]
[assembly: AssemblyVersion("0.18.97")]
@@ -59,7 +59,7 @@
width: 30px;
text-align: CENTER;
padding: 8px;
border: 0.5px solid #ddd;
/* border: 0.5px solid #ddd; */
border-radius: 3px;
margin: 0 2px;
box-sizing: border-box;
@@ -37,20 +37,6 @@
:disabled="!isCnReady()"
@click="navigateTo('\\\\','\\\\', false, 1,0)"
></card-folder-path>-->
<card-folder-path
name="testfolder"
:iconType="'FOLDER'"
:selected="'\\\\' == currentDrive"
:disabled="!isCnReady()"
@click="navigateTo('\\\\','\\\\', false, 1,0)"
></card-folder-path>
<card-folder-path
name="testfile"
:iconType="'FILE'"
:selected="'\\\\' == currentDrive"
:disabled="!isCnReady()"
@click="navigateTo('\\\\','\\\\', false, 1,0)"
></card-folder-path>
<!-- <hr /> -->
<!--
<card-folder-path