diff --git a/MultiTerm.Core/ViewModel/CommunicationDataViewModel.cs b/MultiTerm.Core/ViewModel/CommunicationDataViewModel.cs index ef2fed2..0484f05 100644 --- a/MultiTerm.Core/ViewModel/CommunicationDataViewModel.cs +++ b/MultiTerm.Core/ViewModel/CommunicationDataViewModel.cs @@ -11,22 +11,28 @@ public partial class CommunicationDataViewModel : ObservableObject private ICommunicationProtocol? communicationProtocol; /// - /// Represents the collection of received characters from a communicaiton protocol. + /// Represents the collection of received characters from a communication protocol. /// [ObservableProperty] private ObservableCollection receivedData = new(); /// - /// Represents the collection of received characters from a communicaiton protocol. + /// Represents the collection of the selection of received characters. /// [ObservableProperty] - private ObservableCollection receivedCharacters = new(); //TODO + private List? selectedReceivedData; /// - /// Represents the collection of sent characters to a communicaiton protocol. + /// Represents the collection of sent characters to a communication protocol. /// [ObservableProperty] - private ObservableCollection sentCharacters = new(); // TODO Change + private ObservableCollection sentData = new(); + + /// + /// Represents the collection of the selection of sent characters. + /// + [ObservableProperty] + private List? selectedSentData; public CommunicationDataViewModel(ICommunicationProtocol? communicationProtocol) { @@ -39,8 +45,8 @@ public partial class CommunicationDataViewModel : ObservableObject else // TEMP { //string exampleData = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Pellentesque elit eget gravida cum sociis natoque penatibus et magnis. Purus sit amet volutpat consequat mauris nunc congue nisi vitae. Id ornare arcu odio ut sem. Neque ornare aenean euismod elementum nisi quis eleifend. Faucibus vitae aliquet nec ullamcorper sit. Fermentum iaculis eu non diam phasellus vestibulum lorem sed risus. Pellentesque nec nam aliquam sem et tortor consequat id porta. Diam sollicitudin tempor id eu nisl. Fames ac turpis egestas sed tempus urna et. Commodo odio aenean sed adipiscing diam donec adipiscing tristique risus. Id aliquet lectus proin nibh nisl condimentum id. Dolor sit amet consectetur adipiscing elit duis. Sed vulputate odio ut enim blandit. Neque convallis a cras semper auctor neque vitae.\r\n\r\nLacus laoreet non curabitur gravida arcu ac tortor. Volutpat maecenas volutpat blandit aliquam. Neque laoreet suspendisse interdum consectetur. Tincidunt augue interdum velit euismod in pellentesque massa placerat. Magna fringilla urna porttitor rhoncus dolor purus non enim praesent. Fermentum leo vel orci porta non pulvinar neque laoreet suspendisse. Scelerisque viverra mauris in aliquam sem fringilla. Nec feugiat nisl pretium fusce id velit ut. Urna cursus eget nunc scelerisque viverra mauris. Condimentum mattis pellentesque id nibh tortor id aliquet. Enim sed faucibus turpis in eu. Adipiscing elit pellentesque habitant morbi tristique. A pellentesque sit amet porttitor eget dolor morbi non arcu. Amet commodo nulla facilisi nullam vehicula ipsum a arcu. Hac habitasse platea dictumst vestibulum rhoncus est pellentesque elit ullamcorper. Curabitur vitae nunc sed velit dignissim sodales ut. Malesuada fames ac turpis egestas maecenas pharetra. Tellus pellentesque eu tincidunt tortor aliquam.\r\n\r\nVitae proin sagittis nisl rhoncus mattis rhoncus urna neque viverra. Eget mi proin sed libero enim sed faucibus. Commodo nulla facilisi nullam vehicula ipsum. Proin libero nunc consequat interdum varius sit amet mattis vulputate. Morbi tristique senectus et netus. Feugiat scelerisque varius morbi enim nunc. Nulla aliquet enim tortor at auctor urna nunc. Non pulvinar neque laoreet suspendisse interdum consectetur libero id. Tellus orci ac auctor augue mauris augue neque gravida in. In egestas erat imperdiet sed euismod. Amet volutpat consequat mauris nunc congue nisi. Massa eget egestas purus viverra accumsan in. Eget duis at tellus at. Mi sit amet mauris commodo quis imperdiet. Nibh mauris cursus mattis molestie a iaculis at.\r\n\r\nNetus et malesuada fames ac turpis. Sit amet dictum sit amet justo donec. Euismod quis viverra nibh cras pulvinar mattis. Sit amet commodo nulla facilisi nullam vehicula ipsum a arcu. Scelerisque felis imperdiet proin fermentum. Ac tincidunt vitae semper quis lectus nulla at. Sit amet commodo nulla facilisi nullam vehicula. Enim lobortis scelerisque fermentum dui faucibus in ornare quam. Quam id leo in vitae turpis massa sed. Quam quisque id diam vel quam. A condimentum vitae sapien pellentesque. Neque aliquam vestibulum morbi blandit cursus risus at. Velit laoreet id donec ultrices tincidunt arcu non sodales neque. Tempus imperdiet nulla malesuada pellentesque elit eget gravida cum sociis. Egestas tellus rutrum tellus pellentesque eu tincidunt tortor. Nec feugiat in fermentum posuere. Dui accumsan sit amet nulla. Lacus viverra vitae congue eu consequat ac felis. Etiam tempor orci eu lobortis. Fermentum leo vel orci porta non pulvinar."; - //string exampleData = "<\\r><\\n>\r\n--------------------------------------------------------------<\\r><\\n>\r\nSPLITFLAP<\\r><\\n>\r\n--------------------------------------------------------------<\\r><\\n>\r\nMcuShell ; Group of McuShell commands<\\r><\\n>\r\n help|status ; Print help or status information<\\r><\\n>\r\nSplitFlap ; Group of McuRTOS commands<\\r><\\n>\r\n help ; Print help or status information<\\r><\\n>\r\n setId ; sets the position (setupId) of the sf and its id (hwId)<\\r><\\n>\r\n initAll ; init all Splitflaps<\\r><\\n>\r\n Display ; displays as many chars of the string as sf are available<\\r><\\n>\r\n addId ; add new hwId with offset<\\r><\\n>\r\nMcuRTOS ; Group of McuRTOS commands<\\r><\\n>\r\n help|status ; Print help or status information<\\r><\\n>\r\n tasklist ; Print tasklist<\\r><\\n>\r\nMcuFlash ; Group of flash ini commands<\\r><\\n>\r\n help|status ; Print help or status information<\\r><\\n>\r\n dump ; Dump memory data<\\r><\\n>\r\n erase ; Erase memory at address<\\r><\\n>\r\nini ; Group of flash ini commands<\\r><\\n>\r\n help|status ; Print help or status information<\\r><\\n>\r\n dump ; Dump data information<\\r><\\n>\r\n erase ; Erase data information<\\r><\\n>\r\nMcuMinINI ; Group of McuMinINI commands<\\r><\\n>\r\n help|status ; Print help or status information<\\r><\\n>\r\n read ; Read a key from a section in a file<\\r><\\n>\r\n write ; Write a key with value to a section in a file<\\r><\\n>\r\n delkey ; Delete a key in a section of file<\\r><\\n>\r\n delsec ; Delete a section in a file<\\r><\\n>\r\nnvmc ; Group of NVMC commands<\\r><\\n>\r\n help|status ; Print help or status information<\\r><\\n>\r\n flags ; Set flags<\\r><\\n>\r\nrs ; Group of RS-485 commands<\\r><\\n>\r\n help|status ; Print help or status information<\\r><\\n>\r\n addr ; Set RS-485 address<\\r><\\n>\r\n send ; Send a text to the RS-485 bus<\\r><\\n>\r\n sendcmd ; Send a shell command to the RS-485 address and check response<\\r><\\n>\r\n log on|off ; Log RS-485 bus activity to McuLog<\\r><\\n>\r\nMcuUart485 ; Group of RS-485 commands<\\r><\\n>\r\n help|status ; Print help or status information<\\r><\\n>\r\n clear ; Clear UART ISR flags<\\r><\\n>\r\n<\\r><\\n>\r\nCMD>"; - string exampleData = "This is some example Text\nSecond line\nNow a very long line: Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."; + string exampleData = "<\\r><\\n>\r\n--------------------------------------------------------------<\\r><\\n>\r\nSPLITFLAP<\\r><\\n>\r\n--------------------------------------------------------------<\\r><\\n>\r\nMcuShell ; Group of McuShell commands<\\r><\\n>\r\n help|status ; Print help or status information<\\r><\\n>\r\nSplitFlap ; Group of McuRTOS commands<\\r><\\n>\r\n help ; Print help or status information<\\r><\\n>\r\n setId ; sets the position (setupId) of the sf and its id (hwId)<\\r><\\n>\r\n initAll ; init all Splitflaps<\\r><\\n>\r\n Display ; displays as many chars of the string as sf are available<\\r><\\n>\r\n addId ; add new hwId with offset<\\r><\\n>\r\nMcuRTOS ; Group of McuRTOS commands<\\r><\\n>\r\n help|status ; Print help or status information<\\r><\\n>\r\n tasklist ; Print tasklist<\\r><\\n>\r\nMcuFlash ; Group of flash ini commands<\\r><\\n>\r\n help|status ; Print help or status information<\\r><\\n>\r\n dump ; Dump memory data<\\r><\\n>\r\n erase ; Erase memory at address<\\r><\\n>\r\nini ; Group of flash ini commands<\\r><\\n>\r\n help|status ; Print help or status information<\\r><\\n>\r\n dump ; Dump data information<\\r><\\n>\r\n erase ; Erase data information<\\r><\\n>\r\nMcuMinINI ; Group of McuMinINI commands<\\r><\\n>\r\n help|status ; Print help or status information<\\r><\\n>\r\n read ; Read a key from a section in a file<\\r><\\n>\r\n write ; Write a key with value to a section in a file<\\r><\\n>\r\n delkey ; Delete a key in a section of file<\\r><\\n>\r\n delsec ; Delete a section in a file<\\r><\\n>\r\nnvmc ; Group of NVMC commands<\\r><\\n>\r\n help|status ; Print help or status information<\\r><\\n>\r\n flags ; Set flags<\\r><\\n>\r\nrs ; Group of RS-485 commands<\\r><\\n>\r\n help|status ; Print help or status information<\\r><\\n>\r\n addr ; Set RS-485 address<\\r><\\n>\r\n send ; Send a text to the RS-485 bus<\\r><\\n>\r\n sendcmd ; Send a shell command to the RS-485 address and check response<\\r><\\n>\r\n log on|off ; Log RS-485 bus activity to McuLog<\\r><\\n>\r\nMcuUart485 ; Group of RS-485 commands<\\r><\\n>\r\n help|status ; Print help or status information<\\r><\\n>\r\n clear ; Clear UART ISR flags<\\r><\\n>\r\n<\\r><\\n>\r\nCMD>"; + //string exampleData = "This is some example Text\nSecond line\nNow a very long line: Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."; int counter = 0; int lineNumber = 1; //List listOfChars = new(); diff --git a/MultiTerm.Core/ViewModel/SendReceiveViewModel.cs b/MultiTerm.Core/ViewModel/SendReceiveViewModel.cs index b72c5bd..2f95769 100644 --- a/MultiTerm.Core/ViewModel/SendReceiveViewModel.cs +++ b/MultiTerm.Core/ViewModel/SendReceiveViewModel.cs @@ -2,6 +2,7 @@ using CommunityToolkit.Mvvm.Input; using MultiTerm.Core.Model; using MultiTerm.Core.Types; +using System.Diagnostics; namespace MultiTerm.Core.ViewModel; @@ -14,6 +15,7 @@ public partial class SendReceiveViewModel : TerminalViewModel return $"{ViewType} {ProtocolType}"; } } + public override TerminalViewType ViewType => TerminalViewType.SendReceive; /// @@ -34,6 +36,9 @@ public partial class SendReceiveViewModel : TerminalViewModel [RelayCommand] private void Send() { + // Temp + var items = this.CommunicationData.SelectedReceivedData; + Debugger.Break(); this.SentData = this.SendData.ToString(); } } diff --git a/MultiTerm.Wpf.CustomControl/MultiFormatDataView/MultiFormatDataView.cs b/MultiTerm.Wpf.CustomControl/MultiFormatDataView/MultiFormatDataView.cs index 1a3a048..324321f 100644 --- a/MultiTerm.Wpf.CustomControl/MultiFormatDataView/MultiFormatDataView.cs +++ b/MultiTerm.Wpf.CustomControl/MultiFormatDataView/MultiFormatDataView.cs @@ -2,11 +2,13 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.ComponentModel; +using System.Diagnostics; +using System.Runtime.CompilerServices; using System.Windows; using System.Windows.Controls; using System.Windows.Data; -using System.Windows.Threading; namespace MultiTerm.Wpf.CustomControl; @@ -44,7 +46,8 @@ public class MultiFormatDataView : Control { private static readonly Dictionary itemParentPairs = new(); private const string itemsControlTemplateName = "itemsControl"; - private ItemsControl? itemsControl; + private ListBox? itemsControl; + private List currentSelectedItems = new(); #region Dependency Properties public static readonly DependencyProperty DataSourceProperty = @@ -52,6 +55,14 @@ public class MultiFormatDataView : Control typeof(IEnumerable), typeof(MultiFormatDataView), new PropertyMetadata(null, OnDataSourcePropertyChanged)); + public static readonly DependencyProperty SelectedItemsProperty = + DependencyProperty.Register("SelectedItems", + typeof(IList), typeof(MultiFormatDataView), + new FrameworkPropertyMetadata(OnSelectedItemsPropertyChanged) + { + BindsTwoWayByDefault = false + }); + public static readonly DependencyProperty RealizedItemsCountProperty = DependencyProperty.Register("RealizedItemsCount", typeof(uint), typeof(MultiFormatDataView), @@ -79,6 +90,16 @@ public class MultiFormatDataView : Control set { SetValue(DataSourceProperty, value); } } + /// + /// .NET Property for SelectedItems. + /// + [Bindable(true)] + public IList SelectedItems + { + get { return (IList)GetValue(SelectedItemsProperty); } + set { SetValue(SelectedItemsProperty, value); } + } + /// /// .NET Property for RealizedItemsCount. /// @@ -113,15 +134,16 @@ public class MultiFormatDataView : Control DefaultStyleKeyProperty.OverrideMetadata(typeof(MultiFormatDataView), new FrameworkPropertyMetadata(typeof(MultiFormatDataView))); } - public override void OnApplyTemplate() { base.OnApplyTemplate(); + this.SelectedItems = new List(); // get itemsControl from template - if (GetTemplateChild(itemsControlTemplateName) is ItemsControl itemsControl) + if (GetTemplateChild(itemsControlTemplateName) is ListBox listBox) { - this.itemsControl = itemsControl; + this.itemsControl = listBox; + this.itemsControl.SelectionChanged += ItemsControl_SelectionChanged; } else { @@ -129,6 +151,31 @@ public class MultiFormatDataView : Control } } + private void ItemsControl_SelectionChanged(object sender, SelectionChangedEventArgs e) + { + if(this.currentSelectedItems == null) + { this.currentSelectedItems = new List(); } + + // if there are no changes => return + if (e.AddedItems.Count <= 0 && e.RemovedItems.Count <= 0) { return; } + + // otherwise update internal list + foreach (DataViewModel item in e.RemovedItems) + { + this.SelectedItems.Remove(item); + } + foreach (DataViewModel item in e.AddedItems) + { + this.SelectedItems.Add(item); + } + } + + private static void OnSelectedItemsPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + // NOP + } + + private static void OnDataSourcePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) { // extract instance and guard null diff --git a/MultiTerm.Wpf.CustomControl/MultiFormatDataView/MultiFormatDataView.xaml b/MultiTerm.Wpf.CustomControl/MultiFormatDataView/MultiFormatDataView.xaml index 8b2739a..129f4eb 100644 --- a/MultiTerm.Wpf.CustomControl/MultiFormatDataView/MultiFormatDataView.xaml +++ b/MultiTerm.Wpf.CustomControl/MultiFormatDataView/MultiFormatDataView.xaml @@ -1,5 +1,4 @@ - + ItemTemplate="{StaticResource dataContainerTemplate}" + SelectionMode="Extended">