1
0
mirror of https://github.com/moparisthebest/Simba synced 2024-08-13 16:53:59 -04:00

Little clean-up; We need to initalize every record!!!!

git-svn-id: http://www.villavu.com/repositories/merlijn/mufasa@227 3f818213-9676-44b0-a9b4-5e4c4e03d09d
This commit is contained in:
Raymond 2009-11-11 22:35:26 +00:00
parent 99e6decced
commit fce233838d
8 changed files with 231 additions and 264 deletions

View File

@ -7,7 +7,7 @@
<TargetFileExt Value=""/>
<Title Value="Mufasa Stand Alone"/>
<UseXPManifest Value="True"/>
<ActiveEditorIndexAtStart Value="4"/>
<ActiveEditorIndexAtStart Value="6"/>
</General>
<VersionInfo>
<ProjectVersion Value=""/>
@ -33,14 +33,16 @@
<PackageName Value="LCL"/>
</Item2>
</RequiredPackages>
<Units Count="251">
<Units Count="244">
<Unit0>
<Filename Value="project1.lpr"/>
<IsPartOfProject Value="True"/>
<UnitName Value="project1"/>
<CursorPos X="22" Y="20"/>
<TopLine Value="17"/>
<CursorPos X="32" Y="29"/>
<TopLine Value="24"/>
<EditorIndex Value="5"/>
<UsageCount Value="205"/>
<Loaded Value="True"/>
</Unit0>
<Unit1>
<Filename Value="unit1.pas"/>
@ -162,8 +164,8 @@
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="TestUnit"/>
<CursorPos X="10" Y="35"/>
<TopLine Value="21"/>
<CursorPos X="34" Y="677"/>
<TopLine Value="676"/>
<EditorIndex Value="0"/>
<UsageCount Value="202"/>
<Loaded Value="True"/>
@ -219,8 +221,8 @@
<Filename Value="../../Units/MMLCore/client.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="Client"/>
<CursorPos X="23" Y="42"/>
<TopLine Value="21"/>
<CursorPos X="25" Y="41"/>
<TopLine Value="24"/>
<EditorIndex Value="3"/>
<UsageCount Value="201"/>
<Loaded Value="True"/>
@ -229,8 +231,8 @@
<Filename Value="../../Units/MMLCore/mufasatypes.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="MufasaTypes"/>
<CursorPos X="1" Y="1"/>
<TopLine Value="1"/>
<CursorPos X="66" Y="42"/>
<TopLine Value="30"/>
<EditorIndex Value="1"/>
<UsageCount Value="201"/>
<Loaded Value="True"/>
@ -254,9 +256,11 @@
<Filename Value="../../Units/MMLCore/window.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="Window"/>
<CursorPos X="28" Y="157"/>
<TopLine Value="143"/>
<CursorPos X="39" Y="52"/>
<TopLine Value="41"/>
<EditorIndex Value="11"/>
<UsageCount Value="201"/>
<Loaded Value="True"/>
</Unit29>
<Unit30>
<Filename Value="../../../cogat/Units/CogatUnits/comptypes.pas"/>
@ -268,26 +272,30 @@
<Unit31>
<Filename Value="../../Units/MMLCore/windowutil.pas"/>
<UnitName Value="windowutil"/>
<CursorPos X="29" Y="29"/>
<TopLine Value="24"/>
<CursorPos X="20" Y="21"/>
<TopLine Value="21"/>
<EditorIndex Value="10"/>
<UsageCount Value="55"/>
<Loaded Value="True"/>
</Unit31>
<Unit32>
<Filename Value="../../Units/MMLCore/input.pas"/>
<UnitName Value="Input"/>
<CursorPos X="5" Y="188"/>
<CursorPos X="71" Y="171"/>
<TopLine Value="169"/>
<EditorIndex Value="4"/>
<UsageCount Value="81"/>
<EditorIndex Value="12"/>
<UsageCount Value="82"/>
<Loaded Value="True"/>
</Unit32>
<Unit33>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="finder"/>
<CursorPos X="50" Y="19"/>
<TopLine Value="19"/>
<CursorPos X="75" Y="1181"/>
<TopLine Value="1170"/>
<EditorIndex Value="6"/>
<UsageCount Value="201"/>
<Loaded Value="True"/>
</Unit33>
<Unit34>
<Filename Value="../../../lazarus/lcl/graphics.pp"/>
@ -307,9 +315,9 @@
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="mmlpsthread"/>
<CursorPos X="1" Y="1"/>
<TopLine Value="1"/>
<EditorIndex Value="12"/>
<CursorPos X="21" Y="194"/>
<TopLine Value="184"/>
<EditorIndex Value="15"/>
<UsageCount Value="202"/>
<Loaded Value="True"/>
</Unit36>
@ -378,8 +386,8 @@
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<CursorPos X="68" Y="104"/>
<TopLine Value="99"/>
<EditorIndex Value="16"/>
<UsageCount Value="96"/>
<EditorIndex Value="20"/>
<UsageCount Value="97"/>
<Loaded Value="True"/>
</Unit46>
<Unit47>
@ -398,9 +406,11 @@
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="bitmaps"/>
<CursorPos X="44" Y="692"/>
<TopLine Value="670"/>
<CursorPos X="1" Y="867"/>
<TopLine Value="856"/>
<EditorIndex Value="8"/>
<UsageCount Value="200"/>
<Loaded Value="True"/>
</Unit49>
<Unit50>
<Filename Value="../../../FPC/FPCCheckout/packages/fcl-image/src/fpcanvas.pp"/>
@ -413,8 +423,8 @@
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/colour.inc"/>
<CursorPos X="1" Y="1"/>
<TopLine Value="1"/>
<EditorIndex Value="17"/>
<UsageCount Value="40"/>
<EditorIndex Value="21"/>
<UsageCount Value="41"/>
<Loaded Value="True"/>
</Unit51>
<Unit52>
@ -481,9 +491,11 @@
<Unit61>
<Filename Value="../../../lazarus/lcl/graphtype.pp"/>
<UnitName Value="GraphType"/>
<CursorPos X="19" Y="634"/>
<TopLine Value="630"/>
<UsageCount Value="8"/>
<CursorPos X="3" Y="186"/>
<TopLine Value="175"/>
<EditorIndex Value="9"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit61>
<Unit62>
<Filename Value="../../../FPC/FPCCheckout/packages/fcl-image/src/fpcolors.inc"/>
@ -552,9 +564,11 @@
<Filename Value="../../Units/MMLCore/colour_conv.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="colour_conv"/>
<CursorPos X="41" Y="76"/>
<TopLine Value="76"/>
<CursorPos X="39" Y="295"/>
<TopLine Value="282"/>
<EditorIndex Value="7"/>
<UsageCount Value="201"/>
<Loaded Value="True"/>
</Unit72>
<Unit73>
<Filename Value="../../../cogat/Units/CogatUnits/compcolors.pas"/>
@ -566,9 +580,9 @@
<Unit74>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/mouse.inc"/>
<CursorPos X="33" Y="31"/>
<TopLine Value="1"/>
<EditorIndex Value="15"/>
<UsageCount Value="17"/>
<TopLine Value="9"/>
<EditorIndex Value="19"/>
<UsageCount Value="18"/>
<Loaded Value="True"/>
</Unit74>
<Unit75>
@ -649,8 +663,8 @@
<Filename Value="../../Units/MMLAddon/PSInc/psdefines.inc"/>
<CursorPos X="1" Y="1"/>
<TopLine Value="1"/>
<EditorIndex Value="14"/>
<UsageCount Value="12"/>
<EditorIndex Value="18"/>
<UsageCount Value="13"/>
<Loaded Value="True"/>
</Unit86>
<Unit87>
@ -709,9 +723,11 @@
<Filename Value="../../Units/MMLCore/dtm.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="dtm"/>
<CursorPos X="34" Y="141"/>
<TopLine Value="113"/>
<CursorPos X="71" Y="392"/>
<TopLine Value="388"/>
<EditorIndex Value="4"/>
<UsageCount Value="200"/>
<Loaded Value="True"/>
</Unit95>
<Unit96>
<Filename Value="../../../cogat/Units/CogatUnits/comppicker.pas"/>
@ -863,7 +879,7 @@
<UnitName Value="ocr"/>
<CursorPos X="19" Y="91"/>
<TopLine Value="75"/>
<UsageCount Value="193"/>
<UsageCount Value="195"/>
</Unit116>
<Unit117>
<Filename Value="../../Units/PascalScript/uPSR_extctrls.pas"/>
@ -930,9 +946,11 @@
</Unit126>
<Unit127>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/window.inc"/>
<CursorPos X="28" Y="28"/>
<TopLine Value="1"/>
<CursorPos X="41" Y="52"/>
<TopLine Value="31"/>
<EditorIndex Value="16"/>
<UsageCount Value="12"/>
<Loaded Value="True"/>
</Unit127>
<Unit128>
<Filename Value="../../../FPC/FPCCheckout/rtl/objpas/classes/classes.inc"/>
@ -991,7 +1009,7 @@
<UnitName Value="web"/>
<CursorPos X="1" Y="1"/>
<TopLine Value="1"/>
<UsageCount Value="118"/>
<UsageCount Value="120"/>
</Unit136>
<Unit137>
<Filename Value="../../../lazarus/lcl/lazhelphtml.pas"/>
@ -1190,8 +1208,8 @@
<UnitName Value="framescript"/>
<CursorPos X="15" Y="195"/>
<TopLine Value="180"/>
<EditorIndex Value="18"/>
<UsageCount Value="111"/>
<EditorIndex Value="22"/>
<UsageCount Value="113"/>
<Loaded Value="True"/>
</Unit161>
<Unit162>
@ -1505,9 +1523,9 @@
<ResourceBaseClass Value="Form"/>
<UnitName Value="colourhistory"/>
<CursorPos X="37" Y="126"/>
<TopLine Value="95"/>
<EditorIndex Value="11"/>
<UsageCount Value="48"/>
<TopLine Value="104"/>
<EditorIndex Value="14"/>
<UsageCount Value="50"/>
<Loaded Value="True"/>
</Unit208>
<Unit209>
@ -1623,8 +1641,8 @@
<UnitName Value="MMLKeyInput"/>
<CursorPos X="62" Y="31"/>
<TopLine Value="21"/>
<EditorIndex Value="8"/>
<UsageCount Value="22"/>
<EditorIndex Value="13"/>
<UsageCount Value="23"/>
<Loaded Value="True"/>
</Unit225>
<Unit226>
@ -1663,267 +1681,211 @@
<UsageCount Value="10"/>
</Unit230>
<Unit231>
<Filename Value="../../../../Documents/lazarus/lcl/lclintf.pas"/>
<UnitName Value="LCLIntf"/>
<CursorPos X="1" Y="1"/>
<TopLine Value="281"/>
<UsageCount Value="10"/>
</Unit231>
<Unit232>
<Filename Value="../../../../Documents/lazarus/lcl/lcltype.pp"/>
<Filename Value="../../../Documents/lazarus/lcl/lcltype.pp"/>
<UnitName Value="LCLType"/>
<CursorPos X="67" Y="522"/>
<TopLine Value="507"/>
<UsageCount Value="11"/>
</Unit232>
<Unit233>
<Filename Value="../../../../Documents/lazarus/lcl/include/listitem.inc"/>
<CursorPos X="1" Y="513"/>
<TopLine Value="498"/>
<UsageCount Value="10"/>
</Unit233>
<Unit234>
<Filename Value="../../../../Documents/fpc/rtl/inc/objpash.inc"/>
</Unit231>
<Unit232>
<Filename Value="../../../Documents/fpc/rtl/inc/objpash.inc"/>
<CursorPos X="11" Y="326"/>
<TopLine Value="311"/>
<UsageCount Value="10"/>
</Unit234>
<Unit235>
</Unit232>
<Unit233>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/keyboard.inc"/>
<CursorPos X="13" Y="46"/>
<TopLine Value="16"/>
<EditorIndex Value="13"/>
<UsageCount Value="12"/>
<TopLine Value="24"/>
<EditorIndex Value="17"/>
<UsageCount Value="13"/>
<Loaded Value="True"/>
</Unit235>
<Unit236>
<Filename Value="../../../../Documents/fpc/packages/x11/src/xlib.pp"/>
</Unit233>
<Unit234>
<Filename Value="../../../Documents/fpc/packages/x11/src/xlib.pp"/>
<UnitName Value="xlib"/>
<CursorPos X="10" Y="1535"/>
<TopLine Value="1520"/>
<UsageCount Value="10"/>
</Unit236>
<Unit237>
<Filename Value="../../../../Documents/lazarus/lcl/include/winapih.inc"/>
</Unit234>
<Unit235>
<Filename Value="../../../Documents/lazarus/lcl/include/winapih.inc"/>
<CursorPos X="1" Y="312"/>
<TopLine Value="100"/>
<UsageCount Value="11"/>
</Unit237>
<Unit238>
<Filename Value="../../../../Documents/lazarus/components/mouseandkeyinput/xkeyinput.pas"/>
<UnitName Value="XKeyInput"/>
<CursorPos X="60" Y="51"/>
<TopLine Value="31"/>
<EditorIndex Value="9"/>
<UsageCount Value="11"/>
<Loaded Value="True"/>
</Unit238>
<Unit239>
<Filename Value="../../../../Documents/lazarus/lcl/interfaces/gtk2/gtk2winapi.inc"/>
</Unit235>
<Unit236>
<Filename Value="../../../Documents/lazarus/lcl/interfaces/gtk2/gtk2winapi.inc"/>
<CursorPos X="34" Y="10"/>
<TopLine Value="1"/>
<UsageCount Value="10"/>
</Unit239>
<Unit240>
<Filename Value="../../../../Documents/lazarus/lcl/interfaces/gtk/gtkwinapi.inc"/>
</Unit236>
<Unit237>
<Filename Value="../../../Documents/lazarus/lcl/interfaces/gtk/gtkwinapi.inc"/>
<CursorPos X="32" Y="5220"/>
<TopLine Value="5199"/>
<UsageCount Value="10"/>
</Unit240>
<Unit241>
<Filename Value="../../../../Documents/lazarus/lcl/interfaces/gtk/gtkint.pp"/>
</Unit237>
<Unit238>
<Filename Value="../../../Documents/lazarus/lcl/interfaces/gtk/gtkint.pp"/>
<UnitName Value="GtkInt"/>
<CursorPos X="26" Y="87"/>
<TopLine Value="82"/>
<UsageCount Value="10"/>
</Unit241>
<Unit242>
<Filename Value="../../../../Documents/fpc/rtl/objpas/classes/classesh.inc"/>
<CursorPos X="3" Y="170"/>
<TopLine Value="165"/>
<UsageCount Value="10"/>
</Unit242>
<Unit243>
<Filename Value="../../../../Documents/fpc/packages/x11/src/x.pp"/>
<UnitName Value="x"/>
<CursorPos X="4" Y="82"/>
<TopLine Value="67"/>
<UsageCount Value="10"/>
</Unit243>
<Unit244>
<Filename Value="../../../../Documents/fpc/rtl/unix/aliasctp.inc"/>
<CursorPos X="7" Y="49"/>
<TopLine Value="31"/>
<UsageCount Value="10"/>
</Unit244>
<Unit245>
<Filename Value="../../../../Documents/fpc/rtl/unix/ctypes.inc"/>
</Unit238>
<Unit239>
<Filename Value="../../../Documents/fpc/rtl/unix/ctypes.inc"/>
<CursorPos X="3" Y="59"/>
<TopLine Value="40"/>
<UsageCount Value="10"/>
</Unit245>
<Unit246>
<Filename Value="../../../../Documents/fpc/packages/x11/src/keysym.pp"/>
</Unit239>
<Unit240>
<Filename Value="../../../Documents/fpc/packages/x11/src/keysym.pp"/>
<UnitName Value="keysym"/>
<CursorPos X="3" Y="501"/>
<TopLine Value="486"/>
<EditorIndex Value="10"/>
<UsageCount Value="11"/>
<Loaded Value="True"/>
</Unit246>
<Unit247>
<Filename Value="../../../../Documents/fpc/rtl/objpas/math.pp"/>
<UnitName Value="math"/>
<CursorPos X="10" Y="326"/>
<TopLine Value="311"/>
<UsageCount Value="10"/>
</Unit247>
<Unit248>
<Filename Value="../../../../Documents/lazarus/lcl/interfaces/gtk/gtkproc.inc"/>
</Unit240>
<Unit241>
<Filename Value="../../../Documents/lazarus/lcl/interfaces/gtk/gtkproc.inc"/>
<CursorPos X="14" Y="3074"/>
<TopLine Value="3064"/>
<EditorIndex Value="5"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit248>
<Unit249>
</Unit241>
<Unit242>
<Filename Value="../../Units/Linux/xdo_util.inc"/>
<CursorPos X="24" Y="12"/>
<TopLine Value="1"/>
<EditorIndex Value="6"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit249>
<Unit250>
</Unit242>
<Unit243>
<Filename Value="../../Units/Linux/xkeyboard.pas"/>
<UnitName Value="xkeyboard"/>
<CursorPos X="26" Y="9"/>
<TopLine Value="9"/>
<EditorIndex Value="7"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit250>
</Unit243>
</Units>
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="199" Column="53" TopLine="185"/>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="215" Column="1" TopLine="197"/>
</Position1>
<Position2>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="193" Column="21" TopLine="178"/>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="268" Column="76" TopLine="254"/>
</Position2>
<Position3>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="198" Column="43" TopLine="178"/>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="205" Column="7" TopLine="194"/>
</Position3>
<Position4>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="203" Column="91" TopLine="188"/>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="209" Column="1" TopLine="198"/>
</Position4>
<Position5>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="244" Column="17" TopLine="235"/>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="329" Column="16" TopLine="318"/>
</Position5>
<Position6>
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<Caret Line="114" Column="73" TopLine="99"/>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="326" Column="18" TopLine="318"/>
</Position6>
<Position7>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="169" Column="11" TopLine="148"/>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="330" Column="18" TopLine="317"/>
</Position7>
<Position8>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="200" Column="3" TopLine="178"/>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="484" Column="1" TopLine="473"/>
</Position8>
<Position9>
<Filename Value="../../Units/MMLCore/mmlkeyinput.pas"/>
<Caret Line="31" Column="61" TopLine="21"/>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="722" Column="1" TopLine="711"/>
</Position9>
<Position10>
<Filename Value="../../Units/MMLCore/mmlkeyinput.pas"/>
<Caret Line="31" Column="62" TopLine="21"/>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="30" Column="22" TopLine="19"/>
</Position10>
<Position11>
<Filename Value="../../../../Documents/lazarus/components/mouseandkeyinput/xkeyinput.pas"/>
<Caret Line="53" Column="47" TopLine="31"/>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="108" Column="25" TopLine="95"/>
</Position11>
<Position12>
<Filename Value="../../../../Documents/lazarus/components/mouseandkeyinput/xkeyinput.pas"/>
<Caret Line="117" Column="23" TopLine="101"/>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="724" Column="1" TopLine="713"/>
</Position12>
<Position13>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="196" Column="12" TopLine="188"/>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="51" Column="52" TopLine="40"/>
</Position13>
<Position14>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="320" Column="67" TopLine="303"/>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="52" Column="30" TopLine="41"/>
</Position14>
<Position15>
<Filename Value="../../../../Documents/lazarus/components/mouseandkeyinput/xkeyinput.pas"/>
<Caret Line="105" Column="23" TopLine="91"/>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="54" Column="52" TopLine="43"/>
</Position15>
<Position16>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="35" Column="31" TopLine="21"/>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="64" Column="51" TopLine="53"/>
</Position16>
<Position17>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="39" Column="29" TopLine="21"/>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="67" Column="47" TopLine="56"/>
</Position17>
<Position18>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="324" Column="27" TopLine="309"/>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="100" Column="31" TopLine="87"/>
</Position18>
<Position19>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="325" Column="43" TopLine="310"/>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="51" Column="9" TopLine="40"/>
</Position19>
<Position20>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="324" Column="71" TopLine="309"/>
<Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="52" Column="39" TopLine="41"/>
</Position20>
<Position21>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="325" Column="68" TopLine="309"/>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="194" Column="21" TopLine="184"/>
</Position21>
<Position22>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="321" Column="3" TopLine="307"/>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/window.inc"/>
<Caret Line="52" Column="41" TopLine="31"/>
</Position22>
<Position23>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="326" Column="92" TopLine="310"/>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="454" Column="41" TopLine="453"/>
</Position23>
<Position24>
<Filename Value="../../../../Documents/lazarus/lcl/interfaces/gtk/gtkproc.inc"/>
<Caret Line="24" Column="55" TopLine="1"/>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="57" Column="34" TopLine="38"/>
</Position24>
<Position25>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="325" Column="90" TopLine="311"/>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="750" Column="59" TopLine="739"/>
</Position25>
<Position26>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="324" Column="12" TopLine="309"/>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="67" Column="18" TopLine="56"/>
</Position26>
<Position27>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="328" Column="9" TopLine="309"/>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="833" Column="56" TopLine="830"/>
</Position27>
<Position28>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="312" Column="17" TopLine="299"/>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="69" Column="18" TopLine="58"/>
</Position28>
<Position29>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="326" Column="47" TopLine="311"/>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="901" Column="67" TopLine="890"/>
</Position29>
<Position30>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="321" Column="26" TopLine="305"/>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="1104" Column="18" TopLine="1092"/>
</Position30>
</JumpHistory>
</ProjectOptions>

