diff --git a/Signal Generator/AddSignalWindow.xaml b/Signal Generator/AddSignalWindow.xaml new file mode 100644 index 0000000..122ce9b --- /dev/null +++ b/Signal Generator/AddSignalWindow.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/Signal Generator/AddSignalWindow.xaml.cs b/Signal Generator/AddSignalWindow.xaml.cs new file mode 100644 index 0000000..d89e66d --- /dev/null +++ b/Signal Generator/AddSignalWindow.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Shapes; + +namespace Signal_Generator +{ + /// + /// Логика взаимодействия для AddSignalWindow.xaml + /// + public partial class AddSignalWindow : Window + { + public AddSignalWindow() + { + InitializeComponent(); + } + } +} diff --git a/Signal Generator/App.config b/Signal Generator/App.config index 731f6de..b157b72 100644 --- a/Signal Generator/App.config +++ b/Signal Generator/App.config @@ -1,5 +1,7 @@  + + diff --git a/Signal Generator/App.xaml.cs b/Signal Generator/App.xaml.cs index 43963f8..0da5a06 100644 --- a/Signal Generator/App.xaml.cs +++ b/Signal Generator/App.xaml.cs @@ -13,5 +13,6 @@ namespace Signal_Generator /// public partial class App : Application { + } } diff --git a/Signal Generator/FmSignal.cs b/Signal Generator/FmSignal.cs new file mode 100644 index 0000000..5fc38ef --- /dev/null +++ b/Signal Generator/FmSignal.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Signal_Generator +{ + class FmSignal : IAnalogSignal + { + private double ampl = 0; + private double freq = 0; + private IAnalogSignal modSignal; + + public string ParamsToString + { + get + { + return this.ToString() + + " | А = " + ampl + + " | f = " + freq; + } + } + + public override string ToString() + { + return "FM signal"; + } + + public FmSignal(double ampl, double freq, IAnalogSignal modSignal) + { + this.ampl = ampl; + this.freq = freq; + this.modSignal = modSignal; + } + + public double currentAmplitude(double t) + { + return ampl * Math.Sin(2 * Math.PI * freq * t + modSignal.currentAmplitude(t)); + } + } +} diff --git a/Signal Generator/IAnalogSignalModel.cs b/Signal Generator/IAnalogSignalModel.cs new file mode 100644 index 0000000..aec1757 --- /dev/null +++ b/Signal Generator/IAnalogSignalModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Signal_Generator +{ + interface IAnalogSignal + { + string ParamsToString { get; } + double currentAmplitude(double t); + } +} diff --git a/Signal Generator/MainWindow.xaml b/Signal Generator/MainWindow.xaml index 7cc5cda..2b137af 100644 --- a/Signal Generator/MainWindow.xaml +++ b/Signal Generator/MainWindow.xaml @@ -5,8 +5,28 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:Signal_Generator" mc:Ignorable="d" - Title="MainWindow" Height="450" Width="800"> + Title="MainWindow" Height="450" Width="489"> - + + + + + + + + + + + + + +