Add units - v1.1

valfr · Aug 10, 2018 · 386c1e7 · 386c1e7
1 parent bbbf1ee
commit 386c1e7
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 3 deletions.
diff --git a/vRaid/Form1.Designer.cs b/vRaid/Form1.Designer.cs
diff --git a/vRaid/Form1.cs b/vRaid/Form1.cs
@@ -27,6 +27,7 @@ public Form1()
             disksSize = 0;
             labelArraySize.Text = "";
             labelUsableSpace.Text = "";
+            sizeUnit.Text = "";
         }
 
         void raidCalcul()
@@ -43,18 +44,58 @@ void raidCalcul()
                 {
                     if(disksCount >=3)
                     {
-                        int t = (disksCount-1) * disksSize;
+                        decimal t = (disksCount-1) * disksSize;
                         float tt = (float)t / (float)1.073741824;
                         decimal ttt = Math.Round((Decimal)tt, 2, MidpointRounding.AwayFromZero);
+                        // UNIT pre-converter
+                        if(t > 1000 && ttt > 1000)
+                        {
+                            t = t / 1000;
+                            ttt = ttt / 1000;
+                        }
                         labelArraySize.Text = t.ToString();
-                        labelUsableSpace.Text = ttt.ToString();
+                        labelUsableSpace.Text = Math.Round(ttt, 2, MidpointRounding.AwayFromZero).ToString();
                     }
                     else
                     {
                         labelArraySize.Text = "Raid 5 minimum disks are 3";
                     }
                 }
-
+
+                detectUnit();
+            }
+        }
+
+        void detectUnit()
+        {
+            // des GO ?
+            if(disksSize.ToString().Length == 3)
+            {
+                sizeUnit.Text = "Go";
+                if (labelArraySize.Text.Length > 3)
+                {
+                    labelArraySize.Text += " To";
+                    labelUsableSpace.Text += " To";
+                }
+                else
+                {
+                    labelArraySize.Text += " Go";
+                    labelUsableSpace.Text += " Go";
+                }
+            } 
+            // des TB (full longueur)
+            else if (disksSize.ToString().Length == 4)
+            {
+                sizeUnit.Text = "Go";
+                labelArraySize.Text += " To";
+                labelUsableSpace.Text += " To";
+            }
+            // des TB (petite longueur)
+            else if (disksSize.ToString().Length == 1)
+            {
+                sizeUnit.Text = "To";
+                labelArraySize.Text += " To";
+                labelUsableSpace.Text += " To";
             }
         }
 

diff --git a/vRaid/bin/Release/vRaid.exe b/vRaid/bin/Release/vRaid.exe
diff --git a/vRaid/bin/Release/vRaid.pdb b/vRaid/bin/Release/vRaid.pdb
diff --git a/vRaid/bin/Release/vRaid.zip b/vRaid/bin/Release/vRaid.zip
diff --git a/vRaid/obj/Release/vRaid.csproj.GenerateResource.cache b/vRaid/obj/Release/vRaid.csproj.GenerateResource.cache
diff --git a/vRaid/obj/Release/vRaid.exe b/vRaid/obj/Release/vRaid.exe
diff --git a/vRaid/obj/Release/vRaid.pdb b/vRaid/obj/Release/vRaid.pdb