Added count for storage items

josdemmers · Apr 27, 2022 · 0c89d46 · 0c89d46
1 parent 7347a02
commit 0c89d46
Show file tree

Hide file tree

Showing 14 changed files with 128 additions and 52 deletions.
diff --git a/NewWorldCompanion.Constants/EmguConstants.cs b/NewWorldCompanion.Constants/EmguConstants.cs
@@ -14,5 +14,8 @@ public class EmguConstants
         // OCR
         public const int DefaultThresholdMin = 90;
         public const int DefaultThresholdMax = 255;
+        public const int DefaultThresholdMaxR = 200;
+        public const int DefaultThresholdMaxG = 235;
+        public const int DefaultThresholdMaxB = 255;
     }
 }
diff --git a/NewWorldCompanion.Entities/Item.cs b/NewWorldCompanion.Entities/Item.cs
@@ -9,7 +9,7 @@ namespace NewWorldCompanion.Entities
 {
     public class Item
     {
-        public int Count { get; set; } = 0;
+        public int Count { get; set; } = 1;
         /// <value>Unique identifier for items. Nwdb uses this to identify items</value>
         public string ItemID { get; set; } = string.Empty;
         public string Localisation { get; set; } = string.Empty;

diff --git a/NewWorldCompanion.Entities/SettingsNWC.cs b/NewWorldCompanion.Entities/SettingsNWC.cs
@@ -23,5 +23,8 @@ public class SettingsNWC
         // OCR
         public int EmguThresholdMin { get; set; } = 90;
         public int EmguThresholdMax { get; set; } = 255;
+        public int EmguThresholdMaxR { get; set; } = 200;
+        public int EmguThresholdMaxG { get; set; } = 235;
+        public int EmguThresholdMaxB { get; set; } = 255;
     }
 }
diff --git a/NewWorldCompanion.Interfaces/IOcrHandler.cs b/NewWorldCompanion.Interfaces/IOcrHandler.cs
@@ -4,5 +4,6 @@ public interface IOcrHandler
     {
         string OcrText { get; }
         string OcrTextCount { get; }
+        string OcrTextCountRaw { get; }
     }
 }
diff --git a/NewWorldCompanion.Services/OcrHandler.cs b/NewWorldCompanion.Services/OcrHandler.cs
@@ -25,6 +25,7 @@ public class OcrHandler : IOcrHandler
 
         private string _ocrText = string.Empty;
         private string _ocrTextCount = string.Empty;
+        private string _ocrTextCountRaw = string.Empty;
 
         // Start of Constructor region
 
@@ -53,6 +54,7 @@ public OcrHandler(IEventAggregator eventAggregator, INewWorldDataStore newWorldD
 
         public string OcrText { get => _ocrText; set => _ocrText = value; }
         public string OcrTextCount { get => _ocrTextCount; set => _ocrTextCount = value; }
+        public string OcrTextCountRaw { get => _ocrTextCountRaw; set => _ocrTextCountRaw = value; }
 
         #endregion
 
@@ -97,7 +99,10 @@ private void HandleOcrImageCountReadyEvent()
                         Image image = Image.FromFile(@"ocrimages\itemcount.png");
                         Tesseract tesseract = new Tesseract();
                         string ocrText = tesseract.Read(image).Trim().Replace('\n', ' ');
-                        OcrTextCount = ocrText;
+                        OcrTextCountRaw = ocrText;
+                        // Remove non-numeric characters
+                        ocrText = new string(ocrText.Where(c => char.IsDigit(c)).ToArray());
+                        OcrTextCount = string.IsNullOrWhiteSpace(ocrText) ? OcrTextCount : ocrText;
 
                         image.Dispose();
                         tesseract.Dispose();

diff --git a/NewWorldCompanion.Services/PriceManager.cs b/NewWorldCompanion.Services/PriceManager.cs
@@ -165,9 +165,10 @@ public void UpdatePriceData(string itemName)
                             // Always remove from queue, even with exceptions.
                             _priceRequestQueue.RemoveAll(item => item.Equals(itemName));
                             _priceRequestQueueBusy = false;
+                            Task.Delay(100).Wait();
+
                             if (_priceRequestQueue.Any())
                             {
-                                Task.Delay(100).Wait();
                                 UpdatePriceData(_priceRequestQueue.First());
                             }
                         });

