From c8bb1b3c313ffa003b0e668855b283ceb6b7f735 Mon Sep 17 00:00:00 2001 From: H0llowVoid Date: Thu, 18 Apr 2024 22:39:34 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=963?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectAiSD/ProjectAiSD.sln | 31 ---- ProjectAiSD/ProjectAiSD/FileAiSD.c | 0 ProjectAiSD/ProjectAiSD/ProjectAiSD.vcxproj | 138 ------------------ .../ProjectAiSD/ProjectAiSD.vcxproj.filters | 17 --- .../{CraneSharingService.cs => Garage.cs} | 4 +- .../CollectionGenericObjects/ParamClass1.cs | 12 -- .../FormCraneCollection.cs | 3 +- 7 files changed, 3 insertions(+), 202 deletions(-) delete mode 100644 ProjectAiSD/ProjectAiSD.sln delete mode 100644 ProjectAiSD/ProjectAiSD/FileAiSD.c delete mode 100644 ProjectAiSD/ProjectAiSD/ProjectAiSD.vcxproj delete mode 100644 ProjectAiSD/ProjectAiSD/ProjectAiSD.vcxproj.filters rename ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/{CraneSharingService.cs => Garage.cs} (90%) delete mode 100644 ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/ParamClass1.cs diff --git a/ProjectAiSD/ProjectAiSD.sln b/ProjectAiSD/ProjectAiSD.sln deleted file mode 100644 index d414e0a..0000000 --- a/ProjectAiSD/ProjectAiSD.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.8.34330.188 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProjectAiSD", "ProjectAiSD\ProjectAiSD.vcxproj", "{1203BB93-5B4B-446F-9CD3-4E1FBC19A791}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1203BB93-5B4B-446F-9CD3-4E1FBC19A791}.Debug|x64.ActiveCfg = Debug|x64 - {1203BB93-5B4B-446F-9CD3-4E1FBC19A791}.Debug|x64.Build.0 = Debug|x64 - {1203BB93-5B4B-446F-9CD3-4E1FBC19A791}.Debug|x86.ActiveCfg = Debug|Win32 - {1203BB93-5B4B-446F-9CD3-4E1FBC19A791}.Debug|x86.Build.0 = Debug|Win32 - {1203BB93-5B4B-446F-9CD3-4E1FBC19A791}.Release|x64.ActiveCfg = Release|x64 - {1203BB93-5B4B-446F-9CD3-4E1FBC19A791}.Release|x64.Build.0 = Release|x64 - {1203BB93-5B4B-446F-9CD3-4E1FBC19A791}.Release|x86.ActiveCfg = Release|Win32 - {1203BB93-5B4B-446F-9CD3-4E1FBC19A791}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {6902D87F-9F53-4C0D-8571-543876503D6B} - EndGlobalSection -EndGlobal diff --git a/ProjectAiSD/ProjectAiSD/FileAiSD.c b/ProjectAiSD/ProjectAiSD/FileAiSD.c deleted file mode 100644 index e69de29..0000000 diff --git a/ProjectAiSD/ProjectAiSD/ProjectAiSD.vcxproj b/ProjectAiSD/ProjectAiSD/ProjectAiSD.vcxproj deleted file mode 100644 index 7c6c389..0000000 --- a/ProjectAiSD/ProjectAiSD/ProjectAiSD.vcxproj +++ /dev/null @@ -1,138 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - - 17.0 - Win32Proj - {1203bb93-5b4b-446f-9cd3-4e1fbc19a791} - ProjectAiSD - 10.0 - - - - Application - true - v143 - Unicode - - - Application - false - v143 - true - Unicode - - - Application - true - v143 - Unicode - - - Application - false - v143 - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - - - - diff --git a/ProjectAiSD/ProjectAiSD/ProjectAiSD.vcxproj.filters b/ProjectAiSD/ProjectAiSD/ProjectAiSD.vcxproj.filters deleted file mode 100644 index 153170c..0000000 --- a/ProjectAiSD/ProjectAiSD/ProjectAiSD.vcxproj.filters +++ /dev/null @@ -1,17 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - \ No newline at end of file diff --git a/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/CraneSharingService.cs b/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/Garage.cs similarity index 90% rename from ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/CraneSharingService.cs rename to ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/Garage.cs index 3f6aec3..01ae82b 100644 --- a/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/CraneSharingService.cs +++ b/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/Garage.cs @@ -4,9 +4,9 @@ using System.Drawing; namespace ProjectHoistingCrane.CollectionGenericObjects; -public class CraneSharingService : AbstractCompany +public class Garage : AbstractCompany { - public CraneSharingService(int picWidth, int picHeight, ICollectionGenericObjects collection) : base(picWidth, picHeight, collection) + public Garage(int picWidth, int picHeight, ICollectionGenericObjects collection) : base(picWidth, picHeight, collection) { } diff --git a/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/ParamClass1.cs b/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/ParamClass1.cs deleted file mode 100644 index fd15b6d..0000000 --- a/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/ParamClass1.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ProjectHoistingCrane.CollectionGenericObjects -{ - internal class ParamClass1 - { - } -} diff --git a/ProjectHoistingCrane/ProjectHoistingCrane/FormCraneCollection.cs b/ProjectHoistingCrane/ProjectHoistingCrane/FormCraneCollection.cs index 9783e1d..14a77bd 100644 --- a/ProjectHoistingCrane/ProjectHoistingCrane/FormCraneCollection.cs +++ b/ProjectHoistingCrane/ProjectHoistingCrane/FormCraneCollection.cs @@ -40,10 +40,9 @@ public partial class FormCraneCollection : Form switch (comboBoxSelectorCompany.Text) { case "Хранилище": - _company = new CraneSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects()); + _company = new Garage(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects()); break; } - } ///