--- parser3/src/classes/image.C 2001/05/02 11:49:17 1.23 +++ parser3/src/classes/image.C 2001/05/07 15:31:36 1.25 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: image.C,v 1.23 2001/05/02 11:49:17 paf Exp $ + $Id: image.C,v 1.25 2001/05/07 15:31:36 paf Exp $ */ #include "pa_config_includes.h" @@ -25,11 +25,12 @@ class MImage : public Methoded { public: // VStateless_class - Value *create_new_value(Pool& pool) { return new(pool) VImage(pool); } public: MImage(Pool& pool); + +public: // Methoded bool used_directly() { return true; } }; @@ -253,7 +254,6 @@ static size_t read_disk(void*& buf, size // methods -/// ^image:measure[DATA] static void _measure(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -300,9 +300,6 @@ static void append_attrib_pair(const Has if(value.is_string() || value.as_double()>=0) *ai.tag << "=\"" << value.as_string() << "\""; } -/** ^image.html[] - ^image.html[hash] -*/ static void _html(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -350,7 +347,6 @@ static gdImage *load(Request& r, const S } -/// ^image.load[background.gif] static void _load(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -363,9 +359,6 @@ static void _load(Request& r, const Stri static_cast(r.self)->set(&file_name, width, height, &image); } -/** ^image.create[width;height] bgcolor=white - ^image.create[width;height;bgcolor] -*/ static void _create(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -380,7 +373,6 @@ static void _create(Request& r, const St static_cast(r.self)->set(0, width, height, &image); } -/// ^image.gif[] static void _gif(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -402,7 +394,6 @@ static void _gif(Request& r, const Strin r.write_no_lang(vfile); } -/// ^image.line(x0;y0;x1;y1;color) static void _line(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -420,7 +411,6 @@ static void _line(Request& r, const Stri image->Color((int)r.process(params->get(4)).as_double())); } -/// ^image.fill(x;y;color) static void _fill(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -436,7 +426,6 @@ static void _fill(Request& r, const Stri image->Color((int)r.process(params->get(2)).as_double())); } -/// ^image.rectangle(x0;y0;x1;y1;color) static void _rectangle(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -454,7 +443,6 @@ static void _rectangle(Request& r, const image->Color((int)r.process(params->get(4)).as_double())); } -/// ^image.bar(x0;y0;x1;y1;color) static void _bar(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -472,7 +460,6 @@ static void _bar(Request& r, const Strin image->Color((int)r.process(params->get(4)).as_double())); } -/// ^image.replace(color-source;color-dest)(x;y)... point coord pairs static void _replace(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -499,7 +486,6 @@ static void _replace(Request& r, const S image->Color((int)r.process(params->get(1)).as_double()));// dest color } -/// ^image.polygon(color)(x;y)... point coord pairs static void _polygon(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -525,7 +511,6 @@ static void _polygon(Request& r, const S image->Color((int)r.process(params->get(0)).as_double())); } -/// ^image.polybar(color)(x;y)... point coord pairs static void _polybar(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -618,10 +603,6 @@ public: } }; -/** - ^image.font[alPHAbet;font-file-name.gif](height) - ^image.font[alPHAbet;font-file-name.gif](height;width) -*/ static void _font(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -637,7 +618,6 @@ static void _font(Request& r, const Stri height, width); } -/// ^image.text(x;y)[text] static void _text(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -668,46 +648,46 @@ MImage::MImage(Pool& apool) : Methoded(a // ^image:measure[DATA] add_native_method("measure", Method::CT_DYNAMIC, _measure, 1, 1); - /// ^image.html[] - /// ^image.html[hash] + // ^image.html[] + // ^image.html[hash] add_native_method("html", Method::CT_DYNAMIC, _html, 0, 1); - /// ^image.load[background.gif] + // ^image.load[background.gif] add_native_method("load", Method::CT_DYNAMIC, _load, 1, 1); - /// ^image.create[width;height] bgcolor=white - /// ^image.create[width;height;bgcolor] + // ^image.create[width;height] bgcolor=white + // ^image.create[width;height;bgcolor] add_native_method("create", Method::CT_DYNAMIC, _create, 2, 3); - /// ^image.gif[] + // ^image.gif[] add_native_method("gif", Method::CT_DYNAMIC, _gif, 0, 0); - /// ^image.line(x0;y0;x1;y1;color) + // ^image.line(x0;y0;x1;y1;color) add_native_method("line", Method::CT_DYNAMIC, _line, 5, 5); - /// ^image.fill(x;y;color) + // ^image.fill(x;y;color) add_native_method("fill", Method::CT_DYNAMIC, _fill, 3, 3); - /// ^image.rectangle(x0;y0;x1;y1;color) + // ^image.rectangle(x0;y0;x1;y1;color) add_native_method("rectangle", Method::CT_DYNAMIC, _rectangle, 5, 5); - /// ^image.bar(x0;y0;x1;y1;color) + // ^image.bar(x0;y0;x1;y1;color) add_native_method("bar", Method::CT_DYNAMIC, _bar, 5, 5); - /// ^image.replace(color-source;color-dest)(x;y)... point coord pairs + // ^image.replace(color-source;color-dest)(x;y)... point coord pairs add_native_method("replace", Method::CT_DYNAMIC, _replace, 2+3*2, 2+100*2); - /// ^image.polygon(color)(x;y)... point coord pairs + // ^image.polygon(color)(x;y)... point coord pairs add_native_method("polygon", Method::CT_DYNAMIC, _polygon, 1+3*2, 1+100*2); - /// ^image.polybar(color)(x;y)... point coord pairs + // ^image.polybar(color)(x;y)... point coord pairs add_native_method("polybar", Method::CT_DYNAMIC, _polybar, 1+3*2, 1+100*2); - /// ^image.font[alPHAbet;font-file-name.gif](height) - /// ^image.font[alPHAbet;font-file-name.gif](height;width) + // ^image.font[alPHAbet;font-file-name.gif](height) + // ^image.font[alPHAbet;font-file-name.gif](height;width) add_native_method("font", Method::CT_DYNAMIC, _font, 3, 4); - /// ^image.text(x;y)[text] + // ^image.text(x;y)[text] add_native_method("text", Method::CT_DYNAMIC, _text, 3, 3); }