From 67dab7288ccadaf254b064e6f8172b6c8274a0af 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 21:11:28 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=20=D1=87=D0=B5=D1=80=D0=BD=D0=BE=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B9=20=D0=B2=D0=B0=D1=80=D0=B8=D0=B0=D0=BD=D1=82=20=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B4=D0=B5=D1=80=D0=B0=20=D1=81=D0=B8=D0=B3=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Signal Generator/MainWindow.xaml.cs         |  9 ++++-
 Signal Generator/Signal/FmSignal.cs         |  2 +-
 Signal Generator/Signal/MultiSignal.cs      |  6 ++--
 Signal Generator/Signal/SinusoidalSignal.cs |  2 +-
 Signal Generator/TaskWindow.xaml            |  6 ++--
 Signal Generator/TaskWindow.xaml.cs         | 40 ++++++++++++++++++++-
 6 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/Signal Generator/MainWindow.xaml.cs b/Signal Generator/MainWindow.xaml.cs
index 5477699..88e4a84 100644
--- a/Signal Generator/MainWindow.xaml.cs	
+++ b/Signal Generator/MainWindow.xaml.cs	
@@ -22,7 +22,7 @@ namespace Signal_Generator
     public partial class MainWindow : Window
     {
         AddSignalWindow addSignalWindow_Instance;
-        TaskWindow taskWindow_Instance = new TaskWindow();
+        TaskWindow taskWindow_Instance;
         ObservableCollection<IAnalogSignal> signalCollection;
 
         public MainWindow()
@@ -52,11 +52,18 @@ namespace Signal_Generator
 
         private void startProcedure_Button_Click(object sender, RoutedEventArgs e)
         {
+            MultiSignal ms = new MultiSignal();
+            foreach (IAnalogSignal item in signalCollection)
+            {
+                ms.add(item);
+            }
+            taskWindow_Instance = new TaskWindow(ms);
             taskWindow_Instance.Show();
         }
 
         private void removeSignal_Button_Click(object sender, RoutedEventArgs e)
         {
+            if (signals_ListBox.SelectedIndex == -1) return;
             signalCollection.RemoveAt(signals_ListBox.SelectedIndex);
         }
     }
diff --git a/Signal Generator/Signal/FmSignal.cs b/Signal Generator/Signal/FmSignal.cs
index de3265a..74e4611 100644
--- a/Signal Generator/Signal/FmSignal.cs	
+++ b/Signal Generator/Signal/FmSignal.cs	
@@ -32,7 +32,7 @@ namespace Signal_Generator
         public double currentAmplitude(double 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));
+            return c[0].value * Math.Sin(2 * 3.14 * c[1].value* t + c[2].value * Math.Sin(t));
         }
     }
 }
diff --git a/Signal Generator/Signal/MultiSignal.cs b/Signal Generator/Signal/MultiSignal.cs
index 85ff49f..03c826b 100644
--- a/Signal Generator/Signal/MultiSignal.cs	
+++ b/Signal Generator/Signal/MultiSignal.cs	
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace Signal_Generator
 {
-    class MultiSignal : IAnalogSignal
+    public class MultiSignal : IAnalogSignal
     {
         private List<IAnalogSignal> signals { get; set; }
 
@@ -16,12 +16,12 @@ namespace Signal_Generator
             signals = new List<IAnalogSignal>();
         }
 
-        public void add(IAnalogSignal signal)
+        internal void add(IAnalogSignal signal)
         {
             signals.Add(signal);
         }
 
-        public void remove(IAnalogSignal signal)
+        internal void remove(IAnalogSignal signal)
         {
             signals.Remove(signal);
         }
diff --git a/Signal Generator/Signal/SinusoidalSignal.cs b/Signal Generator/Signal/SinusoidalSignal.cs
index 992bfd4..2ac6047 100644
--- a/Signal Generator/Signal/SinusoidalSignal.cs	
+++ b/Signal Generator/Signal/SinusoidalSignal.cs	
@@ -32,7 +32,7 @@ namespace Signal_Generator
         public double currentAmplitude(double t)
         {
             var c = paramsCollection.ToArray<Parameter>();
-            return c[0].value * Math.Sin(2 * Math.PI * c[1].value * t + c[2].value);
+            return c[0].value * Math.Sin(2.0 * 3.14 * c[1].value * t + c[2].value);
         }
     }
 }
