root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 12.0 1086

Browse Source 
Files correlati     : ci1.exe ci1300bb.rep ci1300a.rep ci1300a.msk ci1300b.rep ci1.exe

Commento        :

Aggiunta scalatura per le immagine (tutto , solo in x, solo iny , non scalare)

Iinteno:

Alla prima patch di ve1 controllare una fattura con logo prima e dopo l'installazione della patch.
This commit is contained in:
Alessandro Bonazzi 2021-10-14 18:22:31 +02:00
parent 6cbbab7995
commit b873d61e7b
4 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ba/ba8300.h
View File

@ -45,6 +45,7 @@
#define F_SHADE_ANGLE 151 #define F_SHADE_ANGLE 151
#define F_SHCOLOR 152 #define F_SHCOLOR 152
#define F_TXCOLOR 153 #define F_TXCOLOR 153
#define F_IMAGE_RESIZE 154
#define F_PRFONT_SELECT 159 #define F_PRFONT_SELECT 159
#define F_LEVEL 160 #define F_LEVEL 160

35
src/ba/ba8300b.uml
View File

@ -4,19 +4,19 @@ PAGE "Campo" -1 -1 74 20
LIST F_TYPE 1 16 LIST F_TYPE 1 16
BEGIN BEGIN
PROMPT 1 0 "Tipo " PROMPT 1 0 "Tipo "
ITEM "T|Testo fisso" ITEM "T|Testo fisso" MESSAGE CLEAR,F_IMAGE_RESIZE|HIDE,F_IMAGE_RESIZE
ITEM "S|Stringa" ITEM "S|Stringa" MESSAGE CLEAR,F_IMAGE_RESIZE|HIDE,F_IMAGE_RESIZE
ITEM "N|Numero" ITEM "N|Numero" MESSAGE CLEAR,F_IMAGE_RESIZE|HIDE,F_IMAGE_RESIZE
ITEM "V|Valuta" ITEM "V|Valuta" MESSAGE CLEAR,F_IMAGE_RESIZE|HIDE,F_IMAGE_RESIZE
ITEM "P|Prezzo" ITEM "P|Prezzo" MESSAGE CLEAR,F_IMAGE_RESIZE|HIDE,F_IMAGE_RESIZE
ITEM "D|Data" ITEM "D|Data" MESSAGE CLEAR,F_IMAGE_RESIZE|HIDE,F_IMAGE_RESIZE
ITEM "B|Booleano" ITEM "B|Booleano" MESSAGE CLEAR,F_IMAGE_RESIZE|HIDE,F_IMAGE_RESIZE
ITEM "A|Array (Lista)" ITEM "A|Array (Lista)" MESSAGE CLEAR,F_IMAGE_RESIZE|HIDE,F_IMAGE_RESIZE
ITEM "I|Immagine" ITEM "I|Immagine" MESSAGE ENABLE,F_IMAGE_RESIZE|SHOW,F_IMAGE_RESIZE
ITEM "L|Linea" ITEM "L|Linea" MESSAGE CLEAR,F_IMAGE_RESIZE|HIDE,F_IMAGE_RESIZE
ITEM "R|Rettangolo" ITEM "R|Rettangolo" MESSAGE CLEAR,F_IMAGE_RESIZE|HIDE,F_IMAGE_RESIZE
ITEM "E|Ellisse" ITEM "E|Ellisse" MESSAGE CLEAR,F_IMAGE_RESIZE|HIDE,F_IMAGE_RESIZE
END END
NUMBER F_ID 4 NUMBER F_ID 4
@ -204,6 +204,15 @@ BEGIN
ITEM "270|Lineare in basso" ITEM "270|Lineare in basso"
END END
LIST F_IMAGE_RESIZE 1 13
BEGIN
PROMPT 2 10 "Immagine "
ITEM " |Scala X e Y"
ITEM "X|Scala X"
ITEM "Y|Scala Y"
ITEM "N|Non scalare"
END
BUTTON F_FONT_SELECT 14 2 BUTTON F_FONT_SELECT 14 2
BEGIN BEGIN
PROMPT 2 10 "~Font" PROMPT 2 10 "~Font"

2
src/ba/ba8301.cpp
View File

@ -897,6 +897,7 @@ void TReport_field_mask::set_field(const TReport_field& rf)
TSheet_field& list = sfield(F_LIST); TSheet_field& list = sfield(F_LIST);
rf.get_list(list.rows_array()); rf.get_list(list.rows_array());
} }
set(F_IMAGE_RESIZE, rf.get_image_resize_type());
} }
void TReport_field_mask::get_field(TReport_field& rf) const void TReport_field_mask::get_field(TReport_field& rf) const
@ -940,6 +941,7 @@ void TReport_field_mask::get_field(TReport_field& rf) const
const TSheet_field& list = sfield(F_LIST); const TSheet_field& list = sfield(F_LIST);
rf.set_list(list.rows_array()); rf.set_list(list.rows_array());
} }
rf.set_image_resize_type(get(F_IMAGE_RESIZE));
} }
TReport_field_mask::TReport_field_mask(TReport_field& rf) TReport_field_mask::TReport_field_mask(TReport_field& rf)

15
src/ba/ba8500.cpp
View File

@ -147,12 +147,17 @@ bool TKlarkKent_mask::on_field_event(TOperable_field& o, TField_event e, long jo
TReport* TKlarkKent_app::create_report(const char* name) const TReport* TKlarkKent_app::create_report(const char* name) const
{ {
TReport* r = new TReport; TReport* r = new TReport;
r->load(name); r->load(name);
TString custom_query; TString custom_query;
TFilename filename(name);
get_custom_query("", name, custom_query);
filename = filename.name();
const TString module = (filename[3] >= '0') && (filename[3] <= '9') ? filename.left(2) : "";
get_custom_query(module, filename, custom_query);
if (custom_query.full()) if (custom_query.full())
r->set_recordset(custom_query); r->set_recordset(custom_query);
return r; return r;