From 213885f2ca65c1b122d4ad9d0f4c6ca3205fc531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0?= Date: Sun, 11 Nov 2018 19:22:13 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BB=D0=B5=20=D0=B4=D0=BB=D0=B8?= =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D1=82?= =?UTF-8?q?=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=B5?= =?UTF-8?q?=D1=82=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9?= =?UTF-8?q?=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D0=B2=D0=B0=D0=BB,=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D0=BE=D0=BC=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B8=D1=81=D1=85=D0=BE=D0=B4=D0=B8=D1=82=20=D1=81?= =?UTF-8?q?=D0=B8=D0=BC=D1=83=D0=BB=D1=8F=D1=86=D0=B8=D1=8F=20=D1=81=D0=B8?= =?UTF-8?q?=D0=B3=D0=BD=D0=B0=D0=BB=D0=B0.=20=D0=A4=D0=B0=D0=B7=D0=B0=20?= =?UTF-8?q?=D0=B2=20=D1=81=D0=B8=D0=BD=D1=83=D1=81=D0=BE=D0=B8=D0=B4=D0=B0?= =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D0=BE=D0=BC=20=D1=81=D0=B8=D0=B3=D0=BD=D0=B0?= =?UTF-8?q?=D0=BB=D0=B5=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=B5=D1=82=D1=81=D1=8F?= =?UTF-8?q?=20=D0=B2=20=D0=B3=D1=80=D0=B0=D0=B4=D1=83=D1=81=D0=B0=D1=85.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Signal Generator/DrawTask.cs | 17 +++++++++-------- Signal Generator/ProcedureModel.cs | 2 +- Signal Generator/Signal/FmSignal.cs | 2 +- Signal Generator/Signal/SinusoidalSignal.cs | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Signal Generator/DrawTask.cs b/Signal Generator/DrawTask.cs index 933742e..1cffceb 100644 --- a/Signal Generator/DrawTask.cs +++ b/Signal Generator/DrawTask.cs @@ -54,20 +54,21 @@ namespace Signal_Generator private void drawSignalAtCanvas() { double lastX = 0, lastY = 0; - double w = canvas.ActualWidth; - for (int i = 0; i != (int)w; i++) + double W = canvas.ActualWidth; + double mod = (procedureModel.Duration / 1000) / W; + for (int X = 0; X != (int)W; X++) { - updateTextBoxProps(multiSignal.currentAmplitude(i / 5.0), i / 5.0); - double y = multiSignal.currentAmplitude(i / 5.0); - drawLine(lastX, lastY, i, y); - lastX = i; - lastY = y; + double Y = multiSignal.currentAmplitude(X * mod); + updateTextBoxProps(Y, X * mod); + drawLine(lastX, lastY, X, Y); + lastX = X; + lastY = Y; Thread.Sleep(10); switch (state) { case State.Paused: while (state == State.Paused) - Thread.Sleep(10); + Thread.Sleep(50); break; case State.Canceled: return; } diff --git a/Signal Generator/ProcedureModel.cs b/Signal Generator/ProcedureModel.cs index ea6367f..776ec25 100644 --- a/Signal Generator/ProcedureModel.cs +++ b/Signal Generator/ProcedureModel.cs @@ -168,7 +168,7 @@ namespace Signal_Generator } } - private double duration; + private double duration = 1000; public double Duration { get { return duration; } diff --git a/Signal Generator/Signal/FmSignal.cs b/Signal Generator/Signal/FmSignal.cs index 8f0e190..c447b6f 100644 --- a/Signal Generator/Signal/FmSignal.cs +++ b/Signal Generator/Signal/FmSignal.cs @@ -27,7 +27,7 @@ namespace Signal_Generator public double currentAmplitude(double t) { var c = paramsCollection.ToArray(); - return c[0].value * Math.Sin(2 * 3.14 * 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/SinusoidalSignal.cs b/Signal Generator/Signal/SinusoidalSignal.cs index da1ec6b..ade3171 100644 --- a/Signal Generator/Signal/SinusoidalSignal.cs +++ b/Signal Generator/Signal/SinusoidalSignal.cs @@ -27,7 +27,7 @@ namespace Signal_Generator public double currentAmplitude(double t) { var c = paramsCollection.ToArray(); - return c[0].value * Math.Sin(2.0 * 3.14 * c[1].value * t + c[2].value); + return c[0].value * Math.Sin(2.0 * 3.14 * c[1].value * t + c[2].value * 180 / 3.14); } } }