Changeset 296 for trunk

Timestamp:

Mar 29, 2019, 12:58:09 PM (6 years ago)

Author:

chronos

Message:

• Added: New enumeration field type in generic TItem classes.

Location:

trunk

Files:

• Forms/UFormItem.lfm (modified) (1 diff)
• Forms/UFormItem.pas (modified) (5 diffs)
• Languages/xtactics.cs.po (modified) (2 diffs)
• Languages/xtactics.po (modified) (2 diffs)
• UBuilding.pas (modified) (4 diffs)
• UItemList.pas (modified) (12 diffs)
• UNation.pas (modified) (3 diffs)
• UUnit.pas (modified) (2 diffs)

trunk/Forms/UFormItem.lfm

@@ -28 +28 @@
     Left = 220
     Height = 32
-    Top = 257
+    Top = 260
     Width = 94
     Anchors = [akLeft]

trunk/Forms/UFormItem.pas

@@ -89 +89 @@
   Fields: TItemFields;
   I: Integer;
+  J: Integer;
   Control: TControl;
 begin
@@ -99 +100 @@
     else if DataType = dtColor then TColorBox(Control).Selected := Item.GetValueColor(Index)
     else if DataType = dtBoolean then TCheckBox(Control).Checked := Item.GetValueBoolean(Index)
-    else raise Exception.Create('Unsupported type ' + IntToStr(Integer(DataType)));
+    else if DataType = dtEnumeration then begin
+      TComboBox(Control).Items.BeginUpdate;
+      try
+        TComboBox(Control).Items.Clear;
+        for J := 0 to EnumStates.Count - 1 do
+          TComboBox(Control).Items.Add(EnumStates[J]);
+        TComboBox(Control).ItemIndex := Integer(Item.GetValueEnumeration(Index));
+      finally
+        TComboBox(Control).Items.EndUpdate;
+      end;
+    end
+    else raise Exception.Create(Format(SUnsupportedDataType, [DataTypeStr[DataType]]));
   end;
   Fields.Free;
@@ -118 +130 @@
     else if DataType = dtColor then Item.SetValueColor(Index, TColorBox(Control).Selected)
     else if DataType = dtBoolean then Item.SetValueBoolean(Index, TCheckBox(Control).Checked)
-    else raise Exception.Create('Unsupported type ' + IntToStr(Integer(DataType)));
+    else if DataType = dtEnumeration then Item.SetValueEnumeration(Index, TUndefinedEnum(TComboBox(Control).ItemIndex))
+    else raise Exception.Create(Format(SUnsupportedDataType, [DataTypeStr[DataType]]));
   end;
   Fields.Free;
@@ -145 +158 @@
       NewControl := TSpinEdit.Create(nil);
       NewControl.Width := 100;
+      TSpinEdit(NewControl).MaxValue := High(Integer);
     end else
     if DataType = dtString then begin
@@ -154 +168 @@
       NewControl.Width := 200;
     end else
+    if DataType = dtEnumeration then begin
+      NewControl := TComboBox.Create(nil);
+      NewControl.Width := 200;
+      TComboBox(NewControl).Style := csDropDownList;
+    end else
     if DataType = dtBoolean then begin
       NewControl := TCheckBox.Create(nil);
-    end else raise Exception.Create('Unsupported type ' + IntToStr(Integer(DataType)));
+    end else
+      raise Exception.Create(Format(SUnsupportedDataType, [DataTypeStr[DataType]]));
     NewControl.Left := 150;
     NewControl.Top := Y;

trunk/Languages/xtactics.cs.po

@@ -962 +962 @@
 msgstr "Budovy"
 
+#: ubuilding.scity
+msgid "City"
+msgstr "Město"
+
 #: ubuilding.scost
 msgctxt "ubuilding.scost"
 msgid "Cost"
 msgstr "Cena"
+
+#: ubuilding.snone
+msgctxt "ubuilding.snone"
+msgid "None"
+msgstr "Žádný"
 
 #: ubuilding.sspecialtype
@@ -1288 +1297 @@
 msgstr "Ne"
 
