jedidotnet-commits Mailing List for JEDI.NET (Page 11)
Status: Pre-Alpha
Brought to you by:
jedi_mbe
Menu
▾
▴
jedidotnet-commits — CVS commit notification
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(81) |
Jul
(7) |
Aug
(8) |
Sep
(2) |
Oct
|
Nov
(47) |
Dec
(30) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(32) |
Feb
|
Mar
(86) |
Apr
|
May
(1) |
Jun
(24) |
Jul
(4) |
Aug
(5) |
Sep
(4) |
Oct
|
Nov
|
Dec
(9) |
|
From: Marcel B. <jed...@us...> - 2004-08-03 14:47:36
|
Update of /cvsroot/jedidotnet/main/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv930/main/run Modified Files: Jedi.Windows.Forms.Hmi.Leds.pas Log Message: * LedStateCollection.IndexOf overloaded to find a named state. * Changed design time behavior of LedState selection (interface changed and removed a class as a consequence). * Added AutoSize support to SingleLed control. Index: Jedi.Windows.Forms.Hmi.Leds.pas =================================================================== RCS file: /cvsroot/jedidotnet/main/run/Jedi.Windows.Forms.Hmi.Leds.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Jedi.Windows.Forms.Hmi.Leds.pas 2 Aug 2004 16:19:50 -0000 1.2 --- Jedi.Windows.Forms.Hmi.Leds.pas 3 Aug 2004 14:47:27 -0000 1.3 *************** *** 75,79 **** function Contains(value: LedStateBase): Boolean; function get_Item(index: Integer): LedStateBase; ! function IndexOf(value: LedStateBase): Integer; procedure Insert(index: Integer; value: LedStateBase); procedure Remove(value: LedStateBase); --- 75,80 ---- function Contains(value: LedStateBase): Boolean; function get_Item(index: Integer): LedStateBase; ! function IndexOf(value: LedStateBase): Integer; overload; ! function IndexOf(value: string): Integer; overload; procedure Insert(index: Integer; value: LedStateBase); procedure Remove(value: LedStateBase); *************** *** 83,88 **** --- 84,95 ---- LedStateConverter = class (System.ComponentModel.TypeConverter) + strict protected + class function GetStateCollection(context: ITypeDescriptorContext): LedStateCollection; static; + class function IsCollectionItem(context: ITypeDescriptorContext): Boolean; static; public + function CanConvertFrom(context: ITypeDescriptorContext; sourceType: System.Type): Boolean; override; function CanConvertTo(context: ITypeDescriptorContext; destinationType: System.Type): Boolean; override; + function ConvertFrom(context: ITypeDescriptorContext; culture: CultureInfo; + value: System.Object): System.Object; override; function ConvertTo(context: ITypeDescriptorContext; culture: CultureInfo; value: System.Object; destinationType: System.Type): System.Object; override; *************** *** 90,93 **** --- 97,102 ---- attributes: array of Attribute): PropertyDescriptorCollection; override; function GetPropertiesSupported(context: ITypeDescriptorContext): Boolean; override; + function GetStandardValues(context: ITypeDescriptorContext): TypeConverter.StandardValuesCollection; override; + function GetStandardValuesSupported(context: ITypeDescriptorContext): Boolean; override; end; *************** *** 104,111 **** function GetInstDescArguments: ArrayList; virtual; function GetInstDescMemberInfo: MemberInfo; virtual; - function GetLedStyle: LedStyleBase; procedure OnColorChanged(e: EventArgs); virtual; procedure SetColor(value: System.Drawing.Color); protected { Marks the bitmap as invalid without notifying the owning LedStyle instance. } procedure MarkInvalid; --- 113,120 ---- function GetInstDescArguments: ArrayList; virtual; function GetInstDescMemberInfo: MemberInfo; virtual; procedure OnColorChanged(e: EventArgs); virtual; procedure SetColor(value: System.Drawing.Color); protected + function GetLedStyle: LedStyleBase; { Marks the bitmap as invalid without notifying the owning LedStyle instance. } procedure MarkInvalid; *************** *** 500,518 **** {$ENDREGION} - {$REGION 'Design support classes'} - type - LedStateSelectionConverter = class (System.ComponentModel.Int32Converter) - strict protected - function GetStateCollection(context: ITypeDescriptorContext): LedStateCollection; - public - function ConvertFrom(context: ITypeDescriptorContext; culture: CultureInfo; - value: System.Object): System.Object; override; - function ConvertTo(context: ITypeDescriptorContext; culture: CultureInfo; value: System.Object; - destinationType: System.Type): System.Object; override; - function GetStandardValues(context: ITypeDescriptorContext): TypeConverter.StandardValuesCollection; override; - function GetStandardValuesSupported(context: ITypeDescriptorContext): Boolean; override; - end; - {$ENDREGION} - {$REGION 'Led controls'} type --- 509,512 ---- *************** *** 528,539 **** {$ENDREGION} strict private FLedStyle: LedStyleBase; FLedStateIdx: Integer; - FInitializeCount: Integer; - FBlinkTimer: System.Timers.Timer; - FBlinkStateIdx: Integer; strict protected procedure BlinkTimer_Elapsed(sender: System.Object; e: ElapsedEventArgs); function GetLedStyleInstance: LedStyleBase; procedure OnBackColorChanged(e: EventArgs); override; procedure OnPaint(e: PaintEventArgs); override; --- 522,538 ---- {$ENDREGION} strict private + FAutoSize: Boolean; + FBlinkStateIdx: Integer; + FBlinkTimer: System.Timers.Timer; + FInitializeCount: Integer; FLedStyle: LedStyleBase; FLedStateIdx: Integer; strict protected + procedure BeginInit; procedure BlinkTimer_Elapsed(sender: System.Object; e: ElapsedEventArgs); + procedure EndInit; function GetLedStyleInstance: LedStyleBase; + function IsBlinking: Boolean; + function IsInitializing: Boolean; procedure OnBackColorChanged(e: EventArgs); override; procedure OnPaint(e: PaintEventArgs); override; *************** *** 542,554 **** procedure Style_StateAdded(sender: System.Object; e: StateChangedEventArgs); procedure Style_StateRemoved(sender: System.Object; e: StateChangedEventArgs); ! procedure BeginInit; ! procedure EndInit; ! function IsBlinking: Boolean; ! function IsInitializing: Boolean; public constructor Create; function get_BlinkInterval: Double; procedure set_BlinkInterval(value: Double); ! procedure set_LedState(value: Integer); procedure set_LedStyle(value: LedStyleBase); {$REGION 'SingleLed hiding inherited properties'} --- 541,552 ---- procedure Style_StateAdded(sender: System.Object; e: StateChangedEventArgs); procedure Style_StateRemoved(sender: System.Object; e: StateChangedEventArgs); ! procedure SetBoundsCore(x, y, width, height: Integer; specified: BoundsSpecified); override; public constructor Create; function get_BlinkInterval: Double; + function get_LedState: LedStateBase; + procedure set_AutoSize(value: Boolean); procedure set_BlinkInterval(value: Double); ! procedure set_LedState(value: LedStateBase); procedure set_LedStyle(value: LedStyleBase); {$REGION 'SingleLed hiding inherited properties'} *************** *** 571,580 **** {$ENDREGION} published ! [Category('Appearance'), Description('Style of led to use.')] ! property LedStyle: LedStyleBase read FLedStyle write set_LedStyle; [Category('Behavior'), Description('Blinking interval in ms. Use 0 to disable blinking.')] property BlinkInterval: Double read get_BlinkInterval write set_BlinkInterval; ! [Category('Behavior'), Description('State of the led.'), TypeConverter(TypeOf(LedStateSelectionConverter))] ! property LedState: Integer read FLedStateIdx write set_LedState; end; {$R '..\Resources\Jedi.Windows.Forms.Hmi.Leds.SingleLed.bmp'} --- 569,580 ---- {$ENDREGION} published ! [Category('Behavior'), Description('Specifies if the control resizes to the size of the led.')] ! property AutoSize: Boolean read FAutoSize write set_AutoSize; [Category('Behavior'), Description('Blinking interval in ms. Use 0 to disable blinking.')] property BlinkInterval: Double read get_BlinkInterval write set_BlinkInterval; ! [Category('Behavior'), Description('State of the led.')] ! property LedState: LedStateBase read get_LedState write set_LedState; ! [Category('Appearance'), Description('Style of led to use.')] ! property LedStyle: LedStyleBase read FLedStyle write set_LedStyle; end; {$R '..\Resources\Jedi.Windows.Forms.Hmi.Leds.SingleLed.bmp'} *************** *** 758,761 **** --- 758,768 ---- end; + function LedStateCollection.IndexOf(value: string): Integer; + begin + Result := Count - 1; + while (Result >= 0) and (System.String.Compare(Item[Result].Name, value, True) <> 0) do + Dec(Result); + end; + procedure LedStateCollection.Insert(index: Integer; value: LedStateBase); begin *************** *** 775,781 **** {$REGION 'LedStateConverter'} function LedStateConverter.CanConvertTo(context: ITypeDescriptorContext; destinationType: System.Type): Boolean; begin ! Result := (destinationType = TypeOf(InstanceDescriptor)) or inherited CanConvertTo(context, destinationType); end; --- 782,830 ---- {$REGION 'LedStateConverter'} + class function LedStateConverter.GetStateCollection(context: ITypeDescriptorContext): LedStateCollection; + var + mi: MethodInfo; + ledStyle: LedStyleBase; + begin + Result := nil; + if Assigned(context) and Assigned(context.Instance) then + begin + mi := context.Instance.GetType.GetMethod('GetLedStyleInstance', BindingFlags.Public or BindingFlags.NonPublic or + BindingFlags.Instance, nil, System.Type.EmptyTypes, nil); + if mi <> nil then + ledStyle := LedStyleBase(mi.Invoke(context.Instance, nil)) + else + ledStyle := nil; + if ledStyle <> nil then + Result := ledStyle.States; + end; + end; + + class function LedStateConverter.IsCollectionItem(context: ITypeDescriptorContext): Boolean; + begin + Result := (context <> nil) and (context.PropertyDescriptor <> nil) and + (context.PropertyDescriptor.ComponentType.IsAssignableFrom(TypeOf(LedStateCollection))); + end; + + function LedStateConverter.CanConvertFrom(context: ITypeDescriptorContext; sourceType: System.Type): Boolean; + begin + Result := ((sourceType = TypeOf(string)) and not IsCollectionItem(context)) or + inherited CanConvertFrom(context, sourceType); + end; + function LedStateConverter.CanConvertTo(context: ITypeDescriptorContext; destinationType: System.Type): Boolean; begin ! Result := (destinationType = TypeOf(InstanceDescriptor)) or ! ((destinationType = TypeOf(string)) and not IsCollectionItem(context)) or ! inherited CanConvertTo(context, destinationType); ! end; ! ! function LedStateConverter.ConvertFrom(context: ITypeDescriptorContext; culture: CultureInfo; ! value: System.Object): System.Object; ! begin ! if not IsCollectionItem(context) and (value.GetType = TypeOf(string)) then ! Result := GetStateCollection(context).Item[GetStateCollection(context).IndexOf(string(value))] ! else ! Result := inherited ConvertFrom(context, culture, value); end; *************** *** 786,789 **** --- 835,841 ---- Result := LedStateBase(value).GetInstanceDescriptor else + if (destinationType = TypeOf(string)) and not IsCollectionItem(context) then + Result := LedStateBase(value).Name + else Result := inherited ConvertTo(context, culture, value, destinationType); end; *************** *** 802,806 **** function LedStateConverter.GetPropertiesSupported(context: ITypeDescriptorContext): Boolean; begin ! Result := True; end; {$ENDREGION} --- 854,868 ---- function LedStateConverter.GetPropertiesSupported(context: ITypeDescriptorContext): Boolean; begin ! Result := IsCollectionItem(context); ! end; ! ! function LedStateConverter.GetStandardValues(context: ITypeDescriptorContext): TypeConverter.StandardValuesCollection; ! begin ! Result := TypeConverter.StandardValuesCollection.Create(GetStateCollection(context)); ! end; ! ! function LedStateConverter.GetStandardValuesSupported(context: ITypeDescriptorContext): Boolean; ! begin ! Result := not IsCollectionItem(context); end; {$ENDREGION} *************** *** 1612,1615 **** --- 1674,1680 ---- if (LedStyle <> nil) then LedStyle.InvalidateSize; + + if (LedStyle <> nil) and (LedStyle.CoverHeight * 2 > Math.Min(GetLedSize.Width, GetLedSize.Height)) then + LedStyle.CoverHeight := Math.Min(GetLedSize.Width, GetLedSize.Height) div 2; end; *************** *** 1800,1803 **** --- 1865,1869 ---- begin inherited Create; + Count := 2; end; *************** *** 1913,1916 **** --- 1979,1984 ---- procedure MultiLedShape.set_Count(value: Integer); begin + if value < 2 then + raise ArgumentOutOfRangeException.Create('value', 'Count should be at least 2.'); if Count <> value then begin *************** *** 2182,2270 **** {$ENDREGION} - {$REGION 'LedStateSelectionConverter'} - function LedStateSelectionConverter.GetStateCollection(context: ITypeDescriptorContext): LedStateCollection; - var - mi: MethodInfo; - ledStyle: LedStyleBase; - begin - Result := nil; - if Assigned(context) and Assigned(context.Instance) then - begin - mi := context.Instance.GetType.GetMethod('GetLedStyleInstance', BindingFlags.Public or BindingFlags.NonPublic or - BindingFlags.Instance, nil, System.Type.EmptyTypes, nil); - if mi <> nil then - ledStyle := LedStyleBase(mi.Invoke(context.Instance, nil)) - else - ledStyle := nil; - if ledStyle <> nil then - Result := ledStyle.States; - end; - end; - - function LedStateSelectionConverter.ConvertFrom(context: ITypeDescriptorContext; culture: CultureInfo; - value: System.Object): System.Object; - var - states: LedStateCollection; - str: string; - i: Integer; - begin - if value.GetType = TypeOf(string) then - begin - str := string(Value); - states := GetStateCollection(context); - if states <> nil then - begin - i := states.Count - 1; - while (i >= 0) and (System.String.Compare(str, states[i].Name, True) <> 0) do - Dec(i); - if i >= 0 then - Result := System.Object(i) - else - Result := inherited ConvertFrom(context, culture, value); - end - else - Result := inherited ConvertFrom(context, culture, value); - end - else - Result := inherited ConvertFrom(context, culture, value); - end; - - function LedStateSelectionConverter.ConvertTo(context: ITypeDescriptorContext; culture: CultureInfo; - value: System.Object; destinationType: System.Type): System.Object; - var - states: LedStateCollection; - begin - if destinationType = TypeOf(string) then - begin - states := GetStateCollection(context); - if states <> nil then - begin - if value.GetType.IsAssignableFrom(TypeOf(Integer)) then - Result := states[Integer(value)].Name - else - if value.GetType.IsSubclassOf(TypeOf(LedStateBase)) then - Result := LedStateBase(value).Name - else - Result := inherited ConvertTo(context, culture, value, destinationType); - end - else - Result := inherited ConvertTo(context, culture, value, destinationType); - end - else - Result := inherited ConvertTo(context, culture, value, destinationType); - end; - - function LedStateSelectionConverter.GetStandardValues( - context: ITypeDescriptorContext): TypeConverter.StandardValuesCollection; - begin - Result := TypeConverter.StandardValuesCollection.Create(GetStateCollection(context)); - end; - - function LedStateSelectionConverter.GetStandardValuesSupported(context: ITypeDescriptorContext): Boolean; - begin - Result := True; - end; - {$ENDREGION} - {$REGION 'SingleLed'} constructor SingleLed.Create; --- 2250,2253 ---- *************** *** 2273,2277 **** InitializeComponent; LedStyle := SingleColorNormalLedStyle.Create; ! LedState := 1; FBlinkTimer := System.Timers.Timer.Create; Include(FBlinkTimer.Elapsed, BlinkTimer_Elapsed); --- 2256,2260 ---- InitializeComponent; LedStyle := SingleColorNormalLedStyle.Create; ! LedState := LedStyle.States[1]; FBlinkTimer := System.Timers.Timer.Create; Include(FBlinkTimer.Elapsed, BlinkTimer_Elapsed); *************** *** 2296,2299 **** --- 2279,2289 ---- {$ENDREGION} + procedure SingleLed.BeginInit; + begin + Inc(FInitializeCount); + if Assigned(FLedStyle) then + FLedStyle.BeginInit; + end; + procedure SingleLed.BlinkTimer_Elapsed(sender: System.Object; e: ElapsedEventArgs); begin *************** *** 2302,2305 **** --- 2292,2318 ---- end; + procedure SingleLed.EndInit; + var + idx: Integer; + begin + if FInitializeCount > 0 then + begin + Dec(FInitializeCount); + if Assigned(FLedStyle) then + FLedStyle.EndInit; + if FInitializeCount = 0 then + begin + if Text <> '' then + begin + idx := LedStyle.States.IndexOf(Text); + Text := ''; + if (idx >= 0) and (idx < LedStyle.States.Count) then + FLedStateIdx := idx; + end; + Invalidate; + end; + end; + end; + function SingleLed.GetLedStyleInstance: LedStyleBase; begin *************** *** 2307,2310 **** --- 2320,2333 ---- end; + function SingleLed.IsBlinking: Boolean; + begin + Result := FBlinkTimer.Enabled; + end; + + function SingleLed.IsInitializing: Boolean; + begin + Result := FInitializeCount > 0; + end; + procedure SingleLed.OnBackColorChanged(e: EventArgs); begin *************** *** 2316,2320 **** procedure SingleLed.OnPaint(e: PaintEventArgs); var ! TmpBrush: Brush; begin if BackgroundImage <> nil then --- 2339,2344 ---- procedure SingleLed.OnPaint(e: PaintEventArgs); var ! tmpBrush: Brush; ! tmpBmp: Bitmap; begin if BackgroundImage <> nil then *************** *** 2322,2328 **** else begin ! TmpBrush := SolidBrush.Create(BackColor); try ! e.Graphics.FillRectangle(TmpBrush, DisplayRectangle); finally TmpBrush.Free; --- 2346,2352 ---- else begin ! tmpBrush := SolidBrush.Create(BackColor); try ! e.Graphics.FillRectangle(tmpBrush, DisplayRectangle); finally TmpBrush.Free; *************** *** 2330,2336 **** end; if IsBlinking then ! e.Graphics.DrawImage(LedStyle.States[FBlinkStateIdx].GetBitmap, 0, 0) else ! e.Graphics.DrawImage(LedStyle.States[LedState].GetBitmap, 0, 0); end; --- 2354,2374 ---- end; if IsBlinking then ! tmpBmp := LedStyle.States[FBlinkStateIdx].GetBitmap else ! tmpBmp := LedState.GetBitmap; ! ! e.Graphics.DrawImage(tmpBmp, (DisplayRectangle.Width - tmpBmp.Width) div 2, ! (DisplayRectangle.Height - tmpBmp.Height) div 2); ! end; ! ! procedure SingleLed.SetBoundsCore(x, y, width, height: Integer; specified: BoundsSpecified); ! begin ! if FAutoSize and (Size = LedStyle.LedSize) then ! begin ! width := Self.Width; ! height := Self.Height; ! end; ! inherited SetBoundsCore(x, y, width, height, specified); ! Invalidate; end; *************** *** 2342,2346 **** procedure SingleLed.Style_SizeChanged(sender: System.Object; e: EventArgs); begin ! Size := LedStyle.LedSize; end; --- 2380,2385 ---- procedure SingleLed.Style_SizeChanged(sender: System.Object; e: EventArgs); begin ! if FAutoSize then ! Size := LedStyle.LedSize; end; *************** *** 2367,2405 **** end; ! procedure SingleLed.BeginInit; ! begin ! Inc(FInitializeCount); ! if Assigned(FLedStyle) then ! FLedStyle.BeginInit; ! end; ! ! procedure SingleLed.EndInit; ! begin ! if FInitializeCount > 0 then ! begin ! Dec(FInitializeCount); ! if Assigned(FLedStyle) then ! FLedStyle.EndInit; ! end; ! if FInitializeCount > 0 then ! Invalidate; ! end; ! ! function SingleLed.IsBlinking: Boolean; begin ! Result := FBlinkTimer.Enabled; end; ! function SingleLed.IsInitializing: Boolean; begin ! Result := FInitializeCount > 0; end; ! function SingleLed.get_BlinkInterval: Double; begin ! if FBlinkTimer.Enabled then ! Result := FBlinkTimer.Interval ! else ! Result := 0.0; end; --- 2406,2433 ---- end; ! function SingleLed.get_BlinkInterval: Double; begin ! if FBlinkTimer.Enabled then ! Result := FBlinkTimer.Interval ! else ! Result := 0.0; end; ! function SingleLed.get_LedState: LedStateBase; begin ! if LedStyle <> nil then ! Result := LedStyle.States.Item[fLedStateIdx] ! else ! Result := nil; end; ! procedure SingleLed.set_AutoSize(value: Boolean); begin ! if value <> FAutoSize then ! begin ! FAutoSize := value; ! if not IsInitializing and FAutoSize then ! Size := LedStyle.LedSize; ! end; end; *************** *** 2418,2427 **** end; ! procedure SingleLed.set_LedState(value: Integer); begin ! if (value <> FLedStateIdx) and (value >= 0) and (IsInitializing or (value < FLedStyle.States.Count)) then begin ! FLedStateIdx := value; ! Invalidate; end; end; --- 2446,2467 ---- end; ! procedure SingleLed.set_LedState(value: LedStateBase); ! var ! idx: Integer; begin ! if value = nil then ! raise ArgumentNullException.Create; ! if IsInitializing then ! Text := value.Name ! else begin ! idx := LedStyle.States.IndexOf(value.Name); ! if idx < 0 then ! raise ArgumentOutOfRangeException.Create('value', 'Specified led state does not belong to the current style.'); ! if (idx <> FLedStateIdx) and (IsInitializing or (idx < FLedStyle.States.Count)) then ! begin ! FLedStateIdx := idx; ! Invalidate; ! end; end; end; |
|
From: Marcel B. <jed...@us...> - 2004-08-02 16:20:00
|
Update of /cvsroot/jedidotnet/main/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5384/main/run Modified Files: Jedi.Windows.Forms.Hmi.Leds.pas Log Message: * Updated region usage * Added descriptions to most if not all published properties * Added ShapeLedStyle, Rectangle shape and MultiShape (renders a number of shapes horizontally or vertically as a single ShapedLed) Index: Jedi.Windows.Forms.Hmi.Leds.pas =================================================================== RCS file: /cvsroot/jedidotnet/main/run/Jedi.Windows.Forms.Hmi.Leds.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jedi.Windows.Forms.Hmi.Leds.pas 16 Jun 2004 14:29:53 -0000 1.1 --- Jedi.Windows.Forms.Hmi.Leds.pas 2 Aug 2004 16:19:50 -0000 1.2 *************** *** 51,54 **** --- 51,55 ---- LedFrameStyle = (None, Flush, Sunken, Raised); + {$REGION 'Led state'} LedStateCollection = class sealed (InlineCollectionBase) strict private *************** *** 142,145 **** --- 143,158 ---- LedStateBaseArray = array of LedStateBase; [...963 lines suppressed...] + for i := 1 to States.Count - 1 do + tempLst[i] := States[i]; + Result.Add(tempLst); + end; + + function MultiColorShapedLedStyle.GetInstDescMemberInfo: MemberInfo; + begin + Result := GetType.GetConstructor([TypeOf(LedShapeBase), TypeOf(Integer), TypeOf(Integer), TypeOf(Boolean), + TypeOf(LedStateBaseArray)]); + end; + + procedure MultiColorShapedLedStyle.CreateDefaultStates; + begin + States.Add(LedState.Create(Color.Black, 'Off')); + States.Add(LedState.Create(Color.Lime, 'Lime')); + end; + {$ENDREGION} + {$REGION 'LedStateSelectionConverter'} function LedStateSelectionConverter.GetStateCollection(context: ITypeDescriptorContext): LedStateCollection; |
Update of /cvsroot/jedidotnet/main/examples/Jedi.Windows.Forms.Visual/Shape In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2312/main/examples/Jedi.Windows.Forms.Visual/Shape Added Files: TestProject.bdsproj TestProject.dpr TestProject.res WinForm.TWinForm.resources WinForm.pas WinForm.resx Log Message: Donations by Andreas Hausladen --- NEW FILE: WinForm.resx --- (This appears to be a binary file; contents omitted.) --- NEW FILE: WinForm.TWinForm.resources --- (This appears to be a binary file; contents omitted.) --- NEW FILE: TestProject.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: TestProject.dpr --- program TestProject; {%DelphiDotNetAssemblyCompiler '$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.dll'} {%DelphiDotNetAssemblyCompiler '$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.Data.dll'} {%DelphiDotNetAssemblyCompiler '$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.Drawing.dll'} {%DelphiDotNetAssemblyCompiler '$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.Windows.Forms.dll'} {%DelphiDotNetAssemblyCompiler '$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.XML.dll'} {$R 'WinForm.TWinForm.resources' 'WinForm.resx'} uses System.Reflection, System.Runtime.CompilerServices, System.Windows.Forms, WinForm in 'WinForm.pas' {WinForm.TWinForm: System.Windows.Forms.Form}, Jedi.Controls.Visual in '..\Jedi.Controls.Visual.pas' {Jedi.Controls.Visual.Shape: System.Windows.Forms.Control}; {$R *.res} {$REGION 'Programm/Assemblierungs-Informationen'} // // Die allgemeinen Assemblierungsinformationen werden durch die folgenden // Attribute gesteuert. Ändern Sie die Attributwerte, um die zu einer // Assemblierung gehörenden Informationen zu modifizieren. // [assembly: AssemblyDescription('')] [assembly: AssemblyConfiguration('')] [assembly: AssemblyCompany('')] [assembly: AssemblyProduct('')] [assembly: AssemblyCopyright('')] [assembly: AssemblyTrademark('')] [assembly: AssemblyCulture('')] // Der Delphi-Compiler steuert AssemblyTitleAttribute via ExeDescription. // Sie können dies in der IDE über Projekt/Optionen festlegen. // Wenn Sie das Attribut AssemblyTitle wie unten gezeigt manuell festlegen, // wird die IDE-Einstellung überschrieben. // [assembly: AssemblyTitle('')] // // Die Versionsinformation einer Assemblierung enthält die folgenden vier Werte: // // Hauptversion // Nebenversion // Build-Nummer // Revision // // Sie können alle vier Werte festlegen oder für Revision und Build-Nummer die // Standardwerte mit '*' - wie nachfolgend gezeigt - verwenden: [assembly: AssemblyVersion('1.0.*')] // // Zum Signieren einer Assemblierung müssen Sie einen Schlüssel angeben. Weitere Informationen // über das Signieren von Assemblierungen finden Sie in der Microsoft .NET Framework-Dokumentation. // // Mit den folgenden Attributen steuern Sie, welcher Schlüssel für die Signatur verwendet wird. // // Hinweise: // (*) Wenn kein Schlüssel angegeben wird, ist die Assemblierung nicht signiert. // (*) KeyName verweist auf einen Schlüssel, der im Crypto Service Provider // (CSP) auf Ihrem Rechner installiert wurde. KeyFile verweist auf eine // Datei, die einen Schlüssel enthält. // (*) Wenn sowohl der KeyFile- als auch der KeyName-Wert angegeben ist, wird // die folgende Verarbeitung durchgeführt: // (1) Wenn KeyName in dem CSP gefunden wird, wird dieser Schlüssel verwendet. // (2) Wenn KeyName nicht, aber KeyFile vorhanden ist, wird der Schlüssel // in KeyFile im CSP installiert und verwendet. // (*) Ein KeyFile können Sie mit dem Utility sn.exe (Starker Name) erzeugen. // Der Speicherort von KeyFile sollte relativ zum Projektausgabeverzeichnis // angegeben werden. Wenn sich Ihr KeyFile im Projektverzeichnis befindet, // würden Sie das Attribut AssemblyKeyFile folgendermaßen festlegen: // [assembly: AssemblyKeyFile('mykey.snk')], vorausgesetzt, Ihr // Ausgabeverzeichnis ist das Projektverzeichnis (Vorgabe). // (*) Verzögerte Signatur ist eine erweiterte Option; nähere Informationen // dazu finden Sie in der Microsoft .NET Framework-Dokumentation. // [assembly: AssemblyDelaySign(false)] [assembly: AssemblyKeyFile('')] [assembly: AssemblyKeyName('')] {$ENDREGION} [STAThread] begin Application.Run(TWinForm.Create); end. --- NEW FILE: TestProject.res --- (This appears to be a binary file; contents omitted.) --- NEW FILE: WinForm.pas --- unit WinForm; interface uses System.Drawing, System.Collections, System.ComponentModel, System.Windows.Forms, System.Data, Jedi.Controls.Visual; type TWinForm = class(System.Windows.Forms.Form) {$REGION 'Vom Designer verwalteter Code'} strict private Components: System.ComponentModel.Container; ComboBoxShape: System.Windows.Forms.ComboBox; procedure InitializeComponent; procedure TWinForm_Load(sender: System.Object; e: System.EventArgs); procedure ComboBoxShape_SelectedIndexChanged(sender: System.Object; e: System.EventArgs); {$ENDREGION} strict protected procedure Dispose(Disposing: Boolean); override; private { Private-Deklarationen } shape: Jedi.Controls.Visual.Shape; public constructor Create; end; [assembly: RuntimeRequiredAttribute(TypeOf(TWinForm))] implementation {$AUTOBOX ON} {$REGION 'Windows Form-Designer erzeugter Code'} procedure TWinForm.InitializeComponent; type TArrayOfSystem_Object = array of System.Object; begin Self.ComboBoxShape := System.Windows.Forms.ComboBox.Create; Self.SuspendLayout; // // ComboBoxShape // Self.ComboBoxShape.DropDownStyle := System.Windows.Forms.ComboBoxStyle.DropDownList; Self.ComboBoxShape.Items.AddRange(TArrayOfSystem_Object.Create('Circle', 'Ellipse', 'Rectangle', 'RoundRect', 'RoundSquare', 'Square')); Self.ComboBoxShape.Location := System.Drawing.Point.Create(8, 8); Self.ComboBoxShape.Name := 'ComboBoxShape'; Self.ComboBoxShape.Size := System.Drawing.Size.Create(121, 21); Self.ComboBoxShape.TabIndex := 1; Include(Self.ComboBoxShape.SelectedIndexChanged, Self.ComboBoxShape_SelectedIndexChanged); // // TWinForm // Self.AutoScaleBaseSize := System.Drawing.Size.Create(5, 13); Self.ClientSize := System.Drawing.Size.Create(432, 273); Self.Controls.Add(Self.ComboBoxShape); Self.Name := 'TWinForm'; Self.Text := 'WinForm'; Include(Self.Load, Self.TWinForm_Load); Self.ResumeLayout(False); end; {$ENDREGION} procedure TWinForm.Dispose(Disposing: Boolean); begin if Disposing then begin if Components <> nil then Components.Dispose(); end; inherited Dispose(Disposing); end; constructor TWinForm.Create; begin inherited Create; InitializeComponent; end; procedure TWinForm.ComboBoxShape_SelectedIndexChanged(sender: System.Object; e: System.EventArgs); begin case ComboBoxShape.SelectedIndex of 0: shape.Shape := stCircle; 1: shape.Shape := stEllipse; 2: shape.Shape := stRectangle; 3: shape.Shape := stRoundRect; 4: shape.Shape := stRoundSquare; 5: shape.Shape := stSquare; end; end; procedure TWinForm.TWinForm_Load(sender: System.Object; e: System.EventArgs); begin shape := Jedi.Controls.Visual.Shape.Create(); shape.Location := System.Drawing.Point.Create(100, 100); shape.Width := 200; shape.Height := 100; shape.Pen := Pen.Create(Color.Red); shape.Brush := Brushes.Yellow; shape.Shape := stRoundRect; shape.Anchor := AnchorStyles.Left or AnchorStyles.Top or AnchorStyles.Right or AnchorStyles.Bottom; Self.Controls.Add(shape); ComboBoxShape.SelectedIndex := 0; end; end. |
|
From: Marcel B. <jed...@us...> - 2004-07-29 09:36:22
|
Update of /cvsroot/jedidotnet/main/examples/Jedi.System.IO/FileOfRecord In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2312/main/examples/Jedi.System.IO/FileOfRecord Added Files: ExampleFileOfRecord.bdsproj ExampleFileOfRecord.dpr ExampleFileOfRecord.res WinFormMain.TWinFormMain.resources WinFormMain.pas WinFormMain.resx Log Message: Donations by Andreas Hausladen --- NEW FILE: ExampleFileOfRecord.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ExampleFileOfRecord.dpr --- program ExampleFileOfRecord; {%DelphiDotNetAssemblyCompiler '$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.dll'} {%DelphiDotNetAssemblyCompiler '$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.Data.dll'} {%DelphiDotNetAssemblyCompiler '$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.Drawing.dll'} {%DelphiDotNetAssemblyCompiler '$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.Windows.Forms.dll'} {%DelphiDotNetAssemblyCompiler '$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.XML.dll'} {$R 'WinFormMain.TWinFormMain.resources' 'WinFormMain.resx'} uses System.Reflection, System.Runtime.CompilerServices, System.Windows.Forms, WinFormMain in 'WinFormMain.pas' {WinFormMain.TWinFormMain: System.Windows.Forms.Form}; {$R *.res} {$REGION 'Programm/Assemblierungs-Informationen'} [assembly: AssemblyDescription('')] [assembly: AssemblyConfiguration('')] [assembly: AssemblyCompany('')] [assembly: AssemblyProduct('')] [assembly: AssemblyCopyright('')] [assembly: AssemblyTrademark('')] [assembly: AssemblyCulture('')] [assembly: AssemblyVersion('1.0.*')] [assembly: AssemblyDelaySign(false)] [assembly: AssemblyKeyFile('')] [assembly: AssemblyKeyName('')] {$ENDREGION} [STAThread] begin Application.Run(TWinFormMain.Create); end. --- NEW FILE: WinFormMain.TWinFormMain.resources --- (This appears to be a binary file; contents omitted.) --- NEW FILE: WinFormMain.pas --- {****************************************************************** JEDI-VCL Demo Copyright (C) 2004 Project JEDI.NET Original author: Andreas Hausladen You may retrieve the latest version of this file at the JEDI-JVCL home page, located at http://jedidotnet.sourceforge.net The contents of this file are used with permission, subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.mozilla.org/MPL/MPL-1_1Final.html Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. ******************************************************************} unit WinFormMain; interface uses System.Drawing, System.Collections, System.ComponentModel, System.Windows.Forms, System.Data, System.IO, Jedi.System.IO; type TWinFormMain = class(System.Windows.Forms.Form) {$REGION 'Vom Designer verwalteter Code'} strict private Components: System.ComponentModel.Container; Label1: System.Windows.Forms.Label; TextBoxName: System.Windows.Forms.TextBox; Label2: System.Windows.Forms.Label; NumericUpDownAge: System.Windows.Forms.NumericUpDown; Panel1: System.Windows.Forms.Panel; Label3: System.Windows.Forms.Label; NumericUpDownIncome: System.Windows.Forms.NumericUpDown; LabelRecords: System.Windows.Forms.Label; ListViewRecords: System.Windows.Forms.ListView; ButtonQuit: System.Windows.Forms.Button; ButtonAddRecord: System.Windows.Forms.Button; ButtonOverwrite: System.Windows.Forms.Button; procedure InitializeComponent; procedure ButtonQuit_Click(sender: System.Object; e: System.EventArgs); procedure ButtonAddRecord_Click(sender: System.Object; e: System.EventArgs); procedure TWinFormMain_Load(sender: System.Object; e: System.EventArgs); procedure ButtonOverwrite_Click(sender: System.Object; e: System.EventArgs); procedure ListViewRecords_SelectedIndexChanged(sender: System.Object; e: System.EventArgs); {$ENDREGION} strict protected procedure Dispose(Disposing: Boolean); override; private FFileName: string; procedure PopulateListViewRecords; public ColumnHeader1: System.Windows.Forms.ColumnHeader; constructor Create; end; [assembly: RuntimeRequiredAttribute(TypeOf(TWinFormMain))] TPersonRec = record Name: string[30]; Age: Byte; Income: Double; end; implementation {$AUTOBOX ON} {$REGION 'Windows Form-Designer erzeugter Code'} procedure TWinFormMain.InitializeComponent; type TArrayOfInteger = array of Integer; TArrayOfSystem_Windows_Forms_ColumnHeader = array of System.Windows.Forms.ColumnHeader; begin Self.Panel1 := System.Windows.Forms.Panel.Create; Self.Label3 := System.Windows.Forms.Label.Create; Self.NumericUpDownIncome := System.Windows.Forms.NumericUpDown.Create; Self.NumericUpDownAge := System.Windows.Forms.NumericUpDown.Create; Self.Label2 := System.Windows.Forms.Label.Create; Self.TextBoxName := System.Windows.Forms.TextBox.Create; Self.Label1 := System.Windows.Forms.Label.Create; Self.LabelRecords := System.Windows.Forms.Label.Create; Self.ListViewRecords := System.Windows.Forms.ListView.Create; Self.ColumnHeader1 := System.Windows.Forms.ColumnHeader.Create; Self.ButtonQuit := System.Windows.Forms.Button.Create; Self.ButtonAddRecord := System.Windows.Forms.Button.Create; Self.ButtonOverwrite := System.Windows.Forms.Button.Create; Self.Panel1.SuspendLayout; (System.ComponentModel.ISupportInitialize(Self.NumericUpDownIncome)).BeginInit; (System.ComponentModel.ISupportInitialize(Self.NumericUpDownAge)).BeginInit; Self.SuspendLayout; // // Panel1 // Self.Panel1.Controls.Add(Self.Label3); Self.Panel1.Controls.Add(Self.NumericUpDownIncome); Self.Panel1.Controls.Add(Self.NumericUpDownAge); Self.Panel1.Controls.Add(Self.Label2); Self.Panel1.Controls.Add(Self.TextBoxName); Self.Panel1.Controls.Add(Self.Label1); Self.Panel1.Location := System.Drawing.Point.Create(8, 8); Self.Panel1.Name := 'Panel1'; Self.Panel1.Size := System.Drawing.Size.Create(224, 160); Self.Panel1.TabIndex := 7; // // Label3 // Self.Label3.Location := System.Drawing.Point.Create(16, 112); Self.Label3.Name := 'Label3'; Self.Label3.Size := System.Drawing.Size.Create(72, 16); Self.Label3.TabIndex := 13; Self.Label3.Text := 'Income:'; // // NumericUpDownIncome // Self.NumericUpDownIncome.DecimalPlaces := 2; Self.NumericUpDownIncome.Location := System.Drawing.Point.Create(16, 128); Self.NumericUpDownIncome.Maximum := System.Decimal.Create(TArrayOfInteger.Create(100000000, 0, 0, 0)); Self.NumericUpDownIncome.Name := 'NumericUpDownIncome'; Self.NumericUpDownIncome.TabIndex := 12; Self.NumericUpDownIncome.TextAlign := System.Windows.Forms.HorizontalAlignment.Right; // // NumericUpDownAge // Self.NumericUpDownAge.Location := System.Drawing.Point.Create(16, 80); Self.NumericUpDownAge.Maximum := System.Decimal.Create(TArrayOfInteger.Create(300, 0, 0, 0)); Self.NumericUpDownAge.Name := 'NumericUpDownAge'; Self.NumericUpDownAge.Size := System.Drawing.Size.Create(56, 20); Self.NumericUpDownAge.TabIndex := 11; Self.NumericUpDownAge.TextAlign := System.Windows.Forms.HorizontalAlignment.Right; Self.NumericUpDownAge.Value := System.Decimal.Create(TArrayOfInteger.Create(1, 0, 0, 0)); // // Label2 // Self.Label2.Location := System.Drawing.Point.Create(16, 64); Self.Label2.Name := 'Label2'; Self.Label2.Size := System.Drawing.Size.Create(24, 16); Self.Label2.TabIndex := 10; Self.Label2.Text := 'Age'; // // TextBoxName // Self.TextBoxName.Location := System.Drawing.Point.Create(16, 32); Self.TextBoxName.Name := 'TextBoxName'; Self.TextBoxName.Size := System.Drawing.Size.Create(152, 20); Self.TextBoxName.TabIndex := 9; Self.TextBoxName.Text := ''; // // Label1 // Self.Label1.Location := System.Drawing.Point.Create(16, 16); Self.Label1.Name := 'Label1'; Self.Label1.Size := System.Drawing.Size.Create(40, 16); Self.Label1.TabIndex := 8; Self.Label1.Text := 'Name:'; // // LabelRecords // Self.LabelRecords.Location := System.Drawing.Point.Create(384, 176); Self.LabelRecords.Name := 'LabelRecords'; Self.LabelRecords.Size := System.Drawing.Size.Create(136, 16); Self.LabelRecords.TabIndex := 8; Self.LabelRecords.Text := '{0} records'; Self.LabelRecords.TextAlign := System.Drawing.ContentAlignment.MiddleRight; // // ListViewRecords // Self.ListViewRecords.Columns.AddRange(TArrayOfSystem_Windows_Forms_ColumnHeader.Create(Self.ColumnHeader1)); Self.ListViewRecords.FullRowSelect := True; Self.ListViewRecords.HideSelection := False; Self.ListViewRecords.Location := System.Drawing.Point.Create(240, 8); Self.ListViewRecords.MultiSelect := False; Self.ListViewRecords.Name := 'ListViewRecords'; Self.ListViewRecords.Size := System.Drawing.Size.Create(280, 160); Self.ListViewRecords.TabIndex := 9; Self.ListViewRecords.View := System.Windows.Forms.View.Details; Include(Self.ListViewRecords.SelectedIndexChanged, Self.ListViewRecords_SelectedIndexChanged); // // ColumnHeader1 // Self.ColumnHeader1.Text := 'Name'; Self.ColumnHeader1.Width := 200; // // ButtonQuit // Self.ButtonQuit.Location := System.Drawing.Point.Create(448, 200); Self.ButtonQuit.Name := 'ButtonQuit'; Self.ButtonQuit.TabIndex := 10; Self.ButtonQuit.Text := '&Quit'; Include(Self.ButtonQuit.Click, Self.ButtonQuit_Click); // // ButtonAddRecord // Self.ButtonAddRecord.Location := System.Drawing.Point.Create(8, 200); Self.ButtonAddRecord.Name := 'ButtonAddRecord'; Self.ButtonAddRecord.TabIndex := 11; Self.ButtonAddRecord.Text := 'Add Record'; Include(Self.ButtonAddRecord.Click, Self.ButtonAddRecord_Click); // // ButtonOverwrite // Self.ButtonOverwrite.Location := System.Drawing.Point.Create(96, 200); Self.ButtonOverwrite.Name := 'ButtonOverwrite'; Self.ButtonOverwrite.TabIndex := 12; Self.ButtonOverwrite.Text := '&Replace'; Include(Self.ButtonOverwrite.Click, Self.ButtonOverwrite_Click); // // TWinFormMain // Self.AutoScaleBaseSize := System.Drawing.Size.Create(5, 13); Self.ClientSize := System.Drawing.Size.Create(544, 230); Self.Controls.Add(Self.ButtonOverwrite); Self.Controls.Add(Self.ButtonAddRecord); Self.Controls.Add(Self.ButtonQuit); Self.Controls.Add(Self.ListViewRecords); Self.Controls.Add(Self.LabelRecords); Self.Controls.Add(Self.Panel1); Self.Name := 'TWinFormMain'; Self.StartPosition := System.Windows.Forms.FormStartPosition.CenterScreen; Self.Text := 'Jedi.System.IO.FileOfRecord Test'; Include(Self.Load, Self.TWinFormMain_Load); Self.Panel1.ResumeLayout(False); (System.ComponentModel.ISupportInitialize(Self.NumericUpDownIncome)).EndInit; (System.ComponentModel.ISupportInitialize(Self.NumericUpDownAge)).EndInit; Self.ResumeLayout(False); end; {$ENDREGION} procedure TWinFormMain.Dispose(Disposing: Boolean); begin if Disposing then begin if Components <> nil then Components.Dispose(); end; inherited Dispose(Disposing); end; constructor TWinFormMain.Create; begin inherited Create; InitializeComponent; FFileName := Directory.GetCurrentDirectory + '/ExampleFileOfRecord.rnd'; end; procedure TWinFormMain.ListViewRecords_SelectedIndexChanged(sender: System.Object; e: System.EventArgs); var f: FileOfRecord; r: TPersonRec; begin ButtonOverwrite.Enabled := False; if ListViewRecords.SelectedItems.Count > 0 then begin f := FileOfRecord.Create( TypeOf(TPersonRec), FileStream.Create(FFileName, FileMode.Open), True ); try // seek to the selected item f.Seek(Integer(ListViewRecords.SelectedItems[0].Tag)); f.Read(r); TextBoxName.Text := r.Name; NumericUpDownAge.Value := r.Age; NumericUpDownIncome.Value := r.Income; ButtonOverwrite.Enabled := True; finally f.Free; end; end else begin TextBoxName.Text := ''; NumericUpDownAge.Value := 0; NumericUpDownIncome.Value := 0; end; end; procedure TWinFormMain.ButtonOverwrite_Click(sender: System.Object; e: System.EventArgs); var f: FileOfRecord; r: TPersonRec; begin f := FileOfRecord.Create( TypeOf(TPersonRec), FileStream.Create(FFileName, FileMode.Open), True ); try // seek to the selected item f.Seek(Integer(ListViewRecords.SelectedItems[0].Tag)); r.Name := TextBoxName.Text; r.Age := Decimal.ToByte(NumericUpDownAge.Value); r.Income := Decimal.ToDouble(NumericUpDownAge.Value); f.Write(r); finally f.Free; end; PopulateListViewRecords; TextBoxName.Text := ''; NumericUpDownAge.Value := 0; NumericUpDownIncome.Value := 0; Control(TextBoxName).Focus; end; procedure TWinFormMain.TWinFormMain_Load(sender: System.Object; e: System.EventArgs); begin PopulateListViewRecords; end; procedure TWinFormMain.PopulateListViewRecords; var f: FileOfRecord; r: TPersonRec; begin ButtonOverwrite.Enabled := False; ListViewRecords.Items.Clear; if &File.Exists(FFileName) then begin f := FileOfRecord.Create( TypeOf(TPersonRec), FileStream.Create(FFileName, FileMode.Open), True ); try while not f.Eof do begin f.Read(r); ListViewRecords.Items.Add(r.Name).Tag := Integer(f.FilePos - 1); end; finally f.Free; end; end; LabelRecords.Text := System.String.Format('{0} records', ListViewRecords.Items.Count); end; procedure TWinFormMain.ButtonAddRecord_Click(sender: System.Object; e: System.EventArgs); var f: FileOfRecord; r: TPersonRec; begin f := FileOfRecord.Create( TypeOf(TPersonRec), FileStream.Create(FFileName, FileMode.OpenOrCreate), True ); try f.Seek(f.RecordCount); r.Name := TextBoxName.Text; r.Age := Decimal.ToByte(NumericUpDownAge.Value); r.Income := Decimal.ToDouble(NumericUpDownAge.Value); f.Write(r); finally f.Free; end; PopulateListViewRecords; TextBoxName.Text := ''; NumericUpDownAge.Value := 0; NumericUpDownIncome.Value := 0; Control(TextBoxName).Focus; end; procedure TWinFormMain.ButtonQuit_Click(sender: System.Object; e: System.EventArgs); begin Close; end; end. --- NEW FILE: ExampleFileOfRecord.res --- (This appears to be a binary file; contents omitted.) --- NEW FILE: WinFormMain.resx --- (This appears to be a binary file; contents omitted.) |
|
From: Marcel B. <jed...@us...> - 2004-07-29 09:36:12
|
Update of /cvsroot/jedidotnet/main/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2250/main/run Added Files: Jedi.System.IO.pas Jedi.Windows.Forms.Visual.pas Log Message: Donations by Andreas Hausladen --- NEW FILE: Jedi.Windows.Forms.Visual.pas --- {------------------------------------------------------------------------------- The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.mozilla.org/MPL/MPL-1.1.html Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either expressed or implied. See the License for the specific language governing rights and limitations under the License. The Original Code is: Jedi.Windows.Forms.Visual.pas, released on 2004-07-23. The Initial Developer of the Original Code is Andreas Hausladen Portions created by Andreas Hausladen are Copyright (C) 2004 Andreas Hausladen All Rights Reserved. Contributor(s): You may retrieve the latest version of this file at the JEDI.NET home page, located at http://sourceforge.net/projects/jedidotnet Known Issues: -------------------------------------------------------------------------------} // $Id: Jedi.Windows.Forms.Visual.pas,v 1.1 2004/07/29 09:35:56 jedi_mbe Exp $ unit Jedi.Windows.Forms.Visual; interface {$REGION 'interface uses'} uses System.ComponentModel, System.Drawing, System.Drawing.Drawing2D, System.Windows.Forms; {$ENDREGION} {$REGION 'Shape control'} type Shape = class(Control) public type ShapeType = ( stCircle, stEllipse, stRectangle, stRoundRect, stRoundSquare, stSquare ); strict private FShape: Shape.ShapeType; FPen: System.Drawing.Pen; FBrush: System.Drawing.Brush; private const SShapeType = 'The type of the Shape.'; SShapePen = 'The pen for line drawing.'; SShapeBrush = 'The brush for filling.'; procedure SetShape(const Value: ShapeType); procedure SetPen(const Value: System.Drawing.Pen); procedure SetBrush(const Value: System.Drawing.Brush); strict protected procedure OnPaint(e: PaintEventArgs); override; procedure OnResize(e: EventArgs); override; public constructor Create; [Category('Appearance'), Description(SShapeType)] property Shape: ShapeType read FShape write SetShape default stRectangle; [Category('Appearance'), Description(SShapePen)] property Pen: System.Drawing.Pen read FPen write SetPen; [Category('Appearance'), Description(SShapeBrush)] property Brush: System.Drawing.Brush read FBrush write SetBrush; end; {$ENDREGION} implementation {$REGION 'implementation uses'} {$ENDREGION} {$REGION 'Shape control'} constructor Shape.Create; begin inherited Create; Width := 80; Height := 80; FShape := stRectangle; FPen := System.Drawing.Pen.Create(Color.Black); FBrush := System.Drawing.Brushes.White; end; procedure Shape.OnPaint(e: PaintEventArgs); var X, Y, W, H: Integer; Offset: Integer; begin { Calculate X, Y coordinates } X := 0; Y := 0; W := Width - 1; H := Height - 1; { Invalid size } if (W < 0) or (H < 0) then Exit; Offset := 4; if Width < Offset * 2 then Offset := Width div 2; case Shape of stCircle, stRoundSquare, stSquare: begin if Width > Height then begin W := Height - 1; X := (Width - Height) div 2; end else begin H := Width - 1; Y := (Height - Width) div 2; end; end; end; { Draw shape } case Shape of stCircle, stEllipse: begin e.Graphics.FillEllipse(FBrush, X, Y, W, H); e.Graphics.DrawEllipse(FPen, X, Y, W, H); end; stRectangle, stSquare: begin e.Graphics.FillRectangle(FBrush, X, Y, W, H); e.Graphics.DrawRectangle(FPen, X, Y, W, H); end; stRoundRect, stRoundSquare: begin e.Graphics.FillEllipse(FBrush, X, Y, Offset * 2, Offset * 2); e.Graphics.FillEllipse(FBrush, X, Y + H - Offset * 2, Offset * 2, Offset * 2); e.Graphics.FillEllipse(FBrush, X + W - Offset * 2, Y, Offset * 2, Offset * 2); e.Graphics.FillEllipse(FBrush, X + W - Offset * 2, Y + H - Offset * 2, Offset * 2, Offset * 2); e.Graphics.FillRectangle(FBrush, X, Y + Offset, W, H - Offset * 2); e.Graphics.FillRectangle(FBrush, X + Offset, Y, W - Offset * 2, Offset); e.Graphics.FillRectangle(FBrush, X + Offset, Y + H - Offset, W - Offset * 2, Offset); e.Graphics.DrawArc(FPen, X, Y, Offset * 2, Offset * 2, 180, 90); e.Graphics.DrawArc(FPen, X, Y + H - Offset * 2, Offset * 2, Offset * 2, 90, 90); e.Graphics.DrawArc(FPen, X + W - Offset * 2, Y, Offset * 2, Offset * 2, 270, 90); e.Graphics.DrawArc(FPen, X + W - Offset * 2, Y + H - Offset * 2, Offset * 2, Offset * 2, 0, 90); e.Graphics.DrawLine(FPen, X + Offset, Y, X + W - Offset, Y); e.Graphics.DrawLine(FPen, X + Offset, Y + H, X + W - Offset, Y + H); e.Graphics.DrawLine(FPen, X, Y + Offset, X, Y + H - Offset); e.Graphics.DrawLine(FPen, X + W, Y + Offset, X + W, Y + H - Offset); end; end; end; procedure Shape.OnResize(e: EventArgs); begin inherited OnResize(e); Refresh; end; procedure Shape.SetBrush(const Value: System.Drawing.Brush); begin if Value <> FBrush then begin FBrush := Value; Invalidate; end; end; procedure Shape.SetPen(const Value: System.Drawing.Pen); begin if Value <> FPen then begin FPen := Value; Invalidate; end; end; procedure Shape.SetShape(const Value: ShapeType); begin if Value <> FShape then begin FShape := Value; Invalidate; end; end; {$ENDREGION} end. --- NEW FILE: Jedi.System.IO.pas --- {--------------------------------------------------------------------------------------------------- The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.mozilla.org/MPL/MPL-1.1.html Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either expressed or implied. See the License for the specific language governing rights and limitations under the License. The Original Code is: Jedi.Drawing.pas, released on 2004-07-23. The Initial Developer of the Original Code is Andreas Hausladen Portions created by Marcel Bestebroer are Copyright (C) 2004 Andreas Hausladen All Rights Reserved. Contributor(s): You may retrieve the latest version of this file at the JEDI.NET home page, located at http://sf.net/projects/jedidotnet Known Issues: ---------------------------------------------------------------------------------------------------} // $Id: Jedi.System.IO.pas,v 1.1 2004/07/29 09:35:56 jedi_mbe Exp $ unit Jedi.System.IO; interface {$REGION 'Interface uses'} uses System.IO, System.Reflection; {$ENDREGION} type {$REGION 'StoredExtended = record'} /// <summary> /// StoredExtended is a binary compatible type for the Delphi Win32 Extended /// type. It is only for storage usage. So use it only in records that should /// be written to disk. /// </summary> StoredExtended = record private Data: array[0..9] of Byte; public function ToString: string; override; class operator Implicit(const Value: StoredExtended): Extended; class operator Implicit(const Value: Extended): StoredExtended; class operator Add(const A: StoredExtended; const B: Extended): StoredExtended; class operator Subtract(const A: StoredExtended; const B: Extended): StoredExtended; class operator Multiply(const A: StoredExtended; const B: Extended): StoredExtended; class operator Divide(const A: StoredExtended; const B: Extended): StoredExtended; class operator Trunc(const Value: StoredExtended): StoredExtended; class operator Round(const Value: StoredExtended): StoredExtended; class operator Equal(const A: StoredExtended; const B: Extended): Boolean; class operator Equal(const A: StoredExtended; const B: StoredExtended): Boolean; class operator GreaterThan(const A: StoredExtended; const B: Extended): Boolean; class operator GreaterThan(const A: StoredExtended; const B: StoredExtended): Boolean; class operator GreaterThanOrEqual(const A: StoredExtended; const B: Extended): Boolean; class operator GreaterThanOrEqual(const A: StoredExtended; const B: StoredExtended): Boolean; class operator LessThan(const A: StoredExtended; const B: Extended): Boolean; class operator LessThan(const A: StoredExtended; const B: StoredExtended): Boolean; class operator LessThanOrEqual(const A: StoredExtended; const B: Extended): Boolean; class operator LessThanOrEqual(const A: StoredExtended; const B: StoredExtended): Boolean; end; {$ENDREGION} {$REGION 'FileOfRecord = class(System.Object)'} EFileOfRecordError = class(Exception); /// <summary> /// FileOfRecord implements the "file of type" for .NET. /// </summary> /// <limitation> /// Because Extended is declared as a Double under Delphi.NET the Extended /// type must be changed into StoredExtended. /// </limitation> FileOfRecord = class(System.Object) strict private FType: System.Type; FRecordSize: Cardinal; FStream: System.IO.Stream; FAutoClose: Boolean; FStartPosition: Int64; FRecInstance: System.ValueType; function get_FilePos: Int64; function get_FileSize: Int64; class function CreateRecInstance(AType: System.Type): System.ValueType; static; class procedure CheckValidField(FieldType: System.Type; Typ: System.Type); static; class function SizeOfObject(Obj: System.Object): Cardinal; static; class function SizeOfArray(A: System.Array; Obj: System.Object; const FieldName: string): Cardinal; static; function ProcessType(Obj: System.Object; DoWrite: Boolean): System.Object; procedure ProcessArrayType(A: System.Array; Obj: System.Object; DoWrite: Boolean); procedure WriteByte(const Value: Byte); function ReadByte: Byte; procedure WriteUInt16(const Value: UInt16); function ReadUInt16: UInt16; procedure WriteUInt32(const Value: UInt32); function ReadUInt32: UInt32; procedure WriteUInt64(const Value: UInt64); function ReadUInt64: UInt64; procedure WriteSingle(const Value: Single); function ReadSingle: Single; procedure WriteDouble(const Value: Double); function ReadDouble: Double; procedure WriteStoredExtended(const Value: StoredExtended); function ReadStoredExtended: StoredExtended; strict protected const STypeNotAllowed = 'Type {0} is not allowed in a FileOfRecord record type.'; STypeNotAllowedInRecord = 'Type {0} is not allowed in FileOfRecord record {1}.'; SUninitializedField = 'Field {0} is not initialized. It is null.'; SEmptyArrayNotAllowed = 'Empty array type is not allowed.'; SWrongRecordType = '{0} is a wrong record type for {1}'; public /// <summary> /// </summary> /// @AType is the record type that should be used. /// @AStream is the stream where the data is stored or should be written to. /// @AAutoClose specifies if the FileOfRecord instance should close the /// given stream when the instance is disposed. /// @AStartPosition specifies the zero position for the FileOfRecord in the /// stream. This could be used to offset the first record in the file. constructor Create(AType: System.Type; AStream: System.IO.Stream; AAutoClose: Boolean = True); overload; constructor Create(AType: System.Type; AStream: System.IO.Stream; AAutoClose: Boolean; AStartPosition: Int64); overload; /// <summary> /// Dispose() closes the stream if AutoClose is True. /// </summary> destructor Destroy; override; /// <summary> /// SizeOf() returns the record size in Bytes of the given record ValueType /// instance or ValueType type. /// </summary> class function SizeOf(AType: System.Type): Cardinal; overload; static; class function SizeOf(const Rec: System.ValueType): Cardinal; overload; static; /// <summary> /// Seek() sets the file pointer to the record with the number @RecNo. 0 is /// the first record. /// </summary> function Seek(RecNo: Int64): Int64; /// <summary> /// FilePos() returns the current record number. /// </summary> function FilePos: Int64; /// <summary> /// FileSize() returns the number of records in the stream. /// </summary> function FileSize: Int64; /// <summary> /// EoF() return True when the end of the stream is reached. /// </summary> function Eof: Boolean; /// <summary> /// Truncate() sets the stream size to the current record position. /// </summary> procedure Truncate; /// <summary> /// Write() stores one or more record in the stream and moves the file /// pointer to the next record. /// </summary> procedure Write(const Rec: System.ValueType); overload; procedure Write(const RecArray: array of System.ValueType); overload; procedure Write(const RecArray: array of System.ValueType; StartIndex, Len: Integer); overload; /// <summary> /// Read() reads one record from the stream and moves the file /// pointer to the next record. /// </summary> /// <example> /// C# : MyStruct st = MyFileOfRecord.Read() as MyStruct; /// Delphi: st := MyFileOfRecord.Read as MyStruct; /// </example> function Read: System.Object; overload; procedure Read(var Obj); overload; // not CLR compatible /// <summary> /// property Position, see FilePos() /// </summary> property Position: Int64 read get_FilePos; /// <summary> /// property RecordCount, see FileSize() /// </summary> property RecordCount: Int64 read get_FileSize; /// <summary> /// property RecordSize returns the size of the type of the FileOfRecord in /// Bytes. /// </summary> property RecordSize: Cardinal read FRecordSize; /// <summary> /// property AutoClose controls if the FileOfRecord instance should close /// the stream when it is disposed. /// </summary> property AutoClose: Boolean read FAutoClose write FAutoClose; end; {$ENDREGION} implementation {$REGION 'record StoredExtended operators'} { StoredExtended } function StoredExtended.ToString: string; begin Result := ExtendedAsBytesToDouble(Data).ToString; end; class operator StoredExtended.Implicit(const Value: StoredExtended): Extended; begin Result := ExtendedAsBytesToDouble(Value.Data); end; class operator StoredExtended.Implicit(const Value: Extended): StoredExtended; begin Result.Data := DoubleToExtendedAsBytes(Value); end; class operator StoredExtended.Add(const A: StoredExtended; const B: Extended): StoredExtended; begin Result := Extended(A) + B; end; class operator StoredExtended.Subtract(const A: StoredExtended; const B: Extended): StoredExtended; begin Result := Extended(A) - B; end; class operator StoredExtended.Multiply(const A: StoredExtended; const B: Extended): StoredExtended; begin Result := Extended(A) + B; end; class operator StoredExtended.Divide(const A: StoredExtended; const B: Extended): StoredExtended; begin Result := Extended(A) - B; end; class operator StoredExtended.Trunc(const Value: StoredExtended): StoredExtended; begin Result := Trunc(Extended(Value)); end; class operator StoredExtended.Round(const Value: StoredExtended): StoredExtended; begin Result := Round(Extended(Value)); end; class operator StoredExtended.Equal(const A: StoredExtended; const B: Extended): Boolean; begin Result := Extended(A) = B; end; class operator StoredExtended.Equal(const A: StoredExtended; const B: StoredExtended): Boolean; begin Result := Extended(A) = Extended(B); end; class operator StoredExtended.GreaterThan(const A: StoredExtended; const B: Extended): Boolean; begin Result := Extended(A) > B; end; class operator StoredExtended.GreaterThan(const A: StoredExtended; const B: StoredExtended): Boolean; begin Result := Extended(A) > Extended(B); end; class operator StoredExtended.GreaterThanOrEqual(const A: StoredExtended; const B: Extended): Boolean; begin Result := Extended(A) >= B; end; class operator StoredExtended.GreaterThanOrEqual(const A: StoredExtended; const B: StoredExtended): Boolean; begin Result := Extended(A) >= Extended(B); end; class operator StoredExtended.LessThan(const A: StoredExtended; const B: Extended): Boolean; begin Result := Extended(A) < B; end; class operator StoredExtended.LessThan(const A: StoredExtended; const B: StoredExtended): Boolean; begin Result := Extended(A) < Extended(B); end; class operator StoredExtended.LessThanOrEqual(const A: StoredExtended; const B: Extended): Boolean; begin Result := Extended(A) <= B; end; class operator StoredExtended.LessThanOrEqual(const A: StoredExtended; const B: StoredExtended): Boolean; begin Result := Extended(A) <= Extended(B); end; {$ENDREGION 'StoredExtended'} {$REGION 'FileOfRecord implementation'} { FileOfRecord } constructor FileOfRecord.Create(AType: System.Type; AStream: System.IO.Stream; AAutoClose: Boolean); begin Create(AType, AStream, AAutoClose, 0); end; constructor FileOfRecord.Create(AType: System.Type; AStream: System.IO.Stream; AAutoClose: Boolean; AStartPosition: Int64); begin inherited Create; FType := AType; FStream := AStream; FAutoClose := AAutoClose; FRecordSize := SizeOf(AType); FStartPosition := AStartPosition; FStream.Position := AStartPosition; end; destructor FileOfRecord.Destroy; begin FRecInstance := nil; if FAutoClose then FStream.Close; inherited Destroy; end; function FileOfRecord.FilePos: Int64; begin Result := (FStream.Position - FStartPosition) div FRecordSize; end; function FileOfRecord.FileSize: Int64; begin Result := (FStream.Length - FStartPosition) div FRecordSize; end; function FileOfRecord.Eof: Boolean; begin Result := FStream.Position >= FStream.Length; end; function FileOfRecord.Seek(RecNo: Int64): Int64; begin Result := FStream.Seek(FStartPosition + RecNo * FRecordSize, SeekOrigin.Begin); end; procedure FileOfRecord.Truncate; begin FStream.SetLength(FStream.Position); end; function FileOfRecord.Read: System.Object; begin if FRecInstance = nil then FRecInstance := CreateRecInstance(FType); Result := ProcessType(FRecInstance, False); end; procedure FileOfRecord.Write(const Rec: System.ValueType); begin if Rec.GetType <> FType then raise EFileOfRecordError.Create(System.String.Format(SWrongRecordType, Rec.GetType.Namespace + '.' + Rec.GetType.Name, FType.Namespace + '.' + FType.Name)); ProcessType(Rec, True); end; procedure FileOfRecord.Write(const RecArray: array of System.ValueType; StartIndex, Len: Integer); var i: Integer; begin for i := StartIndex to StartIndex + Len - 1 do Write(RecArray[i]); end; procedure FileOfRecord.Write(const RecArray: array of System.ValueType); begin Write(RecArray, 0, Length(RecArray)); end; procedure FileOfRecord.Read(var Obj); begin if System.Object(Obj).GetType <> FType then raise EFileOfRecordError.Create(System.String.Format(SWrongRecordType, System.Object(Obj).GetType.Namespace + '.' + System.Object(Obj).GetType.Name, FType.Namespace + '.' + FType.Name)); Obj := Read; end; function FileOfRecord.get_FilePos: Int64; begin Result := FilePos; end; function FileOfRecord.get_FileSize: Int64; begin Result := FileSize; end; class function FileOfRecord.CreateRecInstance(AType: System.Type): System.ValueType; var Method: MethodInfo; begin Result := System.ValueType(Activator.CreateInstance(AType)); { Execute Delphi record initialization code if available. } Method := AType.GetMethod('__Initialize__'); if Method <> nil then Method.Invoke(Result, BindingFlags.Instance or BindingFlags.Public or BindingFlags.InvokeMethod, nil, [], nil); end; class procedure FileOfRecord.CheckValidField(FieldType: System.Type; Typ: System.Type); begin if (FieldType.IsClass or FieldType.IsInterface or FieldType.IsPointer) and not FieldType.IsArray then raise EFileOfRecordError.Create(System.String.Format(STypeNotAllowedInRecord, FieldType.Namespace + '.' + FieldType.Name, Typ.Namespace + '.' + Typ.Name)); end; class function FileOfRecord.SizeOf(const Rec: System.ValueType): Cardinal; begin Result := SizeOfObject(Rec); end; class function FileOfRecord.SizeOf(AType: System.Type): Cardinal; begin Result := SizeOf(CreateRecInstance(AType)); end; class function FileOfRecord.SizeOfObject(Obj: System.Object): Cardinal; var Fields: array of FieldInfo; FieldIndex: Integer; Typ, FieldType: System.Type; Value: System.Object; begin Result := 0; Typ := Obj.GetType; if (Typ = TypeOf(SByte)) or (Typ = TypeOf(Byte)) or (Typ = TypeOf(ByteBool)) or (Typ = TypeOf(Boolean)) or (Typ = TypeOf(AnsiChar)) then Inc(Result, 1) else if (Typ = TypeOf(Int16)) or (Typ = TypeOf(UInt16)) or (Typ = TypeOf(WordBool)) or (Typ = TypeOf(WideChar)) then Inc(Result, 2) else if (Typ = TypeOf(Int32)) or (Typ = TypeOf(UInt32)) or (Typ = TypeOf(LongBool)) then Inc(Result, 4) else if (Typ = TypeOf(Int64)) or (Typ = TypeOf(UInt64)) then Inc(Result, 8) else if Typ = TypeOf(Single) then Inc(Result, 4) else if Typ = TypeOf(Double) then Inc(Result, 8) else if Typ = TypeOf(Currency) then Inc(Result, 8) { Extended is declared as Double. The StoredExtended record is processed by the TypeValue code. } else if Typ.IsArray then Inc(Result, SizeOfArray(System.Array(Obj), Obj, '')) else if Typ.IsValueType and (Typ.Namespace <> 'System') then begin Fields := Typ.GetFields(BindingFlags.Instance or BindingFlags.Public or BindingFlags.NonPublic); for FieldIndex := 0 to High(Fields) do begin FieldType := Fields[FieldIndex].FieldType; CheckValidField(FieldType, Typ); Value := Fields[FieldIndex].GetValue(Obj); if Value = nil then raise EFileOfRecordError.Create(System.String.Format(SUninitializedField, Fields[FieldIndex].Name)); if FieldType.IsArray then Inc(Result, SizeOfArray(System.Array(Value), Obj, Fields[FieldIndex].Name)) else Inc(Result, SizeOfObject(Value)); end; end else raise EFileOfRecordError.Create(System.String.Format(STypeNotAllowed, Typ.Namespace + '.' + Typ.Name, '')) end; class function FileOfRecord.SizeOfArray(A: System.Array; Obj: System.Object; const FieldName: string): Cardinal; var Value: System.Object; r: Integer; Indices: array of Integer; begin CheckValidField(A.GetType.GetElementType, Obj.GetType); SetLength(Indices, A.Rank); Value := A.GetValue(Indices); if Value = nil then raise EFileOfRecordError.Create(System.String.Format(SUninitializedField, FieldName)); Result := 0; for r := 0 to A.Rank - 1 do Inc(Result, Cardinal(A.GetLength(r))); Result := Result * SizeOfObject(Value); end; function FileOfRecord.ProcessType(Obj: System.Object; DoWrite: Boolean): System.Object; var Fields: array of FieldInfo; FieldIndex: Integer; Typ, FieldType: System.Type; Value: System.Object; begin Result := Obj; Typ := Obj.GetType; {$REGION 'R/W SByte, Byte, ByteBool, Boolean, AnsiChar'} if Typ = TypeOf(SByte) then begin if DoWrite then WriteByte(Byte(SByte(Obj))) else Result := System.Object(SByte(ReadByte)); end else if Typ = TypeOf(Byte) then begin if DoWrite then WriteByte(Byte(Obj)) else Result := System.Object(ReadByte); end else if Typ = TypeOf(ByteBool) then begin if DoWrite then WriteByte(Byte(ByteBool(Obj))) else Result := System.Object(ByteBool(ReadByte)); end else if Typ = TypeOf(Boolean) then begin if DoWrite then WriteByte(Byte(Boolean(Obj))) else Result := System.Object(Boolean(ReadByte)); end else if Typ = TypeOf(AnsiChar) then begin if DoWrite then WriteByte(Byte(AnsiChar(Obj))) else Result := System.Object(AnsiChar(ReadByte)); end else {$ENDREGION} {$REGION 'R/W Int16, UInt16, WordBool, WideChar'} if Typ = TypeOf(Int16) then begin if DoWrite then WriteUInt16(UInt16(Int16(Obj))) else Result := System.Object(Int16(ReadUInt16)); end else if Typ = TypeOf(UInt16) then begin if DoWrite then WriteUInt16(UInt16(Obj)) else Result := System.Object(ReadUInt16); end else if Typ = TypeOf(WordBool) then begin if DoWrite then WriteUInt16(UInt16(WordBool(Obj))) else Result := System.Object(WordBool(ReadUInt16)); end else if Typ = TypeOf(WideChar) then begin if DoWrite then WriteUInt16(UInt16(WideChar(Obj))) else Result := System.Object(WideChar(ReadUInt16)); end else {$ENDREGION} {$REGION 'R/W Int32, UInt32, LongBool'} if Typ = TypeOf(Int32) then begin if DoWrite then WriteUInt32(UInt32(Int32(Obj))) else Result := System.Object(Int32(ReadUInt32)); end else if Typ = TypeOf(UInt32) then begin if DoWrite then WriteUInt32(UInt32(Obj)) else Result := System.Object(ReadUInt32); end else if Typ = TypeOf(LongBool) then begin if DoWrite then WriteUInt32(UInt32(LongBool(Obj))) else Result := System.Object(LongBool(ReadUInt32)); end else {$ENDREGION} {$REGION 'R/W Int64, UInt64'} if Typ = TypeOf(Int64) then begin if DoWrite then WriteUInt64(UInt64(Int64(Obj))) else Result := System.Object(Int64(ReadUInt64)); end else if Typ = TypeOf(UInt64) then begin if DoWrite then WriteUInt64(UInt64(Obj)) else Result := System.Object(ReadUInt64); end else {$ENDREGION} {$REGION 'R/W Single, Double, StoredExtended, Currency'} if Typ = TypeOf(Single) then begin if DoWrite then WriteSingle(Single(Obj)) else Result := System.Object(Single(ReadSingle)); end else if Typ = TypeOf(Double) then begin if DoWrite then WriteDouble(Double(Obj)) else Result := System.Object(Double(ReadDouble)); end else if Typ = TypeOf(StoredExtended) then begin if DoWrite then WriteStoredExtended(StoredExtended(Obj)) else Result := System.Object(StoredExtended(ReadStoredExtended)); end else if Typ = TypeOf(Currency) then begin if DoWrite then WriteUInt64(Currency(Obj).ToOACurrency) else Result := System.Object(Currency.FromOACurrency(ReadUInt64)); end else {$ENDREGION} if Typ.IsArray then ProcessArrayType(System.Array(Obj), Obj, DoWrite) else if Typ.IsValueType and (Typ.Namespace <> 'System') then begin Fields := Typ.GetFields; for FieldIndex := 0 to High(Fields) do begin FieldType := Fields[FieldIndex].FieldType; Value := Fields[FieldIndex].GetValue(Obj); if FieldType.IsArray then ProcessArrayType(System.Array(Value), Obj, DoWrite) else begin Value := ProcessType(Value, DoWrite); if not DoWrite then Fields[FieldIndex].SetValue(Obj, Value); end; end; end end; procedure FileOfRecord.ProcessArrayType(A: System.Array; Obj: System.Object; DoWrite: Boolean); var Value: System.Object; r, FlatIndex, FlatIndexCount, Idx: Integer; Indices, ItemsCount: array of Integer; begin SetLength(Indices, A.Rank); SetLength(ItemsCount, A.Rank); FlatIndexCount := 0; for r := A.Rank - 1 downto 0 do begin FlatIndexCount := FlatIndexCount + A.GetLength(r); ItemsCount[r] := FlatIndexCount; end; for FlatIndex := 0 to FlatIndexCount - 1 do begin Idx := FlatIndex; for r := 0 to A.Rank - 2 do begin Indices[r] := A.GetLowerBound(r) + (Idx div ItemsCount[r + 1]); Idx := Idx mod ItemsCount[r + 1]; end; Indices[A.Rank - 1] := A.GetLowerBound(A.Rank - 1) + Idx; Value := A.GetValue(Indices); Value := ProcessType(Value, DoWrite); if not DoWrite then A.SetValue(Value, Indices); end; end; {$REGION 'Write/Read Datatype'} procedure FileOfRecord.WriteByte(const Value: Byte); begin FStream.WriteByte(Value); end; function FileOfRecord.ReadByte: Byte; var Data: array[0..0] of Byte; begin FStream.Read(Data, 0, Length(Data)); Result := Data[0]; end; procedure FileOfRecord.WriteUInt16(const Value: UInt16); var Data: array[0..1] of Byte; begin Data[0] := Value and $FF; Data[1] := Value shr 8; FStream.Write(Data, 0, Length(Data)); end; function FileOfRecord.ReadUInt16: UInt16; var Data: array[0..1] of Byte; begin FStream.Read(Data, 0, Length(Data)); Result := (UInt16(Data[1]) shl 8) or Data[0]; end; procedure FileOfRecord.WriteUInt32(const Value: UInt32); var Data: array[0..3] of Byte; begin Data[0] := Value and $FF; Data[1] := (Value shr 8) and $FF; Data[2] := (Value shr 16) and $FF; Data[3] := (Value shr 24) and $FF; FStream.Write(Data, 0, Length(Data)); end; function FileOfRecord.ReadUInt32: UInt32; var Data: array[0..3] of Byte; begin FStream.Read(Data, 0, Length(Data)); Result := (UInt32(Data[3]) shl 24) or (UInt32(Data[2]) shl 16) or (UInt32(Data[1]) shl 8) or Data[0]; end; procedure FileOfRecord.WriteUInt64(const Value: UInt64); var Data: array[0..7] of Byte; begin Data[0] := Value and $FF; Data[1] := (Value shr 8) and $FF; Data[2] := (Value shr 16) and $FF; Data[3] := (Value shr 24) and $FF; Data[4] := (Value shr 32) and $FF; Data[5] := (Value shr 40) and $FF; Data[6] := (Value shr 48) and $FF; Data[7] := (Value shr 56) and $FF; FStream.Write(Data, 0, Length(Data)); end; function FileOfRecord.ReadUInt64: UInt64; var Data: array[0..7] of Byte; begin Result := (UInt64(Data[7]) shl 56) or (UInt64(Data[6]) shl 48) or (UInt64(Data[5]) shl 40) or (UInt64(Data[4]) shl 32) or (UInt64(Data[3]) shl 24) or (UInt64(Data[2]) shl 16) or (UInt64(Data[1]) shl 8) or Data[0]; end; procedure FileOfRecord.WriteSingle(const Value: Single); begin FStream.Write(BitConverter.GetBytes(Value), 0, 4); end; function FileOfRecord.ReadSingle: Single; var Data: array[0..3] of Byte; begin FStream.Read(Data, 0, Length(Data)); Result := BitConverter.ToSingle(Data, 0); end; procedure FileOfRecord.WriteDouble(const Value: Double); begin FStream.Write(BitConverter.GetBytes(Value), 0, 8); end; function FileOfRecord.ReadDouble: Double; var Data: array[0..7] of Byte; begin FStream.Read(Data, 0, Length(Data)); Result := BitConverter.ToDouble(Data, 0); end; procedure FileOfRecord.WriteStoredExtended(const Value: StoredExtended); begin FStream.Write(Value.Data, 0, 10); end; function FileOfRecord.ReadStoredExtended: StoredExtended; begin FStream.Read(Result.Data, 0, 10); end; {$ENDREGION} {$ENDREGION 'FileOfRecord Implemenation'} end. |
|
From: Marcel B. <jed...@us...> - 2004-07-29 09:35:02
|
Update of /cvsroot/jedidotnet/main/examples/Jedi.Windows.Forms.Visual/Shape In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2118/Shape Log Message: Directory /cvsroot/jedidotnet/main/examples/Jedi.Windows.Forms.Visual/Shape added to the repository |
|
From: Marcel B. <jed...@us...> - 2004-07-29 09:34:37
|
Update of /cvsroot/jedidotnet/main/examples/Jedi.System.IO/FileOfRecord In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2062/FileOfRecord Log Message: Directory /cvsroot/jedidotnet/main/examples/Jedi.System.IO/FileOfRecord added to the repository |
|
From: Marcel B. <jed...@us...> - 2004-07-29 09:34:25
|
Update of /cvsroot/jedidotnet/main/examples/Jedi.Windows.Forms.Visual In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2032/Jedi.Windows.Forms.Visual Log Message: Directory /cvsroot/jedidotnet/main/examples/Jedi.Windows.Forms.Visual added to the repository |
|
From: Marcel B. <jed...@us...> - 2004-07-29 09:34:25
|
Update of /cvsroot/jedidotnet/main/examples/Jedi.System.IO In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2032/Jedi.System.IO Log Message: Directory /cvsroot/jedidotnet/main/examples/Jedi.System.IO added to the repository |
|
From: Marcel B. <jed...@us...> - 2004-06-26 10:22:53
|
Update of /cvsroot/jedidotnet/tools/docs/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22001/tools/docs/common Modified Files: Jedi.Docs.System.pas Log Message: Generating assembly XML file Index: Jedi.Docs.System.pas =================================================================== RCS file: /cvsroot/jedidotnet/tools/docs/common/Jedi.Docs.System.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jedi.Docs.System.pas 25 Jun 2004 13:10:32 -0000 1.1 --- Jedi.Docs.System.pas 26 Jun 2004 10:22:44 -0000 1.2 *************** *** 87,90 **** --- 87,92 ---- strict protected constructor Create(overview: AssemblyOverview); + class procedure AddDocFileToList(fileName: string; assemblies: HybridDictionary); static; + class procedure AddDocToAssemblyDocFile(xmlAssembly: XmlTextWriter; filename: string); static; procedure GenerateNamespaceDoc(namespaceName: string); procedure GenerateRemovedDoc; *************** *** 95,98 **** --- 97,101 ---- procedure UpdateMemberSkeleton(var index: Integer); procedure UpdateParamsSkeleton(var index: Integer); + class procedure WriteAssemblyDocFile(assemblies: HybridDictionary; assemblyName: string); static; procedure WriteHeader; procedure WriteMember(var index: Integer); *************** *** 110,113 **** --- 113,118 ---- function XmlWriter: XmlTextWriter; public + { merges namespace documentation files to form the assembly documentation files. } + class procedure GenerateAssemblyFiles; static; { generate per namespace documentation files, combining text in existing files in to the new one. } class procedure GenerateDocFiles(overview: AssemblyOverview); static; *************** *** 725,728 **** --- 730,761 ---- end; + class procedure OutputGenerator.AddDocFileToList(fileName: string; assemblies: HybridDictionary); + var + doc: XmlDocument; + asmNameNode: XmlNode; + begin + doc := XmlDocument.Create; + doc.Load(fileName); + asmNameNode := doc.SelectSingleNode('/doc/assembly/name'); + if (Assigned(asmNameNode)) and (asmNameNode.InnerText <> '') then + begin + if not assemblies.Contains(asmNameNode.InnerText) then + assemblies.Add(asmNameNode.InnerText, ArrayList.Create); + ArrayList(assemblies[asmNameNode.InnerText]).Add(fileName); + end; + end; + + class procedure OutputGenerator.AddDocToAssemblyDocFile(xmlAssembly: XmlTextWriter; filename: string); + var + xmlDoc: XmlDocument; + membersElement: XmlNode; + begin + xmlDoc := XmlDocument.Create; + xmlDoc.Load(filename); + membersElement := xmlDoc.SelectSingleNode('/doc/members'); + if Assigned(membersElement) then + membersElement.WriteContentTo(xmlAssembly); + end; + procedure OutputGenerator.GenerateNamespaceDoc(namespaceName: string); begin *************** *** 907,910 **** --- 940,965 ---- end; + class procedure OutputGenerator.WriteAssemblyDocFile(assemblies: HybridDictionary; assemblyName: string); + var + xml: XmlTextWriter; + i: Integer; + begin + xml := XmlTextWriter.Create(Configuration.AssemblyDirectory + '\' + assemblyName + '.xml', Encoding.UTF8); + xml.Formatting := Formatting.Indented; + xml.Indentation := 2; + xml.WriteStartDocument; + xml.WriteStartElement('doc'); + xml.WriteComment('generation timestamp: ' + DateTime.UtcNow.ToString('yyyy"-"MM"-"dd HH":"mm') + ' UTC'); + xml.WriteStartElement('assembly'); + xml.WriteElementString('name', assemblyName); + xml.WriteFullEndElement; + xml.WriteStartElement('members'); + for i := 0 to ArrayList(assemblies.Item[assemblyName]).Count - 1 do + AddDocToAssemblyDocFile(xml, string(ArrayList(assemblies.Item[assemblyName]).Item[i])); + xml.WriteFullEndElement; + xml.WriteFullEndElement; + xml.Close; + end; + procedure OutputGenerator.WriteHeader; begin *************** *** 1093,1096 **** --- 1148,1170 ---- end; + class procedure OutputGenerator.GenerateAssemblyFiles; + var + assemblies: HybridDictionary; + files: array of string; + enumerator: IDictionaryEnumerator; + index: Integer; + begin + // list of XML files per assembly (assembly name is the key) + assemblies := HybridDictionary.Create; + files := Directory.GetFiles(Configuration.DocumentationDirectory, '*.xml'); + &Array.Sort(files); + for index := Low(files) to High(files) do + AddDocFileToList(files[index], assemblies); + enumerator := assemblies.GetEnumerator; + if Assigned(enumerator) then + while enumerator.MoveNext do + WriteAssemblyDocFile(assemblies, string(enumerator.Key)); + end; + class procedure OutputGenerator.GenerateDocFiles(overview: AssemblyOverview); var |
|
From: Marcel B. <jed...@us...> - 2004-06-25 13:20:51
|
Update of /cvsroot/jedidotnet/tools/docs/Generator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17943/tools/docs/Generator Added Files: MainForm.GeneratorForm.resources MainForm.pas MainForm.resx Log Message: I thought I already added and committed these. Sorry --- NEW FILE: MainForm.GeneratorForm.resources --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MainForm.resx --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MainForm.pas --- unit MainForm; interface uses System.Drawing, System.Collections, System.ComponentModel, System.Windows.Forms, System.Data; type GeneratorForm = class(System.Windows.Forms.Form) {$REGION 'Designer Managed Code'} strict private /// <summary> /// Required designer variable. /// </summary> Components: System.ComponentModel.Container; lblAssembly: System.Windows.Forms.Label; tbAssembly: System.Windows.Forms.TextBox; btnBrowseAssembly: System.Windows.Forms.Button; btnBrowseDocPath: System.Windows.Forms.Button; lblDocPath: System.Windows.Forms.Label; tbDocPath: System.Windows.Forms.TextBox; fbdDocFolder: System.Windows.Forms.FolderBrowserDialog; fbdAsmFolder: System.Windows.Forms.FolderBrowserDialog; clbAssemblies: System.Windows.Forms.CheckedListBox; lblAssemblies: System.Windows.Forms.Label; btnGenerate: System.Windows.Forms.Button; lblLog: System.Windows.Forms.Label; tbLog: System.Windows.Forms.TextBox; btnClear: System.Windows.Forms.Button; /// <summary> /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// </summary> procedure InitializeComponent; procedure btnBrowseAssembly_Click(sender: System.Object; e: System.EventArgs); procedure tbDocPath_TextChanged(sender: System.Object; e: System.EventArgs); procedure btnBrowseDocPath_Click(sender: System.Object; e: System.EventArgs); procedure TWinForm_Closing(sender: System.Object; e: System.ComponentModel.CancelEventArgs); procedure tbAssembly_TextChanged(sender: System.Object; e: System.EventArgs); procedure btnGenerate_Click(sender: System.Object; e: System.EventArgs); procedure clbAssemblies_ItemCheck(sender: System.Object; e: System.Windows.Forms.ItemCheckEventArgs); procedure btnClear_Click(sender: System.Object; e: System.EventArgs); {$ENDREGION} strict protected /// <summary> /// Clean up any resources being used. /// </summary> procedure Dispose(Disposing: Boolean); override; private { Private Declarations } public constructor Create; end; [assembly: RuntimeRequiredAttribute(TypeOf(GeneratorForm))] implementation {$AUTOBOX ON} uses System.IO, System.Reflection, Jedi.Docs.System; type StringArray = array of string; {$REGION 'Windows Form Designer generated code'} /// <summary> /// Required method for Designer support -- do not modify /// the contents of this method with the code editor. /// </summary> procedure GeneratorForm.InitializeComponent; begin Self.lblAssembly := System.Windows.Forms.Label.Create; Self.tbAssembly := System.Windows.Forms.TextBox.Create; Self.btnBrowseAssembly := System.Windows.Forms.Button.Create; Self.btnBrowseDocPath := System.Windows.Forms.Button.Create; Self.lblDocPath := System.Windows.Forms.Label.Create; Self.tbDocPath := System.Windows.Forms.TextBox.Create; Self.fbdDocFolder := System.Windows.Forms.FolderBrowserDialog.Create; Self.fbdAsmFolder := System.Windows.Forms.FolderBrowserDialog.Create; Self.clbAssemblies := System.Windows.Forms.CheckedListBox.Create; Self.lblAssemblies := System.Windows.Forms.Label.Create; Self.btnGenerate := System.Windows.Forms.Button.Create; Self.lblLog := System.Windows.Forms.Label.Create; Self.tbLog := System.Windows.Forms.TextBox.Create; Self.btnClear := System.Windows.Forms.Button.Create; Self.SuspendLayout; // // lblAssembly // Self.lblAssembly.AutoSize := True; Self.lblAssembly.Location := System.Drawing.Point.Create(5, 30); Self.lblAssembly.Name := 'lblAssembly'; Self.lblAssembly.Size := System.Drawing.Size.Create(53, 16); Self.lblAssembly.TabIndex := 3; Self.lblAssembly.Text := 'Assembly'; // // tbAssembly // Self.tbAssembly.Anchor := (System.Windows.Forms.AnchorStyles(((System.Windows.Forms.AnchorStyles.Top or System.Windows.Forms.AnchorStyles.Left) or System.Windows.Forms.AnchorStyles.Right))); Self.tbAssembly.Location := System.Drawing.Point.Create(75, 30); Self.tbAssembly.Name := 'tbAssembly'; Self.tbAssembly.Size := System.Drawing.Size.Create(340, 20); Self.tbAssembly.TabIndex := 4; Self.tbAssembly.Text := ''; Include(Self.tbAssembly.TextChanged, Self.tbAssembly_TextChanged); // // btnBrowseAssembly // Self.btnBrowseAssembly.Anchor := (System.Windows.Forms.AnchorStyles((System.Windows.Forms.AnchorStyles.Top or System.Windows.Forms.AnchorStyles.Right))); Self.btnBrowseAssembly.Location := System.Drawing.Point.Create(420, 30); Self.btnBrowseAssembly.Name := 'btnBrowseAssembly'; Self.btnBrowseAssembly.TabIndex := 5; Self.btnBrowseAssembly.Text := 'Browse'; Include(Self.btnBrowseAssembly.Click, Self.btnBrowseAssembly_Click); // // btnBrowseDocPath // Self.btnBrowseDocPath.Anchor := (System.Windows.Forms.AnchorStyles((System.Windows.Forms.AnchorStyles.Top or System.Windows.Forms.AnchorStyles.Right))); Self.btnBrowseDocPath.Location := System.Drawing.Point.Create(420, 5); Self.btnBrowseDocPath.Name := 'btnBrowseDocPath'; Self.btnBrowseDocPath.TabIndex := 2; Self.btnBrowseDocPath.Text := 'Browse'; Include(Self.btnBrowseDocPath.Click, Self.btnBrowseDocPath_Click); // // lblDocPath // Self.lblDocPath.AutoSize := True; Self.lblDocPath.Location := System.Drawing.Point.Create(5, 5); Self.lblDocPath.Name := 'lblDocPath'; Self.lblDocPath.Size := System.Drawing.Size.Create(49, 16); Self.lblDocPath.TabIndex := 0; Self.lblDocPath.Text := 'Doc path'; // // tbDocPath // Self.tbDocPath.Anchor := (System.Windows.Forms.AnchorStyles(((System.Windows.Forms.AnchorStyles.Top or System.Windows.Forms.AnchorStyles.Left) or System.Windows.Forms.AnchorStyles.Right))); Self.tbDocPath.Location := System.Drawing.Point.Create(75, 5); Self.tbDocPath.Name := 'tbDocPath'; Self.tbDocPath.Size := System.Drawing.Size.Create(340, 20); Self.tbDocPath.TabIndex := 1; Self.tbDocPath.Text := ''; Include(Self.tbDocPath.TextChanged, Self.tbDocPath_TextChanged); // // fbdDocFolder // Self.fbdDocFolder.Description := 'Select the folder where the individual documentation files are stored.'; Self.fbdDocFolder.ShowNewFolderButton := False; // // clbAssemblies // Self.clbAssemblies.Anchor := (System.Windows.Forms.AnchorStyles(((System.Windows.Forms.AnchorStyles.Top or System.Windows.Forms.AnchorStyles.Left) or System.Windows.Forms.AnchorStyles.Right))); Self.clbAssemblies.CheckOnClick := True; Self.clbAssemblies.Location := System.Drawing.Point.Create(75, 65); Self.clbAssemblies.Name := 'clbAssemblies'; Self.clbAssemblies.Size := System.Drawing.Size.Create(340, 109); Self.clbAssemblies.Sorted := True; Self.clbAssemblies.TabIndex := 7; Include(Self.clbAssemblies.ItemCheck, Self.clbAssemblies_ItemCheck); // // lblAssemblies // Self.lblAssemblies.AutoSize := True; Self.lblAssemblies.Location := System.Drawing.Point.Create(5, 70); Self.lblAssemblies.Name := 'lblAssemblies'; Self.lblAssemblies.Size := System.Drawing.Size.Create(62, 16); Self.lblAssemblies.TabIndex := 6; Self.lblAssemblies.Text := 'Assemblies'; // // btnGenerate // Self.btnGenerate.Anchor := (System.Windows.Forms.AnchorStyles((System.Windows.Forms.AnchorStyles.Top or System.Windows.Forms.AnchorStyles.Right))); Self.btnGenerate.Enabled := False; Self.btnGenerate.Location := System.Drawing.Point.Create(420, 65); Self.btnGenerate.Name := 'btnGenerate'; Self.btnGenerate.TabIndex := 8; Self.btnGenerate.Text := 'Generate'; Include(Self.btnGenerate.Click, Self.btnGenerate_Click); // // lblLog // Self.lblLog.AutoSize := True; Self.lblLog.Location := System.Drawing.Point.Create(10, 185); Self.lblLog.Name := 'lblLog'; Self.lblLog.Size := System.Drawing.Size.Create(23, 16); Self.lblLog.TabIndex := 9; Self.lblLog.Text := 'Log'; // // tbLog // Self.tbLog.Anchor := (System.Windows.Forms.AnchorStyles((((System.Windows.Forms.AnchorStyles.Top or System.Windows.Forms.AnchorStyles.Bottom) or System.Windows.Forms.AnchorStyles.Left) or System.Windows.Forms.AnchorStyles.Right))); Self.tbLog.Location := System.Drawing.Point.Create(75, 185); Self.tbLog.Multiline := True; Self.tbLog.Name := 'tbLog'; Self.tbLog.ReadOnly := True; Self.tbLog.ScrollBars := System.Windows.Forms.ScrollBars.Vertical; Self.tbLog.Size := System.Drawing.Size.Create(340, 215); Self.tbLog.TabIndex := 10; Self.tbLog.Text := ''; // // btnClear // Self.btnClear.Anchor := (System.Windows.Forms.AnchorStyles((System.Windows.Forms.AnchorStyles.Top or System.Windows.Forms.AnchorStyles.Right))); Self.btnClear.Location := System.Drawing.Point.Create(420, 185); Self.btnClear.Name := 'btnClear'; Self.btnClear.TabIndex := 11; Self.btnClear.Text := 'Clear'; Include(Self.btnClear.Click, Self.btnClear_Click); // // GeneratorForm // Self.AutoScaleBaseSize := System.Drawing.Size.Create(5, 13); Self.ClientSize := System.Drawing.Size.Create(497, 403); Self.Controls.Add(Self.btnClear); Self.Controls.Add(Self.tbLog); Self.Controls.Add(Self.lblLog); Self.Controls.Add(Self.btnGenerate); Self.Controls.Add(Self.lblAssemblies); Self.Controls.Add(Self.clbAssemblies); Self.Controls.Add(Self.tbDocPath); Self.Controls.Add(Self.lblDocPath); Self.Controls.Add(Self.tbAssembly); Self.Controls.Add(Self.lblAssembly); Self.Controls.Add(Self.btnBrowseDocPath); Self.Controls.Add(Self.btnBrowseAssembly); Self.Name := 'GeneratorForm'; Self.StartPosition := System.Windows.Forms.FormStartPosition.CenterScreen; Self.Text := 'Documentation generator'; Include(Self.Closing, Self.TWinForm_Closing); Self.ResumeLayout(False); end; {$ENDREGION} procedure GeneratorForm.Dispose(Disposing: Boolean); begin if Disposing then begin if Components <> nil then Components.Dispose(); end; inherited Dispose(Disposing); end; constructor GeneratorForm.Create; begin inherited Create; // // Required for Windows Form Designer support // InitializeComponent; // // TODO: Add any constructor code after InitializeComponent call // Configuration.Load(Application.StartupPath + '\doctools.config'); tbDocPath.Text := Configuration.DocumentationDirectory; tbAssembly.Text := Configuration.AssemblyDirectory; end; procedure GeneratorForm.btnClear_Click(sender: System.Object; e: System.EventArgs); begin tbLog.Clear; end; procedure GeneratorForm.clbAssemblies_ItemCheck(sender: System.Object; e: System.Windows.Forms.ItemCheckEventArgs); begin btnGenerate.Enabled := (clbAssemblies.CheckedItems.Count > 1) or (e.NewValue = CheckState.Checked); end; procedure GeneratorForm.btnGenerate_Click(sender: System.Object; e: System.EventArgs); var i: Integer; assem: Assembly; ao: AssemblyOverview; begin for i := 0 to clbAssemblies.CheckedItems.Count - 1 do begin tbLog.Text := tbLog.Text + System.String.Format('Retrieving assembly "{0}"...', clbAssemblies.CheckedItems[i]) + Environment.NewLine; assem := Assembly.LoadFrom(tbAssembly.Text + '\' + clbAssemblies.CheckedItems[i].ToString); try tbLog.Text := tbLog.Text + ' Get overview...' + Environment.NewLine; ao := AssemblyOverview.Create(assem); try tbLog.Text := tbLog.Text + ' Generate/update xml files...' + Environment.NewLine; OutputGenerator.GenerateDocFiles(ao); tbLog.Text := tbLog.Text + ' Done.' + Environment.NewLine; finally ao.Free; end; finally assem.Free; end; end; tbLog.Text := tbLog.Text + 'Finished.' + Environment.NewLine; end; procedure GeneratorForm.tbAssembly_TextChanged(sender: System.Object; e: System.EventArgs); var assemblies: StringArray; i: Integer; begin assemblies := Directory.GetFiles(tbAssembly.Text, '*.dll'); clbAssemblies.Items.Clear; for i := Low(assemblies) to High(assemblies) do clbAssemblies.Items.Add(Path.GetFileName(assemblies[i]), True); end; procedure GeneratorForm.TWinForm_Closing(sender: System.Object; e: System.ComponentModel.CancelEventArgs); begin Configuration.DocumentationDirectory := tbDocPath.Text; Configuration.AssemblyDirectory := tbAssembly.Text; Configuration.Save(Application.StartupPath + '\doctools.config'); end; procedure GeneratorForm.btnBrowseDocPath_Click(sender: System.Object; e: System.EventArgs); begin fbdDocFolder.SelectedPath := tbDocPath.Text; if fbdDocFolder.ShowDialog = System.Windows.Forms.DialogResult.OK then tbDocPath.Text := fbdDocFolder.SelectedPath; end; procedure GeneratorForm.tbDocPath_TextChanged(sender: System.Object; e: System.EventArgs); begin btnBrowseAssembly.Enabled := Directory.Exists(tbDocPath.Text); end; procedure GeneratorForm.btnBrowseAssembly_Click(sender: System.Object; e: System.EventArgs); begin fbdAsmFolder.SelectedPath := tbAssembly.Text; if fbdAsmFolder.ShowDialog = System.Windows.Forms.DialogResult.OK then tbAssembly.Text := fbdAsmFolder.SelectedPath; end; end. |
|
From: Marcel B. <jed...@us...> - 2004-06-25 13:20:51
|
Update of /cvsroot/jedidotnet/tools/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17943/tools/docs Added Files: DocGenerator.bdsproj DocGenerator.dpr DocGenerator.res Jedi.Docs.Core.bdsproj Jedi.Docs.Core.dpk Log Message: I thought I already added and committed these. Sorry --- NEW FILE: Jedi.Docs.Core.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: DocGenerator.dpr --- program DocGenerator; {%DelphiDotNetAssemblyCompiler '$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.dll'} {%DelphiDotNetAssemblyCompiler '$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.Data.dll'} {%DelphiDotNetAssemblyCompiler '$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.Drawing.dll'} {%DelphiDotNetAssemblyCompiler '$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.Windows.Forms.dll'} {%DelphiDotNetAssemblyCompiler '$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.XML.dll'} {$R 'Generator\MainForm.GeneratorForm.resources' 'Generator\MainForm.resx'} {%DelphiDotNetAssemblyCompiler '..\bin\Jedi.Docs.Core.dll'} uses System.Reflection, System.Runtime.CompilerServices, System.Windows.Forms, MainForm in 'Generator\MainForm.pas' {MainForm.GeneratorForm: System.Windows.Forms.Form}; {$R *.res} {$REGION 'Program/Assembly Information'} // // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. // [assembly: AssemblyDescription('')] [assembly: AssemblyConfiguration('')] [assembly: AssemblyCompany('')] [assembly: AssemblyProduct('')] [assembly: AssemblyCopyright('')] [assembly: AssemblyTrademark('')] [assembly: AssemblyCulture('')] // The Delphi compiler controls the AssemblyTitleAttribute via the ExeDescription. // You can set this in the IDE via the Project Options. // Manually setting the AssemblyTitle attribute below will override the IDE // setting. // [assembly: AssemblyTitle('')] // // Version information for an assembly consists of the following four values: // // Major Version // Minor Version // Build Number // Revision // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: [assembly: AssemblyVersion('1.0.*')] // // In order to sign your assembly you must specify a key to use. Refer to the // Microsoft .NET Framework documentation for more information on assembly signing. // // Use the attributes below to control which key is used for signing. // // Notes: // (*) If no key is specified, the assembly is not signed. // (*) KeyName refers to a key that has been installed in the Crypto Service // Provider (CSP) on your machine. KeyFile refers to a file which contains // a key. // (*) If the KeyFile and the KeyName values are both specified, the // following processing occurs: // (1) If the KeyName can be found in the CSP, that key is used. // (2) If the KeyName does not exist and the KeyFile does exist, the key // in the KeyFile is installed into the CSP and used. // (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility. // When specifying the KeyFile, the location of the KeyFile should be // relative to the project output directory. For example, if your KeyFile is // located in the project directory, you would specify the AssemblyKeyFile // attribute as [assembly: AssemblyKeyFile('mykey.snk')], provided your output // directory is the project directory (the default). // (*) Delay Signing is an advanced option - see the Microsoft .NET Framework // documentation for more information on this. // [assembly: AssemblyDelaySign(false)] [assembly: AssemblyKeyFile('')] [assembly: AssemblyKeyName('')] {$ENDREGION} [STAThread] begin Application.Run(GeneratorForm.Create); end. --- NEW FILE: DocGenerator.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Jedi.Docs.Core.dpk --- package Jedi.Docs.Core; {$ALIGN 0} {$ASSERTIONS ON} {$BOOLEVAL OFF} {$DEBUGINFO ON} {$EXTENDEDSYNTAX ON} {$IMPORTEDDATA ON} {$IOCHECKS ON} {$LOCALSYMBOLS ON} {$LONGSTRINGS ON} {$OPENSTRINGS ON} {$OPTIMIZATION ON} {$OVERFLOWCHECKS OFF} {$RANGECHECKS OFF} {$REFERENCEINFO ON} {$SAFEDIVIDE OFF} {$STACKFRAMES OFF} {$TYPEDADDRESS OFF} {$VARSTRINGCHECKS ON} {$WRITEABLECONST OFF} {$MINENUMSIZE 1} {$IMAGEBASE $400000} {$IMPLICITBUILD OFF} requires Borland.Delphi, System; contains Jedi.Docs.System in 'common\Jedi.Docs.System.pas'; [assembly: AssemblyTitle('Jedi.Docs.Core')] [assembly: AssemblyDescription('Documentation related core classes')] [assembly: AssemblyConfiguration('')] [assembly: AssemblyCompany('Project JEDI')] [assembly: AssemblyProduct('Project JEDI documentation tools')] [assembly: AssemblyCopyright('Copyright © 2004 Project JEDI')] [assembly: AssemblyTrademark('')] [assembly: AssemblyCulture('')] [assembly: AssemblyVersion('1.0.0.0')] [assembly: AssemblyDelaySign(false)] [assembly: AssemblyKeyFile('')] [assembly: AssemblyKeyName('')] end. --- NEW FILE: DocGenerator.res --- (This appears to be a binary file; contents omitted.) |
|
From: Marcel B. <jed...@us...> - 2004-06-25 13:11:42
|
Update of /cvsroot/jedidotnet/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15224/docs Modified Files: Jedi.Collections.xml Jedi.System.xml Jedi.Windows.Forms.Hmi.Leds.xml Log Message: Automated update Index: Jedi.System.xml =================================================================== RCS file: /cvsroot/jedidotnet/docs/Jedi.System.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Jedi.System.xml 25 Jun 2004 12:27:40 -0000 1.3 --- Jedi.System.xml 25 Jun 2004 13:11:32 -0000 1.4 *************** *** 1,5 **** <?xml version="1.0" encoding="utf-8"?> <doc> ! <!--most recent auto update: 2004-06-24 20:02 UTC--> <assembly> <name>Jedi.Core</name> --- 1,5 ---- <?xml version="1.0" encoding="utf-8"?> <doc> ! <!--most recent auto update: 2004-06-25 13:01 UTC--> <assembly> <name>Jedi.Core</name> *************** *** 38,43 **** <summary>Provides methods to work with or manipulate arrays or collections of attributes.</summary> </member> ! <member name="M:Jedi.System.AttributeUtils.CombineAttributes(System.Attribute[],System.Attribute[])"> ! <overloads> Combines two attribute lists. </overloads> --- 38,43 ---- <summary>Provides methods to work with or manipulate arrays or collections of attributes.</summary> </member> ! <member name="M:Jedi.System.AttributeUtils.CombineAttributes(System.Attribute[],System.Attribute[])"> ! <overloads> Combines two attribute lists. </overloads> Index: Jedi.Collections.xml =================================================================== RCS file: /cvsroot/jedidotnet/docs/Jedi.Collections.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Jedi.Collections.xml 25 Jun 2004 12:28:06 -0000 1.3 --- Jedi.Collections.xml 25 Jun 2004 13:11:32 -0000 1.4 *************** *** 1,5 **** <?xml version="1.0" encoding="utf-8"?> <doc> ! <!--most recent auto update: 2004-06-24 17:16 UTC--> <assembly> <name>Jedi.Core</name> --- 1,5 ---- <?xml version="1.0" encoding="utf-8"?> <doc> ! <!--most recent auto update: 2004-06-25 13:01 UTC--> <assembly> <name>Jedi.Core</name> *************** *** 7,75 **** <members> <member name="T:Jedi.Collections.NamespaceDoc"> ! <summary> The <b>Jedi.Collections</b> namespace defines several classes and interfaces that deal with collections. In addition it provides a mechanism that allows IList and IDictionary collections to be manipulated from within the PropertyGrid directly, without using additional design dialogs. </summary> ! </member> <member name="T:Jedi.Collections.IInlineCollection"> ! <summary> Defines methods needed to allow a collection to be edited from within a <see cref="T:System.Windows.Forms.PropertyGrid" />. </summary> </member> ! <member name="M:Jedi.Collections.IInlineCollection.AddItem(System.Object,System.Object)"> ! <summary> Adds an item given a value and an property ID. </summary> ! <param name="value"> The value specified in the PropertyGrid to be added. For IDictionary collections this is usually the key value. </param> ! <param name="addPropertyId"> The ID of the property that requested the item to be added. </param> ! </member> ! <member name="M:Jedi.Collections.IInlineCollection.GetAllowRemove(System.Object)"> ! <summary> Determines if the given item can be removed. </summary> ! <param name="key"> Key of the item to remove. For IList collections this parameter represents the ordinal index in the list. </param> ! <returns> ! <see langword="true" /> if the item can be removed from the collection; otherwise <see langword="false" />. </returns> ! <remarks> ! <para> This method is called directly from the ProperyGrid editor when an item's value is set to it's empty value as specified at the moment the item's semi property is created. </para> ! <para> Implementing classes can implement this method to perform checking whether an item can be removed or not. Some collections may not allow the collections to grow smaller than a certain number or certain items are fixed and should never be removed. </para> ! </remarks> ! </member> ! <member name="M:Jedi.Collections.IInlineCollection.GetCollectionValue"> ! <summary> Retrieves the text to show in the PropertyGrid for the property that represents the collection. </summary> ! <returns> A <see cref="T:System.String" /> representing the text to show as the value of the property that represents the collection. </returns> ! </member> ! <member name="M:Jedi.Collections.IInlineCollection.GetItemProperties"> ! <summary> Retrieves a <see cref="System.ComponentModel.PropertyDescriptorCollection" /> contain a <see cref="System.ComponentModel.PropertyDescriptor" /> for each item in the collection. </summary> ! <returns> A <see cref="System.ComponentModel.PropertyDescriptorCollection" /> containing a <see cref="System.ComponentModel.PropertyDescriptor" />for each item in the collection. </returns> ! <remarks> ! <para> The PropertyDescriptorCollection returned by this method will be used to generate the sub properties of the property representing the collection. Under normal circumstances the collection will contain a --- 7,75 ---- <members> <member name="T:Jedi.Collections.NamespaceDoc"> ! <summary> The <b>Jedi.Collections</b> namespace defines several classes and interfaces that deal with collections. In addition it provides a mechanism that allows IList and IDictionary collections to be manipulated from within the PropertyGrid directly, without using additional design dialogs. </summary> ! </member> <member name="T:Jedi.Collections.IInlineCollection"> ! <summary> Defines methods needed to allow a collection to be edited from within a <see cref="T:System.Windows.Forms.PropertyGrid" />. </summary> </member> ! <member name="M:Jedi.Collections.IInlineCollection.AddItem(System.Object,System.Object)"> ! <summary> Adds an item given a value and an property ID. </summary> ! <param name="value"> The value specified in the PropertyGrid to be added. For IDictionary collections this is usually the key value. </param> ! <param name="addPropertyId"> The ID of the property that requested the item to be added. </param> ! </member> ! <member name="M:Jedi.Collections.IInlineCollection.GetAllowRemove(System.Object)"> ! <summary> Determines if the given item can be removed. </summary> ! <param name="key"> Key of the item to remove. For IList collections this parameter represents the ordinal index in the list. </param> ! <returns> ! <see langword="true" /> if the item can be removed from the collection; otherwise <see langword="false" />. </returns> ! <remarks> ! <para> This method is called directly from the ProperyGrid editor when an item's value is set to it's empty value as specified at the moment the item's semi property is created. </para> ! <para> Implementing classes can implement this method to perform checking whether an item can be removed or not. Some collections may not allow the collections to grow smaller than a certain number or certain items are fixed and should never be removed. </para> ! </remarks> ! </member> ! <member name="M:Jedi.Collections.IInlineCollection.GetCollectionValue"> ! <summary> Retrieves the text to show in the PropertyGrid for the property that represents the collection. </summary> ! <returns> A <see cref="T:System.String" /> representing the text to show as the value of the property that represents the collection. </returns> ! </member> ! <member name="M:Jedi.Collections.IInlineCollection.GetItemProperties"> ! <summary> Retrieves a <see cref="System.ComponentModel.PropertyDescriptorCollection" /> contain a <see cref="System.ComponentModel.PropertyDescriptor" /> for each item in the collection. </summary> ! <returns> A <see cref="System.ComponentModel.PropertyDescriptorCollection" /> containing a <see cref="System.ComponentModel.PropertyDescriptor" />for each item in the collection. </returns> ! <remarks> ! <para> The PropertyDescriptorCollection returned by this method will be used to generate the sub properties of the property representing the collection. Under normal circumstances the collection will contain a *************** *** 77,82 **** collection, for instance fixed items that should not be changed or removed may be omitted from the collection. </para> ! <para> ! <note type="implementnotes"> Implementers should use the <see cref="M:Jedi.Collections.InlineCollectionUtils.CreateItemProperty" /> method to create the PropertyDescriptor for each item in the collection which is to be edited. This method --- 77,82 ---- collection, for instance fixed items that should not be changed or removed may be omitted from the collection. </para> ! <para> ! <note type="implementnotes"> Implementers should use the <see cref="M:Jedi.Collections.InlineCollectionUtils.CreateItemProperty" /> method to create the PropertyDescriptor for each item in the collection which is to be edited. This method *************** *** 84,105 **** the item being removed from the collection) as well as the index or key of the item in the collection. </note> ! </para> ! </remarks> ! </member> ! <member name="M:Jedi.Collections.IInlineCollection.GetNewItemProperties"> ! <summary> A <see cref="System.ComponentModel.PropertyDescriptorCollection" /> containing a <see cref="System.ComponentModel.PropertyDescriptor" /> that will add new items to the collection. </summary> ! <returns> A <see cref="System.ComponentModel.PropertyDescriptorCollection" /> containing a <see cref="System.ComponentModel.PropertyDescriptor" /> that will add new items to the collection. </returns> ! <remarks> ! <para> The PropertyDescriptorCollection returned by this method will be used to generate sub properties of the property representing the collection. Each property descriptor represents a way to add a new item. </para> ! <para> By allowing multiple PropertyDescriptors it is possible to add various item types to a collection. Each PropertyDescriptor contains an ID value. This value is send along in a call to --- 84,105 ---- the item being removed from the collection) as well as the index or key of the item in the collection. </note> ! </para> ! </remarks> ! </member> ! <member name="M:Jedi.Collections.IInlineCollection.GetNewItemProperties"> ! <summary> A <see cref="System.ComponentModel.PropertyDescriptorCollection" /> containing a <see cref="System.ComponentModel.PropertyDescriptor" /> that will add new items to the collection. </summary> ! <returns> A <see cref="System.ComponentModel.PropertyDescriptorCollection" /> containing a <see cref="System.ComponentModel.PropertyDescriptor" /> that will add new items to the collection. </returns> ! <remarks> ! <para> The PropertyDescriptorCollection returned by this method will be used to generate sub properties of the property representing the collection. Each property descriptor represents a way to add a new item. </para> ! <para> By allowing multiple PropertyDescriptors it is possible to add various item types to a collection. Each PropertyDescriptor contains an ID value. This value is send along in a call to *************** *** 107,119 **** add the indicated value, taking the property ID in account to determine what the value actually represents. </para> ! <para> ! <note type="implementnotes"> Implementers should use the <see cref="M:Jedi.Collections.InlineCollectionUtils.CreateNewItemProperty" /> method to create the PropertyDescriptors needed. The method allows to specify the ID that is send to the <see cref="M:Jedi.Collections.IInlineCollection.AddItem(System.Object,System.Object)" /> method. </note> ! </para> ! </remarks> ! </member> <member name="M:Jedi.Collections.IInlineCollection.GetService(System.Type)"> <summary> --- 107,119 ---- add the indicated value, taking the property ID in account to determine what the value actually represents. </para> ! <para> ! <note type="implementnotes"> Implementers should use the <see cref="M:Jedi.Collections.InlineCollectionUtils.CreateNewItemProperty" /> method to create the PropertyDescriptors needed. The method allows to specify the ID that is send to the <see cref="M:Jedi.Collections.IInlineCollection.AddItem(System.Object,System.Object)" /> method. </note> ! </para> ! </remarks> ! </member> <member name="M:Jedi.Collections.IInlineCollection.GetService(System.Type)"> <summary> *************** *** 138,144 **** </param> <param name="addPropertyId"> ! </param> ! <returns> ! </returns> </member> <member name="M:Jedi.Collections.InlineCollectionBase.GetAllowRemove(System.Object)"> --- 138,142 ---- </param> <param name="addPropertyId"> ! </param> </member> <member name="M:Jedi.Collections.InlineCollectionBase.GetAllowRemove(System.Object)"> *************** *** 166,170 **** <member name="M:Jedi.Collections.InlineCollectionBase.GetItemEmptyValue(System.Int32)"> <summary> ! </summary> <param name="index"> </param> --- 164,168 ---- <member name="M:Jedi.Collections.InlineCollectionBase.GetItemEmptyValue(System.Int32)"> <summary> ! </summary> <param name="index"> </param> *************** *** 179,183 **** <returns> </returns> ! </member> <member name="M:Jedi.Collections.InlineCollectionBase.GetItemName(System.Int32)"> <summary> --- 177,181 ---- <returns> </returns> ! </member> <member name="M:Jedi.Collections.InlineCollectionBase.GetItemName(System.Int32)"> <summary> *************** *** 197,201 **** <summary> </summary> ! <param name="index"> </param> <returns> --- 195,199 ---- <summary> </summary> ! <param name="index"> </param> <returns> *************** *** 225,229 **** <summary> </summary> ! </member> <member name="M:Jedi.Collections.InlineCollectionConverter.#ctor"> <summary> --- 223,227 ---- <summary> </summary> ! </member> <member name="M:Jedi.Collections.InlineCollectionConverter.#ctor"> <summary> *************** *** 249,253 **** <!-- this member is inherited and does not require documentation. ! <summary> </summary> <param name="context"> --- 247,251 ---- <!-- this member is inherited and does not require documentation. ! <summary> </summary> <param name="context"> *************** *** 256,260 **** </param> <param name="attributes"> ! </param> <returns> </returns>--> --- 254,258 ---- </param> <param name="attributes"> ! </param> <returns> </returns>--> *************** *** 284,288 **** </summary> <param name="context"> ! </param> <param name="provider"> </param> --- 282,286 ---- </summary> <param name="context"> ! </param> <param name="provider"> </param> *************** *** 315,347 **** <returns> </returns> ! </member> ! <member name="M:Jedi.Collections.InlineCollectionUtils.CreateItemProperty(System.Reflection.PropertyInfo,System.Object,System.String,System.String,System.Object,System.Object,System.Boolean)"> ! <summary> ! </summary> ! <param name="info"> ! </param> ! <param name="component"> ! </param> ! <param name="name"> ! </param> ! <param name="description"> ! </param> ! <param name="index"> ! </param> ! <param name="emptyValue"> ! </param> ! <param name="ignoreDefaultProperty"> ! </param> ! <returns> ! </returns> ! </member> ! <member name="M:Jedi.Collections.InlineCollectionUtils.CreateItemProperty(System.Type,System.Attribute[],System.Object,System.String,System.String,System.Object,System.Object)"> ! <summary> ! </summary> ! <param name="propertyType"> ! </param> ! <param name="attributes"> ! </param> ! <param name="component"> </param> <param name="name"> --- 313,345 ---- <returns> </returns> ! </member> ! <member name="M:Jedi.Collections.InlineCollectionUtils.CreateItemProperty(System.Reflection.PropertyInfo,System.Object,System.String,System.String,System.Object,System.Object,System.Boolean)"> ! <summary> ! </summary> ! <param name="info"> ! </param> ! <param name="component"> ! </param> ! <param name="name"> ! </param> ! <param name="description"> ! </param> ! <param name="index"> ! </param> ! <param name="emptyValue"> ! </param> ! <param name="ignoreDefaultProperty"> ! </param> ! <returns> ! </returns> ! </member> ! <member name="M:Jedi.Collections.InlineCollectionUtils.CreateItemProperty(System.Type,System.Attribute[],System.Object,System.String,System.String,System.Object,System.Object)"> ! <summary> ! </summary> ! <param name="propertyType"> ! </param> ! <param name="attributes"> ! </param> ! <param name="component"> </param> <param name="name"> *************** *** 389,393 **** <param name="componentType"> </param> ! <param name="propertyType"> </param> <param name="attributes"> --- 387,391 ---- <param name="componentType"> </param> ! <param name="propertyType"> </param> <param name="attributes"> *************** *** 417,422 **** <param name="addPropertyId"> </param> - <returns> - </returns> </member> <member name="M:Jedi.Collections.InlineDictionaryBase.GetAllowRemove(System.Object)"> --- 415,418 ---- Index: Jedi.Windows.Forms.Hmi.Leds.xml =================================================================== RCS file: /cvsroot/jedidotnet/docs/Jedi.Windows.Forms.Hmi.Leds.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Jedi.Windows.Forms.Hmi.Leds.xml 24 Jun 2004 17:18:16 -0000 1.2 --- Jedi.Windows.Forms.Hmi.Leds.xml 25 Jun 2004 13:11:32 -0000 1.3 *************** *** 1,5 **** <?xml version="1.0" encoding="utf-8"?> <doc> ! <!--most recent auto update: 2004-06-24 17:16 UTC--> <assembly> <name>Jedi.Windows.Forms.Hmi</name> --- 1,5 ---- <?xml version="1.0" encoding="utf-8"?> <doc> ! <!--most recent auto update: 2004-06-25 13:01 UTC--> <assembly> <name>Jedi.Windows.Forms.Hmi</name> *************** *** 39,44 **** <summary> </summary> ! <param name="Jedi.Windows.Forms.Hmi.Leds.LedState.#ctor(System.Drawing.Color,System.String)"> ! </param> <param name="color"> </param> --- 39,46 ---- <summary> </summary> ! </member> ! <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedState.#ctor(System.Drawing.Color,System.String)"> ! <summary> ! </summary> <param name="color"> </param> *************** *** 85,93 **** <summary> </summary> - <param name="Jedi.Windows.Forms.Hmi.Leds.LedStateBase.ColorChanged"> - </param> <value> </value> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateBase.GetBitmap"> <summary> --- 87,97 ---- <summary> </summary> <value> </value> </member> + <member name="E:Jedi.Windows.Forms.Hmi.Leds.LedStateBase.ColorChanged"> + <summary> + </summary> + </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateBase.GetBitmap"> <summary> *************** *** 123,134 **** <summary> </summary> - <returns> - </returns> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateBase.MarkInvalid"> <summary> </summary> - <returns> - </returns> </member> <member name="P:Jedi.Windows.Forms.Hmi.Leds.LedStateBase.Name"> --- 127,134 ---- *************** *** 143,148 **** <param name="e"> </param> - <returns> - </returns> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateBase.SetColor(System.Drawing.Color)"> --- 143,146 ---- *************** *** 151,156 **** <param name="value"> </param> - <returns> - </returns> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateBase.SetLedStyle(Jedi.Windows.Forms.Hmi.Leds.LedStyleBase)"> --- 149,152 ---- *************** *** 159,164 **** <param name="value"> </param> - <returns> - </returns> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateBase.SetName(System.String)"> --- 155,158 ---- *************** *** 167,172 **** <param name="value"> </param> - <returns> - </returns> </member> <member name="T:Jedi.Windows.Forms.Hmi.Leds.LedStateCollection"> --- 161,164 ---- *************** *** 196,202 **** </param> <param name="addPropertyId"> ! </param> ! <returns> ! </returns>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateCollection.Contains(Jedi.Windows.Forms.Hmi.Leds.LedStateBase)"> --- 188,192 ---- </param> <param name="addPropertyId"> ! </param>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateCollection.Contains(Jedi.Windows.Forms.Hmi.Leds.LedStateBase)"> *************** *** 269,274 **** <param name="value"> </param> - <returns> - </returns> </member> <member name="P:Jedi.Windows.Forms.Hmi.Leds.LedStateCollection.Item(System.Int32)"> --- 259,262 ---- *************** *** 284,292 **** this member is inherited and does not require documentation. <summary> ! </summary> ! <param name="Jedi.Windows.Forms.Hmi.Leds.LedStateCollection.OnClearComplete"> ! </param> ! <returns> ! </returns>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateCollection.OnInsert(System.Int32,System.Object)"> --- 272,282 ---- this member is inherited and does not require documentation. <summary> ! </summary>--> ! </member> ! <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateCollection.OnClearComplete"> ! <!-- ! this member is inherited and does not require documentation. ! <summary> ! </summary>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateCollection.OnInsert(System.Int32,System.Object)"> *************** *** 298,304 **** </param> <param name="value"> ! </param> ! <returns> ! </returns>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateCollection.OnInsertComplete(System.Int32,System.Object)"> --- 288,292 ---- </param> <param name="value"> ! </param>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateCollection.OnInsertComplete(System.Int32,System.Object)"> *************** *** 310,316 **** </param> <param name="value"> ! </param> ! <returns> ! </returns>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateCollection.OnRemoveComplete(System.Int32,System.Object)"> --- 298,302 ---- </param> <param name="value"> ! </param>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateCollection.OnRemoveComplete(System.Int32,System.Object)"> *************** *** 322,328 **** </param> <param name="value"> ! </param> ! <returns> ! </returns>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateCollection.OnSet(System.Int32,System.Object,System.Object)"> --- 308,312 ---- </param> <param name="value"> ! </param>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateCollection.OnSet(System.Int32,System.Object,System.Object)"> *************** *** 336,342 **** </param> <param name="newValue"> ! </param> ! <returns> ! </returns>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateCollection.OnSetComplete(System.Int32,System.Object,System.Object)"> --- 320,324 ---- </param> <param name="newValue"> ! </param>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateCollection.OnSetComplete(System.Int32,System.Object,System.Object)"> *************** *** 350,356 **** </param> <param name="newValue"> ! </param> ! <returns> ! </returns>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateCollection.OnValidate(System.Object)"> --- 332,336 ---- </param> <param name="newValue"> ! </param>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateCollection.OnValidate(System.Object)"> *************** *** 360,366 **** </summary> <param name="value"> ! </param> ! <returns> ! </returns>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateCollection.Remove(Jedi.Windows.Forms.Hmi.Leds.LedStateBase)"> --- 340,344 ---- </summary> <param name="value"> ! </param>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStateCollection.Remove(Jedi.Windows.Forms.Hmi.Leds.LedStateBase)"> *************** *** 369,374 **** <param name="value"> </param> - <returns> - </returns> </member> <member name="T:Jedi.Windows.Forms.Hmi.Leds.LedStateConverter"> --- 347,350 ---- *************** *** 515,526 **** <summary> </summary> - <returns> - </returns> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.CreateDefaultStates"> <summary> </summary> - <returns> - </returns> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.DrawFrame(System.Drawing.Bitmap,System.Drawing.Region)"> --- 491,498 ---- *************** *** 531,542 **** <param name="clipRegion"> </param> - <returns> - </returns> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.EndInit"> <summary> </summary> - <returns> - </returns> </member> <member name="P:Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.FrameBitmap"> --- 503,510 ---- *************** *** 561,566 **** <summary> </summary> - <returns> - </returns> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.GetInstanceDescriptor"> --- 529,532 ---- *************** *** 591,612 **** <summary> </summary> ! <param name="Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.InvalidateFrame"> ! </param> ! <param name="Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.InvalidateSettings"> ! </param> ! <param name="Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.InvalidateSize"> ! </param> ! <param name="Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.InvalidateState(Jedi.Windows.Forms.Hmi.Leds.LedStateBase)"> ! </param> <param name="state"> </param> ! <param name="Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.InvalidateState(System.Int32)"> ! </param> <param name="index"> </param> ! <param name="Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.InvalidateStates"> ! </param> ! <returns> ! </returns> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.IsInitializing"> --- 557,588 ---- <summary> </summary> ! </member> ! <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.InvalidateFrame"> ! <summary> ! </summary> ! </member> ! <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.InvalidateSettings"> ! <summary> ! </summary> ! </member> ! <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.InvalidateSize"> ! <summary> ! </summary> ! </member> ! <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.InvalidateState(Jedi.Windows.Forms.Hmi.Leds.LedStateBase)"> ! <summary> ! </summary> <param name="state"> </param> ! </member> ! <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.InvalidateState(System.Int32)"> ! <summary> ! </summary> <param name="index"> </param> ! </member> ! <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.InvalidateStates"> ! <summary> ! </summary> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.IsInitializing"> *************** *** 625,630 **** <summary> </summary> - <returns> - </returns> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.OnSettingsChanged(System.EventArgs)"> --- 601,604 ---- *************** *** 633,638 **** <param name="e"> </param> - <returns> - </returns> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.OnSizeChanged(System.EventArgs)"> --- 607,610 ---- *************** *** 641,646 **** <param name="e"> </param> - <returns> - </returns> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.OnStateAdded(System.Int32)"> --- 613,616 ---- *************** *** 649,654 **** <param name="index"> </param> - <returns> - </returns> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.OnStateRemoved(System.Int32)"> --- 619,622 ---- *************** *** 657,662 **** <param name="index"> </param> - <returns> - </returns> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.LedStyleBase.RenderState(Jedi.Windows.Forms.Hmi.Leds.LedStateBase)"> --- 625,628 ---- *************** *** 831,836 **** <summary> </summary> ! <param name="Jedi.Windows.Forms.Hmi.Leds.MultiColorNormalLedStyle.#ctor(System.Int32,System.Int32,Jedi.Windows.Forms.Hmi.Leds.LedFrameStyle,Jedi.Windows.Forms.Hmi.Leds.LedStateBase[])"> ! </param> <param name="Diameter"> </param> --- 797,804 ---- <summary> </summary> ! </member> ! <member name="M:Jedi.Windows.Forms.Hmi.Leds.MultiColorNormalLedStyle.#ctor(System.Int32,System.Int32,Jedi.Windows.Forms.Hmi.Leds.LedFrameStyle,Jedi.Windows.Forms.Hmi.Leds.LedStateBase[])"> ! <summary> ! </summary> <param name="Diameter"> </param> *************** *** 846,852 **** this member is inherited and does not require documentation. <summary> ! </summary> ! <returns> ! </returns>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.MultiColorNormalLedStyle.GetInstDescArguments"> --- 814,818 ---- this member is inherited and does not require documentation. <summary> ! </summary>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.MultiColorNormalLedStyle.GetInstDescArguments"> *************** *** 894,900 **** </param> <param name="clipRegion"> ! </param> ! <returns> ! </returns>--> </member> <member name="P:Jedi.Windows.Forms.Hmi.Leds.NormalLedStyleBase.FrameStyle"> --- 860,864 ---- </param> <param name="clipRegion"> ! </param>--> </member> <member name="P:Jedi.Windows.Forms.Hmi.Leds.NormalLedStyleBase.FrameStyle"> *************** *** 930,936 **** this member is inherited and does not require documentation. <summary> ! </summary> ! <returns> ! </returns>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.NormalLedStyleBase.RenderState(Jedi.Windows.Forms.Hmi.Leds.LedStateBase)"> --- 894,898 ---- this member is inherited and does not require documentation. <summary> ! </summary>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.NormalLedStyleBase.RenderState(Jedi.Windows.Forms.Hmi.Leds.LedStateBase)"> *************** *** 951,956 **** <summary> </summary> ! <param name="Jedi.Windows.Forms.Hmi.Leds.SingleColorNormalLedStyle.#ctor(System.Int32,System.Int32,Jedi.Windows.Forms.Hmi.Leds.LedFrameStyle,System.Int32,System.Drawing.Color)"> ! </param> <param name="Diameter"> </param> --- 913,920 ---- <summary> </summary> ! </member> ! <member name="M:Jedi.Windows.Forms.Hmi.Leds.SingleColorNormalLedStyle.#ctor(System.Int32,System.Int32,Jedi.Windows.Forms.Hmi.Leds.LedFrameStyle,System.Int32,System.Drawing.Color)"> ! <summary> ! </summary> <param name="Diameter"> </param> *************** *** 968,974 **** this member is inherited and does not require documentation. <summary> ! </summary> ! <returns> ! </returns>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.SingleColorNormalLedStyle.GetInstDescArguments"> --- 932,936 ---- this member is inherited and does not require documentation. <summary> ! </summary>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.SingleColorNormalLedStyle.GetInstDescArguments"> *************** *** 1017,1022 **** <param name="value"> </param> - <returns> - </returns> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.SingleColorNormalLedStyle.SetOffPercentage(System.Int32)"> --- 979,982 ---- *************** *** 1025,1030 **** <param name="value"> </param> - <returns> - </returns> </member> <member name="T:Jedi.Windows.Forms.Hmi.Leds.SingleLed"> --- 985,988 ---- *************** *** 1047,1052 **** <summary> </summary> - <returns> - </returns> </member> <member name="P:Jedi.Windows.Forms.Hmi.Leds.SingleLed.BlinkInterval"> --- 1005,1008 ---- *************** *** 1063,1068 **** <param name="e"> </param> - <returns> - </returns> </member> <member name="P:Jedi.Windows.Forms.Hmi.Leds.SingleLed.CausesValidation"> --- 1019,1022 ---- *************** *** 1078,1084 **** </summary> <param name="Disposing"> ! </param> ! <returns> ! </returns>--> </member> <member name="P:Jedi.Windows.Forms.Hmi.Leds.SingleLed.Enabled"> --- 1032,1036 ---- </summary> <param name="Disposing"> ! </param>--> </member> <member name="P:Jedi.Windows.Forms.Hmi.Leds.SingleLed.Enabled"> *************** *** 1091,1096 **** <summary> </summary> - <returns> - </returns> </member> <member name="P:Jedi.Windows.Forms.Hmi.Leds.SingleLed.Font"> --- 1043,1046 ---- *************** *** 1152,1158 **** </summary> <param name="e"> ! </param> ! <returns> ! </returns>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.SingleLed.OnPaint(System.Windows.Forms.PaintEventArgs)"> --- 1102,1106 ---- </summary> <param name="e"> ! </param>--> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.SingleLed.OnPaint(System.Windows.Forms.PaintEventArgs)"> *************** *** 1162,1168 **** </summary> <param name="e"> ! </param> ! <returns> ! </returns>--> </member> <member name="P:Jedi.Windows.Forms.Hmi.Leds.SingleLed.RightToLeft"> --- 1110,1114 ---- </summary> <param name="e"> ! </param>--> </member> <member name="P:Jedi.Windows.Forms.Hmi.Leds.SingleLed.RightToLeft"> *************** *** 1181,1186 **** <param name="e"> </param> - <returns> - </returns> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.SingleLed.Style_SizeChanged(System.Object,System.EventArgs)"> --- 1127,1130 ---- *************** *** 1191,1196 **** <param name="e"> </param> - <returns> - </returns> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.SingleLed.Style_StateAdded(System.Object,Jedi.Windows.Forms.Hmi.Leds.StateChangedEventArgs)"> --- 1135,1138 ---- *************** *** 1201,1206 **** <param name="e"> </param> - <returns> - </returns> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.SingleLed.Style_StateRemoved(System.Object,Jedi.Windows.Forms.Hmi.Leds.StateChangedEventArgs)"> --- 1143,1146 ---- *************** *** 1211,1216 **** <param name="e"> </param> - <returns> - </returns> </member> <member name="P:Jedi.Windows.Forms.Hmi.Leds.SingleLed.Text"> --- 1151,1154 ---- *************** *** 1269,1274 **** <param name="result"> </param> - <returns> - </returns> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.StateChangedEventHandler.Invoke(System.Object,Jedi.Windows.Forms.Hmi.Leds.StateChangedEventArgs)"> --- 1207,1210 ---- *************** *** 1279,1284 **** <param name="e"> </param> - <returns> - </returns> </member> </members> --- 1215,1218 ---- |
|
From: Marcel B. <jed...@us...> - 2004-06-25 13:10:40
|
Update of /cvsroot/jedidotnet/tools/docs/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15052/tools/docs/common Added Files: Jedi.Docs.System.pas Log Message: * Fixed issue where procedures where wrongly marked as function (procedures have a ReturnType = System.Void) * Fixed issue where two procedures with the same base name (i.e. OnClear and OnClearComplete) would get the second procedure as a parameter of the first. --- NEW FILE: Jedi.Docs.System.pas --- unit Jedi.Docs.System; interface {$REGION 'interface uses'} uses System.Collections, System.Collections.Specialized, System.IO, System.Reflection, System.Text, System.Xml; {$ENDREGION} type ParameterInfoArray = array of ParameterInfo; [Flags] MemberFlags = (None = 0, InAssembly = 1, InXML = 2, InBoth = InAssembly + InXML, IsOptionalClass = 4, IsInherited = 8, IsNamespace = 16, IsType = 32, IsMethod = 64, IsProperty = 128, IsEvent = 256, IsCtor = 512, IsParameter = 1024, [...1068 lines suppressed...] end; function OutputGenerator.XmlWriter: XmlTextWriter; begin Result := FXmlWriter; end; class procedure OutputGenerator.GenerateDocFiles(overview: AssemblyOverview); var i: Integer; begin with OutputGenerator.Create(overview) do begin for i := 0 to overview.Namespaces.Count - 1 do GenerateNamespaceDoc(string(overview.Namespaces.GetKey(i))); end; end; {$ENDREGION} end. |
|
From: Marcel B. <jed...@us...> - 2004-06-25 12:28:14
|
Update of /cvsroot/jedidotnet/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5719/docs Modified Files: Jedi.Collections.xml Log Message: Partially documented Index: Jedi.Collections.xml =================================================================== RCS file: /cvsroot/jedidotnet/docs/Jedi.Collections.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Jedi.Collections.xml 24 Jun 2004 17:18:16 -0000 1.2 --- Jedi.Collections.xml 25 Jun 2004 12:28:06 -0000 1.3 *************** *** 7,55 **** <members> <member name="T:Jedi.Collections.NamespaceDoc"> ! <summary> ! </summary> ! <remarks> ! </remarks> ! </member> <member name="T:Jedi.Collections.IInlineCollection"> ! <summary> ! </summary> ! </member> ! <member name="M:Jedi.Collections.IInlineCollection.AddItem(System.Object,System.Object)"> ! <summary> ! </summary> ! <param name="value"> ! </param> ! <param name="addPropertyId"> ! </param> ! <returns> ! </returns> ! </member> ! <member name="M:Jedi.Collections.IInlineCollection.GetAllowRemove(System.Object)"> ! <summary> ! </summary> ! <param name="key"> ! </param> ! <returns> ! </returns> ! </member> ! <member name="M:Jedi.Collections.IInlineCollection.GetCollectionValue"> ! <summary> ! </summary> ! <returns> ! </returns> ! </member> ! <member name="M:Jedi.Collections.IInlineCollection.GetItemProperties"> ! <summary> ! </summary> ! <returns> ! </returns> ! </member> ! <member name="M:Jedi.Collections.IInlineCollection.GetNewItemProperties"> ! <summary> </summary> - <returns> - </returns> </member> <member name="M:Jedi.Collections.IInlineCollection.GetService(System.Type)"> <summary> --- 7,119 ---- <members> <member name="T:Jedi.Collections.NamespaceDoc"> ! <summary> ! The <b>Jedi.Collections</b> namespace defines several classes and interfaces that deal with collections. In ! addition it provides a mechanism that allows IList and IDictionary collections to be manipulated from within ! the PropertyGrid directly, without using additional design dialogs. ! </summary> ! </member> <member name="T:Jedi.Collections.IInlineCollection"> ! <summary> ! Defines methods needed to allow a collection to be edited from within a ! <see cref="T:System.Windows.Forms.PropertyGrid" />. </summary> </member> + <member name="M:Jedi.Collections.IInlineCollection.AddItem(System.Object,System.Object)"> + <summary> + Adds an item given a value and an property ID. + </summary> + <param name="value"> + The value specified in the PropertyGrid to be added. For IDictionary collections this is usually the key value. + </param> + <param name="addPropertyId"> + The ID of the property that requested the item to be added. + </param> + </member> + <member name="M:Jedi.Collections.IInlineCollection.GetAllowRemove(System.Object)"> + <summary> + Determines if the given item can be removed. + </summary> + <param name="key"> + Key of the item to remove. For IList collections this parameter represents the ordinal index in the list. + </param> + <returns> + <see langword="true" /> if the item can be removed from the collection; otherwise <see langword="false" />. + </returns> + <remarks> + <para> + This method is called directly from the ProperyGrid editor when an item's value is set to it's empty value as + specified at the moment the item's semi property is created. + </para> + <para> + Implementing classes can implement this method to perform checking whether an item can be removed or not. Some + collections may not allow the collections to grow smaller than a certain number or certain items are fixed and + should never be removed. + </para> + </remarks> + </member> + <member name="M:Jedi.Collections.IInlineCollection.GetCollectionValue"> + <summary> + Retrieves the text to show in the PropertyGrid for the property that represents the collection. + </summary> + <returns> + A <see cref="T:System.String" /> representing the text to show as the value of the property that represents the + collection. + </returns> + </member> + <member name="M:Jedi.Collections.IInlineCollection.GetItemProperties"> + <summary> + Retrieves a <see cref="System.ComponentModel.PropertyDescriptorCollection" /> contain a + <see cref="System.ComponentModel.PropertyDescriptor" /> for each item in the collection. + </summary> + <returns> + A <see cref="System.ComponentModel.PropertyDescriptorCollection" /> containing a + <see cref="System.ComponentModel.PropertyDescriptor" />for each item in the collection. + </returns> + <remarks> + <para> + The PropertyDescriptorCollection returned by this method will be used to generate the sub properties of the + property representing the collection. Under normal circumstances the collection will contain a + PropertyDescriptor for each item in the collection but implementers may choose to ignore certain items in the + collection, for instance fixed items that should not be changed or removed may be omitted from the collection. + </para> + <para> + <note type="implementnotes"> + Implementers should use the <see cref="M:Jedi.Collections.InlineCollectionUtils.CreateItemProperty" /> + method to create the PropertyDescriptor for each item in the collection which is to be edited. This method + allows to specify the value to use as an "empty" value (setting the property to this value will result in + the item being removed from the collection) as well as the index or key of the item in the collection. + </note> + </para> + </remarks> + </member> + <member name="M:Jedi.Collections.IInlineCollection.GetNewItemProperties"> + <summary> + A <see cref="System.ComponentModel.PropertyDescriptorCollection" /> containing a + <see cref="System.ComponentModel.PropertyDescriptor" /> that will add new items to the collection. + </summary> + <returns> + A <see cref="System.ComponentModel.PropertyDescriptorCollection" /> containing a + <see cref="System.ComponentModel.PropertyDescriptor" /> that will add new items to the collection. + </returns> + <remarks> + <para> + The PropertyDescriptorCollection returned by this method will be used to generate sub properties of the + property representing the collection. Each property descriptor represents a way to add a new item. + </para> + <para> + By allowing multiple PropertyDescriptors it is possible to add various item types to a collection. Each + PropertyDescriptor contains an ID value. This value is send along in a call to + <see cref="M:Jedi.Collections.IInlineCollection.AddItem(System.Object,System.Object)" /> which will + add the indicated value, taking the property ID in account to determine what the value actually represents. + </para> + <para> + <note type="implementnotes"> + Implementers should use the <see cref="M:Jedi.Collections.InlineCollectionUtils.CreateNewItemProperty" /> + method to create the PropertyDescriptors needed. The method allows to specify the ID that is send to the + <see cref="M:Jedi.Collections.IInlineCollection.AddItem(System.Object,System.Object)" /> method. + </note> + </para> + </remarks> + </member> <member name="M:Jedi.Collections.IInlineCollection.GetService(System.Type)"> <summary> *************** *** 74,78 **** </param> <param name="addPropertyId"> ! </param> <returns> </returns> --- 138,142 ---- </param> <param name="addPropertyId"> ! </param> <returns> </returns> *************** *** 102,106 **** <member name="M:Jedi.Collections.InlineCollectionBase.GetItemEmptyValue(System.Int32)"> <summary> ! </summary> <param name="index"> </param> --- 166,170 ---- <member name="M:Jedi.Collections.InlineCollectionBase.GetItemEmptyValue(System.Int32)"> <summary> ! </summary> <param name="index"> </param> *************** *** 115,119 **** <returns> </returns> ! </member> <member name="M:Jedi.Collections.InlineCollectionBase.GetItemName(System.Int32)"> <summary> --- 179,183 ---- <returns> </returns> ! </member> <member name="M:Jedi.Collections.InlineCollectionBase.GetItemName(System.Int32)"> <summary> *************** *** 133,137 **** <summary> </summary> ! <param name="index"> </param> <returns> --- 197,201 ---- <summary> </summary> ! <param name="index"> </param> <returns> *************** *** 161,165 **** <summary> </summary> ! </member> <member name="M:Jedi.Collections.InlineCollectionConverter.#ctor"> <summary> --- 225,229 ---- <summary> </summary> ! </member> <member name="M:Jedi.Collections.InlineCollectionConverter.#ctor"> <summary> *************** *** 185,189 **** <!-- this member is inherited and does not require documentation. ! <summary> </summary> <param name="context"> --- 249,253 ---- <!-- this member is inherited and does not require documentation. ! <summary> </summary> <param name="context"> *************** *** 192,196 **** </param> <param name="attributes"> ! </param> <returns> </returns>--> --- 256,260 ---- </param> <param name="attributes"> ! </param> <returns> </returns>--> *************** *** 220,224 **** </summary> <param name="context"> ! </param> <param name="provider"> </param> --- 284,288 ---- </summary> <param name="context"> ! </param> <param name="provider"> </param> *************** *** 251,283 **** <returns> </returns> ! </member> ! <member name="M:Jedi.Collections.InlineCollectionUtils.CreateItemProperty(System.Reflection.PropertyInfo,System.Object,System.String,System.String,System.Object,System.Object,System.Boolean)"> ! <summary> ! </summary> ! <param name="info"> ! </param> ! <param name="component"> ! </param> ! <param name="name"> ! </param> ! <param name="description"> ! </param> ! <param name="index"> ! </param> ! <param name="emptyValue"> ! </param> ! <param name="ignoreDefaultProperty"> ! </param> ! <returns> ! </returns> ! </member> ! <member name="M:Jedi.Collections.InlineCollectionUtils.CreateItemProperty(System.Type,System.Attribute[],System.Object,System.String,System.String,System.Object,System.Object)"> ! <summary> ! </summary> ! <param name="propertyType"> ! </param> ! <param name="attributes"> ! </param> ! <param name="component"> </param> <param name="name"> --- 315,347 ---- <returns> </returns> ! </member> ! <member name="M:Jedi.Collections.InlineCollectionUtils.CreateItemProperty(System.Reflection.PropertyInfo,System.Object,System.String,System.String,System.Object,System.Object,System.Boolean)"> ! <summary> ! </summary> ! <param name="info"> ! </param> ! <param name="component"> ! </param> ! <param name="name"> ! </param> ! <param name="description"> ! </param> ! <param name="index"> ! </param> ! <param name="emptyValue"> ! </param> ! <param name="ignoreDefaultProperty"> ! </param> ! <returns> ! </returns> ! </member> ! <member name="M:Jedi.Collections.InlineCollectionUtils.CreateItemProperty(System.Type,System.Attribute[],System.Object,System.String,System.String,System.Object,System.Object)"> ! <summary> ! </summary> ! <param name="propertyType"> ! </param> ! <param name="attributes"> ! </param> ! <param name="component"> </param> <param name="name"> *************** *** 325,329 **** <param name="componentType"> </param> ! <param name="propertyType"> </param> <param name="attributes"> --- 389,393 ---- <param name="componentType"> </param> ! <param name="propertyType"> </param> <param name="attributes"> |
|
From: Marcel B. <jed...@us...> - 2004-06-25 12:27:49
|
Update of /cvsroot/jedidotnet/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5590/docs Modified Files: Jedi.System.xml Log Message: Corrected misused tag Index: Jedi.System.xml =================================================================== RCS file: /cvsroot/jedidotnet/docs/Jedi.System.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Jedi.System.xml 24 Jun 2004 20:07:05 -0000 1.2 --- Jedi.System.xml 25 Jun 2004 12:27:40 -0000 1.3 *************** *** 38,42 **** <summary>Provides methods to work with or manipulate arrays or collections of attributes.</summary> </member> ! <member name="M:Jedi.System.AttributeUtils.CombineAttributes(System.Attribute[],System.Attribute[])"> <summary> Combines two attribute arrays using the <see cref="F:Jedi.System.AttributeCombineOperation.AddAndReplace" /> --- 38,45 ---- <summary>Provides methods to work with or manipulate arrays or collections of attributes.</summary> </member> ! <member name="M:Jedi.System.AttributeUtils.CombineAttributes(System.Attribute[],System.Attribute[])"> ! <overloads> ! Combines two attribute lists. ! </overloads> <summary> Combines two attribute arrays using the <see cref="F:Jedi.System.AttributeCombineOperation.AddAndReplace" /> |
|
From: Marcel B. <jed...@us...> - 2004-06-24 20:07:13
|
Update of /cvsroot/jedidotnet/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2859/docs Modified Files: Jedi.System.xml Log Message: Updates docs Index: Jedi.System.xml =================================================================== RCS file: /cvsroot/jedidotnet/docs/Jedi.System.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jedi.System.xml 24 Jun 2004 14:05:49 -0000 1.1 --- Jedi.System.xml 24 Jun 2004 20:07:05 -0000 1.2 *************** *** 1,5 **** <?xml version="1.0" encoding="utf-8"?> <doc> ! <!--most recent auto update: 200406240154UTC--> <assembly> <name>Jedi.Core</name> --- 1,5 ---- <?xml version="1.0" encoding="utf-8"?> <doc> ! <!--most recent auto update: 2004-06-24 20:02 UTC--> <assembly> <name>Jedi.Core</name> *************** *** 7,73 **** <members> <member name="T:Jedi.System.NamespaceDoc"> ! <summary>The <b>Jedi.System</b> provides common services throughout the JEDI library.</summary> </member> ! <member name="T:Jedi.System.AttributeUtils"> ! <summary>Provides methods to work with or manipulate arrays or collections of attributes.</summary> </member> ! <member name="M:Jedi.System.AttributeUtils.#ctor"> <summary> </summary> </member> ! <member name="M:Jedi.System.AttributeUtils.IndexOf(System.Collections.ArrayList,System.Object)"> ! <summary>Locates an attribute by instance or by type.</summary> ! <param name="attrList">A list of attributes to search in.</param> ! <param name="attr">Attribute or attribute type to search for.</param> <returns> ! <para> ! -1 if the specified attribute or attribute type is not found; otherwise the zero-based index in ! the list. ! </para> </returns> </member> ! <member name="M:Jedi.System.AttributeUtils.OverrideAttributes(System.Attribute[],System.Attribute[],System.Attribute[])"> ! <summary>Override attributes in an array.</summary> ! <param name="attributes">The primary attribute array.</param> ! <param name="overrides"> ! An array of attributes to add to or replace in the primary array or a <B>null</B> reference. </param> ! <param name="replacements"> ! An array of attributes to replace in the primary array or a <B>nil</B> reference. </param> <returns> ! Overridden attribute array. </returns> </member> ! <member name="M:Jedi.System.AttributeUtils.OverrideAttributes(System.ComponentModel.AttributeCollection,System.Attribute[],System.Attribute[])"> <summary> ! Override attributes in an AttributeCollection. </summary> ! <param name="attributes">The primary attribute collection.</param> ! <param name="overrides"> ! An array of attributes to add to or replace in the primary attribute collection or a <B>null</B> reference. </param> ! <param name="replacements"> ! An array of attributes to replace in the primary attribute collection or a <B>nil</B> reference. </param> <returns> ! Overridded AttributeCollection. </returns> </member> ! <member name="M:Jedi.System.AttributeUtils.OverrideAttrList(System.Collections.ArrayList,System.Collections.ArrayList,System.Boolean)"> <summary> ! Override attributes in an array list. </summary> ! <param name="attrList">The primary attribute list.</param> ! <param name="overrideList">The list of attributes to add to or replace in the primary list.</param> ! <param name="mustExist"> ! Controls whether the attributes in <I>overrideList</I> must exist in the primary list. When set to ! <cref langword="true" /> only a replace operation will take place, otherwise an add and replace operation is ! executed. </param> <returns> ! Overridden attribute array list. </returns> </member> </members> </doc> \ No newline at end of file --- 7,198 ---- <members> <member name="T:Jedi.System.NamespaceDoc"> ! <summary>The <b>Jedi.System</b> namespace provides common services used throughout the JEDI library.</summary> </member> ! <member name="T:Jedi.System.AttributeCombineOperation"> ! <summary> ! Specifies how two attribute arrays or collections are combined. ! </summary> </member> ! <member name="F:Jedi.System.AttributeCombineOperation.Add"> ! <summary> ! Every attribute specified in the second list is added to the first list if it isn't in that list already. ! </summary> ! </member> ! <member name="F:Jedi.System.AttributeCombineOperation.AddAndReplace"> <summary> + Every attribute specified in the second list is added to the first list if it isn't in that list already or + replaced if it is. + </summary> + </member> + <member name="F:Jedi.System.AttributeCombineOperation.Delete"> + <summary> + Every attribute in the second list is removed from the first list. + </summary> + </member> + <member name="F:Jedi.System.AttributeCombineOperation.Replace"> + <summary> + Every attribute in the second list that is also in the first, will replace the one in the first list. </summary> </member> ! <member name="T:Jedi.System.AttributeUtils"> ! <summary>Provides methods to work with or manipulate arrays or collections of attributes.</summary> ! </member> ! <member name="M:Jedi.System.AttributeUtils.CombineAttributes(System.Attribute[],System.Attribute[])"> ! <summary> ! Combines two attribute arrays using the <see cref="F:Jedi.System.AttributeCombineOperation.AddAndReplace" /> ! operation. ! </summary> ! <param name="attributes1"> ! The primary attribute array. ! </param> ! <param name="attributes2"> ! The secondary attribute array. ! </param> <returns> ! An array that is the combination of the two specified arrays. </returns> </member> ! <member name="M:Jedi.System.AttributeUtils.CombineAttributes(System.Attribute[],System.Attribute[],Jedi.System.AttributeCombineOperation)"> ! <summary> ! Combines two attribute arrays using the specified combining operation. ! </summary> ! <param name="attributes1"> ! The primary attribute array. </param> ! <param name="attributes2"> ! The secondary attribute array. ! </param> ! <param name="operation"> ! The operation to perform when combining the two arrays. </param> <returns> ! An array that is the combination of the two specified arrays. </returns> </member> ! <member name="M:Jedi.System.AttributeUtils.CombineAttributes(System.Attribute[],System.ComponentModel.AttributeCollection)"> <summary> ! Combines an attribute array and an attribute collection using the ! <see cref="F:Jedi.System.AttributeCombineOperation.AddAndReplace" /> operation. </summary> ! <param name="attributes1"> ! The primary attribute array. </param> ! <param name="attributes2"> ! The secondary attribute collection. </param> <returns> ! An array that is the combination of the specified array and collection. </returns> </member> ! <member name="M:Jedi.System.AttributeUtils.CombineAttributes(System.Attribute[],System.ComponentModel.AttributeCollection,Jedi.System.AttributeCombineOperation)"> <summary> ! Combines an attribute array and an attribute collection using the specified combining operation. </summary> ! <param name="attributes1"> ! The primary attribute array. ! </param> ! <param name="attributes2"> ! The secondary attribute collection. ! </param> ! <param name="operation"> ! The operation to perform when combining the array and the collection. </param> <returns> ! An array that is the combination of the specified array and collection. ! </returns> ! </member> ! <member name="M:Jedi.System.AttributeUtils.CombineAttributes(System.Collections.ArrayList,System.Collections.ArrayList,Jedi.System.AttributeCombineOperation)"> ! <summary> ! Combines two attribute lists using the specified combining operation. ! </summary> ! <param name="attributes1"> ! The primary attribute list. ! </param> ! <param name="attributes2"> ! The secondary attribute list. ! </param> ! <param name="operation"> ! The operation to perform when combining the two lists. ! </param> ! <returns> ! A copy of <paramref name="attributes1" />. The list is modified according to the <paramref name="attributes2" /> ! and <paramref name="operation" /> parameters. ! </returns> ! </member> ! <member name="M:Jedi.System.AttributeUtils.CombineAttributes(System.ComponentModel.AttributeCollection,System.Attribute[])"> ! <summary> ! Combines an attribute array and an attribute collection using the ! <see cref="F:Jedi.System.AttributeCombineOperation.AddAndReplace" /> operation. ! </summary> ! <param name="attributes1"> ! The primary attribute collection. ! </param> ! <param name="attributes2"> ! The secondary attribute array. ! </param> ! <returns> ! An AttributeCollection that is the combination of the specified collection and array. ! </returns> ! </member> ! <member name="M:Jedi.System.AttributeUtils.CombineAttributes(System.ComponentModel.AttributeCollection,System.Attribute[],Jedi.System.AttributeCombineOperation)"> ! <summary> ! Combines an attribute array and an attribute collection using the specified combining operation. ! </summary> ! <param name="attributes1"> ! The primary attribute collection. ! </param> ! <param name="attributes2"> ! The secondary attribute array. ! </param> ! <param name="operation"> ! The operation to perform when combining the specified collection and array. ! </param> ! <returns> ! An AttributeCollection that is the combination of the specified collection and array. ! </returns> ! </member> ! <member name="M:Jedi.System.AttributeUtils.CombineAttributes(System.ComponentModel.AttributeCollection,System.ComponentModel.AttributeCollection)"> ! <summary> ! Combines two attribute collections using the ! <see cref="F:Jedi.System.AttributeCombineOperation.AddAndReplace" /> operation. ! </summary> ! <param name="attributes1"> ! The primary attribute collection. ! </param> ! <param name="attributes2"> ! The secondary attribute collection. ! </param> ! <returns> ! An AttributeCollection that is the combination of the two specified collections. ! </returns> ! </member> ! <member name="M:Jedi.System.AttributeUtils.CombineAttributes(System.ComponentModel.AttributeCollection,System.ComponentModel.AttributeCollection,Jedi.System.AttributeCombineOperation)"> ! <summary> ! Combines two attribute collections using the specified combining operation. ! </summary> ! <param name="attributes1"> ! The primary attribute collection. ! </param> ! <param name="attributes2"> ! The secondary attribute collection. ! </param> ! <param name="operation"> ! The operation to perform when combining the two collections. ! </param> ! <returns> ! An AttributeCollection that is the combination of the two specified collections. </returns> </member> + <member name="M:Jedi.System.AttributeUtils.IndexOf(System.Collections.ArrayList,System.Object)"> + <summary>Locates an attribute by instance or by type.</summary> + <param name="attrList">A list of attributes to search in.</param> + <param name="attr">Attribute or attribute type to search for.</param> + <returns> + <para> + -1 if the specified attribute or attribute type is not found; otherwise the zero-based index in + the list. + </para> + </returns> + </member> </members> </doc> \ No newline at end of file |
|
From: Marcel B. <jed...@us...> - 2004-06-24 20:06:42
|
Update of /cvsroot/jedidotnet/main/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2746/main/run Modified Files: Jedi.Collections.pas Jedi.System.pas Log Message: Removed AttributeUtils.OverrideAttributes and AttributeUtils.OverrideAttrList methods. replaced them with CombineAttributes methods that also allow specifying which operation to perform (Add, AddAndReplace, Delete or Replace). Index: Jedi.System.pas =================================================================== RCS file: /cvsroot/jedidotnet/main/run/Jedi.System.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jedi.System.pas 16 Jun 2004 14:29:53 -0000 1.1 --- Jedi.System.pas 24 Jun 2004 20:06:33 -0000 1.2 *************** *** 35,50 **** type AttributeArray = array of Attribute; type AttributeUtils = class (System.Object) strict protected class function IndexOf(attrList: ArrayList; attr: System.Object): Integer; static; ! class function OverrideAttrList(attrList, overrideList: ArrayList; mustExist: Boolean): ArrayList; static; public ! class function OverrideAttributes(attributes, overrides, replacements: AttributeArray): AttributeArray; ! overload; static; ! class function OverrideAttributes(attributes: AttributeCollection; overrides, ! replacements: AttributeArray): AttributeCollection; overload; static; end; {$ENDREGION} --- 35,66 ---- type AttributeArray = array of Attribute; + AttributeCombineOperation = (Add, Replace, Delete, AddAndReplace); type AttributeUtils = class (System.Object) + strict private + {$HINTS OFF} + constructor Create; + {$HINTS ON} strict protected class function IndexOf(attrList: ArrayList; attr: System.Object): Integer; static; ! class function CombineAttributes(attributes1, attributes2: ArrayList; ! operation: AttributeCombineOperation): ArrayList; overload; static; public ! class function CombineAttributes(attributes1, attributes2: AttributeArray): AttributeArray; overload; static; ! class function CombineAttributes(attributes1, attributes2: AttributeArray; ! operation: AttributeCombineOperation): AttributeArray; overload; static; ! class function CombineAttributes(attributes1, attributes2: AttributeCollection): AttributeCollection; overload; static; + class function CombineAttributes(attributes1, attributes2: AttributeCollection; + operation: AttributeCombineOperation): AttributeCollection; overload; static; + class function CombineAttributes(attributes1: AttributeArray; + attributes2: AttributeCollection): AttributeArray; overload; static; + class function CombineAttributes(attributes1: AttributeArray; attributes2: AttributeCollection; + operation: AttributeCombineOperation): AttributeArray; overload; static; + class function CombineAttributes(attributes1: AttributeCollection; attributes2: + AttributeArray): AttributeCollection; overload; static; + class function CombineAttributes(attributes1: AttributeCollection; attributes2: AttributeArray; + operation: AttributeCombineOperation): AttributeCollection; overload; static; end; {$ENDREGION} *************** *** 53,56 **** --- 69,77 ---- {$REGION 'AttributeUtils'} + constructor AttributeUtils.Create; + begin + inherited Create; + end; + class function AttributeUtils.IndexOf(attrList: ArrayList; attr: System.Object): Integer; var *************** *** 66,123 **** end; ! class function AttributeUtils.OverrideAttrList(attrList, overrideList: ArrayList; mustExist: Boolean): ArrayList; var ! i: Integer; attrIndex: Integer; begin ! Result := attrList; ! for i := 0 to overrideList.Count - 1 do begin ! attrIndex := AttributeUtils.IndexOf(Result, overrideList[i]); if attrIndex > -1 then ! Result[attrIndex] := overrideList[i] else ! if not mustExist then ! Result.Add(overrideList[i]); end; end; ! class function AttributeUtils.OverrideAttributes(attributes, overrides, replacements: AttributeArray): AttributeArray; ! var ! attrList: ArrayList; ! overrideList: ArrayList; ! replaceList: ArrayList; begin ! attrList := ArrayList.Create(System.Array(attributes)); ! if Assigned(overrides) then ! overrideList := ArrayList.Create(System.Array(overrides)) ! else ! overrideList := ArrayList.Create; ! if Assigned(replacements) then ! replaceList := ArrayList.Create(System.Array(replacements)) ! else ! replaceList := ArrayList.Create; ! Result := AttributeArray(OverrideAttrList(OverrideAttrList(attrList, replaceList, True), overrideList, ! False).ToArray(TypeOf(Attribute))); end; ! class function AttributeUtils.OverrideAttributes(attributes: AttributeCollection; overrides, ! replacements: AttributeArray): AttributeCollection; ! var ! attrList: ArrayList; ! overrideList: ArrayList; ! replaceList: ArrayList; begin ! attrList := ArrayList.Create(attributes); ! if Assigned(overrides) then ! overrideList := ArrayList.Create(System.Array(overrides)) ! else ! overrideList := ArrayList.Create; ! if Assigned(replacements) then ! replaceList := ArrayList.Create(System.Array(replacements)) ! else ! replaceList := ArrayList.Create; ! Result := AttributeCollection.Create(AttributeArray(OverrideAttrList(OverrideAttrList(attrList, replaceList, True), ! overrideList, False).ToArray(TypeOf(Attribute)))); end; {$ENDREGION} --- 87,164 ---- end; ! class function AttributeUtils.CombineAttributes(attributes1, attributes2: ArrayList; ! operation: AttributeCombineOperation): ArrayList; var ! index: Integer; attrIndex: Integer; begin ! Result := attributes1; ! for index := 0 to attributes2.Count - 1 do begin ! attrIndex := IndexOf(Result, attributes2[index]); if attrIndex > -1 then ! begin ! case operation of ! AddAndReplace, ! Replace: ! Result[attrIndex] := attributes2[index]; ! Delete: ! Result.RemoveAt(attrIndex); ! end; ! end else ! if (operation = Add) or (operation = AddAndReplace) then ! Result.Add(attributes2[index]); end; end; ! class function AttributeUtils.CombineAttributes(attributes1, attributes2: AttributeArray): AttributeArray; begin ! Result := CombineAttributes(attributes1, attributes2, AttributeCombineOperation.AddAndReplace); end; ! class function AttributeUtils.CombineAttributes(attributes1, attributes2: AttributeArray; ! operation: AttributeCombineOperation): AttributeArray; begin ! Result := AttributeArray(CombineAttributes(ArrayList.Create(&Array(attributes1)), ! ArrayList.Create(&Array(attributes2)), operation).ToArray(TypeOf(Attribute))); ! end; ! ! class function AttributeUtils.CombineAttributes(attributes1, attributes2: AttributeCollection): AttributeCollection; ! begin ! Result := CombineAttributes(attributes1, attributes2, AttributeCombineOperation.AddAndReplace); ! end; ! ! class function AttributeUtils.CombineAttributes(attributes1, attributes2: AttributeCollection; ! operation: AttributeCombineOperation): AttributeCollection; ! begin ! Result := AttributeCollection.Create(AttributeArray(CombineAttributes(ArrayList.Create(attributes1), ! ArrayList.Create(attributes2), operation).ToArray(TypeOf(Attribute)))); ! end; ! ! class function AttributeUtils.CombineAttributes(attributes1: AttributeArray; ! attributes2: AttributeCollection): AttributeArray; ! begin ! Result := CombineAttributes(attributes1, attributes2, AttributeCombineOperation.AddAndReplace); ! end; ! ! class function AttributeUtils.CombineAttributes(attributes1: AttributeArray; attributes2: AttributeCollection; ! operation: AttributeCombineOperation): AttributeArray; ! begin ! Result := AttributeArray(CombineAttributes(ArrayList.Create(&Array(attributes1)), ! ArrayList.Create(attributes2), operation).ToArray(TypeOf(Attribute))); ! end; ! ! class function AttributeUtils.CombineAttributes(attributes1: AttributeCollection; ! attributes2: AttributeArray): AttributeCollection; ! begin ! Result := CombineAttributes(attributes1, attributes2, AttributeCombineOperation.AddAndReplace); ! end; ! ! class function AttributeUtils.CombineAttributes(attributes1: AttributeCollection; ! attributes2: AttributeArray; operation: AttributeCombineOperation): AttributeCollection; ! begin ! Result := AttributeCollection.Create(AttributeArray(CombineAttributes(ArrayList.Create(attributes1), ! ArrayList.Create(&Array(attributes2)), operation).ToArray(TypeOf(Attribute)))); end; {$ENDREGION} Index: Jedi.Collections.pas =================================================================== RCS file: /cvsroot/jedidotnet/main/run/Jedi.Collections.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jedi.Collections.pas 16 Jun 2004 14:29:53 -0000 1.1 --- Jedi.Collections.pas 24 Jun 2004 20:06:33 -0000 1.2 *************** *** 169,174 **** attributes: AttributeArray); begin ! inherited Create(name, AttributeUtils.OverrideAttributes(attributes, ! Jedi.System.AttributeArray.Create(RefreshPropertiesAttribute.All), nil)); FComponentType := componentType; FPropertyType := propertyType; --- 169,174 ---- attributes: AttributeArray); begin ! inherited Create(name, AttributeUtils.CombineAttributes(attributes, ! Jedi.System.AttributeArray.Create(RefreshPropertiesAttribute.All))); FComponentType := componentType; FPropertyType := propertyType; *************** *** 267,272 **** attributes: AttributeArray; emptyValue: System.Object; index: System.Object); begin ! inherited Create(componentType, name, propertyType, AttributeUtils.OverrideAttributes(attributes, ! Jedi.System.AttributeArray.Create(RefreshPropertiesAttribute.All), nil)); FEmptyValue := emptyValue; FIndex := index; --- 267,272 ---- attributes: AttributeArray; emptyValue: System.Object; index: System.Object); begin ! inherited Create(componentType, name, propertyType, AttributeUtils.CombineAttributes(attributes, ! Jedi.System.AttributeArray.Create(RefreshPropertiesAttribute.All))); FEmptyValue := emptyValue; FIndex := index; *************** *** 277,282 **** Result := inherited get_Attributes; if Assigned(SavedInstance) then ! Result := AttributeUtils.OverrideAttributes(Result, ! Jedi.System.AttributeArray.Create(RefreshPropertiesAttribute.All), nil); end; --- 277,282 ---- Result := inherited get_Attributes; if Assigned(SavedInstance) then ! Result := AttributeUtils.CombineAttributes(Result, ! Jedi.System.AttributeArray.Create(RefreshPropertiesAttribute.All)); end; *************** *** 711,731 **** raise ArgumentNullException.Create('property'); if description <> '' then ! attrs := AttributeUtils.OverrideAttributes(&property.Attributes, ! Jedi.System.AttributeArray.Create( ! DescriptionAttribute.Create(description), ! TypeConverterAttribute.Create(TypeOf(SubPropertyTypeConverter)) ), Jedi.System.AttributeArray.Create( EditorAttribute.Create(TypeOf(SubPropertyUITypeEditor), TypeOf(UITypeEditor)) ! ) ) else ! attrs := AttributeUtils.OverrideAttributes(&property.Attributes, ! Jedi.System.AttributeArray.Create( ! TypeConverterAttribute.Create(TypeOf(SubPropertyTypeConverter)) ), Jedi.System.AttributeArray.Create( EditorAttribute.Create(TypeOf(SubPropertyUITypeEditor), TypeOf(UITypeEditor)) ! ) ); inherited Create(componentType, name, itemType, --- 711,739 ---- raise ArgumentNullException.Create('property'); if description <> '' then ! attrs := AttributeUtils.CombineAttributes( ! AttributeUtils.CombineAttributes( ! &property.Attributes, ! Jedi.System.AttributeArray.Create( ! DescriptionAttribute.Create(description), ! TypeConverterAttribute.Create(TypeOf(SubPropertyTypeConverter)) ! ) ), Jedi.System.AttributeArray.Create( EditorAttribute.Create(TypeOf(SubPropertyUITypeEditor), TypeOf(UITypeEditor)) ! ), ! AttributeCombineOperation.AddAndReplace ) else ! attrs := AttributeUtils.CombineAttributes( ! AttributeUtils.CombineAttributes( ! &property.Attributes, ! Jedi.System.AttributeArray.Create( ! TypeConverterAttribute.Create(TypeOf(SubPropertyTypeConverter)) ! ) ), Jedi.System.AttributeArray.Create( EditorAttribute.Create(TypeOf(SubPropertyUITypeEditor), TypeOf(UITypeEditor)) ! ), ! AttributeCombineOperation.AddAndReplace ); inherited Create(componentType, name, itemType, *************** *** 913,918 **** raise ArgumentNullException.Create('component'); if description <> '' then ! attributes := AttributeUtils.OverrideAttributes(attributes, ! AttributeArray.Create(DescriptionAttribute.Create(description)), nil); Result := ItemPropertyDescriptor.Create(component.GetType, name, propertyType, attributes, emptyValue, index); end; --- 921,926 ---- raise ArgumentNullException.Create('component'); if description <> '' then ! attributes := AttributeUtils.CombineAttributes(attributes, ! AttributeArray.Create(DescriptionAttribute.Create(description))); Result := ItemPropertyDescriptor.Create(component.GetType, name, propertyType, attributes, emptyValue, index); end; *************** *** 954,959 **** begin if description <> '' then ! attributes := AttributeUtils.OverrideAttributes(attributes, ! AttributeArray.Create(DescriptionAttribute.Create(description)), nil); Result := NewItemPropertyDescriptor.Create(componentType, name, propertyType, attributes, propertyId); end; --- 962,967 ---- begin if description <> '' then ! attributes := AttributeUtils.CombineAttributes(attributes, ! AttributeArray.Create(DescriptionAttribute.Create(description))); Result := NewItemPropertyDescriptor.Create(componentType, name, propertyType, attributes, propertyId); end; |
|
From: Marcel B. <jed...@us...> - 2004-06-24 17:20:35
|
Update of /cvsroot/jedidotnet/tools/docs/Generator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30550/Generator Log Message: Directory /cvsroot/jedidotnet/tools/docs/Generator added to the repository |
|
From: Marcel B. <jed...@us...> - 2004-06-24 17:20:35
|
Update of /cvsroot/jedidotnet/tools/docs/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30550/common Log Message: Directory /cvsroot/jedidotnet/tools/docs/common added to the repository |
|
From: Marcel B. <jed...@us...> - 2004-06-24 17:20:23
|
Update of /cvsroot/jedidotnet/tools/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30484/docs Log Message: Directory /cvsroot/jedidotnet/tools/docs added to the repository |
|
From: Marcel B. <jed...@us...> - 2004-06-24 17:18:25
|
Update of /cvsroot/jedidotnet/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30042/docs Modified Files: Jedi.Collections.xml Jedi.Drawing.xml Jedi.Windows.Forms.Hmi.Leds.xml Log Message: Fields where missing Index: Jedi.Collections.xml =================================================================== RCS file: /cvsroot/jedidotnet/docs/Jedi.Collections.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jedi.Collections.xml 24 Jun 2004 14:05:49 -0000 1.1 --- Jedi.Collections.xml 24 Jun 2004 17:18:16 -0000 1.2 *************** *** 1,5 **** <?xml version="1.0" encoding="utf-8"?> <doc> ! <!--most recent auto update: 200406240145UTC--> <assembly> <name>Jedi.Core</name> --- 1,5 ---- <?xml version="1.0" encoding="utf-8"?> <doc> ! <!--most recent auto update: 2004-06-24 17:16 UTC--> <assembly> <name>Jedi.Core</name> Index: Jedi.Windows.Forms.Hmi.Leds.xml =================================================================== RCS file: /cvsroot/jedidotnet/docs/Jedi.Windows.Forms.Hmi.Leds.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jedi.Windows.Forms.Hmi.Leds.xml 24 Jun 2004 14:05:49 -0000 1.1 --- Jedi.Windows.Forms.Hmi.Leds.xml 24 Jun 2004 17:18:16 -0000 1.2 *************** *** 1,5 **** <?xml version="1.0" encoding="utf-8"?> <doc> ! <!--most recent auto update: 200406240145UTC--> <assembly> <name>Jedi.Windows.Forms.Hmi</name> --- 1,5 ---- <?xml version="1.0" encoding="utf-8"?> <doc> ! <!--most recent auto update: 2004-06-24 17:16 UTC--> <assembly> <name>Jedi.Windows.Forms.Hmi</name> *************** *** 16,19 **** --- 16,35 ---- </summary> </member> + <member name="F:Jedi.Windows.Forms.Hmi.Leds.LedFrameStyle.Flush"> + <summary> + </summary> + </member> + <member name="F:Jedi.Windows.Forms.Hmi.Leds.LedFrameStyle.None"> + <summary> + </summary> + </member> + <member name="F:Jedi.Windows.Forms.Hmi.Leds.LedFrameStyle.Raised"> + <summary> + </summary> + </member> + <member name="F:Jedi.Windows.Forms.Hmi.Leds.LedFrameStyle.Sunken"> + <summary> + </summary> + </member> <member name="T:Jedi.Windows.Forms.Hmi.Leds.LedState"> <summary> Index: Jedi.Drawing.xml =================================================================== RCS file: /cvsroot/jedidotnet/docs/Jedi.Drawing.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jedi.Drawing.xml 24 Jun 2004 14:05:49 -0000 1.1 --- Jedi.Drawing.xml 24 Jun 2004 17:18:16 -0000 1.2 *************** *** 1,5 **** <?xml version="1.0" encoding="utf-8"?> <doc> ! <!--most recent auto update: 200406240145UTC--> <assembly> <name>Jedi.Drawing</name> --- 1,5 ---- <?xml version="1.0" encoding="utf-8"?> <doc> ! <!--most recent auto update: 2004-06-24 16:54 UTC--> <assembly> <name>Jedi.Drawing</name> |
|
From: Marcel B. <jed...@us...> - 2004-06-24 14:05:57
|
Update of /cvsroot/jedidotnet/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21701/docs Added Files: Jedi.Collections.xml Jedi.Drawing.xml Jedi.System.xml Jedi.Windows.Forms.Hmi.Leds.xml Log Message: Generated documentation source files. Jedi.System actually documented. --- NEW FILE: Jedi.System.xml --- <?xml version="1.0" encoding="utf-8"?> <doc> <!--most recent auto update: 200406240154UTC--> <assembly> <name>Jedi.Core</name> </assembly> <members> <member name="T:Jedi.System.NamespaceDoc"> <summary>The <b>Jedi.System</b> provides common services throughout the JEDI library.</summary> </member> <member name="T:Jedi.System.AttributeUtils"> <summary>Provides methods to work with or manipulate arrays or collections of attributes.</summary> </member> <member name="M:Jedi.System.AttributeUtils.#ctor"> <summary> </summary> </member> <member name="M:Jedi.System.AttributeUtils.IndexOf(System.Collections.ArrayList,System.Object)"> <summary>Locates an attribute by instance or by type.</summary> <param name="attrList">A list of attributes to search in.</param> <param name="attr">Attribute or attribute type to search for.</param> <returns> <para> -1 if the specified attribute or attribute type is not found; otherwise the zero-based index in the list. </para> </returns> </member> <member name="M:Jedi.System.AttributeUtils.OverrideAttributes(System.Attribute[],System.Attribute[],System.Attribute[])"> <summary>Override attributes in an array.</summary> <param name="attributes">The primary attribute array.</param> <param name="overrides"> An array of attributes to add to or replace in the primary array or a <B>null</B> reference. </param> <param name="replacements"> An array of attributes to replace in the primary array or a <B>nil</B> reference. </param> <returns> Overridden attribute array. </returns> </member> <member name="M:Jedi.System.AttributeUtils.OverrideAttributes(System.ComponentModel.AttributeCollection,System.Attribute[],System.Attribute[])"> <summary> Override attributes in an AttributeCollection. </summary> <param name="attributes">The primary attribute collection.</param> <param name="overrides"> An array of attributes to add to or replace in the primary attribute collection or a <B>null</B> reference. </param> <param name="replacements"> An array of attributes to replace in the primary attribute collection or a <B>nil</B> reference. </param> <returns> Overridded AttributeCollection. </returns> </member> <member name="M:Jedi.System.AttributeUtils.OverrideAttrList(System.Collections.ArrayList,System.Collections.ArrayList,System.Boolean)"> <summary> Override attributes in an array list. </summary> <param name="attrList">The primary attribute list.</param> <param name="overrideList">The list of attributes to add to or replace in the primary list.</param> <param name="mustExist"> Controls whether the attributes in <I>overrideList</I> must exist in the primary list. When set to <cref langword="true" /> only a replace operation will take place, otherwise an add and replace operation is executed. </param> <returns> Overridden attribute array list. </returns> </member> </members> </doc> --- NEW FILE: Jedi.Collections.xml --- <?xml version="1.0" encoding="utf-8"?> <doc> <!--most recent auto update: 200406240145UTC--> <assembly> <name>Jedi.Core</name> </assembly> <members> <member name="T:Jedi.Collections.NamespaceDoc"> <summary> </summary> <remarks> </remarks> </member> <member name="T:Jedi.Collections.IInlineCollection"> <summary> </summary> </member> <member name="M:Jedi.Collections.IInlineCollection.AddItem(System.Object,System.Object)"> <summary> </summary> <param name="value"> </param> <param name="addPropertyId"> </param> <returns> </returns> </member> <member name="M:Jedi.Collections.IInlineCollection.GetAllowRemove(System.Object)"> <summary> </summary> <param name="key"> </param> <returns> </returns> </member> <member name="M:Jedi.Collections.IInlineCollection.GetCollectionValue"> <summary> </summary> <returns> </returns> </member> <member name="M:Jedi.Collections.IInlineCollection.GetItemProperties"> <summary> </summary> <returns> </returns> </member> <member name="M:Jedi.Collections.IInlineCollection.GetNewItemProperties"> <summary> </summary> <returns> </returns> </member> <member name="M:Jedi.Collections.IInlineCollection.GetService(System.Type)"> <summary> </summary> <param name="serviceType"> </param> <returns> </returns> </member> <member name="T:Jedi.Collections.InlineCollectionBase"> <summary> </summary> </member> <member name="M:Jedi.Collections.InlineCollectionBase.#ctor"> <summary> </summary> </member> <member name="M:Jedi.Collections.InlineCollectionBase.AddItem(System.Object,System.Object)"> <summary> </summary> <param name="value"> </param> <param name="addPropertyId"> </param> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineCollectionBase.GetAllowRemove(System.Object)"> <summary> </summary> <param name="key"> </param> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineCollectionBase.GetCollectionValue"> <summary> </summary> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineCollectionBase.GetItemDescription(System.Int32)"> <summary> </summary> <param name="index"> </param> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineCollectionBase.GetItemEmptyValue(System.Int32)"> <summary> </summary> <param name="index"> </param> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineCollectionBase.GetItemIgnoreDefaultProperty(System.Int32)"> <summary> </summary> <param name="index"> </param> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineCollectionBase.GetItemName(System.Int32)"> <summary> </summary> <param name="index"> </param> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineCollectionBase.GetItemProperties"> <summary> </summary> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineCollectionBase.GetItemProperty(System.Int32)"> <summary> </summary> <param name="index"> </param> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineCollectionBase.GetNewItemProperties"> <summary> </summary> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineCollectionBase.GetService(System.Type)"> <summary> </summary> <param name="serviceType"> </param> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineCollectionBase.IndexerInfo"> <summary> </summary> <returns> </returns> </member> <member name="T:Jedi.Collections.InlineCollectionConverter"> <summary> </summary> </member> <member name="M:Jedi.Collections.InlineCollectionConverter.#ctor"> <summary> </summary> </member> <member name="M:Jedi.Collections.InlineCollectionConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type)"> <!-- this member is inherited and does not require documentation. <summary> </summary> <param name="context"> </param> <param name="culture"> </param> <param name="value"> </param> <param name="destinationType"> </param> <returns> </returns>--> </member> <member name="M:Jedi.Collections.InlineCollectionConverter.GetProperties(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[])"> <!-- this member is inherited and does not require documentation. <summary> </summary> <param name="context"> </param> <param name="value"> </param> <param name="attributes"> </param> <returns> </returns>--> </member> <member name="M:Jedi.Collections.InlineCollectionConverter.GetPropertiesSupported(System.ComponentModel.ITypeDescriptorContext)"> <!-- this member is inherited and does not require documentation. <summary> </summary> <param name="context"> </param> <returns> </returns>--> </member> <member name="T:Jedi.Collections.InlineCollectionEditor"> <summary> </summary> </member> <member name="M:Jedi.Collections.InlineCollectionEditor.#ctor"> <summary> </summary> </member> <member name="M:Jedi.Collections.InlineCollectionEditor.EditValue(System.ComponentModel.ITypeDescriptorContext,System.IServiceProvider,System.Object)"> <!-- this member is inherited and does not require documentation. <summary> </summary> <param name="context"> </param> <param name="provider"> </param> <param name="value"> </param> <returns> </returns>--> </member> <member name="M:Jedi.Collections.InlineCollectionEditor.GetEditStyle(System.ComponentModel.ITypeDescriptorContext)"> <!-- this member is inherited and does not require documentation. <summary> </summary> <param name="context"> </param> <returns> </returns>--> </member> <member name="T:Jedi.Collections.InlineCollectionUtils"> <summary> </summary> </member> <member name="M:Jedi.Collections.InlineCollectionUtils.#ctor"> <summary> </summary> </member> <member name="M:Jedi.Collections.InlineCollectionUtils.CollectionConverterText"> <summary> </summary> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineCollectionUtils.CreateItemProperty(System.Reflection.PropertyInfo,System.Object,System.String,System.String,System.Object,System.Object,System.Boolean)"> <summary> </summary> <param name="info"> </param> <param name="component"> </param> <param name="name"> </param> <param name="description"> </param> <param name="index"> </param> <param name="emptyValue"> </param> <param name="ignoreDefaultProperty"> </param> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineCollectionUtils.CreateItemProperty(System.Type,System.Attribute[],System.Object,System.String,System.String,System.Object,System.Object)"> <summary> </summary> <param name="propertyType"> </param> <param name="attributes"> </param> <param name="component"> </param> <param name="name"> </param> <param name="description"> </param> <param name="index"> </param> <param name="emptyValue"> </param> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineCollectionUtils.CreateNewItemProperty(System.ComponentModel.PropertyDescriptor,System.String,System.String,System.Object)"> <summary> </summary> <param name="baseDescriptor"> </param> <param name="name"> </param> <param name="description"> </param> <param name="propertyId"> </param> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineCollectionUtils.CreateNewItemProperty(System.Reflection.PropertyInfo,System.String,System.String,System.Object)"> <summary> </summary> <param name="info"> </param> <param name="name"> </param> <param name="description"> </param> <param name="propertyId"> </param> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineCollectionUtils.CreateNewItemProperty(System.Type,System.Type,System.Attribute[],System.String,System.String,System.Object)"> <summary> </summary> <param name="componentType"> </param> <param name="propertyType"> </param> <param name="attributes"> </param> <param name="name"> </param> <param name="description"> </param> <param name="propertyId"> </param> <returns> </returns> </member> <member name="T:Jedi.Collections.InlineDictionaryBase"> <summary> </summary> </member> <member name="M:Jedi.Collections.InlineDictionaryBase.#ctor"> <summary> </summary> </member> <member name="M:Jedi.Collections.InlineDictionaryBase.AddItem(System.Object,System.Object)"> <summary> </summary> <param name="value"> </param> <param name="addPropertyId"> </param> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineDictionaryBase.GetAllowRemove(System.Object)"> <summary> </summary> <param name="key"> </param> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineDictionaryBase.GetCollectionValue"> <summary> </summary> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineDictionaryBase.GetItemDescription(System.Object)"> <summary> </summary> <param name="key"> </param> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineDictionaryBase.GetItemEmptyValue(System.Object)"> <summary> </summary> <param name="key"> </param> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineDictionaryBase.GetItemProperties"> <summary> </summary> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineDictionaryBase.GetItemProperty(System.Object,System.Object)"> <summary> </summary> <param name="key"> </param> <param name="value"> </param> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineDictionaryBase.GetNewItemProperties"> <summary> </summary> <returns> </returns> </member> <member name="M:Jedi.Collections.InlineDictionaryBase.GetService(System.Type)"> <summary> </summary> <param name="serviceType"> </param> <returns> </returns> </member> </members> </doc> --- NEW FILE: Jedi.Windows.Forms.Hmi.Leds.xml --- <?xml version="1.0" encoding="utf-8"?> <doc> <!--most recent auto update: 200406240145UTC--> <assembly> <name>Jedi.Windows.Forms.Hmi</name> </assembly> <members> <member name="T:Jedi.Windows.Forms.Hmi.Leds.NamespaceDoc"> <summary> </summary> <remarks> </remarks> </member> <member name="T:Jedi.Windows.Forms.Hmi.Leds.LedFrameStyle"> <summary> </summary> </member> <member name="T:Jedi.Windows.Forms.Hmi.Leds.LedState"> <summary> [...1230 lines suppressed...] <member name="M:Jedi.Windows.Forms.Hmi.Leds.StateChangedEventHandler.EndInvoke(System.IAsyncResult)"> <summary> </summary> <param name="result"> </param> <returns> </returns> </member> <member name="M:Jedi.Windows.Forms.Hmi.Leds.StateChangedEventHandler.Invoke(System.Object,Jedi.Windows.Forms.Hmi.Leds.StateChangedEventArgs)"> <summary> </summary> <param name="sender"> </param> <param name="e"> </param> <returns> </returns> </member> </members> </doc> --- NEW FILE: Jedi.Drawing.xml --- <?xml version="1.0" encoding="utf-8"?> <doc> <!--most recent auto update: 200406240145UTC--> <assembly> <name>Jedi.Drawing</name> </assembly> <members> <member name="T:Jedi.Drawing.NamespaceDoc"> <summary> </summary> <remarks> </remarks> </member> <member name="T:Jedi.Drawing.ColorUtils"> <summary> </summary> </member> <member name="M:Jedi.Drawing.ColorUtils.#ctor"> <summary> </summary> </member> <member name="M:Jedi.Drawing.ColorUtils.Blend(System.Drawing.Color,System.Drawing.Color,System.Int32)"> <summary> </summary> <param name="firstColor"> </param> <param name="secondColor"> </param> <param name="percentage"> </param> <returns> </returns> </member> <member name="M:Jedi.Drawing.ColorUtils.Brighten(System.Drawing.Color,System.Int32)"> <summary> </summary> <param name="baseColor"> </param> <param name="percentage"> </param> <returns> </returns> </member> <member name="M:Jedi.Drawing.ColorUtils.Darken(System.Drawing.Color,System.Int32)"> <summary> </summary> <param name="baseColor"> </param> <param name="percentage"> </param> <returns> </returns> </member> </members> </doc> |
|
From: Marcel B. <jed...@us...> - 2004-06-16 15:23:26
|
Update of /cvsroot/jedidotnet/main/assemblies In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1582/main/assemblies Modified Files: Jedi.Core.bdsproj Jedi.Drawing.bdsproj Jedi.Windows.Forms.Hmi.bdsproj Log Message: I think my brain was on strike or something; reverted last commit Index: Jedi.Windows.Forms.Hmi.bdsproj =================================================================== RCS file: /cvsroot/jedidotnet/main/assemblies/Jedi.Windows.Forms.Hmi.bdsproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Jedi.Windows.Forms.Hmi.bdsproj 16 Jun 2004 15:14:35 -0000 1.2 --- Jedi.Windows.Forms.Hmi.bdsproj 16 Jun 2004 15:23:13 -0000 1.3 *************** *** 162,166 **** <FileList> ! <File FileName="$(BSDSharedAsm)\Borland.Delphi.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="Borland.Delphi" AssemblyName="borland.delphi" Version="7.1.1523.17956" LinkUnits="False"/> <File FileName="$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="System" AssemblyName="System" Version="1.0.5000.0" LinkUnits="False"/> <File FileName="$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.Drawing.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="System.Drawing" AssemblyName="System.Drawing" Version="1.0.5000.0" LinkUnits="False"/> --- 162,166 ---- <FileList> ! <File FileName="$(BDSSharedAsm)\Borland.Delphi.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="Borland.Delphi" AssemblyName="borland.delphi" Version="7.1.1523.17956" LinkUnits="False"/> <File FileName="$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="System" AssemblyName="System" Version="1.0.5000.0" LinkUnits="False"/> <File FileName="$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.Drawing.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="System.Drawing" AssemblyName="System.Drawing" Version="1.0.5000.0" LinkUnits="False"/> Index: Jedi.Drawing.bdsproj =================================================================== RCS file: /cvsroot/jedidotnet/main/assemblies/Jedi.Drawing.bdsproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Jedi.Drawing.bdsproj 16 Jun 2004 15:14:35 -0000 1.2 --- Jedi.Drawing.bdsproj 16 Jun 2004 15:23:13 -0000 1.3 *************** *** 160,164 **** <FileList> ! <File FileName="$(BSDSharedAsm)\Borland.Delphi.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="Borland.Delphi" AssemblyName="borland.delphi" Version="7.1.1523.17956" LinkUnits="False"/> <File FileName="$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.Drawing.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="System.Drawing" AssemblyName="System.Drawing" Version="1.0.5000.0" LinkUnits="False"/> <File FileName="..\run\Jedi.Drawing.pas" ContainerId="" ModuleName="Jedi.Drawing"/> --- 160,164 ---- <FileList> ! <File FileName="$(BDSSharedAsm)\\Borland.Delphi.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="Borland.Delphi" AssemblyName="borland.delphi" Version="7.1.1523.17956" LinkUnits="False"/> <File FileName="$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.Drawing.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="System.Drawing" AssemblyName="System.Drawing" Version="1.0.5000.0" LinkUnits="False"/> <File FileName="..\run\Jedi.Drawing.pas" ContainerId="" ModuleName="Jedi.Drawing"/> Index: Jedi.Core.bdsproj =================================================================== RCS file: /cvsroot/jedidotnet/main/assemblies/Jedi.Core.bdsproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Jedi.Core.bdsproj 16 Jun 2004 15:14:35 -0000 1.2 --- Jedi.Core.bdsproj 16 Jun 2004 15:23:13 -0000 1.3 *************** *** 160,164 **** <FileList> ! <File FileName="$(BSDSharedAsm)\Borland.Delphi.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="Borland.Delphi" AssemblyName="borland.delphi" Version="7.1.1523.17956" LinkUnits="False"/> <File FileName="$(SystemRoot)\microsoft.net\framework\v1.1.4322\mscorlib.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="mscorlib" AssemblyName="mscorlib" Version="1.0.5000.0" LinkUnits="False"/> <File FileName="$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="System" AssemblyName="System" Version="1.0.5000.0" LinkUnits="False"/> --- 160,164 ---- <FileList> ! <File FileName="$(BDSSharedAsm)\Borland.Delphi.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="Borland.Delphi" AssemblyName="borland.delphi" Version="7.1.1523.17956" LinkUnits="False"/> <File FileName="$(SystemRoot)\microsoft.net\framework\v1.1.4322\mscorlib.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="mscorlib" AssemblyName="mscorlib" Version="1.0.5000.0" LinkUnits="False"/> <File FileName="$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="System" AssemblyName="System" Version="1.0.5000.0" LinkUnits="False"/> |
|
From: Marcel B. <jed...@us...> - 2004-06-16 15:14:46
|
Update of /cvsroot/jedidotnet/main/assemblies In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26705/main/assemblies Modified Files: Jedi.Core.bdsproj Jedi.Drawing.bdsproj Jedi.Windows.Forms.Hmi.bdsproj Log Message: Corrected typo's Index: Jedi.Windows.Forms.Hmi.bdsproj =================================================================== RCS file: /cvsroot/jedidotnet/main/assemblies/Jedi.Windows.Forms.Hmi.bdsproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jedi.Windows.Forms.Hmi.bdsproj 16 Jun 2004 14:29:51 -0000 1.1 --- Jedi.Windows.Forms.Hmi.bdsproj 16 Jun 2004 15:14:35 -0000 1.2 *************** *** 162,166 **** <FileList> ! <File FileName="$(BDSSharedAsm)\Borland.Delphi.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="Borland.Delphi" AssemblyName="borland.delphi" Version="7.1.1523.17956" LinkUnits="False"/> <File FileName="$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="System" AssemblyName="System" Version="1.0.5000.0" LinkUnits="False"/> <File FileName="$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.Drawing.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="System.Drawing" AssemblyName="System.Drawing" Version="1.0.5000.0" LinkUnits="False"/> --- 162,166 ---- <FileList> ! <File FileName="$(BSDSharedAsm)\Borland.Delphi.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="Borland.Delphi" AssemblyName="borland.delphi" Version="7.1.1523.17956" LinkUnits="False"/> <File FileName="$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="System" AssemblyName="System" Version="1.0.5000.0" LinkUnits="False"/> <File FileName="$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.Drawing.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="System.Drawing" AssemblyName="System.Drawing" Version="1.0.5000.0" LinkUnits="False"/> Index: Jedi.Drawing.bdsproj =================================================================== RCS file: /cvsroot/jedidotnet/main/assemblies/Jedi.Drawing.bdsproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jedi.Drawing.bdsproj 16 Jun 2004 14:29:51 -0000 1.1 --- Jedi.Drawing.bdsproj 16 Jun 2004 15:14:35 -0000 1.2 *************** *** 160,164 **** <FileList> ! <File FileName="$(BDSSharedAsm)\\Borland.Delphi.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="Borland.Delphi" AssemblyName="borland.delphi" Version="7.1.1523.17956" LinkUnits="False"/> <File FileName="$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.Drawing.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="System.Drawing" AssemblyName="System.Drawing" Version="1.0.5000.0" LinkUnits="False"/> <File FileName="..\run\Jedi.Drawing.pas" ContainerId="" ModuleName="Jedi.Drawing"/> --- 160,164 ---- <FileList> ! <File FileName="$(BSDSharedAsm)\Borland.Delphi.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="Borland.Delphi" AssemblyName="borland.delphi" Version="7.1.1523.17956" LinkUnits="False"/> <File FileName="$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.Drawing.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="System.Drawing" AssemblyName="System.Drawing" Version="1.0.5000.0" LinkUnits="False"/> <File FileName="..\run\Jedi.Drawing.pas" ContainerId="" ModuleName="Jedi.Drawing"/> Index: Jedi.Core.bdsproj =================================================================== RCS file: /cvsroot/jedidotnet/main/assemblies/Jedi.Core.bdsproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jedi.Core.bdsproj 16 Jun 2004 14:29:51 -0000 1.1 --- Jedi.Core.bdsproj 16 Jun 2004 15:14:35 -0000 1.2 *************** *** 160,164 **** <FileList> ! <File FileName="$(BDSSharedAsm)\Borland.Delphi.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="Borland.Delphi" AssemblyName="borland.delphi" Version="7.1.1523.17956" LinkUnits="False"/> <File FileName="$(SystemRoot)\microsoft.net\framework\v1.1.4322\mscorlib.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="mscorlib" AssemblyName="mscorlib" Version="1.0.5000.0" LinkUnits="False"/> <File FileName="$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="System" AssemblyName="System" Version="1.0.5000.0" LinkUnits="False"/> --- 160,164 ---- <FileList> ! <File FileName="$(BSDSharedAsm)\Borland.Delphi.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="Borland.Delphi" AssemblyName="borland.delphi" Version="7.1.1523.17956" LinkUnits="False"/> <File FileName="$(SystemRoot)\microsoft.net\framework\v1.1.4322\mscorlib.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="mscorlib" AssemblyName="mscorlib" Version="1.0.5000.0" LinkUnits="False"/> <File FileName="$(SystemRoot)\microsoft.net\framework\v1.1.4322\System.dll" ContainerId="DelphiDotNetAssemblyCompiler" ModuleName="System" AssemblyName="System" Version="1.0.5000.0" LinkUnits="False"/> |
