From f861b33f86b3979f37e07484537cb1817378d5f7 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 18:06:07 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B8=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=81=D0=B8=D0=B3=D0=BD=D0=B0=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=BD=D0=B0=20=D0=B3=D0=BB=D0=B0=D0=B2=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=BC=20=D0=BE=D0=BA=D0=BD=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Signal Generator/AddSignalWindow.xaml.cs |  4 +++
 Signal Generator/MainWindow.xaml         |  5 +--
 Signal Generator/MainWindow.xaml.cs      | 41 ++++++++++++------------
 Signal Generator/Signal/MultiSignal.cs   | 20 ++++++------
 4 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/Signal Generator/AddSignalWindow.xaml.cs b/Signal Generator/AddSignalWindow.xaml.cs
index 1f02cde..b6a0b20 100644
--- a/Signal Generator/AddSignalWindow.xaml.cs	
+++ b/Signal Generator/AddSignalWindow.xaml.cs	
@@ -21,9 +21,13 @@ namespace Signal_Generator
     public partial class AddSignalWindow : Window
     {
         ObservableCollection<Parameter> signalProps = new ObservableCollection<Parameter>();
+        ObservableCollection<IAnalogSignal> typesOfSignal = new ObservableCollection<IAnalogSignal>();
         public AddSignalWindow()
         {
             InitializeComponent();
+            typesOfSignal.Add(new SinusoidalSignal(0, 0));
+            typesOfSignal.Add(new FmSignal(0, 0, 0));
+            signalType_ComboBox.ItemsSource = typesOfSignal;
             signalProps_DataGrid.ItemsSource = signalProps;
         }
 
diff --git a/Signal Generator/MainWindow.xaml b/Signal Generator/MainWindow.xaml
index 96d1b59..99a2495 100644
--- a/Signal Generator/MainWindow.xaml	
+++ b/Signal Generator/MainWindow.xaml	
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Signal_Generator"
         mc:Ignorable="d"
-        Title="Генератор сигналов" Height="450" Width="489">
+        Title="Генератор сигналов" Height="450" Width="600">
     <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
@@ -39,6 +39,7 @@
                 Grid.Row="2" Margin="5,0,0,0"/>
         <Button x:Name="addSignal_Button" Width="20" Content="+" Margin="0,0,5,0" Click="addSignal_Button_Click" Grid.Row="2"
                 Grid.Column="2"/>
-        <Button x:Name="removeSignal_Button" Width="20" Margin="0,0,5,0" Content="-" Grid.Row="2" Grid.Column="3"/>
+        <Button x:Name="removeSignal_Button" Width="20" Margin="0,0,5,0" Content="-" Grid.Row="2" Grid.Column="3"
+                Click="removeSignal_Button_Click"/>
     </Grid>
 </Window>
diff --git a/Signal Generator/MainWindow.xaml.cs b/Signal Generator/MainWindow.xaml.cs
index efbf449..5477699 100644
--- a/Signal Generator/MainWindow.xaml.cs	
+++ b/Signal Generator/MainWindow.xaml.cs	
@@ -21,44 +21,43 @@ namespace Signal_Generator
     /// </summary>
     public partial class MainWindow : Window
     {
-        AddSignalWindow addSignalWindow_Instance = new AddSignalWindow();
+        AddSignalWindow addSignalWindow_Instance;
         TaskWindow taskWindow_Instance = new TaskWindow();
-        ObservableCollection<IAnalogSignal> s;
-        ObservableCollection<IAnalogSignal> typesOfSignal = new ObservableCollection<IAnalogSignal>();
+        ObservableCollection<IAnalogSignal> signalCollection;
 
         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>();
+            signalCollection = new ObservableCollection<IAnalogSignal>();
             signals_ListBox.Items.Clear();
-            signals_ListBox.ItemsSource = s;
-            addSignalWindow_Instance.Closed += addSignalWindow_Instance_Closed;
+            signals_ListBox.ItemsSource = signalCollection;
         }
 
-        private void addSignalWindow_Instance_Closed(object sender, EventArgs e)
+        private void addSignal_Button_Click(object sender, RoutedEventArgs e)
         {
+            addSignalWindow_Instance = new AddSignalWindow();
+            addSignalWindow_Instance.createItem_Button.Click += addSignalWindow_Instance_Closing;
+            addSignalWindow_Instance.Show();
         }
 
-        private void addSomeExtra()
+        private void addSignalWindow_Instance_Closing(object sender, EventArgs e)
         {
-            SinusoidalSignal s1 = new SinusoidalSignal(1, 50);
-            s.Add(s1);
-        }
-  
+            var signal = null as IAnalogSignal;
+            signal = (IAnalogSignal) addSignalWindow_Instance.signalType_ComboBox.SelectedItem;
+            if (addSignalWindow_Instance.signalType_ComboBox.SelectedItem == null) return;
+            signalCollection.Add(signal);
+            addSignalWindow_Instance.Close();
+        }  
 
-        private void addSignal_Button_Click(object sender, RoutedEventArgs e)
-        {
-            addSignalWindow_Instance.Show();
-        }
 
         private void startProcedure_Button_Click(object sender, RoutedEventArgs e)
         {
             taskWindow_Instance.Show();
         }
+
+        private void removeSignal_Button_Click(object sender, RoutedEventArgs e)
+        {
+            signalCollection.RemoveAt(signals_ListBox.SelectedIndex);
+        }
     }
 }
diff --git a/Signal Generator/Signal/MultiSignal.cs b/Signal Generator/Signal/MultiSignal.cs
index ebeef22..85ff49f 100644
--- a/Signal Generator/Signal/MultiSignal.cs	
+++ b/Signal Generator/Signal/MultiSignal.cs	
@@ -9,17 +9,7 @@ namespace Signal_Generator
 {
     class MultiSignal : IAnalogSignal
     {
-        private string paramsToString { get; }
         private List<IAnalogSignal> signals { get; set; }
-        private Dictionary<string, double> paramsDict { get; set; }
-
-        public string typeToString => throw new NotImplementedException();
-
-        string IAnalogSignal.paramsToString => throw new NotImplementedException();
-
-        string IAnalogSignal.typeToString => throw new NotImplementedException();
-
-        Collection<Parameter> IAnalogSignal.paramsCollection { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 
         public MultiSignal()
         {
@@ -46,6 +36,16 @@ namespace Signal_Generator
             return summaryAmplitude;
         }
 
+        // Неиспользуемые поля и методы
+
+        public string typeToString => throw new NotImplementedException();
+
+        string IAnalogSignal.paramsToString => throw new NotImplementedException();
+
+        string IAnalogSignal.typeToString => throw new NotImplementedException();
+
+        Collection<Parameter> IAnalogSignal.paramsCollection { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+
         double IAnalogSignal.currentAmplitude(double t)
         {
             throw new NotImplementedException();