Skip to content

Commit

Permalink
Export Set/GetToleranceSpeed3Modifier.
Browse files Browse the repository at this point in the history
Also initialise CTS3Modifier in TMFinder.Create.
  • Loading branch information
MerlijnWajer committed Dec 10, 2011
1 parent 2e3666e commit d2f3ecd
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 0 deletions.
10 changes: 10 additions & 0 deletions Units/MMLAddon/LPInc/Wrappers/lp_colour.inc
Expand Up @@ -48,6 +48,16 @@ begin
ps_GetToleranceSpeed2Modifiers(PExtended(Params^[0])^, PExtended(Params^[1])^);
end;

procedure Lape_SetToleranceSpeed3Modifier(const Params: PParamArray);
begin
ps_SetToleranceSpeed3Modifier(PExtended(Params^[0])^);
end;

function Lape_GetToleranceSpeed3Modifier(const Params: PParamArray): Extended;
begin
Result := ps_GetToleranceSpeed3Modifier();
end;

procedure Lape_SimilarColors(const Params: PParamArray; const Result: Pointer);
begin
Pboolean(Result)^ := ps_SimilarColors(Pinteger(Params^[0])^, Pinteger(Params^[1])^, Pinteger(Params^[2])^);
Expand Down
2 changes: 2 additions & 0 deletions Units/MMLAddon/LPInc/lpexportedmethods.inc
Expand Up @@ -161,6 +161,8 @@ AddGlobalFunc('procedure SetColorToleranceSpeed(cts: Integer);', @Lape_SetColorT
AddGlobalFunc('function GetToleranceSpeed: Integer', @Lape_GetToleranceSpeed);
AddGlobalFunc('procedure SetToleranceSpeed2Modifiers(nHue, nSat: Extended);', @Lape_SetToleranceSpeed2Modifiers);
AddGlobalFunc('procedure GetToleranceSpeed2Modifiers(var hMod, sMod: Extended);', @Lape_GetToleranceSpeed2Modifiers);
AddGlobalFunc('procedure SetToleranceSpeed3Modifier(Modifier: Extended);', @Lape_SetToleranceSpeed3Modifier);
AddGlobalFunc('function GetToleranceSpeed3Modifier: Extended;', @Lape_GetToleranceSpeed3Modifier);
AddGlobalFunc('function SimilarColors(Col1,Col2,Tol: integer): boolean', @Lape_SimilarColors);
AddGlobalFunc('function CountColor(Color, xs, ys, xe, ye: Integer): Integer', @Lape_CountColor);
AddGlobalFunc('function CountColorTolerance(Color, xs, ys, xe, ye, Tolerance: Integer): Integer', @Lape_CountColorTolerance);
Expand Down
10 changes: 10 additions & 0 deletions Units/MMLAddon/PSInc/Wrappers/colour.inc
Expand Up @@ -71,6 +71,16 @@ begin
CurrThread.Client.MFinder.GetToleranceSpeed2Modifiers(hMod, sMod);
end;

procedure ps_SetToleranceSpeed3Modifier(Modifier: Extended); extdecl;
begin
CurrThread.Client.MFinder.SetToleranceSpeed3Modifier(Modifier);
end;

function ps_GetToleranceSpeed3Modifier: extended; extdecl;
begin
Result := CurrThread.Client.MFinder.GetToleranceSpeed3Modifier();
end;

function ps_SimilarColors(Col1,Col2,Tol : integer) : boolean; extdecl;
begin;
Result := CurrThread.Client.MFinder.SimilarColors(Col1,Col2,Tol);
Expand Down
2 changes: 2 additions & 0 deletions Units/MMLAddon/PSInc/psexportedmethods.inc
Expand Up @@ -312,6 +312,8 @@ AddFunction(@ps_SetColorToleranceSpeed, 'procedure SetColorToleranceSpeed(cts: i
AddFunction(@ps_GetToleranceSpeed, 'function GetToleranceSpeed: Integer;');
AddFunction(@ps_SetToleranceSpeed2Modifiers, 'procedure SetToleranceSpeed2Modifiers(nHue, nSat: Extended);');
AddFunction(@ps_GetToleranceSpeed2Modifiers, 'procedure GetToleranceSpeed2Modifiers(var hMod, sMod: Extended);');
AddFunction(@ps_SetToleranceSpeed3Modifier, 'procedure SetToleranceSpeed3Modifier(Modifier: Extended);');
AddFunction(@ps_GetToleranceSpeed3Modifier, 'function GetToleranceSpeed3Modifier: Extended;');
AddFunction(@ps_GetColor,'function GetColor(x, y: Integer): Integer;');
AddFunction(@ps_GetColors,'function GetColors(const Coords : TPointArray) : TIntegerArray;');
AddFunction(@ps_GetColorsWrap,'procedure GetColorsWrap(Coords : TPointArray; var Colors :TIntegerArray);');
Expand Down
1 change: 1 addition & 0 deletions Units/MMLCore/finder.pas
Expand Up @@ -595,6 +595,7 @@ constructor TMFinder.Create(aClient: TObject);
Self.CTS := 1;
Self.hueMod := 0.2;
Self.satMod := 0.2;
Self.CTS3Modifier := 1;
if (Percentage[255] <> 1) then
for i := 0 to 255 do
Percentage[i] := i / 255;
Expand Down

0 comments on commit d2f3ecd

Please sign in to comment.