fully working

s202283440 · s202283440 · commit 912b209c585b · 2025-12-06T15:10:39.000+03:00
diff --git a/FileSystem/MainForm.Designer.cs b/FileSystem/MainForm.Designer.cs
diff --git a/FileSystem/MainForm.cs b/FileSystem/MainForm.cs
@@ -105,7 +105,7 @@ private TreeNode CreateTreeNode(IComponent component)
             if (component is Folder folder)
             {
                 string sizeText = FormatSize(folder.Size);
-                node = new TreeNode($"{folder.Name} ({sizeText})");
+                node = new TreeNode(folder.Name);
                 node.ImageIndex = 0;
                 node.SelectedImageIndex = 0;
 
@@ -143,8 +143,6 @@ private void Visualize()
         {
             if (rootFolder != null)
             {
-                pnlVisualization.Controls.Clear();
-                pnlVisualization.AutoScroll = true;
                 rootFolder.Visualize(currentStrategy, pnlVisualization);
             }
         }
@@ -154,6 +152,7 @@ private void rbTree_CheckedChanged(object sender, EventArgs e)
             if (rbTree.Checked)
             {
                 currentStrategy = new TreeVisualizationStrategy();
+                Text = "Folder Traversal";
                 Visualize();
             }
         }
@@ -163,8 +162,14 @@ private void rbBarChart_CheckedChanged(object sender, EventArgs e)
             if (rbBarChart.Checked)
             {
                 currentStrategy = new BarChartVisualizationStrategy();
+                Text = "Folder Size Visualizer";
                 Visualize();
             }
         }
+
+        private void pnlVisualization_Paint(object sender, PaintEventArgs e)
+        {
+
+        }
     }
 }
diff --git a/FileSystem/MainForm.resx b/FileSystem/MainForm.resx
@@ -125,32 +125,32 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs
         LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu
         SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAHAcAAAJNU0Z0AUkBTAIBAQMB
-        AAGgAQABoAEAARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMAARADAAEBAQABIAYAARD/
+        AAGoAQABqAEAARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMAARADAAEBAQABIAYAARD/
         AP8AGAABXAJfAcgBYAJlAeMBYAJlAeMBYAJlAeMBYAJlAeMBYAJlAeMBYAJlAeMBYAJlAeMBYAJlAeMB
         YAJlAeMBYAJlAeMBYAJlAeMBYAJlAeMBXAJfAcjIAAEyAccB/gH/ATIBxwH+Af8BMgHHAf4B/wEyAccB
         /gH/ATIBxwH+Af8BMgHHAf4B/wEyAccB/gH/ATIBxwH+Af8BMgHHAf4B/wEyAccB/gH/ATIBxwH+Af8B
         MgHHAf4B/wEyAccB/gH/ATIBxwH+Af9gAAMrAUEDKwFBYAABOAHJAf4B/wE4AckB/gH/ATgByQH+Af8B
         OAHJAf4B/wE4AckB/gH/ATgByQH+Af8BOAHJAf4B/wE4AckB/gH/ATgByQH+Af8BOAHJAf4B/wE4AckB
-        /gH/ATgByQH+Af8BOAHJAf4B/wE4AckB/gH/IAACRwFGAYACRwFGAYA0AAMrAUIDRwHrA0cB6wMrAUJc
+        /gH/ATgByQH+Af8BOAHJAf4B/wE4AckB/gH/IAACRwFGAYACRwFGAYA0AAMrAUIDTAHrA0wB6wMrAUJc
         AAE/AcsB/gH/AT8BywH+Af8BPwHLAf4B/wE/AcsB/gH/AT8BywH+Af8BPwHLAf4B/wE/AcsB/gH/AT8B
         ywH+Af8BPwHLAf4B/wE/AcsB/gH/AT8BywH+Af8BPwHLAf4B/wE/AcsB/gH/AT8BywH+Af8cAAJHAUYB
-        gAHzAZYBIQH/AfMBlgEhAf8DSQGILAADKQE9A0UB6QMsAUMDKQE9A0UB6gMsAUNYAAFFAc0B/gH/AUUB
+        gAHzAZYBIQH/AfMBlgEhAf8DSQGILAADKQE9A0kB6QMsAUMDKQE9A0gB6gMsAUNYAAFFAc0B/gH/AUUB
         zQH+Af8BRQHNAf4B/wFFAc0B/gH/AUUBzQH+Af8BRQHNAf4B/wFFAc0B/gH/AUUBzQH+Af8BRQHNAf4B
         /wFFAc0B/gH/AUUBzQH+Af8BRQHNAf4B/wFFAc0B/gH/AUUBzQH+Af8YAAJIAUcBgwHzAZYBIQH/A0kB
