From 4112dd075d37d750b239a4578222ab135d565b36 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 21 Apr 2005 21:54:07 +0000 Subject: [PATCH] Patch level : 2.2 Files correlati : Ricompilazione Demo : [ ] Commento : MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Modlo contabilità industriale git-svn-id: svn://10.65.10.50/trunk@12986 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ci/ci0400.h | 2 - ci/ci0400a.h | 19 ++++++- ci/ci0400a.uml | 83 ++++++++++++----------------- ci/cii0.h | 7 --- ci/cilib.cpp | 130 +++++++++++++++++++++------------------------- ci/cimsk.h | 8 +-- include/campo.aut | 2 +- 7 files changed, 117 insertions(+), 134 deletions(-) delete mode 100755 ci/cii0.h diff --git a/ci/ci0400.h b/ci/ci0400.h index 86c4b98c7..151c3560b 100755 --- a/ci/ci0400.h +++ b/ci/ci0400.h @@ -8,8 +8,6 @@ class TImmissioneDocumenti_mask : public TAlmanac_mask { protected: -// ereditato da TMask - virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly) { return TRUE; } public: // ereditato da TAlmanac_mask diff --git a/ci/ci0400a.h b/ci/ci0400a.h index d5a2f28e7..1e3b339ce 100755 --- a/ci/ci0400a.h +++ b/ci/ci0400a.h @@ -1,4 +1,21 @@ // DEFINIZIONE CAMPI MASCHERE PER LA GESTIONE MASCHERE PER CALENDARIO // campi maschera ci0400a.uml -#include "cimsk.h" \ No newline at end of file +#include "cimsk.h" + +#define F_AL01 101 +#define F_AL02 102 +#define F_AL03 103 +#define F_AL04 104 +#define F_AL05 105 +#define F_AL06 106 +#define F_AL07 107 +#define F_AL08 108 +#define F_AL09 109 +#define F_AL10 110 +#define F_AL11 111 +#define F_AL12 112 +#define F_AL13 113 +#define F_AL14 114 +#define F_AL15 115 +#define F_AL16 116 diff --git a/ci/ci0400a.uml b/ci/ci0400a.uml index d27f9e43e..1d299fd0b 100755 --- a/ci/ci0400a.uml +++ b/ci/ci0400a.uml @@ -17,13 +17,13 @@ END LIST F_CHANGEMONTH 10 BEGIN - PROMPT -36 -11 "Mese " + PROMPT 18 -11 "Mese " FLAGS "M" END NUMBER F_CHANGEYEAR 4 BEGIN - PROMPT -46 -11 "Anno " + PROMPT 44 -11 "Anno " FLAGS "A" END @@ -43,161 +43,146 @@ END ENDPAGE -PAGE "Pagina 00" -1 -1 80 20 +PAGE "Pagina 1" -1 -1 80 20 -ALMANAC "Almanacco 00" 76 16 -BEGIN -END - -ENDPAGE - - -PAGE "Pagina 01" -1 -1 80 20 - -ALMANAC "Almanacco 01" 76 16 +ALMANAC F_AL01 76 16 BEGIN PROMPT 1 1 "" END ENDPAGE +PAGE "Pagina 2" -1 -1 80 20 -PAGE "Pagina 02" -1 -1 80 20 - -ALMANAC "Almanacco 02" 76 16 +ALMANAC F_AL02 76 16 BEGIN PROMPT 1 1 "" END ENDPAGE +PAGE "Pagina 3" -1 -1 80 20 -PAGE "Pagina 03" -1 -1 80 20 - -ALMANAC "Almanacco 03" 76 16 +ALMANAC F_AL03 76 16 BEGIN PROMPT 1 1 "" END ENDPAGE +PAGE "Pagina 4" -1 -1 80 20 -PAGE "Pagina 04" -1 -1 80 20 - -ALMANAC "Almanacco 04" 76 16 +ALMANAC F_AL04 76 16 BEGIN PROMPT 1 1 "" END ENDPAGE +PAGE "Pagina 5" -1 -1 80 20 -PAGE "Pagina 05" -1 -1 80 20 - -ALMANAC "Almanacco 05" 76 16 +ALMANAC F_AL05 76 16 BEGIN PROMPT 1 1 "" END ENDPAGE +PAGE "Pagina 6" -1 -1 80 20 -PAGE "Pagina 06" -1 -1 80 20 - -ALMANAC "Almanacco 06" 76 16 +ALMANAC F_AL06 76 16 BEGIN PROMPT 1 1 "" END ENDPAGE +PAGE "Pagina 7" -1 -1 80 20 -PAGE "Pagina 07" -1 -1 80 20 - -ALMANAC "Almanacco 07" 76 16 +ALMANAC F_AL07 76 16 BEGIN PROMPT 1 1 "" END ENDPAGE +PAGE "Pagina 8" -1 -1 80 20 -PAGE "Pagina 08" -1 -1 80 20 - -ALMANAC "Almanacco 08" 76 16 +ALMANAC F_AL08 76 16 BEGIN PROMPT 1 1 "" END ENDPAGE +PAGE "Pagina 9" -1 -1 80 20 -PAGE "Pagina 09" -1 -1 80 20 - -ALMANAC "Almanacco 09" 76 16 +ALMANAC F_AL09 76 16 BEGIN PROMPT 1 1 "" END ENDPAGE - PAGE "Pagina 10" -1 -1 80 20 -ALMANAC "Almanacco 10" 76 16 +ALMANAC F_AL10 76 16 BEGIN PROMPT 1 1 "" END ENDPAGE - PAGE "Pagina 11" -1 -1 80 20 -ALMANAC "Almanacco 11" 76 16 +ALMANAC F_AL11 76 16 BEGIN PROMPT 1 1 "" END ENDPAGE - PAGE "Pagina 12" -1 -1 80 20 -ALMANAC "Almanacco 12" 76 16 +ALMANAC F_AL12 76 16 BEGIN PROMPT 1 1 "" END ENDPAGE - PAGE "Pagina 13" -1 -1 80 20 -ALMANAC "Almanacco 13" 76 16 +ALMANAC F_AL13 76 16 BEGIN PROMPT 1 1 "" END ENDPAGE - PAGE "Pagina 14" -1 -1 80 20 -ALMANAC "Almanacco 14" 76 16 +ALMANAC F_AL14 76 16 BEGIN PROMPT 1 1 "" END ENDPAGE - PAGE "Pagina 15" -1 -1 80 20 -ALMANAC "Almanacco 15" 76 16 +ALMANAC F_AL15 76 16 BEGIN PROMPT 1 1 "" END ENDPAGE +PAGE "Pagina 16" -1 -1 80 20 + +ALMANAC F_AL16 76 16 +BEGIN + PROMPT 1 1 "" +END + +ENDPAGE diff --git a/ci/cii0.h b/ci/cii0.h deleted file mode 100755 index 3009cea7e..000000000 --- a/ci/cii0.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __CA0_H -#define __CA0_H - -int ci0300(int argc, char* argv[]); -int ci0400(int argc, char* argv[]); - -#endif // __CA0_H diff --git a/ci/cilib.cpp b/ci/cilib.cpp index 31b0e998c..55feceb22 100755 --- a/ci/cilib.cpp +++ b/ci/cilib.cpp @@ -1,12 +1,8 @@ #include -#include -#include -#include -#include +#include #include #include #include -#include #include // file functions #include "cilib.h" @@ -27,32 +23,35 @@ TMask_field* TAlmanac_mask::parse_field(TScanner& scanner) bool TAlmanac_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) { - int year; - - year = curr_almanac()->selected_year(); switch (o.dlg()) { case F_PREVMONTH: - curr_almanac()->move_selected_month(-1); - this->set(F_CHANGEMONTH,curr_almanac()->selected_month()); - if (year!=curr_almanac()->selected_year()) - { - this->set(F_CHANGEYEAR,curr_almanac()->selected_year()); - this->set_year(curr_almanac()->selected_year()); - } + { + const int year = curr_almanac()->selected_year(); + curr_almanac()->move_selected_month(-1); + this->set(F_CHANGEMONTH,curr_almanac()->selected_month()); + if (year!=curr_almanac()->selected_year()) + { + this->set(F_CHANGEYEAR,curr_almanac()->selected_year()); + this->set_year(curr_almanac()->selected_year()); + } + } break; case F_CHANGEMONTH: curr_almanac()->set_selected_month(this->get_int(F_CHANGEMONTH)); break; case F_NEXTMONTH: - curr_almanac()->move_selected_month(1); - this->set(F_CHANGEMONTH,curr_almanac()->selected_month()); - if (year!=curr_almanac()->selected_year()) - { - this->set(F_CHANGEYEAR,curr_almanac()->selected_year()); - this->set_year(curr_almanac()->selected_year()); - } + { + const int year = curr_almanac()->selected_year(); + curr_almanac()->move_selected_month(1); + this->set(F_CHANGEMONTH,curr_almanac()->selected_month()); + if (year!=curr_almanac()->selected_year()) + { + this->set(F_CHANGEYEAR,curr_almanac()->selected_year()); + this->set_year(curr_almanac()->selected_year()); + } + } break; case F_CHANGEYEAR: this->set_year(this->get_int(F_CHANGEMONTH)); @@ -94,8 +93,10 @@ void TAlmanac_mask::activate_almanac(TAlmanac_field* fld, int page, TDate& sdate } TAlmanac_mask::TAlmanac_mask(const char * name) -: TAutomask(name) + :TAutomask() { + read_mask(name, 0, -1); + } TAlmanac_mask::~TAlmanac_mask() @@ -107,10 +108,6 @@ TAlmanac_mask::~TAlmanac_mask() // TAlmanac_field /////////////////////////////////////////////////////////// -#define almanac_win() ((TAlmanac_window&)win()) - -#define almanac_mask() ((TAlmanac_mask&)mask()) - TField_window* TAlmanac_field::create_window(int x, int y, int dx, int dy, WINDOW parent) { return new TAlmanac_window(x, y, dx, dy, parent, this); @@ -118,39 +115,40 @@ TField_window* TAlmanac_field::create_window(int x, int y, int dx, int dy, WINDO bool TAlmanac_field::is_date_void(TDate& cdate) { - return almanac_mask().is_date_void(cdate); + return ((TAlmanac_mask &)mask()).is_date_void(cdate); } void TAlmanac_field::set_selected_day(int nday) { if(nday>=1 && nday<=TDate::last_day(_selecteddate.month(),_selecteddate.year())) _selecteddate.set_day(nday); - almanac_win().force_update(); +// almanac_win().force_update(); + win().force_update(); } void TAlmanac_field::move_selected_day(int ddays) { _selecteddate+=ddays; - almanac_win().force_update(); + win().force_update(); } void TAlmanac_field::set_selected_month(int nmonth) { if(nmonth>=1 && nmonth<=12) _selecteddate.set_month(nmonth); - almanac_win().force_update(); + win().force_update(); } void TAlmanac_field::move_selected_month(int dmonths) { - _selecteddate.addmonth(dmonths); - almanac_win().force_update(); + _selecteddate.addmonth(dmonths); + win().force_update(); } void TAlmanac_field::set_selected_year(int nyear) { _selecteddate.set_year(nyear); - almanac_win().force_update(); + win().force_update(); } @@ -158,8 +156,6 @@ void TAlmanac_field::set_selected_year(int nyear) // TAlmanac_window /////////////////////////////////////////////////////////// -#define almanac_fld() ((TAlmanac_field&)owner()) - void TAlmanac_window::update() { TDate cdate; @@ -170,18 +166,18 @@ void TAlmanac_window::update() int rct_t, rct_l; int pad; int row; + TAlmanac_field & o = (TAlmanac_field&)owner(); TField_window::update(); - - cdate = almanac_fld().selected_date(); + cdate = o.selected_date(); cdate.set_day(1); rct_w = ((rct.right - rct.left) / 9); rct_h = ((rct.bottom - rct.top) / 9); - pad = - almanac_fld().padding(); + pad = - o.padding(); row = 3; - if (almanac_fld().show_month_name()) + if (o.show_month_name()) { str.format("%s", itom(cdate.month())); rct_l = rct.left + rct_w; @@ -201,12 +197,12 @@ void TAlmanac_window::update() while (!cdate.is_end_month()) { - if (almanac_fld().is_date_void(cdate)) + if (o.is_date_void(cdate)) col_b=COLOR_LTGRAY; else col_b=COLOR_YELLOW; - if (almanac_fld().is_selected(cdate.day())) + if (o.is_selected(cdate.day())) col_f=COLOR_RED; else col_f=COLOR_GRAY; @@ -229,30 +225,24 @@ void TAlmanac_window::update() bool TAlmanac_window::on_key(KEY key) { + TAlmanac_field & o = (TAlmanac_field&)owner(); - if (key == K_RIGHT) - { - almanac_fld().move_selected_day(1); - return true; - } - - if (key == K_LEFT) - { - almanac_fld().move_selected_day(-1); - return true; - } - - if (key == K_UP) - { - almanac_fld().move_selected_day(-7); - return true; - } - - if (key == K_DOWN) - { - almanac_fld().move_selected_day(+7); - return true; -; + switch (key) + { + case K_RIGHT: + o.move_selected_day(1); + return true; + case K_LEFT: + o.move_selected_day(-1); + return true; + case K_UP: + o.move_selected_day(-7); + return true; + case K_DOWN: + o.move_selected_day(+7); + return true; + default: + break; } return TField_window::on_key(key); @@ -265,13 +255,14 @@ void TAlmanac_window::handler(WINDOW win, EVENT* ep) int rct_w, rct_h; int pnt_r, pnt_c; int delta; + TAlmanac_field & o = (TAlmanac_field&)owner(); switch(ep->type) { case E_MOUSE_DBL: case E_MOUSE_DOWN: { - cdate = almanac_fld().selected_date(); + cdate = o.selected_date(); cdate.set_day(1); rct_w = ((rct.right - rct.left) / 9); @@ -280,11 +271,10 @@ void TAlmanac_window::handler(WINDOW win, EVENT* ep) pnt_r = (ep->v.mouse.where.h) % rct_h; delta = pnt_c*pnt_r - (27+cdate.wday()); - - if (delta>=1&&delta<=TDate::last_day(almanac_fld().selected_date().month(),almanac_fld().selected_date().year())) + if (delta>=1&&delta<=TDate::last_day(o.selected_date().month(), o.selected_date().year())) { - almanac_fld().set_selected_day(delta); - owner().on_key(K_SPACE); + o.set_selected_day(delta); + o.on_key(K_SPACE); } } break; diff --git a/ci/cimsk.h b/ci/cimsk.h index b87fc5a4d..70da7d6b2 100755 --- a/ci/cimsk.h +++ b/ci/cimsk.h @@ -1,4 +1,4 @@ -#define F_PREVMONTH 101 -#define F_NEXTMONTH 102 -#define F_CHANGEMONTH 103 -#define F_CHANGEYEAR 104 \ No newline at end of file +#define F_PREVMONTH 91 +#define F_NEXTMONTH 92 +#define F_CHANGEMONTH 93 +#define F_CHANGEYEAR 94 \ No newline at end of file diff --git a/include/campo.aut b/include/campo.aut index 03451e03b..939cdb97a 100755 --- a/include/campo.aut +++ b/include/campo.aut @@ -1,4 +1,4 @@ -ba Base +ba Base 74 75 76