From 23e05e864e9e42b6d9e868e8e6d2e28f2e96f2f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0?=
 <itsmylivex@gmail.com>
Date: Thu, 8 Nov 2018 16:01:23 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A2=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20ComboBox?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D0=BA=D0=B0=D0=B7=D1=8B=D0=B2=D0=B0=D0=B5=D1=82?=
 =?UTF-8?q?=20=D0=B2=D1=81=D0=B5=20=D1=81=D1=83=D1=89=D0=B5=D1=81=D1=82?=
 =?UTF-8?q?=D0=B2=D1=83=D1=8E=D1=89=D0=B8=D0=B5=20=D1=8D=D0=BB=D0=B5=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=82=D1=8B=20=D0=B8=D0=B7=20=D0=BA=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=86=D0=B8=D0=B8,=20=D0=B0=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B8=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=B5=20=D1=8D=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=20=D0=BE=D1=82=D0=BE=D0=B1?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B6=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20=D0=BD=D0=B0?=
 =?UTF-8?q?=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B0=20=D1=8D=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2=20DataGrid.=20=D0=9F=D0=BB?=
 =?UTF-8?q?=D1=8E=D1=81=20=D1=81=D0=B2=D0=B5=D1=80=D1=85=D1=83=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=BA=D0=B8=D0=BD=D1=83=D0=BB=20=D0=BC=D0=BD=D0=BE=D0=B3?=
 =?UTF-8?q?=D0=BE=20=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B0?=
 =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B5?=
 =?UTF-8?q?=D0=B9=20=D0=B3=D0=B8=D0=B1=D0=BA=D0=BE=D1=81=D1=82=D0=B8=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B8=20=D0=BD=D0=BE=D0=B2=D1=8B=D1=85=20=D0=BA?=
 =?UTF-8?q?=D0=BB=D0=B0=D1=81=D1=81=D0=BE=D0=B2=20=D1=81=D0=B8=D0=B3=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=BE=D0=B2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Signal Generator/AddSignalWindow.xaml    | 10 ++++---
 Signal Generator/AddSignalWindow.xaml.cs | 11 ++++++++
 Signal Generator/AnalogSignalMethods.cs  | 20 +++++++++++++
 Signal Generator/FmSignal.cs             | 31 ++++++++------------
 Signal Generator/IAnalogSignal.cs        |  3 +-
 Signal Generator/MainWindow.xaml.cs      |  7 ++++-
 Signal Generator/MultiSignal.cs          | 10 ++++++-
 Signal Generator/Parameter.cs            | 20 +++++++++++++
 Signal Generator/Signal Generator.csproj |  2 ++
 Signal Generator/SinusoidalSignal.cs     | 36 ++++++++----------------
 10 files changed, 100 insertions(+), 50 deletions(-)
 create mode 100644 Signal Generator/AnalogSignalMethods.cs
 create mode 100644 Signal Generator/Parameter.cs

diff --git a/Signal Generator/AddSignalWindow.xaml b/Signal Generator/AddSignalWindow.xaml
index 221e9ed..1deb356 100644
--- a/Signal Generator/AddSignalWindow.xaml	
+++ b/Signal Generator/AddSignalWindow.xaml	
@@ -18,11 +18,13 @@
         </Grid.ColumnDefinitions>
 
         <TextBlock x:Name="signalType_TextBlock" Margin="0,0,10,5" Grid.Row="0" Grid.Column="0">Тип сигнала:</TextBlock>
-        <ComboBox x:Name="signalType_ComboBox" Margin="0,0,0,5" HorizontalAlignment="Stretch"  Grid.Row="0" Grid.Column="1"/>
-        <DataGrid x:Name="signalProps_DataGrid" Margin="0,0,0,5" HorizontalAlignment="Stretch" Grid.Row="1" Grid.ColumnSpan="2">
+        <ComboBox x:Name="signalType_ComboBox" Margin="0,0,0,5" HorizontalAlignment="Stretch"  Grid.Row="0" Grid.Column="1"
+                  ItemsSource="{Binding}" DisplayMemberPath="typeToString" SelectionChanged="signalType_ComboBox_SelectionChanged"/>
+        <DataGrid x:Name="signalProps_DataGrid" Margin="0,0,0,5" HorizontalAlignment="Stretch" Grid.Row="1" Grid.ColumnSpan="2"
+                  ItemsSource="{Binding}" AutoGenerateColumns="False">
             <DataGrid.Columns>
-                <DataGridTextColumn Header="Название" Width="*" IsReadOnly="True"/>
-                <DataGridTextColumn Header="Параметр" />
+                <DataGridTextColumn Header="Название параметра" Width="*" IsReadOnly="True" Binding="{Binding Path=name}"/>
+                <DataGridTextColumn Header="Значение параметра"  Binding="{Binding Path=value}"/>
             </DataGrid.Columns>
         </DataGrid>
         <Button x:Name="createItem_Button" Height="20" Width="120" Content="Создать элемент" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"/>
