Fix: incorrect symbols; Report update;
This commit is contained in:
parent
01d6d7a5dd
commit
565cfaa226
|
@ -19,7 +19,7 @@ begin
|
||||||
with args do begin
|
with args do begin
|
||||||
width := 512;
|
width := 512;
|
||||||
height := 512;
|
height := 512;
|
||||||
f := 'sin(x) - y';
|
f := 'y = sin(x)';
|
||||||
zoom := 10;
|
zoom := 10;
|
||||||
centerX := 0;
|
centerX := 0;
|
||||||
centerY := 0;
|
centerY := 0;
|
||||||
|
@ -54,9 +54,14 @@ var
|
||||||
begin
|
begin
|
||||||
fname := '{f}_(z={z},cx={cx},cy={cy},WxH={w}x{h}).bmp';
|
fname := '{f}_(z={z},cx={cx},cy={cy},WxH={w}x{h}).bmp';
|
||||||
|
|
||||||
|
// replacing illegal characters for the filename
|
||||||
fn := stringReplace(args.f, ' ', '', [rfReplaceAll]);
|
fn := stringReplace(args.f, ' ', '', [rfReplaceAll]);
|
||||||
fn := stringReplace(fn, '*', '', [rfReplaceAll]);
|
fn := stringReplace(fn, '*', '', [rfReplaceAll]);
|
||||||
fn := stringReplace(fn, '/', ' div ', [rfReplaceAll]);
|
fn := stringReplace(fn, '/', ' div ', [rfReplaceAll]);
|
||||||
|
fn := stringReplace(fn, '<', ' lt ', [rfReplaceAll]);
|
||||||
|
fn := stringReplace(fn, '<=', ' le ', [rfReplaceAll]);
|
||||||
|
fn := stringReplace(fn, '>', ' gt ', [rfReplaceAll]);
|
||||||
|
fn := stringReplace(fn, '>=', ' ge ', [rfReplaceAll]);
|
||||||
|
|
||||||
fname := StringReplace(fname, '{f}', fn, []);
|
fname := StringReplace(fname, '{f}', fn, []);
|
||||||
fname := StringReplace(fname, '{z}', floatToStr(args.zoom), []);
|
fname := StringReplace(fname, '{z}', floatToStr(args.zoom), []);
|
||||||
|
|
|
@ -6,9 +6,9 @@ uses sysutils, BMPImage, ucomplex, utils;
|
||||||
|
|
||||||
type
|
type
|
||||||
TArgs = record
|
TArgs = record
|
||||||
power: longint;
|
|
||||||
width: longint; // TryStrToInt wants longint
|
width: longint; // TryStrToInt wants longint
|
||||||
height: longint;
|
height: longint;
|
||||||
|
power: longint;
|
||||||
zoom: extended;
|
zoom: extended;
|
||||||
center_x: extended;
|
center_x: extended;
|
||||||
center_y: extended;
|
center_y: extended;
|
||||||
|
@ -68,13 +68,13 @@ end;
|
||||||
procedure setDefaultArgs(var args: TArgs);
|
procedure setDefaultArgs(var args: TArgs);
|
||||||
begin
|
begin
|
||||||
with args do begin
|
with args do begin
|
||||||
power := 2;
|
|
||||||
width := 512;
|
width := 512;
|
||||||
height := 512;
|
height := 512;
|
||||||
|
power := 2;
|
||||||
zoom := 1;
|
zoom := 1;
|
||||||
center_x := 0;
|
center_x := 0;
|
||||||
center_y := 0;
|
center_y := 0;
|
||||||
out_path := './images';
|
out_path := './multibrot_images';
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
BIN
доклад.odt
BIN
доклад.odt
Binary file not shown.
Loading…
Reference in New Issue
Block a user