-        iANJAYgB8wGWASEB/wJIAUcBgyQAAykBPQNFAekDLAFDCAADKQE9A0UB6gMsAUNUAAFLAc8C/wFLAc8C
+        iANJAYgB8wGWASEB/wJIAUcBgyQAAykBPQNJAekDLAFDCAADKQE9A0gB6gMsAUNUAAFLAc8C/wFLAc8C
         /wFLAc8C/wFLAc8C/wFLAc8C/wFLAc8C/wFLAc8C/wFLAc8C/wFLAc8C/wFLAc8C/wFLAc8C/wFLAc8C
-        /wFLAc8C/wFLAc8C/xQAAkcBRgGBAfMBlgEhAf8DSwGMCAADSAGEAfMBlgEhAf8DSgGJHAADKQE9A0UB
-        6QMsAUMQAAMpAT0DRQHqAywBQ1AAAVEB0QL/AVEB0QL/AVEB0QL/AVEB0QL/AVEB0QL/AVEB0QL/AVEB
+        /wFLAc8C/wFLAc8C/xQAAkcBRgGBAfMBlgEhAf8DSwGMCAADSAGEAfMBlgEhAf8DSgGJHAADKQE9A0kB
+        6QMsAUMQAAMpAT0DSAHqAywBQ1AAAVEB0QL/AVEB0QL/AVEB0QL/AVEB0QL/AVEB0QL/AVEB0QL/AVEB
         0QL/AVEB0QL/AVEB0QL/AVEB0QL/AVEB0QL/AVEB0QL/AVEB0QL/AVEB0QL/EAADRwGCAfMBlgEhAf8D
-        SwGMEAADSAGEAfMBlgEhAf8CSwFKAYoUAAMpAT0DRQHpAywBQxgAAykBPQNFAeoDLAFDTAABVwHTAv8B
+        SwGMEAADSAGEAfMBlgEhAf8CSwFKAYoUAAMpAT0DSQHpAywBQxgAAykBPQNIAeoDLAFDTAABVwHTAv8B
         VwHTAv8BVwHTAv8BVwHTAv8BVwHTAv8BVwHTAv8BVwHTAv8BVwHTAv8BVwHTAv8BVwHTAv8BVwHTAv8B
         VwHTAv8BVwHTAv8BVwHTAv8MAANHAYIB8wGWASEB/wNLAYwYAANIAYQB8wGWASEB/wJLAUoBigwAAyoB
-        PwNHAesDKwFCIAADKwFCA0cB6wMqAT9IAAFcAdQB/gH/AV0B1AL/AV0B1AL/AV0B1AL/AV0B1AL/AV0B
-        1AL/AV0B1AL/AV0B1AL/AV0B1AL/AV0B1AL/AV0B1AL/AV0B1AL/AV0B1AL/AV0B1AL/CAADFQEcAZgB
-        dwFKAe4DSQGIIAADSQGIAZgBdwFKAe4DFQEcCAADGAEgAyoBPygAAyoBPwMYASBJAAGIAckB/wEAAYgB
+        PwNMAesDKwFCIAADKwFCA0wB6wMqAT9IAAFcAdQB/gH/AV0B1AL/AV0B1AL/AV0B1AL/AV0B1AL/AV0B
+        1AL/AV0B1AL/AV0B1AL/AV0B1AL/AV0B1AL/AV0B1AL/AV0B1AL/AV0B1AL/AV0B1AL/CAADFQEcAZIB
+        dAFNAe4DSQGIIAADSQGIAZIBdAFNAe4DFQEcCAADGAEgAyoBPygAAyoBPwMYASBJAAGIAckB/wEAAYgB
         yQH/AQABiAHJAf8BAAGIAckB/wEAAYgByQH/AQIBiQHKAf8BMwGwAeUB/wFkAdYC/wFkAdYC/wFkAdYC
         /wFkAdYC/wFkAdYC/wFkAdYC/wFiAdQB/gH/DAADFQEcKAADFQEcjQABlQHYAf8BAAGVAdgB/wEAAZUB