diff --git a/Signal Generator/AddSignalWindow.xaml.cs b/Signal Generator/AddSignalWindow.xaml.cs
index d89e66d..1f02cde 100644
--- a/Signal Generator/AddSignalWindow.xaml.cs	
+++ b/Signal Generator/AddSignalWindow.xaml.cs	
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -19,9 +20,19 @@ namespace Signal_Generator
     /// </summary>
     public partial class AddSignalWindow : Window
     {
+        ObservableCollection<Parameter> signalProps = new ObservableCollection<Parameter>();
         public AddSignalWindow()
         {
             InitializeComponent();
+            signalProps_DataGrid.ItemsSource = signalProps;
+        }
+
+        private void signalType_ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            signalProps.Clear();
+            var dict = ((IAnalogSignal)signalType_ComboBox.SelectedItem).paramsCollection as Collection<Parameter>;
+            foreach (Parameter p in dict)
+                signalProps.Add(p);
         }
     }
 }
diff --git a/Signal Generator/AnalogSignalMethods.cs b/Signal Generator/AnalogSignalMethods.cs
new file mode 100644
index 0000000..6449121
--- /dev/null
+++ b/Signal Generator/AnalogSignalMethods.cs	
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Signal_Generator
+{
+    class AnalogSignalMethods
+    {
+        internal string paramsToString(Collection<Parameter> paramsCollection)
+        {
+            string result = "";
+            foreach (Parameter p in paramsCollection)
+                result += " / " + p.name + " " + p.value;
+            return result;
+        }
+    }
+}
diff --git a/Signal Generator/FmSignal.cs b/Signal Generator/FmSignal.cs
index c32dd4c..de3265a 100644
--- a/Signal Generator/FmSignal.cs	
+++ b/Signal Generator/FmSignal.cs	
@@ -1,45 +1,38 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace Signal_Generator
 {
-    class FmSignal : IAnalogSignal
+    class FmSignal : AnalogSignalMethods, IAnalogSignal
     {
-        public Dictionary<string, double> paramsDict { get; set; }
+        public Collection<Parameter> paramsCollection { get; set; }
 
         public string typeToString
         {
-            get
-            {
-                return "FM сигнал";
-            }
+            get { return "FM сигнал"; }
         }
 
-        public string paramsToString
+        public new string paramsToString
         {
-            get
-            {
-                string result = "";
-                foreach (KeyValuePair<string, double> pair in paramsDict)
-                    result += " / " + pair.Key + " " + pair.Value;
-                return result;
-            }
+            get { return paramsToString(paramsCollection); }
         }
 
         public FmSignal(double ampl, double freq, double ampl2)
         {
-            paramsDict = new Dictionary<string, double>();
-            paramsDict.Add("Амплитуда несущей", ampl);
-            paramsDict.Add("Частота несущей", freq);
-            paramsDict.Add("Амплитуда", ampl);
+            paramsCollection = new Collection<Parameter>();
+            paramsCollection.Add(new Parameter("Амплитуда несущей", ampl));
+            paramsCollection.Add(new Parameter("Частота несущей", freq));
+            paramsCollection.Add(new Parameter("Амплитуда", ampl2));
         }
         
         public double currentAmplitude(double t)
         {
-            return paramsDict.ElementAt(0).Value * Math.Sin(2 * Math.PI * paramsDict.ElementAt(1).Value * t + paramsDict.ElementAt(1).Value * Math.Sin(t));
+            var c = paramsCollection.ToArray<Parameter>();
+            return c[0].value * Math.Sin(2 * Math.PI * c[1].value* t + c[2].value * Math.Sin(t));
         }
     }
 }
diff --git a/Signal Generator/IAnalogSignal.cs b/Signal Generator/IAnalogSignal.cs
index ee276ea..23ac336 100644
--- a/Signal Generator/IAnalogSignal.cs	
+++ b/Signal Generator/IAnalogSignal.cs	
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -11,6 +12,6 @@ namespace Signal_Generator
         string typeToString { get; }
         string paramsToString { get; }
         double currentAmplitude(double t);
-        Dictionary<String, Double> paramsDict { get; set; }
+        Collection<Parameter> paramsCollection { get; set; }
     }
 }
diff --git a/Signal Generator/MainWindow.xaml.cs b/Signal Generator/MainWindow.xaml.cs
index 7aaadac..efbf449 100644
--- a/Signal Generator/MainWindow.xaml.cs	
+++ b/Signal Generator/MainWindow.xaml.cs	
@@ -24,10 +24,16 @@ namespace Signal_Generator
         AddSignalWindow addSignalWindow_Instance = new AddSignalWindow();
         TaskWindow taskWindow_Instance = new TaskWindow();
         ObservableCollection<IAnalogSignal> s;
