Changed Name of Project and add new trained file

Andrewthe13th · Dec 3, 2021 · e9655ea · e9655ea
1 parent ad3c605
commit e9655ea
Show file tree

Hide file tree

Showing 37 changed files with 53 additions and 47 deletions.
diff --git a/GenshinGuide/DesignBust_genshin_impact_folder_icon256.ico b/GenshinGuide/DesignBust_genshin_impact_folder_icon256.ico
diff --git a/GenshinGuide.sln → InventoryKamera.sln b/GenshinGuide.sln → InventoryKamera.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30611.23
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenshinGuide", "GenshinGuide\GenshinGuide.csproj", "{7B7F907E-11F4-4000-B711-8E532A36F8A9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InventoryKamera", "InventoryKamera\InventoryKamera.csproj", "{7B7F907E-11F4-4000-B711-8E532A36F8A9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/GenshinGuide/App.config → InventoryKamera/App.config b/GenshinGuide/App.config → InventoryKamera/App.config
diff --git a/GenshinGuide/Artifact.cs → InventoryKamera/Artifact.cs b/GenshinGuide/Artifact.cs → InventoryKamera/Artifact.cs
diff --git a/GenshinGuide/ArtifactScraper.cs → InventoryKamera/ArtifactScraper.cs b/GenshinGuide/ArtifactScraper.cs → InventoryKamera/ArtifactScraper.cs
@@ -402,7 +402,7 @@ public static void ScanArtifactImage(int id)
             artifactImages.Add(artifactLocked); //6
 
             // Send Image to Worker Queue
-            GenshinData.workerQueue.Enqueue(new OCRImage(artifactImages, "artifact", id));
+            InventoryKamera.workerQueue.Enqueue(new OCRImage(artifactImages, "artifact", id));
             g.Dispose();
         }
 

diff --git a/GenshinGuide/Character.cs → InventoryKamera/Character.cs b/GenshinGuide/Character.cs → InventoryKamera/Character.cs
diff --git a/GenshinGuide/CharacterScraper.cs → InventoryKamera/CharacterScraper.cs b/GenshinGuide/CharacterScraper.cs → InventoryKamera/CharacterScraper.cs
diff --git a/GenshinGuide/Form1.Designer.cs → InventoryKamera/Form1.Designer.cs b/GenshinGuide/Form1.Designer.cs → InventoryKamera/Form1.Designer.cs
diff --git a/GenshinGuide/Form1.cs → InventoryKamera/Form1.cs b/GenshinGuide/Form1.cs → InventoryKamera/Form1.cs
@@ -15,7 +15,7 @@ public partial class Form1 : Form
     {
         //private KeyHandler ghk;
         static Thread mainThread;
-        static GenshinData data = new GenshinData();
+        static InventoryKamera data = new InventoryKamera();
         static public KeyboardHook hook = new KeyboardHook();
         static string filePath = "";
         static int delayLevel = 0;
@@ -137,7 +137,7 @@ private void hook_KeyPressed(object sender, KeyPressedEventArgs e)
                 data.StopImageProcessorWorker();
                 UserInterface.SetProgramStatus("Scan Stopped",true);
                 // Reset data
-                data = new GenshinData();
+                data = new InventoryKamera();
                 Navigation.Reset();
                 // Un register ENTER key
                 //hook.Dispose();
@@ -152,7 +152,7 @@ private void ResetUI()
         {
             UserInterface.SetProgramStatus("Finished");
             // Reset data
-            data = new GenshinData();
+            data = new InventoryKamera();
             Navigation.Reset();
             // Un register ENTER key
             hook.Dispose();
@@ -269,7 +269,7 @@ private void button1_Click(object sender, EventArgs e)
                     }
                     else
                     {
-                        data = new GenshinData();
+                        data = new InventoryKamera();
                         UserInterface.AddError("Game Window not set to 1280 x 720 Windowed");
                         Navigation.Reset();
                     // Un register ENTER key

diff --git a/GenshinGuide/Form1.resx → InventoryKamera/Form1.resx b/GenshinGuide/Form1.resx → InventoryKamera/Form1.resx
diff --git a/GenshinGuide/GOOD.cs → InventoryKamera/GOOD.cs b/GenshinGuide/GOOD.cs → InventoryKamera/GOOD.cs
@@ -282,7 +282,7 @@ public GOOD()
             weapons = new List<IWeapon>();
         }
 
-        public GOOD(GenshinData genshinData)
+        public GOOD(InventoryKamera genshinData)
         {
             format = "GOOD";
             version = 1;

diff --git a/GenshinGuide/Inventory.cs → InventoryKamera/Inventory.cs b/GenshinGuide/Inventory.cs → InventoryKamera/Inventory.cs
diff --git a/GenshinGuide/GenshinData.cs → InventoryKamera/InventoryKamera.cs b/GenshinGuide/GenshinData.cs → InventoryKamera/InventoryKamera.cs
@@ -8,7 +8,7 @@
 
 namespace GenshinGuide
 {
-    public class GenshinData
+    public class InventoryKamera
     {
         [JsonProperty]
         private static List<Character> characters = new List<Character>();
@@ -23,7 +23,7 @@ public class GenshinData
         private static volatile bool b_threadCancel = false;
         // TODO add language option
 
-        public GenshinData()
+        public InventoryKamera()
         {
             characters = new List<Character>();
             inventory = new Inventory();

diff --git a/GenshinGuide/GenshinGuide.csproj → InventoryKamera/InventoryKamera.csproj b/GenshinGuide/GenshinGuide.csproj → InventoryKamera/InventoryKamera.csproj
@@ -6,8 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{7B7F907E-11F4-4000-B711-8E532A36F8A9}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>GenshinGuide</RootNamespace>
-    <AssemblyName>GenshinGuide</AssemblyName>
+    <RootNamespace>InventoryKamera</RootNamespace>
+    <AssemblyName>InventoryKamera</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -120,7 +120,7 @@
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
-    <Compile Include="GenshinData.cs" />
+    <Compile Include="InventoryKamera.cs" />
     <Compile Include="OCRImage.cs" />
     <Compile Include="Inventory.cs" />
     <Compile Include="KeyboardHook.cs" />
@@ -145,6 +145,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="app.manifest" />
     <None Include="packages.config" />
@@ -157,7 +158,9 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <None Include="tessdata\genshin_best_eng.traineddata" />
+    <None Include="tessdata\genshin_best_eng.traineddata">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="tessdata\genshin_fast_09_04_21.traineddata">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/GenshinGuide/Item_Special_Kamera.ico → InventoryKamera/Item_Special_Kamera.ico b/GenshinGuide/Item_Special_Kamera.ico → InventoryKamera/Item_Special_Kamera.ico
diff --git a/GenshinGuide/KeyHandler.cs → InventoryKamera/KeyHandler.cs b/GenshinGuide/KeyHandler.cs → InventoryKamera/KeyHandler.cs
diff --git a/GenshinGuide/KeyboardHook.cs → InventoryKamera/KeyboardHook.cs b/GenshinGuide/KeyboardHook.cs → InventoryKamera/KeyboardHook.cs
diff --git a/GenshinGuide/MaterialScraper.cs → InventoryKamera/MaterialScraper.cs b/GenshinGuide/MaterialScraper.cs → InventoryKamera/MaterialScraper.cs
diff --git a/GenshinGuide/Navigation.cs → InventoryKamera/Navigation.cs b/GenshinGuide/Navigation.cs → InventoryKamera/Navigation.cs
diff --git a/GenshinGuide/OCRImage.cs → InventoryKamera/OCRImage.cs b/GenshinGuide/OCRImage.cs → InventoryKamera/OCRImage.cs
diff --git a/GenshinGuide/Program.cs → InventoryKamera/Program.cs b/GenshinGuide/Program.cs → InventoryKamera/Program.cs
diff --git a/GenshinGuide/Properties/AssemblyInfo.cs → InventoryKamera/Properties/AssemblyInfo.cs b/GenshinGuide/Properties/AssemblyInfo.cs → InventoryKamera/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyDescription("A OCR scanner for Genshin Impact")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Andrew De La Fuente")]
-[assembly: AssemblyProduct("GenshinGuide")]
+[assembly: AssemblyProduct("InventoryKamera")]
 [assembly: AssemblyCopyright("Copyright ©  2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

diff --git a/...hinGuide/Properties/Resources.Designer.cs → ...ryKamera/Properties/Resources.Designer.cs b/...hinGuide/Properties/Resources.Designer.cs → ...ryKamera/Properties/Resources.Designer.cs
diff --git a/GenshinGuide/Properties/Resources.resx → InventoryKamera/Properties/Resources.resx b/GenshinGuide/Properties/Resources.resx → InventoryKamera/Properties/Resources.resx
diff --git a/GenshinGuide/Properties/Settings.Designer.cs → ...oryKamera/Properties/Settings.Designer.cs b/GenshinGuide/Properties/Settings.Designer.cs → ...oryKamera/Properties/Settings.Designer.cs
diff --git a/GenshinGuide/Properties/Settings.settings → InventoryKamera/Properties/Settings.settings b/GenshinGuide/Properties/Settings.settings → InventoryKamera/Properties/Settings.settings
diff --git a/GenshinGuide/Rect.cs → InventoryKamera/Rect.cs b/GenshinGuide/Rect.cs → InventoryKamera/Rect.cs
diff --git a/GenshinGuide/Scraper.cs → InventoryKamera/Scraper.cs b/GenshinGuide/Scraper.cs → InventoryKamera/Scraper.cs
@@ -1296,7 +1296,7 @@ public static string FindElement(string name)
             return element;
         }
 
-        public static void CreateJsonFile(GenshinData data)
+        public static void CreateJsonFile(InventoryKamera data)
         {
             // write to JSON file
             string JSONresult = JsonConvert.SerializeObject(data);

diff --git a/GenshinGuide/Seelie.cs → InventoryKamera/Seelie.cs b/GenshinGuide/Seelie.cs → InventoryKamera/Seelie.cs
@@ -373,7 +373,7 @@ public Seelie()
             inventory = new List<SeelieItem>();
         }
 
-        public Seelie(GenshinData genshinData)
+        public Seelie(InventoryKamera genshinData)
         {
             inventory = new List<SeelieItem>();
 

diff --git a/GenshinGuide/UserInterface.cs → InventoryKamera/UserInterface.cs b/GenshinGuide/UserInterface.cs → InventoryKamera/UserInterface.cs
diff --git a/GenshinGuide/Weapon.cs → InventoryKamera/Weapon.cs b/GenshinGuide/Weapon.cs → InventoryKamera/Weapon.cs
diff --git a/GenshinGuide/WeaponScraper.cs → InventoryKamera/WeaponScraper.cs b/GenshinGuide/WeaponScraper.cs → InventoryKamera/WeaponScraper.cs
@@ -348,7 +348,7 @@ public static void ScanWeaponImage(int id)
             weaponImages.Add(weaponEquippedCharacter);
 
             // Send Image to Worker Queue
-            GenshinData.workerQueue.Enqueue(new OCRImage(weaponImages,"weapon",id));
+            InventoryKamera.workerQueue.Enqueue(new OCRImage(weaponImages,"weapon",id));
             g.Dispose();
         }
 

diff --git a/GenshinGuide/app.manifest → InventoryKamera/app.manifest b/GenshinGuide/app.manifest → InventoryKamera/app.manifest
diff --git a/GenshinGuide/packages.config → InventoryKamera/packages.config b/GenshinGuide/packages.config → InventoryKamera/packages.config
diff --git a/GenshinGuide/tessdata/.gitmodules → InventoryKamera/tessdata/.gitmodules b/GenshinGuide/tessdata/.gitmodules → InventoryKamera/tessdata/.gitmodules
diff --git a/...ide/tessdata/genshin_best_eng.traineddata → ...era/tessdata/genshin_best_eng.traineddata b/...ide/tessdata/genshin_best_eng.traineddata → ...era/tessdata/genshin_best_eng.traineddata
diff --git a/...essdata/genshin_fast_09_04_21.traineddata → ...essdata/genshin_fast_09_04_21.traineddata b/...essdata/genshin_fast_09_04_21.traineddata → ...essdata/genshin_fast_09_04_21.traineddata