View File

@ -30,9 +30,7 @@ uses
cthreads, cmem,
{$ENDIF}{$ENDIF}
Interfaces, // this includes the LCL widgetset
Forms, LResources, Window, files, MufasaTypes, Client, TestUnit, finder,
mmlpsthread, bitmaps, colour_conv, plugins, DTM, colourpicker,
windowselector, dtmutil, mmath, ocr, web, colourhistory;
Forms, LResources, testunit,colourhistory;
{$IFDEF WINDOWS}{$R project1.rc}{$ENDIF}

View File

@ -92,7 +92,6 @@ uses
uPSR_extctrls, //Runtime-libs
Graphics, //For Graphics types
math, //Maths!
bitmaps,
colour_conv,
forms,//Forms
lclintf; // for GetTickCount and others.

View File

@ -27,7 +27,7 @@ unit bitmaps;
interface
uses
Classes, SysUtils, FPImgCanv,FPImage,IntfGraphics,graphtype,MufasaTypes,graphics;
Classes, SysUtils, FPImage,IntfGraphics,graphtype,MufasaTypes,graphics;
type
@ -103,7 +103,7 @@ type
implementation
uses
Windowutil,paszlib,DCPbase64,mmath,math,
Windowutil,paszlib,DCPbase64,math,
colour_conv,window;
function Min(a,b:integer) : integer;
@ -202,11 +202,11 @@ end;
function TMBitmaps.CreateBMPFromString(width, height: integer; Data: string): integer;
var
I,II,x,y: LongWord;
I,II: LongWord;
DestLen : LongWord;
Dest,Source : string;
DestPoint, Point : PByte;
LazIntf : TLazIntfImage;
begin
Result := CreateBMP(width,height);
@ -265,7 +265,7 @@ begin
i := i + 4;
end;
end;
end else if LongWord(Length(Data)) = (Width * Height * 3 * 2) then
end else if LongWord(Length(Data)) = LongWord((Width * Height * 3 * 2)) then
begin;
ii := 1;
i := 0;
@ -327,10 +327,15 @@ var
Bmp : TLazIntfImage;
begin
ArrDataToRawImage(FData,Point(w,h),RawImage);
result := true;
// Bmp := Graphics.TBitmap.Create;
Bmp := TLazIntfImage.Create(RawImage,false);
Bmp.SaveToFile(FileName);
Bmp.Free;
try
Bmp := TLazIntfImage.Create(RawImage,false);
Bmp.SaveToFile(FileName);
Bmp.Free;
except
result := false;
end;
end;
procedure TMufasaBitmap.LoadFromFile(const FileName: string);
@ -476,7 +481,6 @@ var
y : integer;
wi,hi : integer;
PtrRet : TRetData;
Rows : integer;
begin
if Resize then
Self.SetSize(xe-xs+1,ye-ys+1);
@ -715,10 +719,8 @@ end;
procedure TMufasaBitmap.Invert;
var
Ptr : PRGB32;
i : integer;
begin
ptr := Self.FData;
for i := (h*w-1) downto 0 do
begin;
Self.FData[i].r := not Self.FData[i].r;
@ -862,7 +864,6 @@ end;
procedure TMufasaBitmap.StretchResize(AWidth, AHeight: integer);
var
NewData : PRGB32;
i: integer;
x,y : integer;
begin
if (AWidth <> w) or (AHeight <> h) then