diff --git a/Signal Generator/TaskWindow.xaml b/Signal Generator/TaskWindow.xaml
index bd51cf1..dc0a050 100644
--- a/Signal Generator/TaskWindow.xaml	
+++ b/Signal Generator/TaskWindow.xaml	
@@ -20,13 +20,13 @@
             <ColumnDefinition Width="*"/>
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
-
-        <Canvas x:Name="signalGraph_Canvas" Grid.ColumnSpan="4" Margin="0,0,0,5"></Canvas>
+        
+        <Canvas x:Name="signalGraph_Canvas" Background="AliceBlue" Grid.ColumnSpan="4" Margin="0,0,0,5"/>
         <TextBlock x:Name="currentTime_TextBlock" Margin="0,0,5,5" Grid.Row="1" Grid.Column="1">Время выполения:</TextBlock>
         <TextBox x:Name="currentTime_TextBox" Margin="0,0,0,5" Grid.Row="1" Grid.Column="2"/>
         <TextBlock x:Name="currentAmplitude_TextBlock" Margin="0,0,5,5" Grid.Row="2" Grid.Column="1">Текущий сигнал:</TextBlock>
         <TextBox x:Name="currentAmplitude_TextBox"  Margin="0,0,0,5" Grid.Row="2" Grid.Column="2"/>
-        <Button x:Name="start_Button" Width="60" Content="Старт" Margin="5,0" Grid.Row="3" Grid.Column="1"/>
+        <Button x:Name="start_Button" Width="60" Content="Старт" Margin="5,0" Grid.Row="3" Grid.Column="1" Click="start_Button_Click"/>
         <Button x:Name="pause_Button" Width="60" Content="Пауза" Margin="5,0" Grid.Row="3" Grid.Column="2"/>
     </Grid>
 </Window>
diff --git a/Signal Generator/TaskWindow.xaml.cs b/Signal Generator/TaskWindow.xaml.cs
index 0d1b107..9945f42 100644
--- a/Signal Generator/TaskWindow.xaml.cs	
+++ b/Signal Generator/TaskWindow.xaml.cs	
@@ -19,9 +19,47 @@ namespace Signal_Generator
     /// </summary>
     public partial class TaskWindow : Window
     {
-        public TaskWindow()
+        MultiSignal currentMultiSignal;
+        public TaskWindow(MultiSignal s)
         {
             InitializeComponent();
+            currentMultiSignal = s;
+        }
+
+        public void drawSignal(MultiSignal s)
+        {
+            double lastX = 0, lastY = 0;
+            double w = signalGraph_Canvas.ActualWidth;
+            for (int i = 0; i != (int)w; i++)
+            {
+                double y = s.currentAmplitude(i / 5.0);
+                drawLine(lastX, lastY, i, y);
+                lastX = i;
+                lastY = y;
+            }
+        }
+
+        public void drawLine (double x1, double y1, double x2, double y2)
+        {
+            Line l = new Line();
+            l.StrokeThickness = 1;
+            l.Stroke = Brushes.Red;
+            l.X1 = x1;
+            l.Y1 = remap(y1);
+            l.X2 = x2;
+            l.Y2 = remap(y2);
+            signalGraph_Canvas.Children.Add(l);
+        }
+
+        public double remap (double x, double oldMin = -100.0, double oldMax = 100.0, double newMin = 100.0, double newMax = 0.0)
+        {
+            newMin = signalGraph_Canvas.ActualHeight;
+            return newMin + (x - oldMin) * (newMax - newMin) / (oldMax - oldMin);
+        }
+
+        private void start_Button_Click(object sender, RoutedEventArgs e)
+        {
+            drawSignal(currentMultiSignal);
         }
     }
 }