diff --git a/Common/.vs/Common/config/applicationhost.config b/Common/.vs/Common/config/applicationhost.config index 5616ab8b..3f0b69a3 100644 --- a/Common/.vs/Common/config/applicationhost.config +++ b/Common/.vs/Common/config/applicationhost.config @@ -176,6 +176,14 @@ + + + + + + + + diff --git a/Common/CordoPlot/App.xaml b/Common/CordoPlot/App.xaml index 60149e7c..6b991c7c 100644 --- a/Common/CordoPlot/App.xaml +++ b/Common/CordoPlot/App.xaml @@ -2,7 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:CordoPlot" - StartupUri="MainWindow.xaml"> + StartupUri="StartDialog.xaml"> diff --git a/Common/CordoPlot/CordoPlot.csproj b/Common/CordoPlot/CordoPlot.csproj index 41b51618..3423efe9 100644 --- a/Common/CordoPlot/CordoPlot.csproj +++ b/Common/CordoPlot/CordoPlot.csproj @@ -116,6 +116,13 @@ MSBuild:Compile Designer + + StartDialog.xaml + + + Designer + MSBuild:Compile + MSBuild:Compile Designer @@ -124,10 +131,17 @@ App.xaml Code + + GridCopy.xaml + MainWindow.xaml Code + + Designer + MSBuild:Compile + diff --git a/Common/CordoPlot/GridCopy.xaml b/Common/CordoPlot/GridCopy.xaml new file mode 100644 index 00000000..6edf3c56 --- /dev/null +++ b/Common/CordoPlot/GridCopy.xaml @@ -0,0 +1,13 @@ + + + + + diff --git a/Common/CordoPlot/GridCopy.xaml.cs b/Common/CordoPlot/GridCopy.xaml.cs new file mode 100644 index 00000000..9c27e6cd --- /dev/null +++ b/Common/CordoPlot/GridCopy.xaml.cs @@ -0,0 +1,40 @@ +using ScottPlot.WPF; +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 CordoPlot +{ + /// + /// Interaktionslogik für GridCopy.xaml + /// + public partial class GridCopy : Window + { + public GridCopy() + { + InitializeComponent(); + } + + public WpfPlot Chart { get; internal set; } + + public void ShowChart(List lastListOfIndex, List lastListOfValues,string title) + { + WpfPlot1.Plot.Add.Scatter(lastListOfIndex.ToArray(), lastListOfValues.ToArray(), ScottPlot.Colors.Blue); + WpfPlot1.Plot.Title(title); + WpfPlot1.Plot.Axes.AutoScale(); + WpfPlot1.Refresh(); + + + } + } +} diff --git a/Common/CordoPlot/MainWindow.xaml b/Common/CordoPlot/MainWindow.xaml index ca4a9b4a..3d798e67 100644 --- a/Common/CordoPlot/MainWindow.xaml +++ b/Common/CordoPlot/MainWindow.xaml @@ -6,13 +6,14 @@ xmlns:ScottPlot="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF" xmlns:local="clr-namespace:CordoPlot" mc:Ignorable="d" - Title="MainWindow" Height="450" Width="800"> + Title="MainWindow" Height="1000" Width="1000"> - - - - + + + + + @@ -24,15 +25,15 @@ - - - - - - + - + + + + + + @@ -42,53 +43,57 @@ - - - - - - - - - - - - + + + - Serialnr - TestRunNr - TestBenchNr - Date - MeterSize - AirTempC - AirPressure - AirHumanity - WaterTempC - TotalMeters - Remark - - - - - - - - - - - - - - + x:Name="dataGridInfo" + Grid.Row="1" + Grid.Column="1" Grid.ColumnSpan="2" ItemsSource="{Binding}"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +