From ba84f84d102d1d56456b69952ecad45113450634 Mon Sep 17 00:00:00 2001 From: Alessandro Bonazzi Date: Thu, 30 Mar 2023 00:25:27 +0200 Subject: [PATCH] Patch level : 12.01 nopatch Files correlati : Commento : Aggiunti costruttori alla TRecordset_column_info --- src/include/report.h | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/src/include/report.h b/src/include/report.h index e95949a1a..580da9c83 100755 --- a/src/include/report.h +++ b/src/include/report.h @@ -25,6 +25,17 @@ class TRectype; #endif +#define REP_TEXT 'T' +#define REP_STRING 'S' +#define REP_NUM 'N' +#define REP_PRICE 'P' +#define REP_VAL 'V' +#define REP_DATE 'D' +#define REP_BOOL 'B' +#define REP_LINE 'L' +#define REP_RECT 'R' +#define REP_IMG 'I' + /////////////////////////////////////////////////////////// // TReport_font /////////////////////////////////////////////////////////// @@ -415,7 +426,17 @@ public: int id() const { return _id; } void set_id(int id) { _id = id; } char type() const { return _type; } - const char* type_name() const; + bool is_text() const { return type() == 'T'; } + bool is_string() const { return type() == 'S'; } + bool is_num() const { return type() == 'N'; } + bool is_price() const { return type() == 'P'; } + bool is_valuta() const { return type() == 'V'; } + bool is_date() const { return type() == 'D'; } + bool is_bool() const { return type() == 'B'; } + bool is_linea() const { return type() == 'L'; } + bool is_rect() const { return type() == 'R';} + bool is_image() const { return type() == 'I';} + const char* type_name() const; void set_type(char t) { _type = t; } void set_pos(long x, long y); void set_row(long y) { _rct.y = y; } @@ -424,6 +445,8 @@ public: void set_width(long dx) { _rct.set_width(dx); } void set_height(long dy) { _rct.set_height(dy); } const TReport_rct& get_rect() const { return _rct; } + long width() const { return _rct.width(); } + long height() const { _rct.height(); } void set_dynamic_height(bool dh); bool dynamic_height() const; @@ -707,6 +730,7 @@ public: bool export_text(const char * filename, int size = 0, bool signature = false); TReport(); + TReport(const char * name) { load(name); } virtual ~TReport(); }; @@ -721,7 +745,7 @@ protected: public: TProgram_report() {} - TProgram_report(const char * name) { load(name); } + TProgram_report(const char * name) : TReport(name) { } }; class TConfigurable_report : public TProgram_report