wip 7

solution/lab1/CollectionGenericObjects/AbstractCompany.cs

@@ -83,8 +83,12 @@ public abstract class AbstractCompany
         SetObjectsPosition();
         for (int i = 0; i < (_collection?.Count ?? 0); ++i)
         {
-            DrawningTrackedVehicle? obj = _collection?.Get(i);
+            try
-            obj?.DrawTransport(graphics);
+            {
+                DrawningTrackedVehicle? obj = _collection?.Get(i);
+                obj?.DrawTransport(graphics);
+            }
+            catch (Exception) { }
         }
         return bitmap;
     }

solution/lab1/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -47,7 +47,6 @@ public interface ICollectionGenericObjects<T>
     /// Получение типа коллекции
     /// </summary>
     CollectionType GetCollectionType { get; }
-    int SetMaxCount { get; set; }
 
     /// <summary>
     /// Получение объектов коллекции по одному

solution/lab1/CollectionGenericObjects/TrackedVehicleSharingService.cs

@@ -47,11 +47,12 @@ public class TrackedVehicleSharingService : AbstractCompany
         int curHeight = 0;
         for (int i = 0; i < (_collection?.Count ?? 0); i++)
         {
-            if (_collection.Get(i) != null)
+            try
             {
-                _collection.Get(i).SetPictureSize(_pictureWidth, _pictureHeight);
+                _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight);
-                _collection.Get(i).SetPosition(_placeSizeWidth * curWidth + 45, curHeight * _placeSizeHeight + 30);
+                _collection?.Get(i)?.SetPosition(_placeSizeWidth * curWidth+28, curHeight * _placeSizeHeight + 28);
             }
+            catch (Exception) { }
             if (curWidth > 0)
                 curWidth--;
             else

solution/lab1/Program.cs

@@ -1,5 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
-using System;
+using Microsoft.Extensions.Logging;
+using Serilog;
+using Microsoft.Extensions.Configuration;
 
 namespace lab1
 {
@@ -27,14 +29,21 @@ namespace lab1
         /// <param name="services"></param>
         private static void ConfigureServices(ServiceCollection services)
         {
-
+            string[] path = Directory.GetCurrentDirectory().Split('\\');
+            string pathNeed = "";
+            for (int i = 0; i < path.Length - 3; i++)
+            {
+                pathNeed += path[i] + "\\";
+            }
             services.AddSingleton<FormTrackedVehicleCollection>()
                 .AddLogging(option =>
                 {
                     option.SetMinimumLevel(LogLevel.Information);
                     option.AddSerilog(new LoggerConfiguration()
-                            .WriteTo.File("log.txt")
+                        .ReadFrom.Configuration(new ConfigurationBuilder()
-                            .CreateLogger());
+                            .AddJsonFile($"{pathNeed}serilog.json")
+                            .Build())
+                        .CreateLogger());
                 });
         }
     }

solution/lab1/lab1.csproj

@@ -9,7 +9,14 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.12" />
+    <PackageReference Include="Serilog" Version="4.0.1" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.2" />
+    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

solution/lab1/serilog.json

@@ -0,0 +1,15 @@
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.File" ],
+    "MinimumLevel": "Debug",
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": { "path": "log.log" }
+      }
+    ],
+    "Properties": {
+      "Application": "Sample"
+    }
+  }
+}