From d133917283b6d61fc9a07e839ec8d01f02208643 Mon Sep 17 00:00:00 2001 From: Maddo Scientisto Date: Thu, 25 Feb 2021 11:14:44 +0100 Subject: [PATCH] Conversione a c# + threads --- Catalog.sln | 27 +- CatalogVbLib/CatalogVbLib.vbproj | 17 + .../ImageCreator.vb | 65 +- CatalogVbLib/packages.config | 8 + MaddoShared/FileData.cs | 27 + MaddoShared/FileHelperSharp.cs | 116 ++ MaddoShared/ImageCreationStuff.cs | 200 +++ MaddoShared/ImageCreatorSharp.cs | 1021 ++++++++++++++ MaddoShared/MaddoShared.csproj | 101 ++ MaddoShared/Properties/AssemblyInfo.cs | 36 + MaddoShared/ThreadingHelper.cs | 60 + MaddoShared/app.config | 19 + MaddoShared/packages.config | 15 + imagecatalog/FileHelper.vb | 117 +- imagecatalog/Form1.vb | 1 + imagecatalog/ImageCatalog 2.vbproj | 41 +- imagecatalog/MainForm.Designer.vb | 28 +- imagecatalog/MainForm.vb | 184 ++- .../My Project/Application.Designer.vb | 2 +- imagecatalog/My Project/Settings.Designer.vb | 2 +- imagecatalog/PicSettings.vb | 1168 ++++++++--------- imagecatalog/XYThreadPool.vb | 2 +- imagecatalog/app.config | 23 +- imagecatalog/packages.config | 11 + 24 files changed, 2649 insertions(+), 642 deletions(-) rename {imagecatalog => CatalogVbLib}/ImageCreator.vb (95%) create mode 100644 CatalogVbLib/packages.config create mode 100644 MaddoShared/FileData.cs create mode 100644 MaddoShared/FileHelperSharp.cs create mode 100644 MaddoShared/ImageCreationStuff.cs create mode 100644 MaddoShared/ImageCreatorSharp.cs create mode 100644 MaddoShared/MaddoShared.csproj create mode 100644 MaddoShared/Properties/AssemblyInfo.cs create mode 100644 MaddoShared/ThreadingHelper.cs create mode 100644 MaddoShared/app.config create mode 100644 MaddoShared/packages.config create mode 100644 imagecatalog/packages.config diff --git a/Catalog.sln b/Catalog.sln index 05e37b1..7108485 100644 --- a/Catalog.sln +++ b/Catalog.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26403.3 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31005.135 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ImageCatalog 2", "imagecatalog\ImageCatalog 2.vbproj", "{8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}" EndProject @@ -15,6 +15,8 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CatalogVbLib", "CatalogVbLi EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{A3D50937-74F6-4DC8-8D89-B534B484C0F9}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaddoShared", "MaddoShared\MaddoShared.csproj", "{AEBFE9E3-277C-4A7B-8448-145D1B11998B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -28,6 +30,7 @@ Global {8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}.Debug|Any CPU.Build.0 = Debug|Any CPU {8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}.Debug|x64.ActiveCfg = Debug|x64 + {8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}.Debug|x64.Build.0 = Debug|x64 {8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}.Debug|x86.ActiveCfg = Debug|x86 {8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}.Debug|x86.Build.0 = Debug|x86 {8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -39,6 +42,7 @@ Global {D11ED7B0-93E8-4F38-A142-EED72D7EE8B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D11ED7B0-93E8-4F38-A142-EED72D7EE8B5}.Debug|Any CPU.Build.0 = Debug|Any CPU {D11ED7B0-93E8-4F38-A142-EED72D7EE8B5}.Debug|x64.ActiveCfg = Debug|x64 + {D11ED7B0-93E8-4F38-A142-EED72D7EE8B5}.Debug|x64.Build.0 = Debug|x64 {D11ED7B0-93E8-4F38-A142-EED72D7EE8B5}.Debug|x86.ActiveCfg = Debug|Any CPU {D11ED7B0-93E8-4F38-A142-EED72D7EE8B5}.Release|Any CPU.ActiveCfg = Release|Any CPU {D11ED7B0-93E8-4F38-A142-EED72D7EE8B5}.Release|Any CPU.Build.0 = Release|Any CPU @@ -68,14 +72,33 @@ Global {44465926-240D-473F-90B8-786BA4384406}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {44465926-240D-473F-90B8-786BA4384406}.Debug|Any CPU.Build.0 = Debug|Any CPU {44465926-240D-473F-90B8-786BA4384406}.Debug|x64.ActiveCfg = Debug|x64 + {44465926-240D-473F-90B8-786BA4384406}.Debug|x64.Build.0 = Debug|x64 {44465926-240D-473F-90B8-786BA4384406}.Debug|x86.ActiveCfg = Debug|Any CPU {44465926-240D-473F-90B8-786BA4384406}.Release|Any CPU.ActiveCfg = Release|Any CPU {44465926-240D-473F-90B8-786BA4384406}.Release|Any CPU.Build.0 = Release|Any CPU {44465926-240D-473F-90B8-786BA4384406}.Release|x64.ActiveCfg = Release|x64 {44465926-240D-473F-90B8-786BA4384406}.Release|x64.Build.0 = Release|x64 {44465926-240D-473F-90B8-786BA4384406}.Release|x86.ActiveCfg = Release|Any CPU + {AEBFE9E3-277C-4A7B-8448-145D1B11998B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AEBFE9E3-277C-4A7B-8448-145D1B11998B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AEBFE9E3-277C-4A7B-8448-145D1B11998B}.Debug|x64.ActiveCfg = Debug|Any CPU + {AEBFE9E3-277C-4A7B-8448-145D1B11998B}.Debug|x64.Build.0 = Debug|Any CPU + {AEBFE9E3-277C-4A7B-8448-145D1B11998B}.Debug|x86.ActiveCfg = Debug|Any CPU + {AEBFE9E3-277C-4A7B-8448-145D1B11998B}.Debug|x86.Build.0 = Debug|Any CPU + {AEBFE9E3-277C-4A7B-8448-145D1B11998B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AEBFE9E3-277C-4A7B-8448-145D1B11998B}.Release|Any CPU.Build.0 = Release|Any CPU + {AEBFE9E3-277C-4A7B-8448-145D1B11998B}.Release|x64.ActiveCfg = Release|Any CPU + {AEBFE9E3-277C-4A7B-8448-145D1B11998B}.Release|x64.Build.0 = Release|Any CPU + {AEBFE9E3-277C-4A7B-8448-145D1B11998B}.Release|x86.ActiveCfg = Release|Any CPU + {AEBFE9E3-277C-4A7B-8448-145D1B11998B}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {AEBFE9E3-277C-4A7B-8448-145D1B11998B} = {A3D50937-74F6-4DC8-8D89-B534B484C0F9} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0E3ABC63-8601-4DAC-AFEA-33F3E8E36757} + EndGlobalSection EndGlobal diff --git a/CatalogVbLib/CatalogVbLib.vbproj b/CatalogVbLib/CatalogVbLib.vbproj index efab3b3..c6e2591 100644 --- a/CatalogVbLib/CatalogVbLib.vbproj +++ b/CatalogVbLib/CatalogVbLib.vbproj @@ -68,9 +68,24 @@ MinimumRecommendedRules.ruleset + + ..\packages\Ben.Demystifier.0.3.0\lib\net45\Ben.Demystifier.dll + + + ..\packages\System.Collections.Immutable.5.0.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll + + + ..\packages\System.Reflection.Metadata.5.0.0\lib\portable-net45+win8\System.Reflection.Metadata.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll + @@ -92,6 +107,7 @@ + True @@ -127,6 +143,7 @@ My Settings.Designer.vb + - + - + - + - + + + + + + + + + + + + + + diff --git a/imagecatalog/packages.config b/imagecatalog/packages.config new file mode 100644 index 0000000..61c13e3 --- /dev/null +++ b/imagecatalog/packages.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file