View File

@ -35,14 +35,14 @@ uses
Function RGBtoColor(r,g,b : byte) : TColor; overload; inline;
Function RGBtoColor(r,g,b : integer) : TColor; overload; inline;
Procedure ColorToRGB(Color : integer;var r,g,b : byte); overload; inline;
Procedure ColorToRGB(Color : integer;var r,g,b : integer); overload; inline;
Procedure RGBToXYZ(R,G,B : integer;var x,y,z : Extended); inline;
Procedure XYZToRGB(X,Y,Z : Extended;var R,G,B: integer); inline;
Procedure RGBToHSL(RR,GG,BB : integer;var H,S,L : Extended); inline;
Procedure HSLtoRGB(H,S,L : extended;var R,G,B : Byte); inline;overload;
Procedure HSLtoRGB(H,S,L : extended;var R,G,B : Integer); inline;overload;
Procedure ColorToHSL(Col: Integer; var h, s, l: Extended); inline;
Procedure ColorToRGB(Color : integer;out r,g,b : byte); overload; inline;
Procedure ColorToRGB(Color : integer;out r,g,b : integer); overload; inline;
Procedure RGBToXYZ(R,G,B : integer;out x,y,z : Extended); inline;
Procedure XYZToRGB(X,Y,Z : Extended;out R,G,B: integer); inline;
Procedure RGBToHSL(RR,GG,BB : integer;out H,S,L : Extended); inline;
Procedure HSLtoRGB(H,S,L : extended;out R,G,B : Byte); inline;overload;
Procedure HSLtoRGB(H,S,L : extended;out R,G,B : Integer); inline;overload;
Procedure ColorToHSL(Col: Integer; out h, s, l: Extended); inline;
implementation
@ -71,7 +71,7 @@ end;
components. R, G and B are bytes.
/\}
Procedure ColorToRGB(Color : integer;var r,g,b : byte); overload; inline;
Procedure ColorToRGB(Color : integer;out r,g,b : byte); overload; inline;
begin
R := Color and $ff;
G := Color shr 8 and $ff;
@ -83,7 +83,7 @@ end;
components. R, G and B are integers.
/\}
Procedure ColorToRGB(Color : integer;var r,g,b : integer); overload; inline;
Procedure ColorToRGB(Color : integer;out r,g,b : integer); overload; inline;
begin
R := Color and $ff;
G := Color shr 8 and $ff;
@ -95,7 +95,7 @@ end;
X, Y and Z components.
/\}
Procedure RGBToXYZ(R,G,B : integer;var x,y,z : Extended); inline;
Procedure RGBToXYZ(R,G,B : integer;out x,y,z : Extended); inline;
var
Red,Green,Blue : Extended;
begin;
@ -124,7 +124,7 @@ end;
Red (R), Green (G) and Blue (B) components.
/\}
Procedure XYZToRGB(X,Y,Z : Extended;var R,G,B: integer); inline;
Procedure XYZToRGB(X,Y,Z : Extended;out R,G,B: integer); inline;
var
TempR,TempG,TempB,Tempx,tempy,tempz : Extended;
begin;
@ -156,7 +156,7 @@ end;
H (Hue), S (Saturation) and L (Luminance) components.
/\}
Procedure RGBToHSL(RR,GG,BB : integer;var H,S,L : Extended); inline;
Procedure RGBToHSL(RR,GG,BB : integer;out H,S,L : Extended); inline;
var
R, G, B, D, Cmax, Cmin: Extended;
begin
@ -202,7 +202,7 @@ end;
Red (R), Green (G) and Blue (B) components.
/\}
procedure HSLtoRGB(H, S, L: extended; var R, G, B: Byte); inline; overload;
procedure HSLtoRGB(H, S, L: extended; out R, G, B: Byte); inline; overload;
var
Temp,Temp2 : Extended;
//begin
@ -245,7 +245,7 @@ begin;
end;
end;
Procedure HSLtoRGB(H,S,L : extended;var R,G,B : Integer); inline;
Procedure HSLtoRGB(H,S,L : extended;out R,G,B : Integer); inline;
var
Temp,Temp2 : Extended;
//begin
@ -292,7 +292,7 @@ end;
Split the Given Color col in H, S, L components.
/\}
Procedure ColorToHSL(Col: Integer; var h, s, l: Extended); inline;
Procedure ColorToHSL(Col: Integer; out h, s, l: Extended); inline;
Var
R, G, B: Integer;
Begin

