rs_GetUpText should work now in the GUI. It probably still needs internal tweaking, but you can test it now, and report pictures of situations where it does not work.

I may have left some debugging writeln's in - remove them when they annoy you.

Also uploaded the old UpChars font.




git-svn-id: http://www.villavu.com/repositories/merlijn/mufasa@179 3f818213-9676-44b0-a9b4-5e4c4e03d09d

Projects/MufasaTests/project1.lpi

@@ -11,7 +11,7 @@
       <TargetFileExt Value=""/>
       <Icon Value="0"/>
       <UseXPManifest Value="True"/>
-      <ActiveEditorIndexAtStart Value="2"/>
+      <ActiveEditorIndexAtStart Value="0"/>
     </General>
     <VersionInfo>
       <ProjectVersion Value=""/>
@@ -30,15 +30,15 @@
         <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
-    <Units Count="17">
+    <Units Count="19">
       <Unit0>
         <Filename Value="project1.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="project1"/>
-        <CursorPos X="32" Y="57"/>
+        <CursorPos X="71" Y="93"/>
-        <TopLine Value="63"/>
+        <TopLine Value="81"/>
         <EditorIndex Value="0"/>
-        <UsageCount Value="36"/>
+        <UsageCount Value="38"/>
         <Loaded Value="True"/>
       </Unit0>
       <Unit1>
@@ -51,10 +51,10 @@
       <Unit2>
         <Filename Value="../../Units/MMLCore/client.pas"/>
         <UnitName Value="Client"/>
-        <CursorPos X="48" Y="33"/>
+        <CursorPos X="40" Y="5"/>
-        <TopLine Value="21"/>
+        <TopLine Value="5"/>
         <EditorIndex Value="1"/>
-        <UsageCount Value="13"/>
+        <UsageCount Value="14"/>
         <Loaded Value="True"/>
       </Unit2>
       <Unit3>
@@ -67,10 +67,10 @@
       <Unit4>
         <Filename Value="../../Units/MMLCore/window.pas"/>
         <UnitName Value="Window"/>
-        <CursorPos X="56" Y="167"/>
+        <CursorPos X="1" Y="1"/>
-        <TopLine Value="146"/>
+        <TopLine Value="1"/>
-        <EditorIndex Value="4"/>
+        <EditorIndex Value="5"/>
-        <UsageCount Value="12"/>
+        <UsageCount Value="13"/>
         <Loaded Value="True"/>
       </Unit4>
       <Unit5>
@@ -99,17 +99,17 @@
         <UnitName Value="MufasaTypes"/>
         <CursorPos X="50" Y="55"/>
         <TopLine Value="31"/>
-        <EditorIndex Value="5"/>
+        <EditorIndex Value="6"/>
-        <UsageCount Value="14"/>
+        <UsageCount Value="15"/>
         <Loaded Value="True"/>
       </Unit8>
       <Unit9>
         <Filename Value="../../Units/MMLCore/ocr.pas"/>
         <UnitName Value="ocr"/>
-        <CursorPos X="34" Y="661"/>
+        <CursorPos X="38" Y="659"/>
-        <TopLine Value="637"/>
+        <TopLine Value="645"/>
         <EditorIndex Value="2"/>
-        <UsageCount Value="13"/>
+        <UsageCount Value="14"/>
         <Loaded Value="True"/>
       </Unit9>
       <Unit10>
@@ -135,10 +135,10 @@
       <Unit13>
         <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
         <UnitName Value="bitmaps"/>
-        <CursorPos X="1" Y="483"/>
+        <CursorPos X="25" Y="490"/>
-        <TopLine Value="459"/>
+        <TopLine Value="469"/>
-        <EditorIndex Value="3"/>
+        <EditorIndex Value="4"/>
-        <UsageCount Value="11"/>
+        <UsageCount Value="12"/>
         <Loaded Value="True"/>
       </Unit13>
       <Unit14>
@@ -161,128 +161,135 @@
         <TopLine Value="235"/>
         <UsageCount Value="10"/>
       </Unit16>
+      <Unit17>
+        <Filename Value="../../../../Documents/fpc/rtl/i386/mmx.pp"/>
+        <UnitName Value="mmx"/>
+        <CursorPos X="80" Y="15"/>
+        <TopLine Value="71"/>
+        <UsageCount Value="10"/>
+      </Unit17>
+      <Unit18>
+        <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/ocr.inc"/>
+        <CursorPos X="20" Y="5"/>
+        <TopLine Value="1"/>
+        <EditorIndex Value="3"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit18>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="28" HistoryIndex="27">
       <Position1>
         <Filename Value="../../Units/MMLCore/ocr.pas"/>
-        <Caret Line="645" Column="49" TopLine="625"/>
+        <Caret Line="673" Column="15" TopLine="652"/>
       </Position1>
       <Position2>
-        <Filename Value="project1.lpr"/>
+        <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
-        <Caret Line="87" Column="27" TopLine="69"/>
+        <Caret Line="62" Column="33" TopLine="47"/>
       </Position2>
       <Position3>
         <Filename Value="../../Units/MMLCore/ocr.pas"/>
-        <Caret Line="508" Column="17" TopLine="503"/>
+        <Caret Line="673" Column="20" TopLine="652"/>
       </Position3>
       <Position4>
-        <Filename Value="../../Units/MMLCore/ocr.pas"/>
+        <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
-        <Caret Line="471" Column="55" TopLine="456"/>
+        <Caret Line="62" Column="33" TopLine="47"/>
       </Position4>
       <Position5>
-        <Filename Value="../../Units/MMLCore/ocr.pas"/>
+        <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
-        <Caret Line="649" Column="16" TopLine="626"/>
+        <Caret Line="483" Column="21" TopLine="459"/>
       </Position5>
       <Position6>
         <Filename Value="../../Units/MMLCore/ocr.pas"/>
-        <Caret Line="649" Column="19" TopLine="626"/>
+        <Caret Line="656" Column="18" TopLine="636"/>
       </Position6>
       <Position7>
-        <Filename Value="../../Units/MMLCore/ocr.pas"/>
+        <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
-        <Caret Line="646" Column="58" TopLine="625"/>
+        <Caret Line="62" Column="33" TopLine="47"/>
       </Position7>
       <Position8>
-        <Filename Value="project1.lpr"/>
+        <Filename Value="../../Units/MMLCore/ocr.pas"/>
-        <Caret Line="87" Column="25" TopLine="69"/>
+        <Caret Line="653" Column="39" TopLine="637"/>
       </Position8>
       <Position9>
-        <Filename Value="../../Units/MMLCore/ocr.pas"/>
+        <Filename Value="../../Units/MMLCore/window.pas"/>
-        <Caret Line="631" Column="65" TopLine="614"/>
+        <Caret Line="52" Column="40" TopLine="37"/>
       </Position9>
       <Position10>
-        <Filename Value="../../Units/MMLCore/ocr.pas"/>
+        <Filename Value="../../Units/MMLCore/window.pas"/>
-        <Caret Line="633" Column="29" TopLine="618"/>
+        <Caret Line="73" Column="33" TopLine="58"/>
       </Position10>
       <Position11>
-        <Filename Value="project1.lpr"/>
+        <Filename Value="../../Units/MMLCore/window.pas"/>
-        <Caret Line="80" Column="29" TopLine="65"/>
+        <Caret Line="373" Column="39" TopLine="368"/>
       </Position11>
       <Position12>
-        <Filename Value="project1.lpr"/>
+        <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
-        <Caret Line="43" Column="27" TopLine="24"/>
+        <Caret Line="98" Column="27" TopLine="91"/>
       </Position12>
       <Position13>
-        <Filename Value="project1.lpr"/>
+        <Filename Value="../../Units/MMLCore/ocr.pas"/>
-        <Caret Line="61" Column="3" TopLine="54"/>
+        <Caret Line="656" Column="33" TopLine="637"/>
       </Position13>
       <Position14>
-        <Filename Value="project1.lpr"/>
+        <Filename Value="../../Units/MMLCore/window.pas"/>
-        <Caret Line="75" Column="17" TopLine="61"/>
+        <Caret Line="63" Column="37" TopLine="47"/>
       </Position14>
       <Position15>
-        <Filename Value="../../Units/MMLCore/window.pas"/>
+        <Filename Value="project1.lpr"/>
-        <Caret Line="161" Column="1" TopLine="146"/>
+        <Caret Line="68" Column="30" TopLine="63"/>
       </Position15>
       <Position16>
-        <Filename Value="../../Units/MMLCore/window.pas"/>
+        <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
-        <Caret Line="165" Column="21" TopLine="146"/>
+        <Caret Line="487" Column="3" TopLine="469"/>
       </Position16>
       <Position17>
         <Filename Value="project1.lpr"/>
-        <Caret Line="62" Column="32" TopLine="41"/>
+        <Caret Line="81" Column="4" TopLine="66"/>
       </Position17>
       <Position18>
-        <Filename Value="../../Units/MMLCore/client.pas"/>
+        <Filename Value="project1.lpr"/>
-        <Caret Line="33" Column="49" TopLine="21"/>
+        <Caret Line="60" Column="4" TopLine="45"/>
       </Position18>
       <Position19>
-        <Filename Value="../../Units/MMLCore/ocr.pas"/>
+        <Filename Value="project1.lpr"/>
-        <Caret Line="13" Column="41" TopLine="1"/>
+        <Caret Line="81" Column="4" TopLine="66"/>
       </Position19>
       <Position20>
-        <Filename Value="../../Units/MMLCore/ocr.pas"/>
+        <Filename Value="project1.lpr"/>
-        <Caret Line="665" Column="87" TopLine="645"/>
+        <Caret Line="60" Column="4" TopLine="45"/>
       </Position20>
       <Position21>
-        <Filename Value="../../Units/MMLCore/client.pas"/>
+        <Filename Value="../../Units/MMLCore/ocr.pas"/>
-        <Caret Line="33" Column="48" TopLine="21"/>
+        <Caret Line="11" Column="67" TopLine="1"/>
       </Position21>
       <Position22>
         <Filename Value="../../Units/MMLCore/ocr.pas"/>
-        <Caret Line="319" Column="61" TopLine="295"/>
+        <Caret Line="466" Column="18" TopLine="451"/>
       </Position22>
       <Position23>
         <Filename Value="../../Units/MMLCore/ocr.pas"/>
-        <Caret Line="667" Column="48" TopLine="653"/>
+        <Caret Line="477" Column="36" TopLine="45"/>
       </Position23>
       <Position24>
         <Filename Value="../../Units/MMLCore/ocr.pas"/>
-        <Caret Line="673" Column="15" TopLine="652"/>
+        <Caret Line="493" Column="19" TopLine="478"/>
       </Position24>
       <Position25>
         <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
-        <Caret Line="62" Column="33" TopLine="47"/>
+        <Caret Line="98" Column="33" TopLine="91"/>
       </Position25>
       <Position26>
-        <Filename Value="../../Units/MMLCore/ocr.pas"/>
+        <Filename Value="../../Units/MMLCore/client.pas"/>
-        <Caret Line="673" Column="20" TopLine="652"/>
+        <Caret Line="33" Column="53" TopLine="31"/>
       </Position26>
       <Position27>
-        <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
+        <Filename Value="project1.lpr"/>
-        <Caret Line="62" Column="33" TopLine="47"/>
+        <Caret Line="12" Column="6" TopLine="1"/>
       </Position27>
       <Position28>
-        <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
+        <Filename Value="project1.lpr"/>
-        <Caret Line="483" Column="21" TopLine="459"/>
+        <Caret Line="41" Column="17" TopLine="23"/>
       </Position28>
-      <Position29>
-        <Filename Value="../../Units/MMLCore/ocr.pas"/>
-        <Caret Line="656" Column="18" TopLine="636"/>
-      </Position29>
-      <Position30>
-        <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
-        <Caret Line="62" Column="33" TopLine="47"/>
-      </Position30>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>

Projects/MufasaTests/project1.lpr

@@ -10,7 +10,7 @@ uses
   Forms,Interfaces,
   LCLIntf,
   Client,
-  bitmaps
+  bitmaps,x
 
 
   { you can add units after this };
@@ -59,6 +59,7 @@ begin
   C := TClient.Create;
   {$WARNING Change This Path!}
   C.MOCR.InitTOCR('/home/merlijn/Programs/mufasa/Fonts/');
+  //C.MOCR.InitTOCR('/home/merlijn/Programs/mufasa/ben/');
 
  {C.MWindow.GetDimensions(W, H);
   Time := GetTickCount;
@@ -80,21 +81,21 @@ begin
 
   {$WARNING Change This Path!}
  //bmp.LoadFromFile('/home/merlijn/Programs/mufasa/UpText/text5.bmp');
-  bmp.LoadFromFile('/home/merlijn/Programs/mufasa/hoi.bmp');
+  //bmp.LoadFromFile('/home/merlijn/Programs/mufasa/output.bmp');
 
   writeln(inttostr(bmp.Width) + ', ' + inttostr(bmp.height));
+  C.MWindow.SetTarget(x.TWindow(94371927));
+  //C.MWindow.SetTarget(bmp);
 
-  C.MWindow.SetTarget(bmp);
+ { Time := GetTickCount;
-
-  Time := GetTickCount;
   for i := 0 to 100 do
-    C.MOCR.GetUpTextAt(10,10);
+    C.MOCR.GetUpTextAt(0,0);
-  writeln('Time: ' + FloatToStr(((GetTickCount - Time) / (i + 1))));
+  writeln('Time: ' + FloatToStr(((GetTickCount - Time) / (i + 1)))); }
-  writeln(C.MOCR.GetUpTextAt(10,10));
+  writeln(C.MOCR.GetUpTextAt(7,7));
 
   C.Free;
-  bmp.OnDestroy:=nil;
+  //bmp.OnDestroy:=nil;
-  bmp.Free;
+  //bmp.Free;
 
 
   // stop program loop

Projects/SAMufasaGUI/framescript.lfm

@@ -22,7 +22,7 @@ object ScriptFrame: TScriptFrame
     ParentFont = False
     TabOrder = 0
     BookMarkOptions.OnChange = nil
-    Gutter.Width = 57
+    Gutter.Width = 61
     Gutter.MouseActions = <    
       item
         Shift = []
@@ -597,7 +597,7 @@ object ScriptFrame: TScriptFrame
         Width = 23
       end
       object TSynGutterLineNumber
-        Width = 17
+        Width = 21
         MouseActions = <>
         MarkupInfo.Background = clBtnFace
         MarkupInfo.Foreground = clNone

Projects/SAMufasaGUI/framescript.lrs

@@ -6,7 +6,7 @@ LazarusResources.Add('TScriptFrame','FORMDATA',[
   +'t'#11'Font.Height'#2#243#9'Font.Name'#6#11'Courier New'#10'Font.Pitch'#7#7
   +'fpFixed'#12'Font.Quality'#7#16'fqNonAntialiased'#11'ParentColor'#8#10'Paren'
   +'tFont'#8#8'TabOrder'#2#0#24'BookMarkOptions.OnChange'#13#12'Gutter.Width'#2
-  +'9'#19'Gutter.MouseActions'#14#1#5'Shift'#11#0#9'ShiftMask'#11#0#6'Button'#7
+  +'='#19'Gutter.MouseActions'#14#1#5'Shift'#11#0#9'ShiftMask'#11#0#6'Button'#7
   +#6'mbLeft'#10'ClickCount'#7#5'ccAny'#8'ClickDir'#7#6'cdDown'#7'Command'#2#13
   +#9'MoveCaret'#8#6'Option'#2#0#8'Priority'#2#0#0#1#5'Shift'#11#0#9'ShiftMask'
   +#11#0#6'Button'#7#7'mbRight'#10'ClickCount'#7#8'ccSingle'#8'ClickDir'#7#4'cd'
@@ -116,7 +116,7 @@ LazarusResources.Add('TScriptFrame','FORMDATA',[
   +#8'OnChange'#7#13'SynEditChange'#16'OnProcessCommand'#7#21'SynEditProcessCom'
   +'mand'#19'OnSpecialLineColors'#7#24'SynEditSpecialLineColors'#0#18'TSynGutte'
   +'rPartList'#0#0#15'TSynGutterMarks'#0#5'Width'#2#23#0#0#20'TSynGutterLineNum'
-  +'ber'#0#5'Width'#2#17#12'MouseActions'#14#0#21'MarkupInfo.Background'#7#9'cl'
+  +'ber'#0#5'Width'#2#21#12'MouseActions'#14#0#21'MarkupInfo.Background'#7#9'cl'
   +'BtnFace'#21'MarkupInfo.Foreground'#7#6'clNone'#10'DigitCount'#2#2#30'ShowOn'
   +'lyLineNumbersMultiplesOf'#2#1#9'ZeroStart'#8#12'LeadingZeros'#8#0#0#17'TSyn'
   +'GutterChanges'#0#5'Width'#2#4#13'ModifiedColor'#4#252#233#0#0#10'SavedColor'

Projects/SAMufasaGUI/project1.lpi

@@ -33,7 +33,7 @@
         <PackageName Value="LCL"/>
       </Item2>
     </RequiredPackages>
-    <Units Count="196">
+    <Units Count="198">
       <Unit0>
         <Filename Value="project1.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -168,8 +168,8 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="TestUnit"/>
-        <CursorPos X="25" Y="585"/>
+        <CursorPos X="32" Y="265"/>
-        <TopLine Value="570"/>
+        <TopLine Value="250"/>
         <EditorIndex Value="0"/>
         <UsageCount Value="202"/>
         <Loaded Value="True"/>
@@ -225,9 +225,9 @@
         <Filename Value="../../Units/MMLCore/client.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Client"/>
-        <CursorPos X="25" Y="42"/>
+        <CursorPos X="37" Y="33"/>
         <TopLine Value="31"/>
-        <EditorIndex Value="10"/>
+        <EditorIndex Value="6"/>
         <UsageCount Value="201"/>
         <Loaded Value="True"/>
       </Unit26>
@@ -258,8 +258,8 @@
         <Filename Value="../../Units/MMLCore/window.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Window"/>
-        <CursorPos X="5" Y="37"/>
+        <CursorPos X="40" Y="363"/>
-        <TopLine Value="15"/>
+        <TopLine Value="348"/>
         <EditorIndex Value="2"/>
         <UsageCount Value="201"/>
         <Loaded Value="True"/>
@@ -274,19 +274,17 @@
       <Unit32>
         <Filename Value="../../Units/MMLCore/windowutil.pas"/>
         <UnitName Value="windowutil"/>
-        <CursorPos X="33" Y="107"/>
+        <CursorPos X="86" Y="19"/>
-        <TopLine Value="85"/>
+        <TopLine Value="1"/>
-        <EditorIndex Value="5"/>
         <UsageCount Value="31"/>
-        <Loaded Value="True"/>
       </Unit32>
       <Unit33>
         <Filename Value="../../Units/MMLCore/input.pas"/>
         <UnitName Value="Input"/>
         <CursorPos X="3" Y="176"/>
-        <TopLine Value="154"/>
+        <TopLine Value="145"/>
-        <EditorIndex Value="11"/>
+        <EditorIndex Value="8"/>
-        <UsageCount Value="53"/>
+        <UsageCount Value="54"/>
         <Loaded Value="True"/>
       </Unit33>
       <Unit34>
@@ -316,9 +314,9 @@
         <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="mmlpsthread"/>
-        <CursorPos X="26" Y="31"/>
+        <CursorPos X="29" Y="349"/>
-        <TopLine Value="17"/>
+        <TopLine Value="333"/>
-        <EditorIndex Value="9"/>
+        <EditorIndex Value="3"/>
         <UsageCount Value="202"/>
         <Loaded Value="True"/>
       </Unit37>
@@ -385,10 +383,10 @@
       </Unit46>
       <Unit47>
         <Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
-        <CursorPos X="26" Y="121"/>
+        <CursorPos X="48" Y="96"/>
-        <TopLine Value="99"/>
+        <TopLine Value="87"/>
-        <EditorIndex Value="12"/>
+        <EditorIndex Value="9"/>
-        <UsageCount Value="75"/>
+        <UsageCount Value="76"/>
         <Loaded Value="True"/>
       </Unit47>
       <Unit48>
@@ -407,9 +405,9 @@
         <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="bitmaps"/>
-        <CursorPos X="25" Y="474"/>
+        <CursorPos X="29" Y="485"/>
-        <TopLine Value="452"/>
+        <TopLine Value="469"/>
-        <EditorIndex Value="3"/>
+        <EditorIndex Value="7"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit50>
@@ -429,11 +427,9 @@
       <Unit53>
         <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/bitmap.inc"/>
         <IsPartOfProject Value="True"/>
-        <CursorPos X="32" Y="116"/>
+        <CursorPos X="42" Y="236"/>
-        <TopLine Value="114"/>
+        <TopLine Value="200"/>
-        <EditorIndex Value="13"/>
         <UsageCount Value="201"/>
-        <Loaded Value="True"/>
       </Unit53>
       <Unit54>
         <Filename Value="../../../FPC/FPCCheckout/packages/fcl-image/src/fpcanvas.inc"/>
@@ -465,11 +461,9 @@
       <Unit58>
         <Filename Value="../../../FPC/FPCCheckout/packages/fcl-image/src/fpimage.pp"/>
         <UnitName Value="FPimage"/>
-        <CursorPos X="17" Y="133"/>
+        <CursorPos X="21" Y="239"/>
-        <TopLine Value="111"/>
+        <TopLine Value="214"/>
-        <EditorIndex Value="7"/>
         <UsageCount Value="18"/>
-        <Loaded Value="True"/>
       </Unit58>
       <Unit59>
         <Filename Value="../../../FPC/FPCCheckout/packages/fcl-image/src/fpimage.inc"/>
@@ -487,11 +481,9 @@
       <Unit61>
         <Filename Value="../../../lazarus/lcl/intfgraphics.pas"/>
         <UnitName Value="IntfGraphics"/>
-        <CursorPos X="3" Y="112"/>
+        <CursorPos X="84" Y="1334"/>
-        <TopLine Value="90"/>
+        <TopLine Value="1334"/>
-        <EditorIndex Value="6"/>
+        <UsageCount Value="9"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit61>
       <Unit62>
         <Filename Value="../../../lazarus/lcl/graphtype.pp"/>
@@ -588,8 +580,8 @@
         <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/other.inc"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <EditorIndex Value="14"/>
+        <EditorIndex Value="10"/>
-        <UsageCount Value="19"/>
+        <UsageCount Value="20"/>
         <Loaded Value="True"/>
       </Unit76>
       <Unit77>
@@ -763,10 +755,8 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="windowselector"/>
         <CursorPos X="38" Y="161"/>
-        <TopLine Value="139"/>
+        <TopLine Value="135"/>
-        <EditorIndex Value="8"/>
+        <UsageCount Value="199"/>
-        <UsageCount Value="196"/>
-        <Loaded Value="True"/>
       </Unit101>
       <Unit102>
         <Filename Value="../../../usr/lib64/fpc/2.2.4/source/rtl/objpas/classes/classesh.inc"/>
@@ -800,7 +790,7 @@
         <UnitName Value="dtmutil"/>
         <CursorPos X="32" Y="18"/>
         <TopLine Value="1"/>
-        <UsageCount Value="183"/>
+        <UsageCount Value="186"/>
       </Unit106>
       <Unit107>
         <Filename Value="../../../cogat/Units/CogatUnits/compmaths.pas"/>
@@ -842,7 +832,7 @@
         <UnitName Value="mmath"/>
         <CursorPos X="32" Y="42"/>
         <TopLine Value="16"/>
-        <UsageCount Value="163"/>
+        <UsageCount Value="166"/>
       </Unit112>
       <Unit113>
         <Filename Value="../../../Documents/fpc/rtl/objpas/types.pp"/>
@@ -876,10 +866,10 @@
         <Filename Value="../../Units/MMLCore/ocr.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ocr"/>
-        <CursorPos X="35" Y="657"/>
+        <CursorPos X="11" Y="657"/>
-        <TopLine Value="639"/>
+        <TopLine Value="645"/>
-        <EditorIndex Value="4"/>
+        <EditorIndex Value="5"/>
-        <UsageCount Value="133"/>
+        <UsageCount Value="136"/>
         <Loaded Value="True"/>
       </Unit117>
       <Unit118>
@@ -895,7 +885,7 @@
         <UnitName Value="project"/>
         <CursorPos X="46" Y="15"/>
         <TopLine Value="1"/>
-        <UsageCount Value="130"/>
+        <UsageCount Value="133"/>
       </Unit119>
       <Unit120>
         <Filename Value="../../../FPC/FPCCheckout/rtl/inc/heap.inc"/>
@@ -1009,7 +999,7 @@
         <UnitName Value="web"/>
         <CursorPos X="90" Y="16"/>
         <TopLine Value="1"/>
-        <UsageCount Value="58"/>
+        <UsageCount Value="61"/>
       </Unit137>
       <Unit138>
         <Filename Value="../../../lazarus/lcl/lazhelphtml.pas"/>
@@ -1210,8 +1200,8 @@
         <UnitName Value="framescript"/>
         <CursorPos X="24" Y="32"/>
         <TopLine Value="32"/>
-        <EditorIndex Value="15"/>
+        <EditorIndex Value="11"/>
-        <UsageCount Value="51"/>
+        <UsageCount Value="54"/>
         <Loaded Value="True"/>
       </Unit162>
       <Unit163>
@@ -1430,127 +1420,141 @@
         <TopLine Value="1424"/>
         <UsageCount Value="10"/>
       </Unit195>
+      <Unit196>
+        <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/ocr.inc"/>
+        <CursorPos X="33" Y="4"/>
+        <TopLine Value="1"/>
+        <EditorIndex Value="4"/>
+        <UsageCount Value="11"/>
+        <Loaded Value="True"/>
+      </Unit196>
+      <Unit197>
+        <Filename Value="../../../../Documents/lazarus/lcl/interfaces/gtk/gtkwidgetset.inc"/>
+        <CursorPos X="1" Y="1291"/>
+        <TopLine Value="1276"/>
+        <UsageCount Value="10"/>
+      </Unit197>
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="testunit.pas"/>
-        <Caret Line="446" Column="17" TopLine="441"/>
+        <Caret Line="345" Column="28" TopLine="325"/>
       </Position1>
       <Position2>
         <Filename Value="testunit.pas"/>
-        <Caret Line="867" Column="3" TopLine="865"/>
+        <Caret Line="374" Column="23" TopLine="343"/>
       </Position2>
       <Position3>
         <Filename Value="testunit.pas"/>
-        <Caret Line="444" Column="14" TopLine="441"/>
+        <Caret Line="91" Column="96" TopLine="80"/>
       </Position3>
       <Position4>
         <Filename Value="testunit.pas"/>
-        <Caret Line="355" Column="3" TopLine="350"/>
+        <Caret Line="203" Column="23" TopLine="184"/>
       </Position4>
       <Position5>
         <Filename Value="testunit.pas"/>
-        <Caret Line="446" Column="14" TopLine="441"/>
+        <Caret Line="379" Column="26" TopLine="372"/>
       </Position5>
       <Position6>
         <Filename Value="testunit.pas"/>
-        <Caret Line="869" Column="9" TopLine="865"/>
+        <Caret Line="437" Column="82" TopLine="426"/>
       </Position6>
       <Position7>
         <Filename Value="testunit.pas"/>
-        <Caret Line="184" Column="12" TopLine="173"/>
+        <Caret Line="17" Column="76" TopLine="9"/>
       </Position7>
       <Position8>
         <Filename Value="testunit.pas"/>
-        <Caret Line="410" Column="15" TopLine="399"/>
+        <Caret Line="137" Column="31" TopLine="118"/>
       </Position8>
       <Position9>
-        <Filename Value="testunit.pas"/>
+        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="6" Column="68" TopLine="1"/>
+        <Caret Line="193" Column="21" TopLine="177"/>
       </Position9>
       <Position10>
-        <Filename Value="testunit.pas"/>
+        <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/ocr.inc"/>
-        <Caret Line="184" Column="12" TopLine="173"/>
+        <Caret Line="4" Column="21" TopLine="1"/>
       </Position10>
       <Position11>
-        <Filename Value="testunit.pas"/>
+        <Filename Value="../../Units/MMLCore/client.pas"/>
-        <Caret Line="410" Column="15" TopLine="399"/>
+        <Caret Line="33" Column="37" TopLine="31"/>
       </Position11>
       <Position12>
-        <Filename Value="testunit.pas"/>
+        <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
-        <Caret Line="869" Column="12" TopLine="858"/>
+        <Caret Line="7" Column="38" TopLine="1"/>
       </Position12>
       <Position13>
-        <Filename Value="testunit.pas"/>
+        <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
-        <Caret Line="444" Column="15" TopLine="441"/>
+        <Caret Line="62" Column="33" TopLine="47"/>
       </Position13>
       <Position14>
-        <Filename Value="../../Units/MMLCore/window.pas"/>
+        <Filename Value="../../Units/MMLCore/ocr.pas"/>
-        <Caret Line="5" Column="143" TopLine="1"/>
+        <Caret Line="663" Column="44" TopLine="645"/>
       </Position14>
       <Position15>
-        <Filename Value="../../Units/MMLCore/window.pas"/>
+        <Filename Value="../../Units/MMLCore/ocr.pas"/>
-        <Caret Line="52" Column="34" TopLine="1"/>
+        <Caret Line="662" Column="1" TopLine="645"/>
       </Position15>
       <Position16>
-        <Filename Value="../../Units/MMLCore/window.pas"/>
+        <Filename Value="../../Units/MMLCore/ocr.pas"/>
-        <Caret Line="73" Column="27" TopLine="45"/>
+        <Caret Line="661" Column="1" TopLine="645"/>
       </Position16>
       <Position17>
-        <Filename Value="../../Units/MMLCore/window.pas"/>
+        <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/ocr.inc"/>
-        <Caret Line="373" Column="33" TopLine="345"/>
+        <Caret Line="4" Column="32" TopLine="1"/>
       </Position17>
       <Position18>
-        <Filename Value="../../Units/MMLCore/window.pas"/>
+        <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
-        <Caret Line="37" Column="5" TopLine="13"/>
+        <Caret Line="484" Column="45" TopLine="469"/>
       </Position18>
       <Position19>
-        <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
+        <Filename Value="../../Units/MMLCore/ocr.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Caret Line="659" Column="43" TopLine="645"/>
       </Position19>
       <Position20>
-        <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
+        <Filename Value="../../Units/MMLCore/ocr.pas"/>
-        <Caret Line="41" Column="121" TopLine="29"/>
+        <Caret Line="671" Column="19" TopLine="648"/>
       </Position20>
       <Position21>
-        <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
+        <Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
-        <Caret Line="332" Column="13" TopLine="324"/>
+        <Caret Line="38" Column="39" TopLine="26"/>
       </Position21>
       <Position22>
-        <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
+        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="331" Column="36" TopLine="324"/>
+        <Caret Line="16" Column="70" TopLine="1"/>
       </Position22>
       <Position23>
-        <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
+        <Filename Value="../../Units/MMLCore/ocr.pas"/>
-        <Caret Line="329" Column="18" TopLine="304"/>
+        <Caret Line="669" Column="45" TopLine="654"/>
       </Position23>
       <Position24>
-        <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
+        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="474" Column="42" TopLine="440"/>
+        <Caret Line="152" Column="31" TopLine="146"/>
       </Position24>
       <Position25>
-        <Filename Value="../../Units/MMLCore/ocr.pas"/>
+        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="42" Column="43" TopLine="5"/>
+        <Caret Line="247" Column="21" TopLine="232"/>
       </Position25>
       <Position26>
-        <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
+        <Filename Value="testunit.pas"/>
-        <Caret Line="89" Column="79" TopLine="62"/>
+        <Caret Line="1" Column="1" TopLine="631"/>
       </Position26>
       <Position27>
-        <Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
+        <Filename Value="testunit.pas"/>
-        <Caret Line="121" Column="26" TopLine="85"/>
+        <Caret Line="264" Column="7" TopLine="242"/>
       </Position27>
       <Position28>
         <Filename Value="testunit.pas"/>
-        <Caret Line="463" Column="28" TopLine="441"/>
+        <Caret Line="265" Column="18" TopLine="250"/>
       </Position28>
       <Position29>
-        <Filename Value="../../Units/MMLCore/ocr.pas"/>
+        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="658" Column="12" TopLine="644"/>
+        <Caret Line="158" Column="50" TopLine="142"/>
       </Position29>
       <Position30>
-        <Filename Value="testunit.pas"/>
+        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="32" Column="3" TopLine="21"/>
+        <Caret Line="246" Column="21" TopLine="231"/>
       </Position30>
     </JumpHistory>
   </ProjectOptions>