diff --git a/NewWorldCompanion.Services/ScreenProcessHandler.cs b/NewWorldCompanion.Services/ScreenProcessHandler.cs
@@ -65,6 +65,9 @@ public ScreenProcessHandler(IEventAggregator eventAggregator, ISettingsManager s
         public int HysteresisUpper { get => _settingsManager.Settings.EmguHysteresisUpper; }
         public int ThresholdMin { get => _settingsManager.Settings.EmguThresholdMin; }
         public int ThresholdMax { get => _settingsManager.Settings.EmguThresholdMax; }
+        public int ThresholdOcrMaxR { get => _settingsManager.Settings.EmguThresholdMaxR; }
+        public int ThresholdOcrMaxG { get => _settingsManager.Settings.EmguThresholdMaxG; }
+        public int ThresholdOcrMaxB { get => _settingsManager.Settings.EmguThresholdMaxB; }
         public Bitmap? ProcessedImage { get => _processedImage; set => _processedImage = value; }
         public Bitmap? RoiImage { get => _roiImage; set => _roiImage = value; }
         //public Bitmap? OcrImage { get => _roiImage; set => _roiImage = value; }
@@ -270,20 +273,7 @@ private void ProcessImageCountOCR(Mat img)
             {
                 Mat imgFilter = new Mat(img.Size, DepthType.Cv8U, 3);
 
-                // Convert the image to grayscale
-                CvInvoke.CvtColor(img, imgFilter, ColorConversion.Bgr2Gray);
-
-                // Apply threshold
-                //CvInvoke.Threshold(imgFilter, imgFilter, 0, 255, ThresholdType.Otsu);
-                //CvInvoke.Threshold(imgFilter, imgFilter, ThresholdMin, ThresholdMax, ThresholdType.Binary);
-                CvInvoke.Threshold(imgFilter, imgFilter, ThresholdMin, ThresholdMax, ThresholdType.BinaryInv);
-
-                // Thinning and Skeletonization
-                //Mat element = CvInvoke.GetStructuringElement(ElementShape.Rectangle, new System.Drawing.Size(2, 2), new System.Drawing.Point(-1, -1));
-                //CvInvoke.Erode(imgFilter, imgFilter, element, new System.Drawing.Point(-1, -1), 1, BorderType.Constant, new MCvScalar(255, 255, 255));
-
-                // Filter out the noise
-                //CvInvoke.GaussianBlur(imgFilter, imgFilter, new System.Drawing.Size(0, 0), 1, 0, BorderType.Default);
+                CvInvoke.InRange(img, new ScalarArray(new MCvScalar(0, 0, 0)), new ScalarArray(new MCvScalar(ThresholdOcrMaxR, ThresholdOcrMaxG, ThresholdOcrMaxB)), imgFilter);
 
                 if (!Directory.Exists(@"ocrimages\"))
                 {
@@ -294,12 +284,6 @@ private void ProcessImageCountOCR(Mat img)
                 OcrImageCount = imgFilter.ToBitmap();
                 img.Save(@"ocrimages\itemcountraw.png");
                 imgFilter.Save(@"ocrimages\itemcount.png");
-
-                if(!File.Exists(@"ocrimages\itemcountdebug.png"))
-                {
-                    img.Save(@"ocrimages\itemcountdebug.png");
-                }
-
                 _eventAggregator.GetEvent<OcrImageCountReadyEvent>().Publish();
             }
             catch (Exception) { }
@@ -320,21 +304,6 @@ public void ProcessImageCountOCRDebug(int minR, int minG, int minB, int maxR, in
 
                     CvInvoke.InRange(img, new ScalarArray(new MCvScalar(minR, minG, minB)), new ScalarArray(new MCvScalar(maxR, maxG, maxB)), imgFilter);
 
-                    // Convert the image to grayscale
-                    //CvInvoke.CvtColor(img, imgFilter, ColorConversion.Bgr2Gray);
-
-                    // Apply threshold
-                    //CvInvoke.Threshold(imgFilter, imgFilter, 0, 255, ThresholdType.Otsu);
-                    //CvInvoke.Threshold(imgFilter, imgFilter, ThresholdMin, ThresholdMax, ThresholdType.Binary);
-                    //CvInvoke.Threshold(imgFilter, imgFilter, ThresholdMin, ThresholdMax, ThresholdType.BinaryInv);
-
-                    // Thinning and Skeletonization
-                    //Mat element = CvInvoke.GetStructuringElement(ElementShape.Rectangle, new System.Drawing.Size(2, 2), new System.Drawing.Point(-1, -1));
-                    //CvInvoke.Erode(imgFilter, imgFilter, element, new System.Drawing.Point(-1, -1), 1, BorderType.Constant, new MCvScalar(255, 255, 255));
-
-                    // Filter out the noise
-                    //CvInvoke.GaussianBlur(imgFilter, imgFilter, new System.Drawing.Size(0, 0), 1, 0, BorderType.Default);
-
                     if (!Directory.Exists(@"ocrimages\"))
                     {
                         DirectoryInfo directoryInfo = Directory.CreateDirectory(@"ocrimages\");

diff --git a/NewWorldCompanion/ViewModels/Tabs/Debug/DebugScreenCountOCRViewModel.cs b/NewWorldCompanion/ViewModels/Tabs/Debug/DebugScreenCountOCRViewModel.cs
@@ -20,6 +20,7 @@ public class DebugScreenCountOCRViewModel : BindableBase
         private readonly IOcrHandler _ocrHandler;
 
         private string _itemCount = string.Empty;
+        private string _itemCountRaw = string.Empty;
         private BitmapSource? _ocrImageCount = null;
         private BitmapSource? _ocrImageCountRaw = null;
 
@@ -67,6 +68,16 @@ public string ItemCount
             }
         }
 
+        public string ItemCountRaw
+        {
+            get => _itemCountRaw;
+            set
+            {
+                _itemCountRaw = value;
+                RaisePropertyChanged(nameof(ItemCountRaw));
+            }
+        }
+
         public int ThresholdMinR
         {
             get => _thresholdMinR;
@@ -169,6 +180,7 @@ private void HandleOcrTextCountReadyEvent()
             Application.Current?.Dispatcher?.Invoke(() =>
             {
                 ItemCount = _ocrHandler.OcrTextCount;
+                ItemCountRaw = _ocrHandler.OcrTextCountRaw;
             });
         }
 

diff --git a/NewWorldCompanion/ViewModels/Tabs/Debug/DebugScreenOCRViewModel.cs b/NewWorldCompanion/ViewModels/Tabs/Debug/DebugScreenOCRViewModel.cs
@@ -19,6 +19,7 @@ public class DebugScreenOCRViewModel : BindableBase
 
         private string _itemName = string.Empty;
         private string _itemCount = string.Empty;
+        private string _itemCountRaw = string.Empty;
         private BitmapSource? _ocrImage = null;
         private BitmapSource? _ocrImageCount = null;
 
@@ -66,6 +67,7 @@ public int ThresholdMin
                 RaisePropertyChanged(nameof(ThresholdMin));
             }
         }
+
         public int ThresholdMax
         {
             get => _settingsManager.Settings.EmguThresholdMax;
@@ -77,6 +79,39 @@ public int ThresholdMax
             }
         }
 
+        public int ThresholdMaxR
+        {
+            get => _settingsManager.Settings.EmguThresholdMaxR;
+            set
+            {
+                _settingsManager.Settings.EmguThresholdMaxR = value;
+                _settingsManager.SaveSettings();
+                RaisePropertyChanged(nameof(ThresholdMaxR));
+            }
+        }
+
+        public int ThresholdMaxG
+        {
+            get => _settingsManager.Settings.EmguThresholdMaxG;
+            set
+            {
+                _settingsManager.Settings.EmguThresholdMaxG = value;
+                _settingsManager.SaveSettings();
+                RaisePropertyChanged(nameof(ThresholdMaxG));
+            }
+        }
+
+        public int ThresholdMaxB
+        {
+            get => _settingsManager.Settings.EmguThresholdMaxB;
+            set
+            {
+                _settingsManager.Settings.EmguThresholdMaxB = value;
+                _settingsManager.SaveSettings();
+                RaisePropertyChanged(nameof(ThresholdMaxB));
+            }
+        }
+
         public string ItemName
         {
             get => _itemName;
@@ -97,6 +132,16 @@ public string ItemCount
             }
         }
 
+        public string ItemCountRaw
+        {
+            get => _itemCountRaw;
+            set
+            {
+                _itemCountRaw = value;
+                RaisePropertyChanged(nameof(ItemCountRaw));
+            }
+        }
+
         public BitmapSource? OcrImage
         {
             get => _ocrImage;
@@ -156,6 +201,7 @@ private void HandleOcrTextCountReadyEvent()
             Application.Current?.Dispatcher?.Invoke(() =>
             {
                 ItemCount = _ocrHandler.OcrTextCount;
+                ItemCountRaw = _ocrHandler.OcrTextCountRaw;
             });
         }
 
@@ -169,6 +215,9 @@ private void RestoreDefaultsExecute()
         {
             ThresholdMin = EmguConstants.DefaultThresholdMin;
             ThresholdMax = EmguConstants.DefaultThresholdMax;
+            ThresholdMaxR = EmguConstants.DefaultThresholdMaxR;
+            ThresholdMaxG = EmguConstants.DefaultThresholdMaxG;
+            ThresholdMaxB = EmguConstants.DefaultThresholdMaxB;
         }
 
         private void CopyItemNameExecute()

diff --git a/NewWorldCompanion/ViewModels/Tabs/StorageViewModel.cs b/NewWorldCompanion/ViewModels/Tabs/StorageViewModel.cs
@@ -162,9 +162,11 @@ private void HandleOcrTextReadyEvent()
                                 var item = Items.FirstOrDefault(i => i.Storage.Equals(SelectedStorage) && i.ItemID.Equals(itemId));
                                 if (item != null)
                                 {
-                                    // TODO item count
-                                    //item.Count = int.TryParse(_ocrHandler.OcrTextCount, out int itemCount) ? itemCount : 0;
-                                    item.Count = 0;
+                                    item.Count = int.TryParse(_ocrHandler.OcrTextCount, out int itemCount) ? itemCount : 1;
+                                    Application.Current?.Dispatcher?.Invoke(() =>
+                                    {
+                                        ItemsFiltered?.Refresh();
+                                    });
                                 }
                             }
                             else
@@ -174,9 +176,7 @@ private void HandleOcrTextReadyEvent()
                                     // Add item
                                     Items.Add(new Item()
                                     {
-                                        // TODO item count
-                                        //Count = int.TryParse(_ocrHandler.OcrTextCount, out int itemCount) ? itemCount : 0;
-                                        Count = 0,
+                                        Count = int.TryParse(_ocrHandler.OcrTextCount, out int itemCount) ? itemCount : 1,
                                         ItemID = itemId,
                                         Name = itemDefinition.Name,
                                         Localisation = _itemName,

diff --git a/NewWorldCompanion/Views/Tabs/Debug/DebugScreenCountOCRView.xaml b/NewWorldCompanion/Views/Tabs/Debug/DebugScreenCountOCRView.xaml
@@ -48,7 +48,18 @@
     <StackPanel Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="5">
       <Label Content="Item count: "/>
       <StackPanel Orientation="Horizontal">
-        <Label Content="{Binding ItemCount}"/>
+        <Label>
+          <Label.Content>
+            <TextBlock>
+              <TextBlock.Text>
+                <MultiBinding StringFormat="{}{0} ({1})">
+                  <Binding Path="ItemCount" />
+                  <Binding Path="ItemCountRaw" />
+                </MultiBinding>
+              </TextBlock.Text>
+            </TextBlock>
+          </Label.Content>
+        </Label>
         <Button BorderThickness="0" Background="Transparent" Focusable="False" Command="{Binding CopyItemCountCommand}">
           <iconPacks:PackIconMaterial Kind="ContentCopy" />
         </Button>

diff --git a/NewWorldCompanion/Views/Tabs/Debug/DebugScreenOCRView.xaml b/NewWorldCompanion/Views/Tabs/Debug/DebugScreenOCRView.xaml
@@ -14,9 +14,12 @@
       <RowDefinition Height="Auto"/>
       <RowDefinition Height="Auto"/>
       <RowDefinition Height="Auto"/>
+      <RowDefinition Height="Auto"/>
       <RowDefinition Height="*"/>
     </Grid.RowDefinitions>
     <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="Auto"/>
+      <ColumnDefinition Width="200"/>
       <ColumnDefinition Width="Auto"/>
       <ColumnDefinition Width="200"/>
       <ColumnDefinition Width="*"/>
@@ -26,16 +29,24 @@
     <Slider Grid.Row="0" Grid.Column="1" Minimum="0" Maximum="255" Value="{Binding ThresholdMin}" IsSnapToTickEnabled="True" TickFrequency="1" AutoToolTipPlacement="TopLeft" AutoToolTipPrecision="0"/>
     <Label Grid.Row="1" Grid.Column="0" Content="Max Threshold" />
     <Slider Grid.Row="1" Grid.Column="1" Minimum="0" Maximum="255" Value="{Binding ThresholdMax}" IsSnapToTickEnabled="True" TickFrequency="1" AutoToolTipPlacement="TopLeft" AutoToolTipPrecision="0"/>
-    <Button Grid.Row="2" Grid.Column="0" Content="Restore defaults" Command="{Binding RestoreDefaultsCommand}"/>
 
-    <StackPanel Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3" Orientation="Vertical">
+    <Label Grid.Row="0" Grid.Column="2" Content="Max Threshold R" />
+    <Slider Grid.Row="0" Grid.Column="3" Minimum="0" Maximum="255" Value="{Binding ThresholdMaxR}" IsSnapToTickEnabled="True" TickFrequency="1" AutoToolTipPlacement="TopLeft" AutoToolTipPrecision="0"/>
+    <Label Grid.Row="1" Grid.Column="2" Content="Max Threshold G" />
+    <Slider Grid.Row="1" Grid.Column="3" Minimum="0" Maximum="255" Value="{Binding ThresholdMaxG}" IsSnapToTickEnabled="True" TickFrequency="1" AutoToolTipPlacement="TopLeft" AutoToolTipPrecision="0"/>
+    <Label Grid.Row="2" Grid.Column="2" Content="Max Threshold B" />
+    <Slider Grid.Row="2" Grid.Column="3" Minimum="0" Maximum="255" Value="{Binding ThresholdMaxB}" IsSnapToTickEnabled="True" TickFrequency="1" AutoToolTipPlacement="TopLeft" AutoToolTipPrecision="0"/>
+
+    <Button Grid.Row="3" Grid.Column="0" Content="Restore defaults" Command="{Binding RestoreDefaultsCommand}"/>
+
+    <StackPanel Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="5" Orientation="Vertical">
       <StackPanel Orientation="Horizontal">
         <Image Height="150" HorizontalAlignment="Left" VerticalAlignment="top" Source="{Binding OcrImage}"/>
         <Image Width="100" HorizontalAlignment="Left" VerticalAlignment="top" Source="{Binding OcrImageCount}"/>
       </StackPanel>
     </StackPanel>
 
-    <StackPanel Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="3">
+    <StackPanel Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="5">
       <Label Content="Item name: "/>
       <StackPanel Orientation="Horizontal">
         <Label Content="{Binding ItemName}"/>
@@ -45,7 +56,18 @@
       </StackPanel>
       <Label Content="Item count: "/>
       <StackPanel Orientation="Horizontal">
-        <Label Content="{Binding ItemCount}"/>
+        <Label>
+          <Label.Content>
+            <TextBlock>
+              <TextBlock.Text>
+                <MultiBinding StringFormat="{}{0} ({1})">
+                  <Binding Path="ItemCount" />
+                  <Binding Path="ItemCountRaw" />
+                </MultiBinding>
+              </TextBlock.Text>
+            </TextBlock>
+          </Label.Content>
+        </Label>
         <Button BorderThickness="0" Background="Transparent" Focusable="False" Command="{Binding CopyItemCountCommand}">
           <iconPacks:PackIconMaterial Kind="ContentCopy" />
         </Button>

diff --git a/NewWorldCompanion/Views/Tabs/StorageView.xaml b/NewWorldCompanion/Views/Tabs/StorageView.xaml
@@ -43,7 +43,7 @@
 
     <DataGrid Grid.Row="3" Grid.Column="0"  ItemsSource="{Binding ItemsFiltered}" AutoGenerateColumns="False">
       <DataGrid.Columns>
-        <!--<DataGridTextColumn Header="Count" Binding="{Binding Count}"/>-->
+        <DataGridTextColumn Header="Count" Binding="{Binding Count}"/>
         <DataGridTextColumn Header="Item" Binding="{Binding Localisation}"/>
         <DataGridTextColumn Header="Location" Binding="{Binding Storage}"/>
       </DataGrid.Columns>

diff --git a/NewWorldCompanion/common.props b/NewWorldCompanion/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
-    <FileVersion>1.0.4.3</FileVersion>
-    <Version>1.0.4.3</Version>
+    <FileVersion>1.0.4.4</FileVersion>
+    <Version>1.0.4.4</Version>
     <Copyright>Copyright © 2022</Copyright>
   </PropertyGroup>
 </Project>