diff --git a/vRaid/Form1.Designer.cs b/vRaid/Form1.Designer.cs
index a9df597..793516a 100644
--- a/vRaid/Form1.Designer.cs
+++ b/vRaid/Form1.Designer.cs
@@ -195,7 +195,7 @@ private void InitializeComponent()
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(14, 7);
this.label7.TabIndex = 14;
- this.label7.Text = "1.1";
+ this.label7.Text = "1.2";
//
// Form1
//
diff --git a/vRaid/Form1.cs b/vRaid/Form1.cs
index 9648319..d26695b 100644
--- a/vRaid/Form1.cs
+++ b/vRaid/Form1.cs
@@ -28,6 +28,7 @@ public Form1()
labelArraySize.Text = "";
labelUsableSpace.Text = "";
sizeUnit.Text = "";
+ this.AcceptButton = button1;
}
void raidCalcul()
@@ -38,7 +39,27 @@ void raidCalcul()
// selection du niveau de raid
if(comboBoxRaidLevel.Text == "Raid 1")
{
-
+ // verif si nombre pair ?
+ if (disksCount == 2)
+ {
+ decimal t = 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 = Math.Round(ttt, 2, MidpointRounding.AwayFromZero).ToString();
+ }
+ else
+ {
+ labelArraySize.Text = "Use 2 disks for RAID 1";
+ labelArraySize.ForeColor = Color.Red;
+ return;
+ }
}
else if (comboBoxRaidLevel.Text == "Raid 5")
{
@@ -58,7 +79,9 @@ void raidCalcul()
}
else
{
- labelArraySize.Text = "Raid 5 minimum disks are 3";
+ labelArraySize.Text = "3 disks minimum for RAID 5";
+ labelArraySize.ForeColor = Color.Red;
+ return;
}
}
diff --git a/vRaid/Properties/AssemblyInfo.cs b/vRaid/Properties/AssemblyInfo.cs
index 8befe78..75af2c0 100644
--- a/vRaid/Properties/AssemblyInfo.cs
+++ b/vRaid/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]
diff --git a/vRaid/Properties/app.manifest b/vRaid/Properties/app.manifest
new file mode 100644
index 0000000..cd90d8b
--- /dev/null
+++ b/vRaid/Properties/app.manifest
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vRaid/bin/Release/app.publish/vRaid.exe b/vRaid/bin/Release/app.publish/vRaid.exe
new file mode 100644
index 0000000..be44718
Binary files /dev/null and b/vRaid/bin/Release/app.publish/vRaid.exe differ
diff --git a/vRaid/bin/Release/vRaid.application b/vRaid/bin/Release/vRaid.application
new file mode 100644
index 0000000..579f26f
--- /dev/null
+++ b/vRaid/bin/Release/vRaid.application
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ qYxL148g2nR0DUU3MhUzw1Tg+TM=
+
+
+
+
\ No newline at end of file
diff --git a/vRaid/bin/Release/vRaid.exe b/vRaid/bin/Release/vRaid.exe
index cda64e7..8a4819e 100644
Binary files a/vRaid/bin/Release/vRaid.exe and b/vRaid/bin/Release/vRaid.exe differ
diff --git a/vRaid/bin/Release/vRaid.exe.manifest b/vRaid/bin/Release/vRaid.exe.manifest
new file mode 100644
index 0000000..3b6a012
--- /dev/null
+++ b/vRaid/bin/Release/vRaid.exe.manifest
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ uclicB8DytewwpY5r+5PMIeUw4E=
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vRaid/bin/Release/vRaid.pdb b/vRaid/bin/Release/vRaid.pdb
index d660f07..8bc7b73 100644
Binary files a/vRaid/bin/Release/vRaid.pdb and b/vRaid/bin/Release/vRaid.pdb differ
diff --git a/vRaid/obj/Release/DesignTimeResolveAssemblyReferences.cache b/vRaid/obj/Release/DesignTimeResolveAssemblyReferences.cache
index e0eeb91..0199168 100644
Binary files a/vRaid/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/vRaid/obj/Release/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/vRaid/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/vRaid/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
index 9510904..7b16c26 100644
Binary files a/vRaid/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/vRaid/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/vRaid/obj/Release/vRaid.TrustInfo.xml b/vRaid/obj/Release/vRaid.TrustInfo.xml
new file mode 100644
index 0000000..7aaa723
--- /dev/null
+++ b/vRaid/obj/Release/vRaid.TrustInfo.xml
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/vRaid/obj/Release/vRaid.application b/vRaid/obj/Release/vRaid.application
new file mode 100644
index 0000000..579f26f
--- /dev/null
+++ b/vRaid/obj/Release/vRaid.application
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ qYxL148g2nR0DUU3MhUzw1Tg+TM=
+
+
+
+
\ No newline at end of file
diff --git a/vRaid/obj/Release/vRaid.csproj.FileListAbsolute.txt b/vRaid/obj/Release/vRaid.csproj.FileListAbsolute.txt
index 471ad58..e9c3360 100644
--- a/vRaid/obj/Release/vRaid.csproj.FileListAbsolute.txt
+++ b/vRaid/obj/Release/vRaid.csproj.FileListAbsolute.txt
@@ -7,3 +7,8 @@ E:\Dev\RAID calculator\vRAID\vRaid\vRaid\obj\Release\vRaid.csproj.CoreCompileInp
E:\Dev\RAID calculator\vRAID\vRaid\vRaid\obj\Release\vRaid.exe
E:\Dev\RAID calculator\vRAID\vRaid\vRaid\obj\Release\vRaid.pdb
E:\Dev\RAID calculator\vRAID\vRaid\vRaid\obj\Release\vRaid.csprojResolveAssemblyReference.cache
+E:\Dev\RAID calculator\vRAID\vRaid\vRaid\bin\Release\vRaid.exe.manifest
+E:\Dev\RAID calculator\vRAID\vRaid\vRaid\bin\Release\vRaid.application
+E:\Dev\RAID calculator\vRAID\vRaid\vRaid\obj\Release\vRaid.TrustInfo.xml
+E:\Dev\RAID calculator\vRAID\vRaid\vRaid\obj\Release\vRaid.exe.manifest
+E:\Dev\RAID calculator\vRAID\vRaid\vRaid\obj\Release\vRaid.application
diff --git a/vRaid/obj/Release/vRaid.csproj.GenerateResource.cache b/vRaid/obj/Release/vRaid.csproj.GenerateResource.cache
index a5d0562..9b646d0 100644
Binary files a/vRaid/obj/Release/vRaid.csproj.GenerateResource.cache and b/vRaid/obj/Release/vRaid.csproj.GenerateResource.cache differ
diff --git a/vRaid/obj/Release/vRaid.csprojResolveAssemblyReference.cache b/vRaid/obj/Release/vRaid.csprojResolveAssemblyReference.cache
index 2f0afb9..9b575ed 100644
Binary files a/vRaid/obj/Release/vRaid.csprojResolveAssemblyReference.cache and b/vRaid/obj/Release/vRaid.csprojResolveAssemblyReference.cache differ
diff --git a/vRaid/obj/Release/vRaid.exe b/vRaid/obj/Release/vRaid.exe
index cda64e7..8a4819e 100644
Binary files a/vRaid/obj/Release/vRaid.exe and b/vRaid/obj/Release/vRaid.exe differ
diff --git a/vRaid/obj/Release/vRaid.exe.manifest b/vRaid/obj/Release/vRaid.exe.manifest
new file mode 100644
index 0000000..3b6a012
--- /dev/null
+++ b/vRaid/obj/Release/vRaid.exe.manifest
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ uclicB8DytewwpY5r+5PMIeUw4E=
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vRaid/obj/Release/vRaid.pdb b/vRaid/obj/Release/vRaid.pdb
index d660f07..8bc7b73 100644
Binary files a/vRaid/obj/Release/vRaid.pdb and b/vRaid/obj/Release/vRaid.pdb differ
diff --git a/vRaid/vRaid.csproj b/vRaid/vRaid.csproj
index 2cac9d2..d92d5db 100644
--- a/vRaid/vRaid.csproj
+++ b/vRaid/vRaid.csproj
@@ -10,6 +10,22 @@
vRaid
v4.0
512
+ false
+ publish\
+ true
+ Disk
+ false
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ 1
+ 1.1.0.%2a
+ false
+ true
+ true
AnyCPU
@@ -30,6 +46,24 @@
prompt
4
+
+ 0E31E07634D65CFDFB5D4D40C4DCA465B6558279
+
+
+ vRaid_TemporaryKey.pfx
+
+
+ true
+
+
+ LocalIntranet
+
+
+ Properties\app.manifest
+
+
+ true
+
@@ -63,6 +97,7 @@
True
Resources.resx
+
SettingsSingleFileGenerator
Settings.Designer.cs
@@ -72,6 +107,14 @@
Settings.settings
True
+
+
+
+
+ False
+ .NET Framework 3.5 SP1
+ false
+
\ No newline at end of file
diff --git a/vRaid/vRaid.csproj.user b/vRaid/vRaid.csproj.user
new file mode 100644
index 0000000..f563beb
--- /dev/null
+++ b/vRaid/vRaid.csproj.user
@@ -0,0 +1,16 @@
+
+
+
+ publish\
+
+
+
+
+
+ en-US
+ false
+
+
+ false
+
+
\ No newline at end of file
diff --git a/vRaid/vRaid_TemporaryKey.pfx b/vRaid/vRaid_TemporaryKey.pfx
new file mode 100644
index 0000000..4f44fa4
Binary files /dev/null and b/vRaid/vRaid_TemporaryKey.pfx differ