RandomizerNumber (#4)

* Number`[...] * fix ui * remove IFieldOptions
StefH · Nov 9, 2018 · 9d2180c · 9d2180c
1 parent 2357621
commit 9d2180c
Show file tree

Hide file tree

Showing 33 changed files with 239 additions and 415 deletions.
diff --git a/Example Project Files/My Table.xml b/Example Project Files/My Table.xml
@@ -14,9 +14,9 @@
  <Name>Numbers_Integer</Name>
  <FieldOptions xsi:type="FieldOptionsInteger">
  <ValueAsString>false</ValueAsString>
- <UseNullValues>true</UseNullValues>
+ <UseNullValues>false</UseNullValues>
  <Min>0</Min>
- <Max>99999999</Max>
+ <Max>77778888</Max>
  </FieldOptions>
  <Field>
  <FieldType>Numbers</FieldType>
@@ -25,20 +25,6 @@
  <SubFieldType>Integer</SubFieldType>
  </SubField>
  </DataField>
- <DataField>
- <Name>Numbers_IntegerFixed</Name>
- <FieldOptions xsi:type="FieldOptionsIntegerFixed">
- <ValueAsString>false</ValueAsString>
- <UseNullValues>false</UseNullValues>
- <Value>77</Value>
- </FieldOptions>
- <Field>
- <FieldType>Numbers</FieldType>
- </Field>
- <SubField>
- <SubFieldType>IntegerFixed</SubFieldType>
- </SubField>
- </DataField>
  <DataField>
  <Name>Human_First_Both</Name>
  <FieldOptions xsi:type="FieldOptionsFirstName">

diff --git a/src/ConsoleAppClassic/MainTest.cs b/src/ConsoleAppClassic/MainTest.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using RandomDataGenerator.FieldOptions;
 using RandomDataGenerator.Randomizers;
 
@@ -28,10 +29,22 @@ public static void Run()
  string firstname = randomizerFirstName.Generate();
  Write(randomizerFirstName, firstname);
 
+ var randomizerBoolean = RandomizerFactory.GetRandomizer(new FieldOptionsBoolean());
+ bool? b = randomizerBoolean.Generate();
+ Write(randomizerBoolean, b);
+
+ var randomizerShort = RandomizerFactory.GetRandomizer(new FieldOptionsShort());
+ short? sh = randomizerShort.Generate();
+ Write(randomizerShort, sh);
+
  var randomizerInteger = RandomizerFactory.GetRandomizer(new FieldOptionsInteger());
  int? integer = randomizerInteger.Generate();
  Write(randomizerInteger, integer);
 
+ var randomizerDouble = RandomizerFactory.GetRandomizer(new FieldOptionsDouble());
+ double? dbl = randomizerDouble.Generate();
+ Write(randomizerDouble, dbl);
+
  var randomizerGuid = RandomizerFactory.GetRandomizer(new FieldOptionsGuid());
  Guid? guid = randomizerGuid.Generate();
  Write(randomizerGuid, guid);
@@ -70,7 +83,8 @@ public static void Run()
 
  private static void Write<T>(object randomizer, T value)
  {
- Console.WriteLine("{0} --> '{1}'", randomizer.GetType().Name, value);
+ Type genericType = randomizer.GetType().GetTypeInfo().GenericTypeArguments.FirstOrDefault();
+ Console.WriteLine("{0}{1} --> '{2}'", randomizer.GetType().Name, genericType != null ? $"[{genericType}]" : string.Empty, value);
  }
  }
 }
diff --git a/src/RandomDataGenerator Solution.sln.DotSettings b/src/RandomDataGenerator Solution.sln.DotSettings
@@ -3,4 +3,5 @@
  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SQL/@EntryIndexedValue">SQL</s:String>
  <s:Boolean x:Key="/Default/UserDictionary/Words/=Lipsum/@EntryIndexedValue">True</s:Boolean>
  <s:Boolean x:Key="/Default/UserDictionary/Words/=Randomizer/@EntryIndexedValue">True</s:Boolean>
- <s:Boolean x:Key="/Default/UserDictionary/Words/=Randomizers/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+ <s:Boolean x:Key="/Default/UserDictionary/Words/=Randomizers/@EntryIndexedValue">True</s:Boolean>
+ <s:Boolean x:Key="/Default/UserDictionary/Words/=Stef/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/src/RandomDataGenerator.Gui/Data/DataManager.cs b/src/RandomDataGenerator.Gui/Data/DataManager.cs
@@ -11,24 +11,17 @@ public class DataManager
 
  public DataManager()
  {
- /*
- _fields.Add(new Field
- {
- FieldType = FieldType.None,
- SubFields = new []
- {
- new SubField { SubFieldType = SubFieldType.None }
- }
- });
- */
-
  _fields.Add(new Field
  {
  FieldType = FieldType.Numbers,
  SubFields = new[]
  {
+ // new SubField { SubFieldType = SubFieldType.Boolean },
+ // new SubField { SubFieldType = SubFieldType.Short },
  new SubField { SubFieldType = SubFieldType.Integer },
- new SubField { SubFieldType = SubFieldType.IntegerFixed }
+ // new SubField { SubFieldType = SubFieldType.Long },
+ // new SubField { SubFieldType = SubFieldType.Float },
+ // new SubField { SubFieldType = SubFieldType.Double }
  }
  });
 

diff --git a/src/RandomDataGenerator.Gui/RandomDataGenerator.Gui.csproj b/src/RandomDataGenerator.Gui/RandomDataGenerator.Gui.csproj
@@ -184,12 +184,6 @@
  <Compile Include="UserControlsFields\UserControlTextWords.Designer.cs">
  <DependentUpon>UserControlTextWords.cs</DependentUpon>
  </Compile>
- <Compile Include="UserControlsFields\UserControlIntegerFixed.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="UserControlsFields\UserControlIntegerFixed.Designer.cs">
- <DependentUpon>UserControlIntegerFixed.cs</DependentUpon>
- </Compile>
  <Compile Include="UserControlsFields\UserControlCity.cs">
  <SubType>UserControl</SubType>
  </Compile>
@@ -276,9 +270,6 @@
  <EmbeddedResource Include="UserControlsFields\UserControlTextWords.resx">
  <DependentUpon>UserControlTextWords.cs</DependentUpon>
  </EmbeddedResource>
- <EmbeddedResource Include="UserControlsFields\UserControlIntegerFixed.resx">
- <DependentUpon>UserControlIntegerFixed.cs</DependentUpon>
- </EmbeddedResource>
  <EmbeddedResource Include="UserControlsFields\UserControlCity.resx">
  <DependentUpon>UserControlCity.cs</DependentUpon>
  </EmbeddedResource>

diff --git a/src/RandomDataGenerator.Gui/UserControlsFields/UserControlIntegerFixed.Designer.cs b/src/RandomDataGenerator.Gui/UserControlsFields/UserControlIntegerFixed.Designer.cs
diff --git a/src/RandomDataGenerator.Gui/UserControlsFields/UserControlIntegerFixed.cs b/src/RandomDataGenerator.Gui/UserControlsFields/UserControlIntegerFixed.cs
diff --git a/src/RandomDataGenerator.Gui/UserControlsFields/UserControlIntegerFixed.resx b/src/RandomDataGenerator.Gui/UserControlsFields/UserControlIntegerFixed.resx