+#: uitemlist.sunsupporteddatatype
+msgid "Unsupported field value data type %s"
+msgstr "Nepodporovaný datový typ hodnoty pole %s"
+
 #: uitemlist.syes
 msgid "Yes"

trunk/Languages/xtactics.po

@@ -947 +947 @@
 msgstr ""
 
+#: ubuilding.scity
+msgid "City"
+msgstr ""
+
 #: ubuilding.scost
 msgctxt "ubuilding.scost"
 msgid "Cost"
+msgstr ""
+
+#: ubuilding.snone
+msgctxt "ubuilding.snone"
+msgid "None"
 msgstr ""
 
@@ -1265 +1274 @@
 msgstr ""
 
+#: uitemlist.sunsupporteddatatype
+msgid "Unsupported field value data type %s"
+msgstr ""
+
 #: uitemlist.syes
 msgid "Yes"

trunk/UBuilding.pas

@@ -52 +52 @@
   SCost = 'Cost';
   SSpecialType = 'Special type';
+  SNone = 'None';
+  SCity = 'City';
 
 
@@ -83 +85 @@
 
 class function TBuildingKind.GetFields: TItemFields;
+var
+  Field: TItemField;
 begin
   Result := inherited;
   Result.AddField(2, 'Cost', SCost, dtInteger);
-  Result.AddField(3, 'SpecialType', SSpecialType, dtInteger);
+  Field := Result.AddField(3, 'SpecialType', SSpecialType, dtEnumeration);
+  Field.EnumStates.Add(SNone);
+  Field.EnumStates.Add(SCity);
 end;
 
@@ -94 +100 @@
   else if Index = 2 then Integer(Value) := Cost
   else if Index = 3 then TBuildingSpecialType(Value) := SpecialType
-  else raise Exception.Create('Unsupported value index ' + IntToStr(Index));
+  else inherited;
 end;
 
@@ -102 +108 @@
   else if Index = 2 then Cost := Integer(Value)
   else if Index = 3 then SpecialType := TBuildingSpecialType(Value)
-  else raise Exception.Create('Unsupported value index ' + IntToStr(Index));
+  else inherited;
 end;
 

trunk/UItemList.pas

@@ -9 +9 @@
 
 type
+  TUndefinedEnum = (eeNone);
+
   TDataType = (dtNone, dtString, dtBoolean, dtInteger, dtFloat, dtColor,
     dtTime, dtDate, dtDateTime, dtEnumeration);
@@ -21 +23 @@
     Position: TPoint;
     Size: TPoint;
+    EnumStates: TStringList;
+    constructor Create;
+    destructor Destroy; override;
     procedure Assign(Source: TItemField);
   end;
@@ -48 +53 @@
     function GetValueColor(Index: Integer): TColor;
     function GetValueBoolean(Index: Integer): Boolean;
+    function GetValueEnumeration(Index: Integer): TUndefinedEnum;
     function GetValueAsText(Index: Integer): string;
     procedure SetValue(Index: Integer; var Value); virtual;
@@ -54 +60 @@
     procedure SetValueColor(Index: Integer; Value: TColor);
     procedure SetValueBoolean(Index: Integer; Value: Boolean);
+    procedure SetValueEnumeration(Index: Integer; Value: TUndefinedEnum);
     procedure Assign(Source: TItem); virtual;
     procedure LoadFromNode(Node: TDOMNode); virtual;
@@ -80 +87 @@
   end;
 
+const
+  DataTypeStr: array[TDataType] of string = ('None', 'String', 'Boolean',
+    'Integer', 'Float', 'Color', 'Time', 'Date', 'DateTime', 'Enumeration');
+
+resourcestring
+    SUnsupportedDataType = 'Unsupported field value data type %s';
+
 
 implementation
@@ -90 +104 @@
 
 { TItemField }
+
+constructor TItemField.Create;
+begin
+  EnumStates := TStringList.Create;
+end;
+
+destructor TItemField.Destroy;
+begin
+  EnumStates.Free;
+  inherited Destroy;
+end;
 
 procedure TItemField.Assign(Source: TItemField);
@@ -99 +124 @@
   Position := Source.Position;
   Size := Source.Size;