+        ObservableCollection<IAnalogSignal> typesOfSignal = new ObservableCollection<IAnalogSignal>();
 
         public MainWindow()
         {
             InitializeComponent();
+
+            typesOfSignal.Add(new SinusoidalSignal(0, 0));
+            typesOfSignal.Add(new FmSignal(0, 0, 0));
+            addSignalWindow_Instance.signalType_ComboBox.ItemsSource = typesOfSignal;
+
             s = new ObservableCollection<IAnalogSignal>();
             signals_ListBox.Items.Clear();
             signals_ListBox.ItemsSource = s;
@@ -42,7 +48,6 @@ namespace Signal_Generator
         {
             SinusoidalSignal s1 = new SinusoidalSignal(1, 50);
             s.Add(s1);
-            signals_ListBox.UpdateLayout();
         }
   
 
diff --git a/Signal Generator/MultiSignal.cs b/Signal Generator/MultiSignal.cs
index 3433d55..ebeef22 100644
--- a/Signal Generator/MultiSignal.cs	
+++ b/Signal Generator/MultiSignal.cs	
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -16,7 +17,9 @@ namespace Signal_Generator
 
         string IAnalogSignal.paramsToString => throw new NotImplementedException();
 
-        Dictionary<string, double> IAnalogSignal.paramsDict { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        string IAnalogSignal.typeToString => throw new NotImplementedException();
+
+        Collection<Parameter> IAnalogSignal.paramsCollection { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 
         public MultiSignal()
         {
@@ -42,5 +45,10 @@ namespace Signal_Generator
             }
             return summaryAmplitude;
         }
+
+        double IAnalogSignal.currentAmplitude(double t)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/Signal Generator/Parameter.cs b/Signal Generator/Parameter.cs
new file mode 100644
index 0000000..90abca8
--- /dev/null
+++ b/Signal Generator/Parameter.cs	
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Signal_Generator
+{
+    class Parameter
+    {
+        public string name { get; set; }
+        public double value { get; set; }
+
+        public Parameter (string name, double value)
+        {
+            this.name = name;
+            this.value = value;
+        }
+    }
+}
diff --git a/Signal Generator/Signal Generator.csproj b/Signal Generator/Signal Generator.csproj
index c6fd0f9..6d778f8 100644
--- a/Signal Generator/Signal Generator.csproj	
+++ b/Signal Generator/Signal Generator.csproj	
@@ -58,8 +58,10 @@
     <Compile Include="AddSignalWindow.xaml.cs">
       <DependentUpon>AddSignalWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="AnalogSignalMethods.cs" />
     <Compile Include="FmSignal.cs" />
     <Compile Include="Settings.cs" />
+    <Compile Include="Parameter.cs" />
     <Compile Include="SinusoidalSignal.cs" />
     <Compile Include="TaskWindow.xaml.cs">
       <DependentUpon>TaskWindow.xaml</DependentUpon>
diff --git a/Signal Generator/SinusoidalSignal.cs b/Signal Generator/SinusoidalSignal.cs
index a9c97ff..992bfd4 100644
--- a/Signal Generator/SinusoidalSignal.cs	
+++ b/Signal Generator/SinusoidalSignal.cs	
@@ -1,50 +1,38 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace Signal_Generator
 {
-    class SinusoidalSignal : IAnalogSignal
+    class SinusoidalSignal : AnalogSignalMethods, IAnalogSignal
     {
         public string typeToString
         {
-            get
-            {
-                return "SIN сигнал";
-            }
+            get { return "SIN сигнал"; }
         }
 
-        public string paramsToString
+        public new string paramsToString
         {
-            get
-            {
-                string result = "";
-                foreach (KeyValuePair<string, double> pair in paramsDict)
-                    result += " / " + pair.Key + " " + pair.Value;
-                return result;
-            }
+            get { return paramsToString(paramsCollection); }
         }
 
-        public Dictionary<String, Double> paramsDict { get; set; }
-
-        public override string ToString()
-        {
-            return "SIN signal";
-        }
+        public Collection<Parameter> paramsCollection { get; set; }
 
         public SinusoidalSignal(double ampl, double freq, double phase = 0)
         {
-            paramsDict = new Dictionary<string, double>();
-            paramsDict.Add("Амплитуда", ampl);
-            paramsDict.Add("Частота", freq);
-            paramsDict.Add("Фаза", phase);
+            paramsCollection = new Collection<Parameter>();
+            paramsCollection.Add(new Parameter("Амплитуда", ampl));
+            paramsCollection.Add(new Parameter("Частота", freq));
+            paramsCollection.Add(new Parameter("Фаза", phase));
         }
 
         public double currentAmplitude(double t)
         {
-            return paramsDict.ElementAt(0).Value * Math.Sin(2 * Math.PI * paramsDict.ElementAt(1).Value * t + paramsDict.ElementAt(2).Value);
+            var c = paramsCollection.ToArray<Parameter>();
+            return c[0].value * Math.Sin(2 * Math.PI * c[1].value * t + c[2].value);
         }
     }
 }