aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-08-26 20:09:38 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-08-26 20:09:38 +0300
commit7d7281f91edfb2d0e7d0e92bd282403f0426f94d (patch)
tree4672bd653c0abdb6612032a819f670993a31a17a /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels
parentf98cac2d6e331eaf62167d63524134d53db921ef (diff)
downloadTango-7d7281f91edfb2d0e7d0e92bd282403f0426f94d.tar.gz
Tango-7d7281f91edfb2d0e7d0e92bd282403f0426f94d.zip
Added new colorized static text widget to tech board.
Added option to go back to job/jobs from running job view. Fixed issue with bug reporting. Fixed other bugs.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index 55235b3c2..9ecfa2312 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -635,6 +635,10 @@ namespace Tango.MachineStudio.Technician.ViewModels
var editor = CreateElement<JobRunnerElementEditor, JobRunnerItem, object>(bounds, null);
InitJobRunnerItem(editor.JobRunnerItem);
}
+ else if (item is TextItem)
+ {
+ CreateElement<TextElementEditor, TextItem, object>(bounds, null);
+ }
}
/// <summary>
@@ -774,6 +778,10 @@ namespace Tango.MachineStudio.Technician.ViewModels
var editor = CreateElement<JobRunnerElementEditor>(item);
InitJobRunnerItem(editor.JobRunnerItem);
}
+ else if (item is TextItem)
+ {
+ CreateElement<TextElementEditor>(item);
+ }
}
/// <summary>
@@ -1574,7 +1582,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
public override void OnApplicationReady()
{
-
+
}
#endregion