diff --git a/src/function_imaging.pas b/src/function_imaging.pas index 1c08893..85c2335 100644 --- a/src/function_imaging.pas +++ b/src/function_imaging.pas @@ -19,7 +19,7 @@ begin with args do begin width := 512; height := 512; - f := 'sin(x) - y'; + f := 'y = sin(x)'; zoom := 10; centerX := 0; centerY := 0; @@ -54,9 +54,14 @@ var begin 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(fn, '*', '', [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, '{z}', floatToStr(args.zoom), []); diff --git a/src/multibrot_imaging.pas b/src/multibrot_imaging.pas index 7601759..dc0122f 100644 --- a/src/multibrot_imaging.pas +++ b/src/multibrot_imaging.pas @@ -6,9 +6,9 @@ uses sysutils, BMPImage, ucomplex, utils; type TArgs = record - power: longint; width: longint; // TryStrToInt wants longint height: longint; + power: longint; zoom: extended; center_x: extended; center_y: extended; @@ -68,13 +68,13 @@ end; procedure setDefaultArgs(var args: TArgs); begin with args do begin - power := 2; width := 512; height := 512; + power := 2; zoom := 1; center_x := 0; center_y := 0; - out_path := './images'; + out_path := './multibrot_images'; end; end; diff --git a/доклад.odt b/доклад.odt index 66b351b..88b3149 100644 Binary files a/доклад.odt and b/доклад.odt differ