aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels
diff options
context:
space:
mode:
authorRoy Ben Shabat <Roy.mail.net@gmail.com>2020-08-04 14:18:28 +0300
committerRoy Ben Shabat <Roy.mail.net@gmail.com>2020-08-04 14:18:28 +0300
commit91d5be468e28266a4ae18ee3845f0cb3433dd898 (patch)
tree267173e3d906a2168ac72692b8d4ec523f59d30f /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels
parenta5c6a3baaf597ef58369192716ffe02d3af87ac2 (diff)
downloadTango-91d5be468e28266a4ae18ee3845f0cb3433dd898.tar.gz
Tango-91d5be468e28266a4ae18ee3845f0cb3433dd898.zip
Reset Application & Firmware "Logs" tab even when machine connection is the same.
Fixed issue on FileSystem download. Ignored issue with procedure error highlighting caused application error. Fixed issue when logout/login with different environment did not refreshed the list of available machines for connection.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 01def8679..40710ea21 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1709,12 +1709,12 @@ namespace Tango.MachineStudio.Developer.ViewModels
{
try
{
- LogManager.Log(String.Format("Uploading process parameters table {0}...", SelectedProcessParametersTable.Name));
+ LogManager.Log($"Uploading process parameters table {SelectedProcessParametersTable.Name}...");
await MachineOperator.UploadProcessParameters(SelectedProcessParametersTable);
}
catch (Exception ex)
{
- LogManager.LogFormat(ex, "Failed to upload process parameters table {0}", SelectedProcessParametersTable.Name);
+ LogManager.Log(ex, $"Failed to upload process parameters table {SelectedProcessParametersTable.Name}");
_notification.ShowError("Failed to upload the selected process parameters." + Environment.NewLine + ex.Message);
}
}
@@ -2189,7 +2189,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
{
if (ActiveJob != null)
{
- LogManager.LogFormat("Adding new segment to job {0}...", ActiveJob.Name);
+ LogManager.Log($"Adding new segment to job {ActiveJob.Name}...");
Segment seg = new Segment();
seg.Job = ActiveJob;
seg.Name = "SEGMENT";
@@ -2342,7 +2342,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
{
if (SelectedSegment != null)
{
- LogManager.LogFormat("Adding new brush stop to segment...", SelectedSegment.SegmentIndex.ToString());
+ LogManager.Log($"Adding new brush stop to segment '{SelectedSegment.SegmentIndex}'...");
var stop = new BrushStop();
@@ -2373,7 +2373,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
/// </summary>
private void DuplicateSelectedBrushStops()
{
- LogManager.LogFormat("Duplicating {0} brush stops...", SelectedBrushStops.Count);
+ LogManager.Log($"Duplicating {SelectedBrushStops.Count} brush stops...");
foreach (var stop in SelectedBrushStops.OrderBy(x => x.StopIndex))
{
@@ -2391,7 +2391,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
/// </summary>
private void DuplicateSelectedSegments()
{
- LogManager.LogFormat("Duplicating {0} segments...", SelectedSegments.Count);
+ LogManager.Log($"Duplicating {SelectedSegments.Count} segments...");
int start_index = SelectedSegments.Max(x => x.SegmentIndex);
@@ -2419,7 +2419,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
{
CanWork = false;
- LogManager.LogFormat("Duplicating {0} jobs...", SelectedJobs.Count);
+ LogManager.Log($"Duplicating {SelectedJobs.Count} jobs...");
int index = SelectedMachine.Jobs.Max(x => x.JobIndex);