-        2AH/AQABlQHYAf8BAAGVAdgB/wEAAZUB2AH/AVkBcAFzAfEDTQGTA0wBjgNMAY4DTAGOA0wBjgNMAY4D
+        2AH/AQABlQHYAf8BAAGVAdgB/wEAAZUB2AH/AVoBcAFyAfEDTQGTA0wBjgNMAY4DTAGOA0wBjgNMAY4D
         PQFnyAADSgGJAVMCVQGqAVMCVQGqAVMCVQGqAVMCVQGqAVMCVAGmAyQBNf8A/wDiAAFCAU0BPgcAAT4D
         AAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/AQAG/wIABv8CAAGAAQEE/wIAAYABAQL/Af4BfwIAAYAB
         AQH+AX8B/AE/AgABgAEBAfwBPwH4AR8CAAGAAQEB+AEfAfEBjwIAAYABAQHxAY8B4wHHAgABgAEBAeMC
@@ -166,14 +166,14 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs
         LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu
         SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAnAIAAAJNU0Z0AUkBTAIBAQIB
-        AAEoAQABKAEAARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMAARADAAEBAQABIAYAARD/
-        AP8A/wAxAAMrAUEDKwFB9AADKwFCAzoB6wM6AesDKwFCNAACRwFGAYACRwFGAYCwAAMpAT0DOgHpAywB
-        QwMpAT0DOgHqAywBQywAAkcBRgGAAfMBlgEhAf8B8wGWASEB/wNJAYioAAMpAT0DOgHpAywBQwgAAykB
-        PQM6AeoDLAFDJAACSAFHAYMB8wGWASEB/wNJAYgDSQGIAfMBlgEhAf8CSAFHAYOgAAMpAT0DOgHpAywB
-        QxAAAykBPQM6AeoDLAFDHAACRwFGAYEB8wGWASEB/wNLAYwIAANIAYQB8wGWASEB/wNKAYmYAAMpAT0D
-        OgHpAywBQxgAAykBPQM6AeoDLAFDFAADRwGCAfMBlgEhAf8DSwGMEAADSAGEAfMBlgEhAf8CSwFKAYqQ
-        AAMqAT8DOgHrAysBQiAAAysBQgM6AesDKgE/DAADRwGCAfMBlgEhAf8DSwGMGAADSAGEAfMBlgEhAf8C
-        SwFKAYqMAAMYASADKgE/KAADKgE/AxgBIAgAAxUBHAGpAXwBQgHuA0kBiCAAA0kBiAGpAXwBQgHuAxUB
+        AAEwAQABMAEAARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMAARADAAEBAQABIAYAARD/
+        AP8A/wAxAAMrAUEDKwFB9AADKwFCA0EB6wNBAesDKwFCNAACRwFGAYACRwFGAYCwAAMpAT0DQQHpAywB
+        QwMpAT0DPwHqAywBQywAAkcBRgGAAfMBlgEhAf8B8wGWASEB/wNJAYioAAMpAT0DQQHpAywBQwgAAykB
+        PQM/AeoDLAFDJAACSAFHAYMB8wGWASEB/wNJAYgDSQGIAfMBlgEhAf8CSAFHAYOgAAMpAT0DQQHpAywB
+        QxAAAykBPQM/AeoDLAFDHAACRwFGAYEB8wGWASEB/wNLAYwIAANIAYQB8wGWASEB/wNKAYmYAAMpAT0D
+        QQHpAywBQxgAAykBPQM/AeoDLAFDFAADRwGCAfMBlgEhAf8DSwGMEAADSAGEAfMBlgEhAf8CSwFKAYqQ
+        AAMqAT8DQQHrAysBQiAAAysBQgNBAesDKgE/DAADRwGCAfMBlgEhAf8DSwGMGAADSAGEAfMBlgEhAf8C
+        SwFKAYqMAAMYASADKgE/KAADKgE/AxgBIAgAAxUBHAGhAXkBRwHuA0kBiCAAA0kBiAGhAXkBRwHuAxUB
         HMwAAxUBHCgAAxUBHP8A/wD/AP8AjAABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEAAQEFAAGAFwAD
         /wEABP8EAAT/BAAE/wQAAf4BfwL/BAAB/AE/Af4BfwQAAfgBHwH8AT8EAAHxAY8B+AEfBAAB4wHHAfEB
         jwQAAccC4wHHBAABjwHxAccB4wQAAZ8B+QGPAfEEAAL/Ad8B+wQABP8EAAT/BAAE/wQABP8EAAs=
