moparisthebest/Simba
1
0
Fork 0
mirror of https://github.com/moparisthebest/Simba synced 2024-11-24 18:22:25 -05:00
Code Issues Releases Wiki Activity

OCR Filter changes, fix in TMWindow

Browse Source 
git-svn-id: http://www.villavu.com/repositories/merlijn/mufasa@293 3f818213-9676-44b0-a9b4-5e4c4e03d09d
This commit is contained in:
Wizzup? 2009-12-19 18:09:04 +00:00
parent 1d85a03a11
commit 446c7a7318
4 changed files with 151 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

203
Projects/SAMufasaGUI/project1.lpi
View File

@ -10,7 +10,7 @@
<TargetFileExt Value=""/> <TargetFileExt Value=""/>
<Title Value="Mufasa Stand Alone"/> <Title Value="Mufasa Stand Alone"/>
<UseXPManifest Value="True"/> <UseXPManifest Value="True"/>
<ActiveEditorIndexAtStart Value="8"/> <ActiveEditorIndexAtStart Value="10"/>
</General> </General>
<VersionInfo> <VersionInfo>
<ProjectVersion Value=""/> <ProjectVersion Value=""/>
@ -36,14 +36,14 @@
<PackageName Value="LCL"/> <PackageName Value="LCL"/>
</Item2> </Item2>
</RequiredPackages> </RequiredPackages>
<Units Count="263"> <Units Count="265">
<Unit0> <Unit0>
<Filename Value="project1.lpr"/> <Filename Value="project1.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="project1"/> <UnitName Value="project1"/>
<CursorPos X="100" Y="21"/> <CursorPos X="100" Y="21"/>
<TopLine Value="6"/> <TopLine Value="6"/>
<EditorIndex Value="12"/> <EditorIndex Value="14"/>
<UsageCount Value="205"/> <UsageCount Value="205"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit0> </Unit0>
@ -167,10 +167,9 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="TestUnit"/> <UnitName Value="TestUnit"/>
<ComponentState Value="1"/>
<CursorPos X="1" Y="403"/> <CursorPos X="1" Y="403"/>
<TopLine Value="380"/> <TopLine Value="380"/>
<EditorIndex Value="4"/> <EditorIndex Value="5"/>
<UsageCount Value="202"/> <UsageCount Value="202"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit17> </Unit17>
@ -225,7 +224,7 @@
<Filename Value="../../Units/MMLCore/client.pas"/> <Filename Value="../../Units/MMLCore/client.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="Client"/> <UnitName Value="Client"/>
<CursorPos X="19" Y="69"/> <CursorPos X="107" Y="49"/>
<TopLine Value="34"/> <TopLine Value="34"/>
<EditorIndex Value="1"/> <EditorIndex Value="1"/>
<UsageCount Value="201"/> <UsageCount Value="201"/>
@ -260,9 +259,9 @@
<Filename Value="../../Units/MMLCore/window.pas"/> <Filename Value="../../Units/MMLCore/window.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="Window"/> <UnitName Value="Window"/>
<CursorPos X="73" Y="291"/> <CursorPos X="49" Y="283"/>
<TopLine Value="274"/> <TopLine Value="273"/>
<EditorIndex Value="3"/> <EditorIndex Value="4"/>
<UsageCount Value="201"/> <UsageCount Value="201"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit29> </Unit29>
@ -278,8 +277,8 @@
<UnitName Value="windowutil"/> <UnitName Value="windowutil"/>
<CursorPos X="23" Y="8"/> <CursorPos X="23" Y="8"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<EditorIndex Value="16"/> <EditorIndex Value="18"/>
<UsageCount Value="64"/> <UsageCount Value="69"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit31> </Unit31>
<Unit32> <Unit32>
@ -295,7 +294,7 @@
<UnitName Value="finder"/> <UnitName Value="finder"/>
<CursorPos X="25" Y="820"/> <CursorPos X="25" Y="820"/>
<TopLine Value="807"/> <TopLine Value="807"/>
<EditorIndex Value="7"/> <EditorIndex Value="8"/>
<UsageCount Value="201"/> <UsageCount Value="201"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit33> </Unit33>
@ -319,7 +318,7 @@
<UnitName Value="mmlpsthread"/> <UnitName Value="mmlpsthread"/>
<CursorPos X="63" Y="188"/> <CursorPos X="63" Y="188"/>
<TopLine Value="298"/> <TopLine Value="298"/>
<EditorIndex Value="17"/> <EditorIndex Value="19"/>
<UsageCount Value="202"/> <UsageCount Value="202"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit36> </Unit36>
@ -388,7 +387,7 @@
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/> <Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<CursorPos X="117" Y="32"/> <CursorPos X="117" Y="32"/>
<TopLine Value="4"/> <TopLine Value="4"/>
<EditorIndex Value="14"/> <EditorIndex Value="16"/>
<UsageCount Value="100"/> <UsageCount Value="100"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit46> </Unit46>
@ -408,8 +407,8 @@
<Filename Value="../../Units/MMLCore/bitmaps.pas"/> <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="bitmaps"/> <UnitName Value="bitmaps"/>
<CursorPos X="6" Y="916"/> <CursorPos X="1" Y="1"/>
<TopLine Value="888"/> <TopLine Value="1"/>
<EditorIndex Value="2"/> <EditorIndex Value="2"/>
<UsageCount Value="200"/> <UsageCount Value="200"/>
<Loaded Value="True"/> <Loaded Value="True"/>
@ -715,7 +714,7 @@
<UnitName Value="dtm"/> <UnitName Value="dtm"/>
<CursorPos X="62" Y="135"/> <CursorPos X="62" Y="135"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<EditorIndex Value="13"/> <EditorIndex Value="15"/>
<UsageCount Value="200"/> <UsageCount Value="200"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit95> </Unit95>
@ -731,8 +730,8 @@
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="colourpicker"/> <UnitName Value="colourpicker"/>
<CursorPos X="65" Y="243"/> <CursorPos X="65" Y="243"/>
<TopLine Value="86"/> <TopLine Value="134"/>
<EditorIndex Value="10"/> <EditorIndex Value="12"/>
<UsageCount Value="201"/> <UsageCount Value="201"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit97> </Unit97>
@ -757,9 +756,11 @@
<Filename Value="../../Units/MMLAddon/windowselector.pas"/> <Filename Value="../../Units/MMLAddon/windowselector.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="windowselector"/> <UnitName Value="windowselector"/>
<CursorPos X="38" Y="161"/> <CursorPos X="54" Y="139"/>
<TopLine Value="135"/> <TopLine Value="116"/>
<EditorIndex Value="11"/>
<UsageCount Value="201"/> <UsageCount Value="201"/>
<Loaded Value="True"/>
</Unit100> </Unit100>
<Unit101> <Unit101>
<Filename Value="../../../usr/lib64/fpc/2.2.4/source/rtl/objpas/classes/classesh.inc"/> <Filename Value="../../../usr/lib64/fpc/2.2.4/source/rtl/objpas/classes/classesh.inc"/>
@ -793,7 +794,7 @@
<UnitName Value="dtmutil"/> <UnitName Value="dtmutil"/>
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<TopLine Value="151"/> <TopLine Value="151"/>
<EditorIndex Value="11"/> <EditorIndex Value="13"/>
<UsageCount Value="206"/> <UsageCount Value="206"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit105> </Unit105>
@ -808,8 +809,8 @@
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/dtm.inc"/> <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/dtm.inc"/>
<CursorPos X="33" Y="34"/> <CursorPos X="33" Y="34"/>
<TopLine Value="30"/> <TopLine Value="30"/>
<EditorIndex Value="15"/> <EditorIndex Value="17"/>
<UsageCount Value="23"/> <UsageCount Value="28"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit107> </Unit107>
<Unit108> <Unit108>
@ -873,9 +874,9 @@
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="ocr"/> <UnitName Value="ocr"/>
<CursorPos X="59" Y="79"/> <CursorPos X="105" Y="105"/>
<TopLine Value="58"/> <TopLine Value="74"/>
<EditorIndex Value="8"/> <EditorIndex Value="9"/>
<UsageCount Value="200"/> <UsageCount Value="200"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit116> </Unit116>
@ -1005,7 +1006,7 @@
<UnitName Value="web"/> <UnitName Value="web"/>
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<UsageCount Value="174"/> <UsageCount Value="185"/>
</Unit136> </Unit136>
<Unit137> <Unit137>
<Filename Value="../../../lazarus/lcl/lazhelphtml.pas"/> <Filename Value="../../../lazarus/lcl/lazhelphtml.pas"/>
@ -1204,7 +1205,7 @@
<UnitName Value="framescript"/> <UnitName Value="framescript"/>
<CursorPos X="106" Y="190"/> <CursorPos X="106" Y="190"/>
<TopLine Value="180"/> <TopLine Value="180"/>
<UsageCount Value="167"/> <UsageCount Value="178"/>
</Unit161> </Unit161>
<Unit162> <Unit162>
<Filename Value="framesynedit.lrs"/> <Filename Value="framesynedit.lrs"/>
@ -1516,11 +1517,10 @@
<ComponentName Value="ColourHistoryForm"/> <ComponentName Value="ColourHistoryForm"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="colourhistory"/> <UnitName Value="colourhistory"/>
<ComponentState Value="1"/>
<CursorPos X="72" Y="21"/> <CursorPos X="72" Y="21"/>
<TopLine Value="13"/> <TopLine Value="13"/>
<EditorIndex Value="5"/> <EditorIndex Value="6"/>
<UsageCount Value="104"/> <UsageCount Value="115"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit208> </Unit208>
<Unit209> <Unit209>
@ -1771,7 +1771,7 @@
<UnitName Value="about"/> <UnitName Value="about"/>
<CursorPos X="44" Y="21"/> <CursorPos X="44" Y="21"/>
<TopLine Value="4"/> <TopLine Value="4"/>
<UsageCount Value="67"/> <UsageCount Value="78"/>
</Unit245> </Unit245>
<Unit246> <Unit246>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/file.inc"/> <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/file.inc"/>
@ -1785,7 +1785,7 @@
<UnitName Value="internets"/> <UnitName Value="internets"/>
<CursorPos X="87" Y="3"/> <CursorPos X="87" Y="3"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<UsageCount Value="61"/> <UsageCount Value="72"/>
</Unit247> </Unit247>
<Unit248> <Unit248>
<Filename Value="debugimageform.pas"/> <Filename Value="debugimageform.pas"/>
@ -1794,7 +1794,7 @@
<UnitName Value="debugimageform"/> <UnitName Value="debugimageform"/>
<CursorPos X="20" Y="1"/> <CursorPos X="20" Y="1"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<UsageCount Value="48"/> <UsageCount Value="59"/>
</Unit248> </Unit248>
<Unit249> <Unit249>
<Filename Value="debugimage.pas"/> <Filename Value="debugimage.pas"/>
@ -1802,11 +1802,10 @@
<ComponentName Value="DebugImgForm"/> <ComponentName Value="DebugImgForm"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="debugimage"/> <UnitName Value="debugimage"/>
<ComponentState Value="1"/>
<CursorPos X="87" Y="39"/> <CursorPos X="87" Y="39"/>
<TopLine Value="20"/> <TopLine Value="20"/>
<EditorIndex Value="6"/> <EditorIndex Value="7"/>
<UsageCount Value="47"/> <UsageCount Value="58"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit249> </Unit249>
<Unit250> <Unit250>
@ -1878,10 +1877,10 @@
<Unit260> <Unit260>
<Filename Value="../../Units/MMLCore/ocrutil.pas"/> <Filename Value="../../Units/MMLCore/ocrutil.pas"/>
<UnitName Value="ocrutil"/> <UnitName Value="ocrutil"/>
<CursorPos X="36" Y="338"/> <CursorPos X="60" Y="594"/>
<TopLine Value="318"/> <TopLine Value="573"/>
<EditorIndex Value="9"/> <EditorIndex Value="10"/>
<UsageCount Value="11"/> <UsageCount Value="16"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit260> </Unit260>
<Unit261> <Unit261>
@ -1897,127 +1896,143 @@
<TopLine Value="236"/> <TopLine Value="236"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit262> </Unit262>
<Unit263>
<Filename Value="../../../../Documents/fpc/packages/x11/src/xlib.pp"/>
<UnitName Value="xlib"/>
<CursorPos X="10" Y="1831"/>
<TopLine Value="1811"/>
<UsageCount Value="10"/>
</Unit263>
<Unit264>
<Filename Value="../../../../Documents/lazarus/lcl/intfgraphics.pas"/>
<UnitName Value="IntfGraphics"/>
<CursorPos X="37" Y="3116"/>
<TopLine Value="3105"/>
<EditorIndex Value="3"/>
<UsageCount Value="11"/>
<Loaded Value="True"/>
</Unit264>
</Units> </Units>
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="../../Units/MMLCore/ocrutil.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="584" Column="53" TopLine="572"/> <Caret Line="99" Column="17" TopLine="90"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="../../Units/MMLCore/ocrutil.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="24" Column="43" TopLine="2"/> <Caret Line="110" Column="9" TopLine="90"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="../../Units/MMLCore/ocrutil.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="108" Column="70" TopLine="85"/> <Caret Line="97" Column="9" TopLine="91"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="../../Units/MMLCore/ocrutil.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="71" Column="34" TopLine="64"/> <Caret Line="111" Column="24" TopLine="91"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="../../Units/MMLCore/ocrutil.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="168" Column="40" TopLine="148"/> <Caret Line="130" Column="60" TopLine="103"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="../../Units/MMLCore/ocrutil.pas"/> <Filename Value="../../Units/MMLCore/ocrutil.pas"/>
<Caret Line="589" Column="26" TopLine="570"/> <Caret Line="61" Column="23" TopLine="49"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="../../Units/MMLCore/ocrutil.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="155" Column="24" TopLine="145"/> <Caret Line="177" Column="3" TopLine="158"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="../../Units/MMLCore/ocrutil.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="226" Column="29" TopLine="201"/> <Caret Line="241" Column="38" TopLine="218"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="../../Units/MMLCore/ocrutil.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="602" Column="13" TopLine="574"/> <Caret Line="229" Column="60" TopLine="146"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="../../Units/MMLCore/ocrutil.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="604" Column="35" TopLine="575"/> <Caret Line="241" Column="41" TopLine="161"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="99" Column="31" TopLine="67"/> <Caret Line="200" Column="34" TopLine="178"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="102" Column="16" TopLine="79"/> <Caret Line="263" Column="49" TopLine="242"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="../../Units/MMLCore/ocrutil.pas"/> <Filename Value="../../Units/MMLCore/ocrutil.pas"/>
<Caret Line="605" Column="23" TopLine="579"/> <Caret Line="598" Column="1" TopLine="573"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="../../Units/MMLCore/ocrutil.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="63" Column="64" TopLine="37"/> <Caret Line="301" Column="126" TopLine="278"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="../../Units/MMLCore/ocrutil.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="588" Column="21" TopLine="572"/> <Caret Line="270" Column="56" TopLine="242"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="../../Units/MMLCore/ocrutil.pas"/> <Filename Value="../../Units/MMLAddon/windowselector.pas"/>
<Caret Line="48" Column="44" TopLine="25"/> <Caret Line="97" Column="22" TopLine="73"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLAddon/windowselector.pas"/>
<Caret Line="106" Column="30" TopLine="94"/> <Caret Line="99" Column="30" TopLine="73"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLAddon/windowselector.pas"/>
<Caret Line="100" Column="25" TopLine="80"/> <Caret Line="117" Column="31" TopLine="97"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLAddon/windowselector.pas"/>
<Caret Line="178" Column="1" TopLine="138"/> <Caret Line="102" Column="104" TopLine="85"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLAddon/windowselector.pas"/>
<Caret Line="99" Column="17" TopLine="90"/> <Caret Line="101" Column="40" TopLine="87"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="110" Column="9" TopLine="90"/> <Caret Line="339" Column="73" TopLine="314"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="97" Column="9" TopLine="91"/> <Caret Line="83" Column="20" TopLine="74"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="111" Column="24" TopLine="91"/> <Caret Line="65" Column="33" TopLine="45"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="130" Column="60" TopLine="103"/> <Caret Line="27" Column="37" TopLine="1"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="../../Units/MMLCore/ocrutil.pas"/> <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="61" Column="23" TopLine="49"/> <Caret Line="65" Column="33" TopLine="45"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="177" Column="3" TopLine="158"/> <Caret Line="66" Column="33" TopLine="45"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="241" Column="38" TopLine="218"/> <Caret Line="137" Column="47" TopLine="110"/>
</Position27> </Position27>
<Position28> <Position28>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="229" Column="60" TopLine="146"/> <Caret Line="81" Column="71" TopLine="62"/>
</Position28> </Position28>
<Position29> <Position29>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="241" Column="41" TopLine="161"/> <Caret Line="65" Column="33" TopLine="41"/>
</Position29> </Position29>
<Position30> <Position30>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="200" Column="34" TopLine="178"/> <Caret Line="66" Column="33" TopLine="41"/>
</Position30> </Position30>
</JumpHistory> </JumpHistory>
</ProjectOptions> </ProjectOptions>