View File

@ -35,7 +35,7 @@ type
function AddDTM(d: TDTM): Integer;
function AddpDTM(d: pDTM): Integer;
function GetDTM(index: Integer; var dtm: pDTM): Boolean;
function GetDTM(index: Integer; out dtm: pDTM): Boolean;
procedure FreeDTM(DTM: Integer);
Function StringToDTM(S: String): pDTM;
@ -106,7 +106,7 @@ const
implementation
uses
Client, dtmutil, paszlib, finder,
Client, dtmutil, paszlib,
graphics, // for TColor
math // for max
;
@ -354,7 +354,7 @@ end;
Returns true is succesfull, false if the dtm does not exist.
/\}
function TMDTM.GetDTM(index: Integer; var dtm: pDTM): Boolean;
function TMDTM.GetDTM(index: Integer; out dtm: pDTM): Boolean;
begin
Result := True;
try
@ -396,6 +396,7 @@ var
B: TBox;
begin
FillChar(b,sizeOf(TBox),0);
for i := 0 to high(dtm.p) do
begin
B.X1 := Min(B.X1, dtm.p[i].X - dtm.asz[i]);
@ -417,6 +418,7 @@ var
B: TBox;
begin
FillChar(b,sizeOf(TBox),0);
for i := 0 to high(dtm.p) do
begin
B.X1 := Min(B.X1, dtm.p[i].X - dtm.asz[i]);
@ -651,7 +653,7 @@ Var
tAngle: Extended;
Found: Boolean;
TempTP: TPoint;
MaxSubPointDist: TPoint;
// MaxSubPointDist: TPoint;
Begin
For I := 1 To High(DTM.p) Do