+  EnumStates.Assign(Source.EnumStates);
 end;
 
@@ -231 +257 @@
 
 procedure TItem.AssignValue(Source: TItem; Field: TItemField);
-var
-  ValueString: string;
-  ValueColor: TColor;
-  ValueInteger: Integer;
-  ValueBoolean: Boolean;
 begin
   if Field.DataType = dtString then begin
-    Source.GetValue(Field.Index, ValueString);
-    SetValue(Field.Index, ValueString);
+    SetValueString(Field.Index, Source.GetValueString(Field.Index));
   end else
   if Field.DataType = dtColor then begin
-    Source.GetValue(Field.Index, ValueColor);
-    SetValue(Field.Index, ValueColor);
+    SetValueColor(Field.Index, Source.GetValueColor(Field.Index));
   end else
   if Field.DataType = dtInteger then begin
-    Source.GetValue(Field.Index, ValueInteger);
-    SetValue(Field.Index, ValueInteger);
+    SetValueInteger(Field.Index, Source.GetValueInteger(Field.Index));
   end else
   if Field.DataType = dtBoolean then begin
-    Source.GetValue(Field.Index, ValueBoolean);
-    SetValue(Field.Index, ValueBoolean);
-  end else
-  raise Exception.Create('Unsupported field value data type');
+    SetValueBoolean(Field.Index, Source.GetValueBoolean(Field.Index));
+  end else
+  if Field.DataType = dtEnumeration then begin
+    SetValueEnumeration(Field.Index, Source.GetValueEnumeration(Field.Index));
+  end else
+    raise Exception.Create(Format(SUnsupportedDataType, [DataTypeStr[Field.DataType]]));
 end;
 
 procedure TItem.LoadValueFromNode(Node: TDOMNode; Field: TItemField);
-var
-  ValueString: string;
-  ValueColor: TColor;
-  ValueInteger: Integer;
 begin
   if Field.DataType = dtString then begin
-    ValueString := ReadString(Node, Field.SysName, '');
-    SetValue(Field.Index, ValueString);
+    SetValueString(Field.Index, ReadString(Node, Field.SysName, ''));
   end else
   if Field.DataType = dtColor then begin
-    ValueColor := ReadInteger(Node, Field.SysName, 0);
-    SetValue(Field.Index, ValueColor);
+    SetValueColor(Field.Index, ReadInteger(Node, Field.SysName, 0));
   end else
   if Field.DataType = dtInteger then begin
-    ValueInteger := ReadInteger(Node, Field.SysName, 0);
-    SetValue(Field.Index, ValueInteger);
-  end else
-  raise Exception.Create('Unsupported field value data type');
+    SetValueInteger(Field.Index, ReadInteger(Node, Field.SysName, 0));
+  end else
+  if Field.DataType = dtBoolean then begin
+    SetValueBoolean(Field.Index, ReadBoolean(Node, Field.SysName, False));
+  end else
+  if Field.DataType = dtEnumeration then begin
+    SetValueEnumeration(Field.Index, TUndefinedEnum(ReadInteger(Node, Field.SysName, 0)));
+  end else
+    raise Exception.Create(Format(SUnsupportedDataType, [DataTypeStr[Field.DataType]]));
 end;
 
 procedure TItem.SaveValueToNode(Node: TDOMNode; Field: TItemField);
-var
-  ValueString: string;
-  ValueColor: TColor;
-  ValueInteger: Integer;
 begin
   if Field.DataType = dtString then begin
-    GetValue(Field.Index, ValueString);
-    WriteString(Node, Field.SysName, ValueString);
+    WriteString(Node, Field.SysName, GetValueString(Field.Index));
   end else
   if Field.DataType = dtColor then begin
-    GetValue(Field.Index, ValueColor);
-    WriteInteger(Node, Field.SysName, ValueColor);
+    WriteInteger(Node, Field.SysName, GetValueColor(Field.Index));
   end else
   if Field.DataType = dtInteger then begin