diff --git a/FileSystem/barchart_strategy.cs b/FileSystem/barchart_strategy.cs
@@ -12,6 +12,7 @@ public class BarChartVisualizationStrategy : IVisualizationStrategy
         public void VisualizeFolder(Folder folder, Panel panel)
         {
             panel.Controls.Clear();
+            
             currentY = 10;
             items = new List<(string, long, bool)>();
 
@@ -38,13 +39,13 @@ private void CollectItems(Folder folder)
         {
             foreach (var child in folder.Children)
             {
-                if (child is Folder childFolder)
+                if (child.isFolder)
                 {
-                    items.Add((childFolder.Name, childFolder.Size, true));
+                    items.Add((child.Name, child.Size, true));
                 }
-                else if (child is File file)
+                else if (!child.isFolder)
                 {
-                    items.Add((file.Name, file.Size, false));
+                    items.Add((child.Name, child.Size, false));
                 }
             }
 
diff --git a/FileSystem/component_interface.cs b/FileSystem/component_interface.cs
@@ -5,6 +5,7 @@ public interface IComponent
     {
         string Name { get; }
         long Size { get; }
+        bool isFolder { get; }
         long CalculateSize();
         void Visualize(IVisualizationStrategy strategy, Panel panel);
     }
diff --git a/FileSystem/file_class.cs b/FileSystem/file_class.cs
@@ -6,6 +6,8 @@ public class File : IComponent
         public string Name { get; set; }
         public long Size { get; set; }
         public string Extension { get; set; }
+        public bool isFolder => false;
+
 
         public File(string name, long size, string extension)
         {
diff --git a/FileSystem/folder_class.cs b/FileSystem/folder_class.cs
@@ -9,6 +9,8 @@ public class Folder : IComponent
 
         public List<IComponent> Children => children;
 
+        public bool isFolder => true;
+
         public Folder(string name)
         {
             Name = name;
diff --git a/FileSystem/tree_strategy.cs b/FileSystem/tree_strategy.cs
@@ -42,20 +42,20 @@ private void DrawFolderTree(Folder folder, Panel panel, int x, int level)
             // Draw children
             foreach (var child in folder.Children)
             {
-                if (child is Folder childFolder)
+                if (child.isFolder)
                 {
                     // Draw connecting line from parent to child
                     DrawLine(panel, x + (level * INDENT) + 60, folderY + 10, 
                             x + ((level + 1) * INDENT) + 60, currentY + 10);
                     
-                    DrawFolderTree(childFolder, panel, x, level + 1);
+                    DrawFolderTree((Folder)child, panel, x, level + 1);
                 }
-                else if (child is File file)
+                else if (!child.isFolder)
                 {
                     // Draw connecting line from parent to file
                     DrawLine(panel, x + (level * INDENT) + 60, folderY + 10, 
                             x + ((level + 1) * INDENT) + 60, currentY + 10);
-                    DrawFile(file, panel, x + ((level + 1) * INDENT) + 20 , currentY );
+                    DrawFile((File)child, panel, x + ((level + 1) * INDENT) + 20 , currentY );
                     currentY += LINE_HEIGHT;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ private TreeNode CreateTreeNode(IComponent component)`
`105`	`105`	`if (component is Folder folder)`
`106`	`106`	`{`
`107`	`107`	`string sizeText = FormatSize(folder.Size);`
`108`		`- node = new TreeNode($"{folder.Name} ({sizeText})");`
	`108`	`+ node = new TreeNode(folder.Name);`
`109`	`109`	`node.ImageIndex = 0;`
`110`	`110`	`node.SelectedImageIndex = 0;`
`111`	`111`
`@@ -143,8 +143,6 @@ private void Visualize()`
`143`	`143`	`{`
`144`	`144`	`if (rootFolder != null)`
`145`	`145`	`{`
`146`		`- pnlVisualization.Controls.Clear();`
`147`		`- pnlVisualization.AutoScroll = true;`
`148`	`146`	`rootFolder.Visualize(currentStrategy, pnlVisualization);`
`149`	`147`	`}`
`150`	`148`	`}`
`@@ -154,6 +152,7 @@ private void rbTree_CheckedChanged(object sender, EventArgs e)`
`154`	`152`	`if (rbTree.Checked)`
`155`	`153`	`{`
`156`	`154`	`currentStrategy = new TreeVisualizationStrategy();`
	`155`	`+ Text = "Folder Traversal";`
`157`	`156`	`Visualize();`
`158`	`157`	`}`
`159`	`158`	`}`
`@@ -163,8 +162,14 @@ private void rbBarChart_CheckedChanged(object sender, EventArgs e)`
`163`	`162`	`if (rbBarChart.Checked)`
`164`	`163`	`{`
`165`	`164`	`currentStrategy = new BarChartVisualizationStrategy();`
	`165`	`+ Text = "Folder Size Visualizer";`
`166`	`166`	`Visualize();`
`167`	`167`	`}`
`168`	`168`	`}`
	`169`	`+`
	`170`	`+ private void pnlVisualization_Paint(object sender, PaintEventArgs e)`
	`171`	`+ {`
	`172`	`+`
	`173`	`+ }`
`169`	`174`	`}`
`170`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ public class BarChartVisualizationStrategy : IVisualizationStrategy`
`12`	`12`	`public void VisualizeFolder(Folder folder, Panel panel)`
`13`	`13`	`{`
`14`	`14`	`panel.Controls.Clear();`
	`15`	`+`
`15`	`16`	`currentY = 10;`
`16`	`17`	`items = new List<(string, long, bool)>();`
`17`	`18`
`@@ -38,13 +39,13 @@ private void CollectItems(Folder folder)`
`38`	`39`	`{`
`39`	`40`	`foreach (var child in folder.Children)`
`40`	`41`	`{`
`41`		`- if (child is Folder childFolder)`
	`42`	`+ if (child.isFolder)`
`42`	`43`	`{`
`43`		`- items.Add((childFolder.Name, childFolder.Size, true));`
	`44`	`+ items.Add((child.Name, child.Size, true));`
`44`	`45`	`}`
`45`		`- else if (child is File file)`
	`46`	`+ else if (!child.isFolder)`
`46`	`47`	`{`
`47`		`- items.Add((file.Name, file.Size, false));`
	`48`	`+ items.Add((child.Name, child.Size, false));`
`48`	`49`	`}`
`49`	`50`	`}`
`50`	`51`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ public interface IComponent`
`5`	`5`	`{`
`6`	`6`	`string Name { get; }`
`7`	`7`	`long Size { get; }`
	`8`	`+ bool isFolder { get; }`
`8`	`9`	`long CalculateSize();`
`9`	`10`	`void Visualize(IVisualizationStrategy strategy, Panel panel);`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ public class File : IComponent`
`6`	`6`	`public string Name { get; set; }`
`7`	`7`	`public long Size { get; set; }`
`8`	`8`	`public string Extension { get; set; }`
	`9`	`+ public bool isFolder => false;`
	`10`	`+`
`9`	`11`
`10`	`12`	`public File(string name, long size, string extension)`
`11`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ public class Folder : IComponent`
`9`	`9`
`10`	`10`	`public List<IComponent> Children => children;`
`11`	`11`
	`12`	`+ public bool isFolder => true;`
	`13`	`+`
`12`	`14`	`public Folder(string name)`
`13`	`15`	`{`
`14`	`16`	`Name = name;`
Original file line number	Diff line number	Diff line change
`@@ -42,20 +42,20 @@ private void DrawFolderTree(Folder folder, Panel panel, int x, int level)`
`42`	`42`	`// Draw children`
`43`	`43`	`foreach (var child in folder.Children)`
`44`	`44`	`{`
`45`		`- if (child is Folder childFolder)`
	`45`	`+ if (child.isFolder)`
`46`	`46`	`{`
`47`	`47`	`// Draw connecting line from parent to child`
`48`	`48`	`DrawLine(panel, x + (level * INDENT) + 60, folderY + 10,`
`49`	`49`	`x + ((level + 1) * INDENT) + 60, currentY + 10);`
`50`	`50`
`51`		`- DrawFolderTree(childFolder, panel, x, level + 1);`
	`51`	`+ DrawFolderTree((Folder)child, panel, x, level + 1);`
`52`	`52`	`}`
`53`		`- else if (child is File file)`
	`53`	`+ else if (!child.isFolder)`
`54`	`54`	`{`
`55`	`55`	`// Draw connecting line from parent to file`
`56`	`56`	`DrawLine(panel, x + (level * INDENT) + 60, folderY + 10,`
`57`	`57`	`x + ((level + 1) * INDENT) + 60, currentY + 10);`
`58`		`- DrawFile(file, panel, x + ((level + 1) * INDENT) + 20 , currentY );`
	`58`	`+ DrawFile((File)child, panel, x + ((level + 1) * INDENT) + 20 , currentY );`
`59`	`59`	`currentY += LINE_HEIGHT;`
`60`	`60`	`}`
`61`	`61`	`}`