View File

@ -54,23 +54,23 @@ type
procedure SetToleranceSpeed(nCTS: Integer);
function SimilarColors(Color1,Color2,Tolerance : Integer) : boolean;
// Possibly turn x, y into a TPoint var.
function FindColor(var x, y: Integer; Color, xs, ys, xe, ye: Integer): Boolean;
function FindColor(out x, y: Integer; Color, xs, ys, xe, ye: Integer): Boolean;
function FindColorSpiral(var x, y: Integer; color, xs, ys, xe, ye: Integer): Boolean;
function FindColorTolerance(var x, y: Integer; Color, xs, ys, xe, ye, tol: Integer): Boolean;
function FindColorsTolerance(var Points: TPointArray; Color, xs, ys, xe, ye, Tol: Integer): Boolean;
function FindColorTolerance(out x, y: Integer; Color, xs, ys, xe, ye, tol: Integer): Boolean;
function FindColorsTolerance(out Points: TPointArray; Color, xs, ys, xe, ye, Tol: Integer): Boolean;
function FindColorsSpiralTolerance(x, y: Integer; var Points: TPointArray; color, xs, ys, xe, ye: Integer; Tolerance: Integer) : boolean;
function FindColors(var TPA: TPointArray; Color, xs, ys, xe, ye: Integer): Boolean;
//Mask
function FindBitmapMaskTolerance(mask: TMask; var x, y: Integer; xs, ys, xe, ye: Integer; Tolerance, ContourTolerance: Integer): Boolean;
function FindBitmapMaskTolerance(mask: TMask; out x, y: Integer; xs, ys, xe, ye: Integer; Tolerance, ContourTolerance: Integer): Boolean;
procedure CheckMask(Mask : TMask);
//Bitmap functions
function FindBitmap(bitmap: TMufasaBitmap; var x, y: Integer): Boolean;
function FindBitmapIn(bitmap: TMufasaBitmap; var x, y: Integer; xs, ys, xe, ye: Integer): Boolean;
function FindBitmapToleranceIn(bitmap: TMufasaBitmap; var x, y: Integer; xs, ys, xe, ye: Integer; tolerance: Integer): Boolean;
function FindBitmap(bitmap: TMufasaBitmap; out x, y: Integer): Boolean;
function FindBitmapIn(bitmap: TMufasaBitmap; out x, y: Integer; xs, ys, xe, ye: Integer): Boolean;
function FindBitmapToleranceIn(bitmap: TMufasaBitmap; out x, y: Integer; xs, ys, xe, ye: Integer; tolerance: Integer): Boolean;
function FindBitmapSpiral(bitmap: TMufasaBitmap; var x, y: Integer; xs, ys, xe, ye: Integer): Boolean;
function FindBitmapSpiralTolerance(bitmap: TMufasaBitmap; var x, y: Integer; xs, ys, xe, ye,tolerance : integer): Boolean;
function FindBitmapsSpiralTolerance(bitmap: TMufasaBitmap; x, y: Integer; var Points : TPointArray; xs, ys, xe, ye,tolerance: Integer): Boolean;
function FindDeformedBitmapToleranceIn(bitmap: TMufasaBitmap; var x, y: Integer; xs, ys, xe, ye: Integer; tolerance: Integer; Range: Integer; AllowPartialAccuracy: Boolean; var accuracy: Extended): Boolean;
function FindBitmapsSpiralTolerance(bitmap: TMufasaBitmap; x, y: Integer; out Points : TPointArray; xs, ys, xe, ye,tolerance: Integer): Boolean;
function FindDeformedBitmapToleranceIn(bitmap: TMufasaBitmap; out x, y: Integer; xs, ys, xe, ye: Integer; tolerance: Integer; Range: Integer; AllowPartialAccuracy: Boolean; var accuracy: Extended): Boolean;
protected
Client: TObject;
CachedWidth, CachedHeight : integer;
@ -90,7 +90,7 @@ type
procedure TMFinder.LoadSpiralPath(startX, startY, x1, y1, x2, y2: Integer);
var
i,y,x,c,Ring : integer;
i,c,Ring : integer;
CurrBox : TBox;
begin;
i := 0;
@ -362,7 +362,7 @@ begin
TClient(Client).MWindow.FreeReturnData;
end;
function TMFinder.FindColor(var x, y: Integer; Color, xs, ys, xe, ye: Integer): Boolean;
function TMFinder.FindColor(out x, y: Integer; Color, xs, ys, xe, ye: Integer): Boolean;
var
PtrData: TRetData;
Ptr: PRGB32;
@ -451,7 +451,7 @@ begin
TClient(Client).MWindow.FreeReturnData;
end;
function TMFinder.FindColorTolerance(var x, y: Integer; Color, xs, ys, xe, ye, tol: Integer): Boolean;
function TMFinder.FindColorTolerance(out x, y: Integer; Color, xs, ys, xe, ye, tol: Integer): Boolean;
var
PtrData: TRetData;
Ptr: PRGB32;
@ -461,7 +461,6 @@ var
HueXTol, SatXTol: Extended;
label Hit;
label Miss;
begin
Result := false;
@ -538,7 +537,7 @@ begin
TClient(Client).MWindow.FreeReturnData;
end;
function TMFinder.FindColorsTolerance(var Points: TPointArray; Color, xs, ys,
function TMFinder.FindColorsTolerance(out Points: TPointArray; Color, xs, ys,
xe, ye, Tol: Integer): Boolean;
var
PtrData: TRetData;
@ -748,7 +747,7 @@ end;
//Only works with CTS 1 for now.. Since Colorsame doesn't return a boolean :-(
//We do not check whether every white pixel is in tol range with every other white pixel..
function TMFinder.FindBitmapMaskTolerance(mask: TMask; var x, y: Integer; xs,
function TMFinder.FindBitmapMaskTolerance(mask: TMask; out x, y: Integer; xs,
ys, xe, ye: Integer; Tolerance, ContourTolerance: Integer): Boolean;
var
MainRowdata : TPRGB32Array;
@ -831,7 +830,7 @@ begin
raise exception.CreateFMT('Mask is invalid. Width/Height: (%d,%d). WhiteHi/BlackHi: (%d,%d)',[Mask.W,Mask.H,Mask.WhiteHi,Mask.BlackHi]);
end;
function TMFinder.FindBitmap(bitmap: TMufasaBitmap; var x, y: Integer): Boolean;
function TMFinder.FindBitmap(bitmap: TMufasaBitmap; out x, y: Integer): Boolean;
var
w,h : integer;
begin
@ -839,7 +838,7 @@ begin
result := Self.FindBitmapIn(bitmap,x,y,0,0,w-1,h-1);
end;
function TMFinder.FindBitmapIn(bitmap: TMufasaBitmap; var x, y: Integer; xs,
function TMFinder.FindBitmapIn(bitmap: TMufasaBitmap; out x, y: Integer; xs,
ys, xe, ye: Integer): Boolean;
var
MainRowdata : TPRGB32Array;
@ -899,7 +898,7 @@ begin
TClient(Client).MWindow.FreeReturnData;
end;
function TMFinder.FindBitmapToleranceIn(bitmap: TMufasaBitmap; var x, y: Integer; xs,
function TMFinder.FindBitmapToleranceIn(bitmap: TMufasaBitmap; out x, y: Integer; xs,
ys, xe, ye: Integer; tolerance: Integer): Boolean;
var
MainRowdata : TPRGB32Array;
@ -934,8 +933,10 @@ begin
//Heck our bitmap cannot be outside the search area
dX := dX - bmpW;
dY := dY - bmpH;
//We wont want HSL comparison with BMPs, right? Not for now atleast.
//Compiler hints
HMod := 0;SMod := 0;H := 0.0;S := 0.0; L := 0.0;
CCTS := Self.CTS;
//We wont want HSL comparison with BMPs, right? Not for now atleast.
if CCTS > 1 then
CCTS := 1;
//Get the "skip coords".
@ -1066,6 +1067,8 @@ begin
//Load the spiral into memory
LoadSpiralPath(x-xs,y-ys,0,0,dX,dY);
HiSpiral := (dx+1) * (dy+1) - 1;
//Compiler hints
HMod := 0;SMod := 0;H := 0.0;S := 0.0; L := 0.0;
//NO HSL.
CCTS := Self.CTS;
if CCTS > 1 then
@ -1098,7 +1101,7 @@ begin
end;
function TMFinder.FindBitmapsSpiralTolerance(bitmap: TMufasaBitmap; x,
y: Integer; var Points: TPointArray; xs, ys, xe, ye,tolerance: Integer): Boolean;
y: Integer; out Points: TPointArray; xs, ys, xe, ye,tolerance: Integer): Boolean;
var
MainRowdata : TPRGB32Array;
BmpRowData : TPRGB32Array;
@ -1136,6 +1139,8 @@ begin
//Load the spiral into memory
LoadSpiralPath(x-xs,y-ys,0,0,dX,dY);
HiSpiral := (dx+1) * (dy+1) - 1;
//Compiler hints
HMod := 0;SMod := 0;H := 0.0;S := 0.0; L := 0.0;
//NO HSL.
CCTS := Self.CTS;
if CCTS > 1 then
@ -1173,7 +1178,7 @@ begin
TClient(Client).MWindow.FreeReturnData;
end;
function TMFinder.FindDeformedBitmapToleranceIn(bitmap: TMufasaBitmap; var x,
function TMFinder.FindDeformedBitmapToleranceIn(bitmap: TMufasaBitmap; out x,
y: Integer; xs, ys, xe, ye: Integer; tolerance: Integer; Range: Integer;
AllowPartialAccuracy: Boolean; var accuracy: Extended): Boolean;
var

View File

@ -47,7 +47,7 @@ type
function GetColor(x,y : integer) : TColor;
function ReturnData(xs, ys, width, height: Integer): TRetData;
procedure FreeReturnData;
procedure GetDimensions(var W, H: Integer);
procedure GetDimensions(out W, H: Integer);
function GetDimensionBox(out Box : TBox) : boolean;
function CopyClientToBitmap(xs, ys, xe, ye: integer): TBitmap;
procedure ActivateClient;
@ -535,7 +535,7 @@ begin
end;
{$ENDIF}
procedure TMWindow.GetDimensions(var W, H: Integer);
procedure TMWindow.GetDimensions(out W, H: Integer);
{$IFDEF LINUX}
var
Attrib: TXWindowAttributes;