-    GetValue(Field.Index, ValueInteger);
-    WriteInteger(Node, Field.SysName, ValueInteger);
-  end else
-  raise Exception.Create('Unsupported field value data type');
+    WriteInteger(Node, Field.SysName, GetValueInteger(Field.Index));
+  end else
+  if Field.DataType = dtBoolean then begin
+    WriteBoolean(Node, Field.SysName, GetValueBoolean(Field.Index));
+  end else
+  if Field.DataType = dtEnumeration then begin
+    WriteInteger(Node, Field.SysName, Integer(GetValueEnumeration(Field.Index)));
+  end else
+    raise Exception.Create(Format(SUnsupportedDataType, [DataTypeStr[Field.DataType]]));
 end;
 
@@ -319 +337 @@
 procedure TItem.GetValue(Index: Integer; out Value);
 begin
+  raise Exception.Create('Unsupported value index ' + IntToStr(Index));
 end;
 
@@ -341 +360 @@
 end;
 
+function TItem.GetValueEnumeration(Index: Integer): TUndefinedEnum;
+begin
+  GetValue(Index, Result);
+end;
+
 function TItem.GetValueAsText(Index: Integer): string;
 var
   Fields: TItemFields;
-  ItemField: TItemField;
+  Field: TItemField;
 begin
   Fields := GetFields;
-  ItemField := GetField(Fields.IndexOf(Fields.SearchByIndex(Index)));
-  if ItemField.DataType = dtInteger then Result := IntToStr(GetValueInteger(Index))
-  else if ItemField.DataType = dtString then Result := GetValueString(Index)
-  else if ItemField.DataType = dtColor then Result := ''
-  else if ItemField.DataType = dtBoolean then begin
+  Field := GetField(Fields.IndexOf(Fields.SearchByIndex(Index)));
+  if Field.DataType = dtInteger then Result := IntToStr(GetValueInteger(Index))
+  else if Field.DataType = dtString then Result := GetValueString(Index)
+  else if Field.DataType = dtColor then Result := ''
+  else if Field.DataType = dtEnumeration then Result := Field.EnumStates[Integer(GetValueEnumeration(Index))]
+  else if Field.DataType = dtBoolean then begin
     if GetValueBoolean(Index) then Result := SYes else Result := SNo;
-  end;
-  ItemField.Free;
+  end else
+    raise Exception.Create(Format(SUnsupportedDataType, [DataTypeStr[Field.DataType]]));
+  Field.Free;
   Fields.Free;
 end;
@@ -360 +386 @@
 procedure TItem.SetValue(Index: Integer; var Value);
 begin
+  raise Exception.Create('Unsupported value index ' + IntToStr(Index));
 end;
 
@@ -378 +405 @@
 
 procedure TItem.SetValueBoolean(Index: Integer; Value: Boolean);
+begin
+  SetValue(Index, Value);
+end;
+
+procedure TItem.SetValueEnumeration(Index: Integer;
+  Value: TUndefinedEnum);
 begin
   SetValue(Index, Value);

trunk/UNation.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, DOM, UXMLUtils, Graphics, UItemList;
+  Classes, SysUtils, Graphics, UItemList;
 
 type
@@ -49 +49 @@
   if Index = 1 then string(Value) := Name
   else if Index = 2 then TColor(Value) := Color
-  else raise Exception.Create('Unsupported value index ' + IntToStr(Index));
+  else inherited;
 end;
 
@@ -56 +56 @@
   if Index = 1 then Name := string(Value)
   else if Index = 2 then Color := TColor(Value)
-  else raise Exception.Create('Unsupported value index ' + IntToStr(Index));
+  else inherited;
 end;
 

trunk/UUnit.pas

@@ -115 +115 @@
   else if Index = 6 then Integer(Value) := PowerDefense
   else if Index = 7 then Integer(Value) := ViewRange
-  else raise Exception.Create('Unsupported value index ' + IntToStr(Index));
+  else inherited;
 end;
 
@@ -127 +127 @@
   else if Index = 6 then PowerDefense := Integer(Value)
   else if Index = 7 then ViewRange := Integer(Value)
-  else raise Exception.Create('Unsupported value index ' + IntToStr(Index));
+  else inherited;
 end;