53
Units/MMLCore/ocr.pas
View File

@ -53,7 +53,7 @@ uses
colour_conv, client, files; colour_conv, client, files;
const const
ocr_Limit_High = 191; ocr_Limit_High = 190;
ocr_Limit_Low = 65; ocr_Limit_Low = 65;
ocr_White = 16777215; ocr_White = 16777215;
@ -79,7 +79,9 @@ var
begin begin
bmp := TMufasaBitmap.Create; bmp := TMufasaBitmap.Create;
bmp.CopyClientToBitmap(TClient(Client).MWindow, True, sx, sy, sx + w - 1, sy + h - 1); bmp.SetSize(w, h + 2);
bmp.CopyClientToBitmap(TClient(Client).MWindow, False, 0,1, sx, sy, sx + w - 1, sy + h - 1);
//bmp.CopyClientToBitmap(TClient(Client).MWindow, True, sx, sy, sx + w - 1, sy + h - 1);
bmp.SaveToFile('/tmp/ocrinit.bmp'); bmp.SaveToFile('/tmp/ocrinit.bmp');
for y := 0 to bmp.Height - 1 do for y := 0 to bmp.Height - 1 do
@ -87,7 +89,10 @@ begin
begin begin
colortorgb(bmp.fastgetpixel(x,y),r,g,b); colortorgb(bmp.fastgetpixel(x,y),r,g,b);
// the abs(g-b) < 15 seems to help heaps when taking out crap points // the abs(g-b) < 15 seems to help heaps when taking out crap points
if (r > ocr_Limit_High) and (g > ocr_Limit_High) and (b > ocr_Limit_High){ and (abs(g-b) < 15)} then if (r > ocr_Limit_High) and (g > ocr_Limit_High) and (b > ocr_Limit_High)
// 50 or 55. 55 seems to be better.
and (abs(r-g) + abs(r-b) + abs(g-b) < 55) then
// TODO: make 55 a var, and make it so that it can be set
begin begin
bmp.fastsetpixel(x,y,ocr_White); bmp.fastsetpixel(x,y,ocr_White);
continue; continue;
@ -104,7 +109,7 @@ begin
end; end;
// false results with fire // false results with fire
if(r > ocr_Limit_High) and (g > 100) and (g < ocr_Limit_High) and (b > 40) and (b < 90) then if(r > ocr_Limit_High) and (g > 100) and (g < ocr_Limit_High) and (b > 40) and (b < 127) then
begin begin
bmp.fastsetpixel(x,y,ocr_ItemC); bmp.fastsetpixel(x,y,ocr_ItemC);
continue; continue;
@ -131,7 +136,11 @@ begin
end; end;
// increase height by 1, so our algo works better. // increase height by 1, so our algo works better.
bmp.SetSize(Bmp.Width, Bmp.Height+1); {bmp.SetSize(Bmp.Width, Bmp.Height+1); }
// first and last horiz line = 0
for x := 0 to bmp.width -1 do
bmp.fastsetpixel(x,0,0);
for x := 0 to bmp.width -1 do for x := 0 to bmp.width -1 do
bmp.fastsetpixel(x,bmp.height-1,0); bmp.fastsetpixel(x,bmp.height-1,0);
@ -164,8 +173,8 @@ begin
end; end;
{ remove bad points } { remove bad points }
for y := bmp.Height - 2 downto 1 do for y := bmp.Height - 2 downto 0 do
for x := bmp.Width - 2 downto 1 do for x := bmp.Width - 2 downto 0 do
begin begin
if bmp.fastgetpixel(x,y) = clPurple then if bmp.fastgetpixel(x,y) = clPurple then
continue; continue;
@ -181,8 +190,20 @@ begin
end; end;
end; end;
{ may remove some pixels from chars. }
{ for y := bmp.Height - 2 downto 1 do
for x := bmp.Width - 2 downto 1 do
begin
if (bmp.fastgetpixel(x,y) <> bmp.fastgetpixel(x+1,y)) and
(bmp.fastgetpixel(x,y) <> bmp.fastgetpixel(x-1,y)) and
(bmp.fastgetpixel(x,y) <> bmp.fastgetpixel(x,y+1)) and
(bmp.fastgetpixel(x,y) <> bmp.fastgetpixel(x,y-1)) then
bmp.fastsetpixel(x,y, clOlive);
end; }
{ remove debug ;) } { remove debug ;) }
bmp.SaveToFile('/tmp/ocrdebug.bmp');
for y := 0 to bmp.Height - 1 do for y := 0 to bmp.Height - 1 do
for x := 0 to bmp.Width - 1 do for x := 0 to bmp.Width - 1 do
begin begin
@ -259,14 +280,17 @@ function TMOCR.InitTOCR(path: string): boolean;
begin begin
{ This must be dynamic } { This must be dynamic }
SetLength(OCRData, 1); SetLength(OCRData, 2);
result := true; result := true;
OCRPath := path + DS; OCRPath := path + DS;
if DirectoryExists(path + DS + 'UpChars' + DS) then if DirectoryExists(path + DS + 'UpChars' + DS) then
OCRData[0] := ocrutil.InitOCR(path + DS + 'UpChars' + DS) OCRData[0] := ocrutil.InitOCR(path + DS + 'UpChars' + DS)
else else
result := false; result := false;
if DirectoryExists(path + DS + 'StatChars' + DS) then
OCRData[1] := ocrutil.InitOCR(path + DS + 'StatChars' + DS)
else
result := false;
end; end;
function TMOCR.GetUpTextAt(atX, atY: integer): string; function TMOCR.GetUpTextAt(atX, atY: integer): string;
@ -281,9 +305,9 @@ begin
n := getTextPointsIn(atX, atY, ww, hh); n := getTextPointsIn(atX, atY, ww, hh);
Result := ocrDetect(n, ww, hh, OCRData[0]); Result := ocrDetect(n, ww, hh, OCRData[0]);
writeln(result); //writeln(result);
end; end;
{ {
function TMOCR.GetUpTextAt(atX, atY: integer): string; function TMOCR.GetUpTextAt(atX, atY: integer): string;
var var
@ -294,7 +318,8 @@ var
n:Tnormarray; n:Tnormarray;
begin begin
t:=MakeTPAString('01:44 < mixster> Wizzup: Lies! How can my laptop handle that as well as playing music if even ownage machines suffer from it?'); // t:=MakeTPAString('01:44 < mixster> Wizzup: Lies! How can my laptop handle that as well as playing music if even ownage machines suffer from it?');
t:=MakeTPAString('Wizzup Lies How can my laptop handle that as well as playing music if even ownage machines suffer from it');
writeln(inttostr(length(t))); writeln(inttostr(length(t)));
b := TMufasaBitmap.Create; b := TMufasaBitmap.Create;
b.SetSize(1000,1000); b.SetSize(1000,1000);
@ -322,11 +347,11 @@ begin
Inc(P); Inc(P);
end; end;
Result := ocrDetect(n, b.Width, b.Height, OCRData[0]); Result := ocrDetect(n, b.Width, b.Height, OCRData[1]);
writeln(result); writeln(result);
end; } end; }
{ {
function TMOCR.GetUpTextAt(atX, atY: integer): string; function TMOCR.GetUpTextAt(atX, atY: integer): string;

2
Units/MMLCore/ocrutil.pas
View File

@ -593,7 +593,7 @@ begin
SetLength(bmp,length(str)); SetLength(bmp,length(str));
for i:= 0 to length(str)-1 do for i:= 0 to length(str)-1 do
begin begin
bmp[i]:= ReadBmp('/home/merlijn/Programs/mufasa/Fonts/UpChars/' + inttostr(ord(str[i+1])) + '.bmp'); bmp[i]:= ReadBmp('/home/merlijn/Programs/mufasa/Fonts/StatChars/' + inttostr(ord(str[i+1])) + '.bmp');
SetLength(result,c+bmp[i].width*bmp[i].height); SetLength(result,c+bmp[i].width*bmp[i].height);
for j:= 0 to bmp[i].width*bmp[i].height - 1 do for j:= 0 to bmp[i].width*bmp[i].height - 1 do
begin begin

3
Units/MMLCore/window.pas
View File

@ -337,11 +337,12 @@ begin
Writeln('ReturnData: XGetImage Error. Dumping data now:'); Writeln('ReturnData: XGetImage Error. Dumping data now:');
Writeln('xs, ys, width, height: ' + inttostr(xs) + ', ' + inttostr(ys) + Writeln('xs, ys, width, height: ' + inttostr(xs) + ', ' + inttostr(ys) +
', ' + inttostr(width) + ', ' + inttostr(height)); ', ' + inttostr(width) + ', ' + inttostr(height));
raise Exception.CreateFMT('TMWindow.ReturnData: ReturnData: XGetImage Error', []);
Result.Ptr := nil; Result.Ptr := nil;
Result.IncPtrWith := 0; Result.IncPtrWith := 0;
XSetErrorHandler(Old_Handler); XSetErrorHandler(Old_Handler);
raise Exception.CreateFMT('TMWindow.ReturnData: ReturnData: XGetImage Error', []);
Exit; Exit;
end; end;
//WriteLn(IntToStr(Self.XWindowImage^.width) + ', ' + IntToStr(Self.XWindowImage^.height)); //WriteLn(IntToStr(Self.XWindowImage^.width) + ', ' + IntToStr(Self.XWindowImage^.height));