Merge pull request #8 from kctowers/main

Fixed problem when PCAN dongle not plugged in

Author: negrusti

MainWindow.xaml

@@ -24,7 +24,7 @@
             </Menu.ItemContainerStyle>
             <MenuItem Header="File" x:Name="FileMenu">
                 <MenuItem Header="Open" Click="OpenMenuItem_ClickAsync" />
-                <MenuItem x:Name="RecordMenuItem" Header="Record" Click="RecordMenuItem_ClickAsync" />
+                <MenuItem x:Name="RecordMenuItem" Header="PCAN Capture" Click="RecordMenuItem_ClickAsync" />
                 <Separator x:Name="RecentFilesSeparator" Visibility="Collapsed" />
             </MenuItem>
             <MenuItem Header="Statistics">
@@ -166,7 +166,7 @@
                 </DataGrid.Columns>
             </DataGrid>
             <GridSplitter Grid.Column="1"
-                            Width="3"
+                            Width="Auto"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
                             Background="LightGray"

MainWindow.xaml.cs

@@ -17,8 +17,7 @@ public partial class MainWindow : Window
         private List<Nmea2000Record>? _Data;
         private List<Nmea2000Record>? _assembledData;
         private List<Nmea2000Record>? _filteredData;
-        private bool _isRecording = false;
-
+        
         public MainWindow()
         {
             InitializeComponent();
@@ -211,18 +210,18 @@ private async void RecentFileMenuItem_Click(object sender, RoutedEventArgs e)
 
         private async void RecordMenuItem_ClickAsync(object sender, RoutedEventArgs e)
         {
-            if (!_isRecording)
-            {
-                PCAN.InitCan(true);
-                RecordMenuItem.Header = "Stop recording";
-                _isRecording = true;
-            }
-            else
+            if (PCAN.StartCapture())
             {
-                PCAN.InitCan(false);
-                RecordMenuItem.Header = "Record";
-                _isRecording = false;
+                // Pause here to allow packet to capture.
+                System.Windows.MessageBox.Show(
+                                "Capture Started.  Press OK to stop",
+                                "Capturing Data...",
+                                MessageBoxButton.OK,
+                                MessageBoxImage.Information
+                                );
 
+                PCAN.StopCapture();
+                
                 _Data = PCAN.LoadCapture();
                 UpdateTimestampRange();
 
@@ -233,7 +232,15 @@ private async void RecordMenuItem_ClickAsync(object sender, RoutedEventArgs e)
                 UpdateSrcDevices(_assembledData);
 
             }
-
+            else 
+            {
+                System.Windows.MessageBox.Show(
+                                "PCAN dongle not plugged in or driver not installed",
+                                "Error:",
+                                MessageBoxButton.OK,
+                                MessageBoxImage.Error
+                                );
+            }
 
         }
 

PCAN.cs

@@ -17,22 +17,37 @@ class PCAN
         private static readonly Worker _worker = new Worker(PcanChannel.Usb01, Bitrate.Pcan250);
         private static List<Nmea2000Record>? capture;
 
-        public static void InitCan(Boolean start)
+        public static bool StartCapture()
         {
-            if ((start))
+            try
             {
                 if (capture == null)
-                { 
+                {
                     capture = new List<Nmea2000Record>();
                 }
                 _worker.MessageAvailable += OnMessageAvailable;
                 _worker.Start();
                 Debug.WriteLine("Worker started successfully.");
+                return (true);
+            }
+            catch (PcanBasicException)
+            {
+                return (false);
             }
-            else
+            catch (DllNotFoundException)
+            {
+                return (false);
+            }
+        }
+        public static void StopCapture()
+        {
+            try
             {
                 _worker.Stop();
             }
+            catch (PcanBasicException e)
+            {
+            }
         }
 
         public static List<Nmea2000Record> LoadCapture()