Editor fixes

Fixed clicking on a layer selecting the wrong layer
Fixed adding a layer after closing the edit-layer dialog not working
Fixed pipe server buffer size
This commit is contained in:
SpoinkyNL committed 2016-08-12 20:40:56 +02:00
1 parent aa10b20759
commit 4d006784f3
4 files changed
+6 -4

No files matched your search

@@ -123,7 +123,7 @@ namespace Artemis.Profiles.Layers.Models
public IEnumerable<LayerModel> GetLayers() public IEnumerable<LayerModel> GetLayers()
{ {
var layers = new List<LayerModel>(); var layers = new List<LayerModel>();
foreach (var layerModel in Children) foreach (var layerModel in Children.OrderBy(c => c.Order))
{ {
layers.Add(layerModel); layers.Add(layerModel);
layers.AddRange(layerModel.GetLayers()); layers.AddRange(layerModel.GetLayers());
+1 -1
View File
@@ -74,7 +74,7 @@ namespace Artemis.Profiles
public List<LayerModel> GetLayers() public List<LayerModel> GetLayers()
{ {
var layers = new List<LayerModel>(); var layers = new List<LayerModel>();
foreach (var layerModel in Layers) foreach (var layerModel in Layers.OrderBy(l => l.Order))
{ {
layers.Add(layerModel); layers.Add(layerModel);
layers.AddRange(layerModel.GetLayers()); layers.AddRange(layerModel.GetLayers());
@@ -55,7 +55,7 @@ namespace Artemis.Utilities.DataReaders
var buffer = new byte[4096]; var buffer = new byte[4096];
// Read the incoming message // Read the incoming message
pipeServer.Read(buffer, 0, 255); pipeServer.Read(buffer, 0, 4096);
// Convert byte buffer to string // Convert byte buffer to string
var stringData = Encoding.ASCII.GetString(buffer, 0, buffer.Length); var stringData = Encoding.ASCII.GetString(buffer, 0, buffer.Length);
@@ -422,6 +422,8 @@ namespace Artemis.ViewModels.Profiles
{ {
// Update the UI // Update the UI
Layers.Clear(); Layers.Clear();
ProfileViewModel.SelectedLayer = null;
if (SelectedProfile != null) if (SelectedProfile != null)
Layers.AddRange(SelectedProfile.Layers); Layers.AddRange(SelectedProfile.Layers);
@@ -431,7 +433,7 @@ namespace Artemis.ViewModels.Profiles
// A small delay to allow the profile list to rebuild // A small delay to allow the profile list to rebuild
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
Thread.Sleep(20); Thread.Sleep(100);
ProfileViewModel.SelectedLayer = selectModel; ProfileViewModel.SelectedLayer = selectModel;
}); });
} }