Patch level : 2.2 237

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :

Riportata la versione 2.2 patch 237


git-svn-id: svn://10.65.10.50/trunk@12773 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2005-03-03 15:42:04 +00:00
parent bf79f8b82e
commit ef2e599769
55 changed files with 2005 additions and 453 deletions

View File

@ -589,13 +589,23 @@ void TSection_properties_mask::vedo_non_vedo()
const int level = get_int(F_LEVEL);
const bool can_pos = (type != 'H' && level == 0) || (type == 'F' && level == 1);
show(F_X, can_pos); show(F_Y, can_pos);
show(F_CONDITION, type == 'B' && level > 0);
show(F_GROUP_BY, type == 'H' && level > 1);
show(F_CONDITION, type == 'B' && level > 0 && level < 10);
show(F_GROUP_BY, type == 'H' && level > 1 && level < 10);
show(F_SQL, type == 'B' && level > 10);
show(F_KEEP_WITH_NEXT, level > 1 && type == 'H');
show(F_CAN_BREAK, level > 0 && type == 'B');
show(F_HIDE_IF_NEEDED, level == 0 && type != 'B');
show(F_REPEAT, level > 1 && type == 'H');
enable(DLG_DELREC, level > 1);
bool can_delete = false;
if (level > 1)
{
if (level > 10)
can_delete = _report.find_section('B', level+1) == NULL;
else
can_delete = true;
}
enable(DLG_DELREC, can_delete);
}
bool TSection_properties_mask::on_field_event(TOperable_field& o, TField_event e, long jolly)
@ -638,6 +648,10 @@ void TSection_properties_mask::set_section(const TReport_section& rs)
set_num(F_DY, rs.height());
set(F_CONDITION, rs.condition());
set(F_GROUP_BY, rs.grouped_by());
if (rs.recordset() != NULL)
set(F_SQL, rs.recordset()->query_text());
else
reset(F_SQL);
set(F_HIDE_IF_NEEDED, rs.hidden_if_needed());
set(F_HIDDEN, rs.hidden());
@ -673,6 +687,7 @@ void TSection_properties_mask::get_section(TReport_section& rs) const
rs.set_condition(get(F_CONDITION));
rs.group_by(get(F_GROUP_BY));
rs.set_recordset(get(F_SQL));
rs.hide_if_needed(get_bool(F_HIDE_IF_NEEDED));
rs.force_page_break(get_bool(F_PAGE_BREAK));
rs.keep_with_next(get_bool(F_KEEP_WITH_NEXT));
@ -786,6 +801,7 @@ protected:
bool add_section();
void section_properties();
void report_properties();
bool enumerate_bodies(int level, TToken_string& code, TToken_string& desc) const;
bool get_rep_path(TFilename& path) const;
void set_num_attr(TXmlItem& item, const char* attr, short num, short def = 0) const;
@ -979,33 +995,42 @@ void TReport_mask::select_section()
hlevel = 1-level;
else
{
if (_report.find_section('H', level-1))
hlevel = level-1;
if (level < 10)
{
if (_report.find_section('H', level-1))
hlevel = level-1;
}
else
htype = 'B';
}
}
break;
case 'B':
if (level >= 1)
{
if (level >= 1)
if (level < 10)
{
hlevel = _report.find_max_level('H');
if (hlevel <= 1)
hlevel = 0;
}
else
hlevel = 0;
}
else
hlevel = 0;
break;
case 'F':
if (level > 1)
{
if (level <= 1)
hlevel = 1-level;
if (level > 10)
htype = 'B';
else
{
if (_report.find_section('F', level-1))
hlevel = level-1;
}
}
else
hlevel = 1-level;
break;
default:
break;
@ -1129,35 +1154,75 @@ void TReport_mask::fields_properties()
}
}
bool TReport_mask::enumerate_bodies(int level, TToken_string& code, TToken_string& desc) const
{
TReport_section* rs = _report.find_section('B', level);
if (rs != NULL)
{
TString str; str.format("B%d", level);
code.add(str);
describe_section('B', level, str); str.trim();
desc.add(str);
enumerate_bodies(level*10+1, code, desc); // Figlio
enumerate_bodies(level+1, code, desc); // Fratello
}
return rs != NULL;
}
bool TReport_mask::add_section()
{
TMask m(TR("Nuova sezione"), 1, 32, 5);
m.add_radio(101, 0, "", 1, 0, 22, "H|B", TR("Raggruppamento|Corpo alternativo"), "");
m.add_button(DLG_OK, 0, "", -12, -1, 10, 2);
m.add_button(DLG_CANCEL, 0, "", -22, -1, 10, 2);
TMask m("ba8300e");
TToken_string code, desc;
enumerate_bodies(1, code, desc);
TList_field& list = (TList_field&)m.field(102);
list.replace_items(code, desc);
if (m.run() == K_ENTER)
{
const char type = m.get(101)[0];
char type = m.get(101)[0];
int level = 0;
if (type == 'H')
if (type == 'S')
{
const int hl = _report.find_max_level('H');
const int fl = _report.find_max_level('F');
level = max(hl, fl) + 1;
type = 'B';
const int father = atoi(m.get(102).mid(1));
if (father < 100000L)
{
int i;
for (i = 1; i <= 9; i++) // Cerca l'ultimo figlio del nodo padre
{
level = father*10+i;
if (_report.find_section(type, level) == NULL)
break;
}
if (i > 9)
level = 0;
}
}
else
level = _report.find_max_level('B')+1;
if (level > 1 && level <= 9)
{
if (type == 'H')
{
const int hl = _report.find_max_level('H');
const int fl = _report.find_max_level('F');
level = max(hl, fl) + 1;
}
else
level = _report.find_max_level('B')+1;
if (level > 9)
level = 0;
}
if (level > 0)
{
_tree.goto_node(type, level);
tfield(F_SECTIONS).select_current();
_curr_section = &_report.section(type, level);
section_properties();
return true;
}
else
error_box(TR("Livello non ammesso: %d"), level);
error_box(TR("Livello non ammesso"));
}
return false;
}

View File

@ -1,6 +1,6 @@
#include "ba8300.h"
PAGE "Sezione" -1 -1 52 16
PAGE "Sezione" -1 -1 60 16
LISTBOX F_TYPE 1 8
BEGIN
@ -11,7 +11,7 @@ BEGIN
FLAGS "D"
END
NUMBER F_LEVEL 1
NUMBER F_LEVEL 7
BEGIN
PROMPT 21 1 "Livello "
FLAGS "D"
@ -48,7 +48,7 @@ END
BOOLEAN F_DISABLED
BEGIN
PROMPT 21 4 "Disattivata"
PROMPT 22 4 "Disattivata"
END
BOOLEAN F_PAGE_BREAK
@ -58,12 +58,12 @@ END
BOOLEAN F_KEEP_WITH_NEXT
BEGIN
PROMPT 21 5 "Mantieni col successivo"
PROMPT 22 5 "Mantieni col successivo"
END
BOOLEAN F_CAN_BREAK
BEGIN
PROMPT 21 5 "Ammetti spezzamento su due pagine"
PROMPT 22 5 "Ammetti spezzamento su due pagine"
END
BOOLEAN F_HIDE_IF_NEEDED
@ -80,21 +80,29 @@ BEGIN
FLAGS "H"
END
MEMO F_CONDITION 48 6
MEMO F_CONDITION 56 6
BEGIN
// Visibile sezioni con livello > 0
PROMPT 1 6 "Condizione"
FLAGS "H"
END
MEMO F_GROUP_BY 48 3
MEMO F_GROUP_BY 56 3
BEGIN
// Visibile per sezioni con livello > 1
// Visibile per sezioni con livello > 1 e < 10
PROMPT 1 9 "Raggruppamento"
FLAGS "H"
CHECKTYPE REQUIRED
END
MEMO F_SQL 56 6
BEGIN
// Visibile sezioni con livello > 10
PROMPT 1 6 "Query"
FLAGS "H"
CHECKTYPE REQUIRED
END
BUTTON DLG_OK 10 2
BEGIN
PROMPT -13 -1 ""
@ -179,12 +187,12 @@ ENDPAGE
PAGE "Avanzate" -1 -1 50 16
MEMO F_PRESCRIPT 48 7
MEMO F_PRESCRIPT 56 7
BEGIN
PROMPT 1 0 "Script iniziale"
END
MEMO F_POSTSCRIPT 48 7
MEMO F_POSTSCRIPT 56 7
BEGIN
PROMPT 1 7 "Script finale"
END

33
ba/ba8300e.uml Executable file
View File

@ -0,0 +1,33 @@
#include "ba8300.h"
PAGE "Nuova Sezione" -1 -1 38 7
RADIOBUTTON 101 1 35
BEGIN
PROMPT 1 0 "@bTipo"
ITEM "H|Raggruppamento"
MESSAGE HIDE,102
ITEM "B|Corpo alternativo"
MESSAGE HIDE,102
ITEM "S|Sottosezione"
MESSAGE SHOW,102
END
LIST 102 1 12
BEGIN
PROMPT 1 5 "Sezione principale "
END
BUTTON DLG_CANCEL 10 2
BEGIN
PROMPT -12 -1 ""
END
BUTTON DLG_OK 10 2
BEGIN
PROMPT -22 -1 ""
END
ENDPAGE
ENDMASK

View File

@ -38,8 +38,7 @@ void describe_section(char type, int level, TString& str)
case 'F': str << TR("Coda"); break;
default : break;
}
str << ' ';
if (type == 'H' || type == 'F')
if (level < 10 && (type == 'H' || type == 'F'))
{
if (level <= 1)
str << TR("Report");
@ -47,7 +46,7 @@ void describe_section(char type, int level, TString& str)
str << TR("Gruppo") << ' ' << (level-1);
}
else
str << level;
str << ' ' << level;
}
}
@ -74,10 +73,15 @@ void TReport_tree::node2id(const TObject* node, TString& id) const
id = *(TString*)node;
}
int TReport_tree::curr_level() const
{
return atoi((const char*)_curr + 1);
}
TReport_section& TReport_tree::curr_section() const
{
char type = _curr[0];
int level = atoi((const char*)_curr + 1);
int level = curr_level();
if (type == 'R' || type == 'P')
{
type = 'B';
@ -93,7 +97,7 @@ bool TReport_tree::goto_root()
bool TReport_tree::goto_firstson()
{
char ntype = 'H';
const char ntype = 'H';
int nlevel = -1;
switch (_curr[0])
{
@ -103,6 +107,14 @@ bool TReport_tree::goto_firstson()
case 'R':
nlevel = 1;
break;
case 'B':
if (_curr[1] > '0')
{
const int first_son = curr_level() * 10 + 1;
if (_report.find_section('B', first_son))
nlevel = first_son;
}
break;
default:
break;
}
@ -112,7 +124,7 @@ bool TReport_tree::goto_firstson()
bool TReport_tree::goto_rbrother()
{
const char type = _curr[0];
const int level = _curr[1]-'0';
const int level = curr_level();
char ntype = ' ';
int nlevel = -1;
if (level <= 0) // Page
@ -128,41 +140,61 @@ bool TReport_tree::goto_rbrother()
}
else // Report
{
switch (type)
if (level > 10) // Subsections
{
case 'H':
if (level < _report.find_max_level('H'))
switch (type)
{
ntype = 'H';
nlevel = level+1;
case 'H': ntype = 'B'; nlevel = level; break;
case 'B': ntype = 'F'; nlevel = level; break;
case 'F':
if (_report.find_section('B', level+1)) // Header del fratello
{
ntype = 'H';
nlevel = level+1;
}
break;
default:
break;
}
else
}
else
{
switch (type)
{
ntype = 'B';
nlevel = 1;
case 'H':
if (level < _report.find_max_level('H'))
{
ntype = 'H';
nlevel = level+1;
}
else
{
ntype = 'B';
nlevel = 1;
}
break;
case 'B':
if (level < _report.find_max_level('B'))
{
ntype = 'B';
nlevel = level+1;
}
else
{
ntype = 'F';
nlevel = _report.find_max_level('F');
}
break;
case 'F':
if (level > 1)
{
ntype = 'F';
nlevel = level-1;
}
break;
default:
break;
}
break;
case 'B':
if (level < _report.find_max_level('B'))
{
ntype = 'B';
nlevel = level+1;
}
else
{
ntype = 'F';
nlevel = _report.find_max_level('F');
}
break;
case 'F':
if (level > 1)
{
ntype = 'F';
nlevel = level-1;
}
break;
default:
break;
}
}
return goto_node(ntype, nlevel);
@ -170,7 +202,8 @@ bool TReport_tree::goto_rbrother()
bool TReport_tree::goto_node(const TString &id)
{
return goto_node(id[0], id[1]-'0');
const int level = atoi((const char*)id + 1);
return goto_node(id[0], level);
}
bool TReport_tree::has_son() const
@ -182,6 +215,13 @@ bool TReport_tree::has_son() const
case 'R':
yes = true;
break;
case 'B':
{
const int level = curr_level();
if (level > 0)
yes = _report.find_section('B', level * 10 + 1) != NULL;
}
break;
default:
break;
}
@ -190,7 +230,7 @@ bool TReport_tree::has_son() const
bool TReport_tree::has_rbrother() const
{
const TString4 old = _curr;
const TString8 old = _curr;
TReport_tree* myself = (TReport_tree*)this;
const bool ok = myself->goto_rbrother();
myself->_curr = old;
@ -204,6 +244,9 @@ bool TReport_tree::has_root() const
bool TReport_tree::has_father() const
{
if (curr_level() > 10) // Subsection
return true;
return !has_son();
}
@ -212,15 +255,23 @@ bool TReport_tree::goto_father()
bool yes = has_father();
if (yes)
{
const char ntype = _curr[1] == '0' ? 'P' : 'R';
yes = goto_node(ntype, 0);
const int level = curr_level();
if (level > 10) // Subsection
{
yes = goto_node('B', level/10);
}
else
{
const char ntype = _curr[1] == '0' ? 'P' : 'R';
yes = goto_node(ntype, 0);
}
}
return yes;
}
bool TReport_tree::has_lbrother() const
{
const TString4 old = _curr;
const TString8 old = _curr;
TReport_tree* myself = (TReport_tree*)this;
const bool ok = myself->goto_lbrother();
myself->_curr = old;
@ -230,7 +281,7 @@ bool TReport_tree::has_lbrother() const
bool TReport_tree::goto_lbrother()
{
const char type = _curr[0];
const int level = _curr[1]-'0';
const int level = curr_level();
char ntype = ' ';
int nlevel = -1;
if (level == 0) // Page
@ -246,41 +297,59 @@ bool TReport_tree::goto_lbrother()
}
else // Report
{
switch (type)
if (level > 10) // Subsection
{
case 'F':
if (level < _report.find_max_level('F'))
switch (type)
{
ntype = 'F';
nlevel = level+1;
case 'B': ntype = 'H'; nlevel = level; break;
case 'F': ntype = 'B'; nlevel = level; break;
case 'H':
if (level % 10 > 1)
{
ntype = 'F';
nlevel = level-1;
}
default: break;
}
else
}
else
{
switch (type)
{
ntype = 'B';
nlevel = _report.find_max_level('B');
case 'F':
if (level < _report.find_max_level('F'))
{
ntype = 'F';
nlevel = level+1;
}
else
{
ntype = 'B';
nlevel = _report.find_max_level('B');
}
break;
case 'B':
if (level > 1)
{
ntype = 'B';
nlevel = level-1;
}
else
{
ntype = 'H';
nlevel = 1;
}
break;
case 'H':
if (level > 1)
{
ntype = 'H';
nlevel = level-1;
}
break;
default:
break;
}
break;
case 'B':
if (level > 1)
{
ntype = 'B';
nlevel = level-1;
}
else
{
ntype = 'H';
nlevel = 1;
}
break;
case 'H':
if (level > 1)
{
ntype = 'H';
nlevel = level-1;
}
break;
default:
break;
}
}
return goto_node(ntype, nlevel);
@ -291,13 +360,23 @@ TImage* TReport_tree::image(bool selected) const
int id = 0;
switch (_curr[0])
{
case 'H': id = 1810; break;
case 'B': id = 1811; break;
case 'F': id = 1812; break;
case 'H': id = 1810; break; // Testa aquila
case 'B': id = 1811; break; // Corpo aquila
case 'F': id = 1812; break; // Coda aquila
default : break;
}
if (id > 0)
{
const int sub = _curr.len();
if (sub > 2)
{
if (sub > 3)
id += 6; // Sub-Subsection (uovo)
else
id += 3; // Subsection (pulcino)
}
return get_res_image(id);
}
return TTree::image(selected);
}

View File

@ -17,12 +17,13 @@
class TReport_tree : public TBidirectional_tree
{
TReport& _report;
TString4 _curr;
TString8 _curr;
protected:
virtual bool get_description(TString& str) const;
virtual TImage* image(bool selected) const;
virtual void node2id(const TObject* node, TString& id) const;
int curr_level() const;
public:
virtual bool goto_root();
@ -46,6 +47,8 @@ public:
TReport_tree(TReport& r) : _report(r) { goto_root(); }
};
void describe_section(char type, int level, TString& str);
///////////////////////////////////////////////////////////
// TReport_drawer
///////////////////////////////////////////////////////////

View File

@ -24,7 +24,7 @@ Item_06 = "Tabelle", [MENU_002]
Item_07 = "Stampa anagrafiche", "ba6 -0", ""
Item_08 = "Stampa tabelle", [MENU_003]
Item_09 = "Stampa tabelle ministeriali", [MENU_012]
Item_10 = "Stampa fogli libri bollati", "ba3 -2", ""
Item_10 = "Stampa fogli libri bollati", "ba3 -2", "F"
[MENU_002]
Caption = "Tabelle"
@ -98,6 +98,14 @@ Item_07 = "Backup", "ba2 -1", "", 10213
Item_08 = "Generatore query", "ba8 -1", ""
Item_09 = "Generatore report", "ba8 -2", ""
Item_10 = "Convertitore da form a report", "ba8 -3", ""
Item_11 = "Conversioni", [MENU_016]
[MENU_016]
Caption = "Conversioni"
Picture = <ba04>
Module = 0
Flags = ""
Item_01 = "Riattribuzione codice allegato", "bacnv 21", ""
[MENU_PREFERITI]
Caption = "Preferiti"

View File

@ -5,6 +5,7 @@
#include <form.h>
#include <prefix.h>
#include <recarray.h>
#include <rePRINT.h>
#include <sheet.h>
#include <tabutil.h>
@ -175,7 +176,7 @@ bool TQuadro_VT_selfirm_mask::on_field_event(TOperable_field& o, TField_event e,
set(F_RAGSOC, "");
}
break;
default:
default:
break;
}
@ -200,8 +201,7 @@ public:
void set_prospect();
void print_prospect();
virtual bool on_key(KEY k) { return TAutomask::on_key(k);}
virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly) { return TRUE;}
virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly);
TQuadro_VT_iva_mask(TQuadro_VT_selfirm_mask *m) : TAutomask("cg5800b") {_sf = m;}
virtual ~TQuadro_VT_iva_mask() {};
};
@ -276,6 +276,39 @@ void TQuadro_VT_iva_mask::print_prospect()
frm.print();
}
bool TQuadro_VT_iva_mask::on_field_event(TOperable_field& o, TField_event e, long jolly)
{
switch (o.dlg())
{
case DLG_PRELPR:
if (e == fe_button)
{
TReport_book book;
TReport rep;
if (rep.load("cg5800ra.rep"))
{
TRecordset * r = rep.recordset();
if (r != NULL)
{
TVariant var;
var = get(F_YEAR);
r->set_var("#ANNO", var);
}
book.add(rep);
if (book.pages() > 0)
book.print_or_preview();
}
}
default:
break;
}
return TRUE;
}
void TQuadro_VT_iva_mask::set_prospect()
{
CHECK(_sf, "Invalid mask");

View File

@ -31,3 +31,4 @@
#define FFR_REGIMP(reg) 2 ## reg
#define FFR_REGIVA(reg) 3 ## reg
#define DLG_PRELPR 151

View File

@ -4,13 +4,18 @@ TOOLBAR "" 0 -3 0 3
BUTTON DLG_PRINT 10 2
BEGIN
PROMPT -12 -11 ""
PROMPT -13 -11 ""
MESSAGE EXIT, K_ENTER
END
BUTTON DLG_PRELPR 15 2
BEGIN
PROMPT -23 -11 "Elenco Privati"
END
BUTTON DLG_QUIT 10 2
BEGIN
PROMPT -22 -11 ""
PROMPT -33 -11 ""
END
ENDPAGE

101
cg/cg5800ra.rep Executable file
View File

@ -0,0 +1,101 @@
<report libraries="cg5800a" name="ListaQuadroVTPriv" lpi="6">
<description>Lista privati per regione per quadro VT</description>
<font face="Courier New" size="10" />
<section type="Head">
<field type="Stringa" align="center" width="80" height="2" pattern="1">
<font face="Courier New" bold="1" size="14" />
<source>"Lista clienti privati per quadro IVA VT anno " + #ANNO</source>
</field>
<field border="3" y="2" type="Linea" width="80" height="0" pattern="1" />
<field y="3" type="Testo" width="16" pattern="1" text="N.Operazione" />
<field x="20" y="3" type="Testo" align="right" width="18" pattern="1" text="Imponibile" />
<field x="41" y="3" type="Testo" width="6" pattern="1" text="Cod." />
<field x="49" y="3" type="Testo" align="right" width="18" pattern="1" text="Imposta" />
</section>
<section type="Head" level="1" />
<section type="Head" level="2" height="3">
<groupby>13.CODREG</groupby>
<prescript description="H2 PRESCRIPT">0 "F2.201" !
0 "F2.202" !
</prescript>
<field y="1" type="Testo" width="10" pattern="1" text="Regione">
<font face="Courier New" bold="1" size="12" />
</field>
<field x="10" y="1" type="Stringa" width="4" pattern="1">
<font face="Courier New" bold="1" size="12" />
<source>13.CODREG</source>
</field>
<field x="15" y="1" type="Stringa" width="25" pattern="1">
<font face="Courier New" bold="1" size="12" />
<source>201@.S0</source>
</field>
<field border="1" y="2" type="Linea" width="40" height="0" pattern="1" />
</section>
<section type="Head" level="3" height="3">
<groupby>23.CODCF</groupby>
<prescript description="H3 PRESCRIPT">0 "F3.101" !
0 "F3.102" !</prescript>
<field y="1" type="Testo" width="10" pattern="1" text="Cliente">
<font face="Courier New" bold="1" size="12" />
</field>
<field x="10" y="1" type="Numero" align="right" width="8" pattern="1">
<font face="Courier New" bold="1" size="12" />
<source>23.CODCF</source>
</field>
<field x="19" y="1" type="Stringa" width="49" pattern="1">
<font face="Courier New" bold="1" size="12" />
<source>20.RAGSOC</source>
</field>
<field border="1" y="2" type="Linea" width="68" height="0" pattern="1" />
</section>
<section type="Body" />
<section type="Body" level="1">
<field type="Numero" align="right" width="6" pattern="1">
<source>RMOVIVA.NUMREG</source>
</field>
<field x="16" type="Valuta" align="right" width="20" pattern="1" text="###.###.###,@@">
<source>RMOVIVA.IMPONIBILE</source>
<prescript description="B1.0 PRESCRIPT">MESSAGE ADD,F3.101</prescript>
</field>
<field x="41" type="Stringa" width="4" pattern="1">
<source>RMOVIVA.CODIVA</source>
</field>
<field x="49" type="Valuta" align="right" width="18" pattern="1" text="#########,@@">
<source>RMOVIVA.IMPOSTA</source>
<prescript description="B1.0 PRESCRIPT">MESSAGE ADD,F3.102</prescript>
</field>
</section>
<section type="Foot" />
<section type="Foot" level="1">
<field x="2" y="1" type="Testo" width="15" pattern="1" text="Totale generale" />
<field x="18" y="1" type="Valuta" align="right" width="18" id="301" pattern="1" text="###.###.###,@@" />
<field x="49" y="1" type="Valuta" align="right" width="18" id="302" pattern="1" text="###.###.###,@@">
<prescript description="F1.302 PRESCRIPT">MESSAGE ADD,F1.302</prescript>
</field>
</section>
<section type="Foot" level="2">
<field x="2" y="1" type="Testo" width="14" pattern="1" text="Totale regione" />
<field x="18" y="1" type="Valuta" align="right" width="18" id="201" pattern="1" text="###.###.###,@@">
<prescript description="F2.201 PRESCRIPT">MESSAGE ADD,F1.301</prescript>
</field>
<field x="49" y="1" type="Valuta" align="right" width="18" id="202" pattern="1" text="###.###.###,@@">
<prescript description="F2.202 PRESCRIPT">MESSAGE ADD,F1.202</prescript>
</field>
</section>
<section type="Foot" level="3">
<field x="2" y="1" type="Testo" width="14" pattern="1" text="Totale cliente" />
<field x="18" y="1" type="Valuta" align="right" width="18" id="101" pattern="1" text="###.###.###,@@">
<prescript description="F3.101 PRESCRIPT">MESSAGE ADD,F2.201</prescript>
</field>
<field x="49" y="1" type="Valuta" align="right" width="18" id="102" pattern="1" text="###.###.###,@@">
<prescript description="F3.102 PRESCRIPT">MESSAGE ADD,F2.202</prescript>
</field>
</section>
<sql>USE RMOVIVA SE (23.TIPO=="C")&#26;&#26;(23.ANNOIVA=#ANNO)&#26;&#26;(20.ALLEG=="6")&#26;&#26;(202@.S1=="") BY 23.ANNOIVA 13.CODREG 23.TIPO 23.CODCF NUMREG
JOIN MOV INTO NUMREG==NUMREG
JOIN CLIFO TO MOV INTO TIPOCF==TIPO CODCF==CODCF
JOIN COMUNI TO CLIFO INTO STATO==STATOCF COM==COMCF
JOIN %RGI TO COMUNI ALIAS 201 INTO CODTAB==CODREG
JOIN %IVA TO RMOVIVA ALIAS 202 INTO CODTAB==CODIVA</sql>
</report>

View File

@ -17,7 +17,8 @@
#include <rmov.h>
#include <rmoviva.h>
#define ALIAS_REG 100
#define ALIAS_PCON1 100
#define ALIAS_PCON2 200
class TInvioP_file: public TFile_text
{
@ -73,7 +74,6 @@ class TInvioP : public TSkeleton_application
TInvioP_mask* _msk;
TInvioP_file* _trasfile;
TDate _dataini, _datafin;
char _decsep;
protected:
virtual bool create(void);
@ -88,7 +88,6 @@ protected:
public:
TInvioP() {};
virtual ~TInvioP() {};
const char get_decsep() { return _decsep;};
};
// restituisce un riferimento all' applicazione
@ -110,10 +109,13 @@ void TInvioP_file::validate(TCursor& cur,TRecord_text &rec, TToken_string &s, TS
in.trim();
valore = in;
}
else if (code == "_IMPORTO")
else if (code == "_TELEFONO")
{
valore = str;
valore.replace('.', app().get_decsep()); //!?!?! consento decsep diversi per isam e text ?
valore.trim();
str = cur.curr().get("PTEL");
valore << str;
valore.trim();
}
else NFCHECK("Macro non definita: %s", (const char *)code);
str = valore;
@ -180,7 +182,7 @@ bool TInvioP::i_proforma_conti()
remove(filename);
_trasfile = new TInvioP_file(filename, configname);
_trasfile->open(filename,'w');
_decsep = configfile.get_char("DECSEP","MAIN");
_trasfile->force_record_separator();
TRelation rel(LF_PCON);
TCursor cur(&rel);
const long cur_items = cur.items();
@ -212,7 +214,7 @@ bool TInvioP::i_proforma_movimenti()
remove(filename);
_trasfile = new TInvioP_file(filename, configname);
_trasfile->open(filename,'w');
_decsep = configfile.get_char("DECSEP","MAIN");
_trasfile->force_record_separator();
TRectype da(LF_MOV);
TRectype a(LF_MOV);
da.put(MOV_DATAREG, _dataini);
@ -250,7 +252,7 @@ bool TInvioP::i_proforma_righe()
remove(filename);
_trasfile = new TInvioP_file(filename, configname);
_trasfile->open(filename,'w');
_decsep = configfile.get_char("DECSEP","MAIN");
_trasfile->force_record_separator();
TRectype da(LF_MOV);
TRectype a(LF_MOV);
da.put(MOV_DATAREG, _dataini);
@ -258,6 +260,11 @@ bool TInvioP::i_proforma_righe()
TRelation rel(LF_MOV);
rel.add(LF_RMOVIVA, "NUMREG==NUMREG", 1);
rel.add(LF_RMOV, "NUMREG==NUMREG", 1);
rel.add(LF_PCON, "GRUPPO==GRUPPO|CONTO==CONTO|SOTTOCONTO==SOTTOCONTO", 1, LF_RMOV, ALIAS_PCON1);
rel.add(LF_PCON, "GRUPPO==GRUPPO|CONTO==CONTO|SOTTOCONTO==SOTTOCONTO", 1, LF_RMOVIVA, ALIAS_PCON2);
bool add(int logicnum, const char* relexprs, int key = 1, int linkto = 0, int alias = 0, bool allow_lock = FALSE);
//rel.add("REG", "CODTAB[1,4]==ANNOIVA|CODTAB[5,7]==REG", 1);
//TString filtro = "(23->PROTIVA != \"\") && ";
//filtro << "(REG->I0 == 1) || (REG->I0 == 2)";
@ -320,10 +327,11 @@ bool TInvioP::i_proforma_clifor(char tipocf)
remove(filename);
_trasfile = new TInvioP_file(filename, configname);
_trasfile->open(filename,'w');
_decsep = configfile.get_char("DECSEP","MAIN");
_trasfile->force_record_separator();
TString80 filtro = "";
filtro.format("TIPOCF == \"%c\"", tipocf);
TRelation rel(LF_CLIFO);
rel.add(LF_COMUNI, "STATO==STATOCF|COM==COMCF", 1);
TCursor cur(&rel, filtro);
const long cur_items = cur.items();
if (cur_items != 0)

View File

@ -1,8 +1,8 @@
[MAIN]
DECSEP = ,
FIELDSEP =
FIELDSEP =
RECORDSEP = \n
RECORDSIZE =
RECORDSIZE = 0
SKIPLINES = 0
TYPEFIELD = -1
TYPELEN = -1
@ -37,7 +37,8 @@ ALIGN = R
DATA = N
DECIMAL = 2
FILLER = '0'
LENGTH = 0
LENGTH = 14
PICTURE = @@@@@@@@@,@@
[RECORD T]
@ -97,24 +98,15 @@ FIELD(8) = 23->CODCF
NAME(9) = TOTALE IMPONIBILE
TYPE(9) = IMPORTO
POSITION(9) = 155
LENGTH(9) = 14
DECIMAL(9) = 2
MESSAGE(9) = _IMPORTO
NAME(10) = TOTALE IVA
TYPE(10) = IMPORTO
POSITION(10) = 169
LENGTH(10) = 14
DECIMAL(10) = 2
MESSAGE(10) = _IMPORTO
NAME(11) = TOTALE DOCUMENTO
TYPE(11) = IMPORTO
POSITION(11) = 183
LENGTH(11) = 14
DECIMAL(11) = 2
FIELD(11) = 23->TOTDOC
MESSAGE(11) = _IMPORTO
NAME(12) = DATA PAGAMENTO
TYPE(12) = DATA
@ -148,7 +140,7 @@ MESSAGE(16)=_FISSO,!1
[RECORD R]
NAME(0) = ID REGISTRAZIONE
TYPE(0) = STRINGA
TYPE(0) = NUMERO
POSITION(0) = 0
LENGTH(0) = 10
FIELD(0) = 24->NUMREG
@ -204,17 +196,11 @@ FIELD(8) = 24->DESCR[1,40]
NAME(9) = IMPORTO SOTTOCONTO
TYPE(9) = IMPORTO
POSITION(9) = 78
LENGTH(9) = 14
DECIMAL(9) = 2
FIELD(9) = 24->IMPORTO
MESSAGE(9) = _IMPORTO
NAME(10) = IMPONIBILE
TYPE(10) = IMPORTO
POSITION(10) = 92
LENGTH(10) = 14
DECIMAL(10) = 2
MESSAGE(10) = _IMPORTO
NAME(11) = CODICE IVA
TYPE(11) = STRINGA
@ -236,12 +222,12 @@ NAME(14) = VOCE DI SPESA
TYPE(14) = STRINGA
POSITION(14) = 145
LENGTH(14) = 10
FIELD(14) = 24->FASCMS
FIELD(14) = 100@->CODCBL
[RECORD I]
NAME(0) = ID REGISTRAZIONE
TYPE(0) = STRINGA
TYPE(0) = NUMERO
POSITION(0) = 0
LENGTH(0) = 10
FIELD(0) = 25->NUMREG
@ -290,17 +276,11 @@ LENGTH(8) = 40
NAME(9) = IMPORTO SOTTOCONTO
TYPE(9) = IMPORTO
POSITION(9) = 78
LENGTH(9) = 14
DECIMAL(9) = 2
MESSAGE(9) = _IMPORTO
NAME(10) = IMPONIBILE
TYPE(10) = IMPORTO
POSITION(10) = 92
LENGTH(10) = 14
DECIMAL(10) = 2
FIELD(10) = 25->IMPONIBILE
MESSAGE(10) = _IMPORTO
NAME(11) = CODICE IVA
TYPE(11) = STRINGA
@ -323,7 +303,7 @@ NAME(14) = VOCE DI SPESA
TYPE(14) = STRINGA
POSITION(14) = 145
LENGTH(14) = 10
FIELD(14) = 25->FASCMS
FIELD(14) = 200@->CODCBL
[RECORD C]
@ -359,19 +339,28 @@ FIELD(4) = 20->INDCF
NAME(5) = CAP DI RESIDENZA
TYPE(5) = STRINGA
POSITION(5) = 40
POSITION(5) = 118
LENGTH(5) = 5
FIELD(5)=20->CAPCF
NAME(6) = COMUNE DI RESIDENZA
TYPE(6) = STRINGA
POSITION(6) = 45
POSITION(6) = 123
LENGTH(6) = 23
FIELD(6) = 13->DENCOM[1,40]
NAME(7) = PROVINCIA DI RESIDENZA
TYPE(7) = STRINGA
POSITION(7) = 68
POSITION(7) = 163
LENGTH(7) = 2
FIELD(7) = 13->PROVCOM
NAME(8) = TELEFONO
TYPE(8) = STRINGA
POSITION(8) = 165
LENGTH(8) = 20
FIELD(8) = 20->TEL
MESSAGE(8) = _TELEFONO
[RECORD P]

View File

@ -1105,6 +1105,7 @@ void TDistinta_app::init_query_mode(TMask& m)
{
((TQuery_mask&)m).restart_tree();
set_search_field(F_CODICE);
m.enable_page(1);
}
void TDistinta_app::load_memo(TMask& m, TToken_string& memo)

View File

@ -325,20 +325,35 @@ class TAVM_monitor : public TAutomask
{
TAVM_list_window *_lw;
TAVM_stack_window *_sw, *_rw;
bool _ignore_mon;
protected:
virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly);
virtual bool on_key(KEY k);
public:
void set_ignore_mon(bool im) { _ignore_mon = im; }
bool ignore_mon() const { return _ignore_mon; }
TAVM_list_window& monitor() const { return *_lw; }
TAVM_stack_window& stacker() const { return *_sw; }
TAVM_stack_window& rstacker() const { return *_rw; }
TAVM_monitor();
};
bool TAVM_monitor::on_field_event(TOperable_field& o, TField_event e, long jolly)
{
switch (o.dlg())
{
case 104:
if (e == fe_init)
o.set(ignore_mon() ? "X" : "");
if (e == fe_modify)
set_ignore_mon(!o.get().blank());
break;
default:
break;
}
return true;
}
@ -355,20 +370,22 @@ bool TAVM_monitor::on_key(KEY k)
return TAutomask::on_key(k);
}
TAVM_monitor::TAVM_monitor() : TAutomask("Monitor", 1, 50, 20)
TAVM_monitor::TAVM_monitor() : TAutomask("Monitor", 1, 50, 20), _ignore_mon(false)
{
TWindowed_field* wf = new TAVM_list_field(this);
wf->create(101, 0, 0, 24, -3); add_field(wf);
wf->create(101, 0, 0, 24, -4); add_field(wf);
_lw = (TAVM_list_window*)&wf->win();
TWindowed_field* sf = new TAVM_stack_field(this);
sf->create(102, 27, 0, -3, 10); add_field(sf);
sf->create(102, 27, 0, -3, 9); add_field(sf);
_sw = (TAVM_stack_window*)&sf->win();
TWindowed_field* rf = new TAVM_stack_field(this);
rf->create(103, 27, 11, -3, -3); add_field(rf);
rf->create(103, 27, 10, -3, -4); add_field(rf);
_rw = (TAVM_stack_window*)&rf->win();
add_boolean(104, 0, "Ignora MON d'ora in poi", 1, -3);
add_button(DLG_NEXTREC, 0, "", -14, -1, 10, 2, "", 124).set_exit_key(K_F11);
add_button(DLG_LASTREC, 0, "", -24, -1, 10, 2, "", 1671).set_exit_key(K_F10);
add_button(DLG_ELABORA, 0, "", -34, -1, 10, 2, "", BMP_LASTREC).set_exit_key(K_F5);
@ -863,7 +880,7 @@ void TAVM::execute(const TAVM_op& op)
}
break;
case avm_mon:
if (!_mon.is_open())
if (!_mon.is_open() && !_mon.ignore_mon())
_mon.open_modal();
break;
case avm_mul:
@ -1074,6 +1091,7 @@ void TAVM::do_restart(bool cold)
_vars.destroy();
do_include("alex.alx");
}
_mon.set_ignore_mon(false);
}
TAVM::TAVM(TAlex_virtual_machine* vm)

View File

@ -10,7 +10,7 @@ class TConfig;
// questo sara' il principale, per ora non c'e'
#define CONFIG_GENERAL 0
// file prawin.ini
// file campo.ini
#define CONFIG_INSTALL 1
// file parametri studio (uno per studio, per ora e' il principale)
#define CONFIG_STUDIO 2

View File

@ -686,8 +686,11 @@ void TExpression::eval()
case _ansi:
{
TString& s = evalstack.peek_string();
const TDate d(s);
s = d.string(ANSI);
if (!s.empty())
{
const TDate d(s);
s = d.string(ANSI);
}
}
break;
case _num:

View File

@ -91,7 +91,7 @@ class TValue : public TObject
// @cmember:(INTERNAL) Valore real
real _r;
// @cmember:(INTERNAL) Valore in formato stringa
TString256 _s;
TString _s;
// @cmember:(INTERNAL) Tipo preferito
TTypeexp _t;

View File

@ -2090,8 +2090,8 @@ int TBrowse::do_input(
_inp_id.restart();
_inp_fn.restart();
TString256 val; // Value to output
bool tofilter;
TString val; // Value to output
bool tofilter = false;
for (const char* fld = _inp_id.get(); fld; fld = _inp_id.get())
{
@ -2103,20 +2103,39 @@ int TBrowse::do_input(
}
else
{
const short id = field().atodlg(fld);
const bool filter_flag = strchr(fld, '@') != NULL;
tofilter = filter && filter_flag;
val = field(id).get();
const TMask_field& f = field(id);
if (f.class_id() == CLASS_DATE_FIELD && f.right_justified())
const TMask_field* campf = NULL;
if (*fld == '-')
{
const TDate d(val);
val = d.string(ANSI);
TSheet_field* sheet = field().mask().get_sheet();
if (sheet != NULL)
{
const short id = atoi(fld+1);
campf = &sheet->mask().field(id);
}
}
else
{
const short id = field().atodlg(fld);
campf = &field(id);
}
if (campf != NULL)
{
const TMask_field& f = *campf;
val = f.get();
if (f.is_edit() && val.not_empty() && !filter_flag)
ne++; // Increment not empty fields count
if (f.class_id() == CLASS_DATE_FIELD && f.right_justified())
{
const TDate d(val);
val = d.string(ANSI);
}
const bool filter_flag = strchr(fld, '@') != NULL;
tofilter = filter && filter_flag;
if (f.is_edit() && val.not_empty() && !filter_flag)
ne++; // Increment not empty fields count
}
}
TFieldref fldref(_inp_fn.get(), 0); // Output field
fldref.write(val, *_cursor->relation());

View File

@ -457,7 +457,7 @@ bool is_var_separator(char c)
{
if (isspace(c))
return true;
return strchr("<=>,", c) != NULL;
return strchr("<=>(,", c) != NULL;
}
// Cerca le variabili nel testo SQL:
@ -1600,6 +1600,10 @@ TVariant& TISAM_recordset::get_tmp_var() const
const TVariant& TISAM_recordset::get(int logic, const char* fldname) const
{
const int idx = relation()->log2ind(logic);
if (idx < 0)
return NULL_VARIANT;
TString80 name = fldname;
TString16 subfield;
int from = 1, to = 0;
@ -1618,7 +1622,7 @@ const TVariant& TISAM_recordset::get(int logic, const char* fldname) const
name.cut(colon);
}
const TRectype& rec = relation()->curr(logic);
const TRectype& rec = relation()->file(idx).curr();
const TFieldtypes ft = rec.type(name);
if (ft == _nullfld)
@ -1731,8 +1735,10 @@ TCursor* TISAM_recordset::cursor() const
if (_cursor != NULL)
{
_cursor->items();
const TRecnotype items = _cursor->items();
_cursor->freeze();
if (items > 0)
*_cursor = 0L;
}
}
return _cursor;

View File

@ -126,7 +126,6 @@ class TISAM_recordset : public TRecordset
TArray _column; // Column infos
protected:
TCursor* cursor() const;
TRelation* relation() const;
virtual void reset();
@ -134,6 +133,7 @@ protected:
virtual const TVariant& get(int logic, const char* field) const;
public:
TCursor* cursor() const;
void set(const char* use);
virtual void requery();
virtual TRecnotype items() const;

View File

@ -39,8 +39,6 @@ class TRelation : public TObject
// @access Protected Member
protected:
// @cmember Ritorna l'indice di <p _files> del numero logico passato
int log2ind(int logicnum) const;
// @cmember Ritorna l'indice di <p _files> del alias del file passato
int alias2ind(int alias) const;
// @cmember Ritorna l'indice di <p _files> del nome del file passato
@ -50,21 +48,22 @@ protected:
TRelationdef& reldef(int i) const
{ return (TRelationdef&)_reldefs[i]; }
// @cmember Ritorna il descrittore del file <p i>-esimo
TLocalisamfile& file(int i = 0) const
{ return (TLocalisamfile&)_files[i]; }
// @cmember Permette di posizionare l'albero di relazioni tra i file
int position_rels(TIsamop op = _isequal, TReclock lockop = _nolock, int first = 0);
// @access Public Member
public: // TObject
// @cmember Ritorna l'indice di <p _files> del numero logico passato
int log2ind(int logicnum) const;
// @cmember Controlla se si tratta di un oggetto valido
TLocalisamfile& file(int i = 0) const
{ return (TLocalisamfile&)_files[i]; }
virtual bool ok() const
{ return good(); }
// @cmember Permette di stampare l'oggetto su <p out>
virtual void print_on(ostream& out) const;
public:
// @cmember Aggiorna l'albero delle relazioni
int update(int first = 0)
{ return position_rels(_isequal, _nolock, first); }

View File

@ -668,7 +668,7 @@ void TReport_section::save(TXmlItem& root) const
rf.save(item);
}
if (type() == 'B' && level() > 0) // Save subsections
if (type() == 'B' && level() > 0) // Save subsections if any
{
for (int s = 1; s <= 9; s++)
{
@ -2214,7 +2214,7 @@ bool TReport::execute_prescript()
{
// Script dei poverissimi: chiede le eventuali variabili
if (recordset() != NULL)
recordset()->ask_variables(true);
recordset()->ask_variables(false);
}
}

View File

@ -1549,7 +1549,7 @@ bool TReport_book::close_page()
return TBook::close_page();
}
void TReport_book::reprint_group_headers()
void TReport_book::reprint_group_headers(const TReport_section& rs)
{
const int max_group = _report->find_max_level('H');
for (int level = max_group; level >= 2; level--)
@ -1565,6 +1565,28 @@ void TReport_book::reprint_group_headers()
}
}
}
if (rs.level() > 10) // E' una sottosezione
{
TPointer_array headers; // Elenco degli header di sottosezione che devo stampare
for (int level = rs.level(); level > 10; level /= 10)
{
TReport_section& rs = _report->section('H', level);
if (rs.repeat_on_page())
{
const long height = rs.compute_size().y; // Compute size after the initilization script!
if (height > 0)
headers.add(rs);
}
}
for (int i = headers.last(); i >= 0; i--) // Stampo in ordine livello
{
TReport_section& rs = (TReport_section&)headers[i];
const long height = rs.compute_size().y;
rs.print(*this);
_delta.y += height;
}
}
}
long TReport_book::print_section(TReport_section& rs)
@ -1615,7 +1637,7 @@ long TReport_book::print_section(TReport_section& rs)
close_page();
open_page();
if (rs.type() == 'B')
reprint_group_headers();
reprint_group_headers(rs);
}
if (_page_is_open)
{
@ -1731,8 +1753,11 @@ bool TReport_book::add(TReport& rep, bool progind)
_rep_page = 0; // Azzera numero di pagina relativo
_is_last_page = false;
open_page();
for (bool ok = rex->move_to(0); ok && !_print_aborted; ok = rex->move_next())
bool ok = rex->move_to(0);
open_page();
for (; ok && !_print_aborted; ok = rex->move_next())
{
if (max_group >= 2) // Gestione raggruppamenti
{
@ -1771,11 +1796,10 @@ bool TReport_book::add(TReport& rep, bool progind)
for (int b = 1; b <= max_body; b++)
{
const int dy = print_section('B', b);
int column_delta = 0;
// Cerco di vedere se e' possibile la stampa etichette
if (dy > 0)
if (dy > 0) // Ho stampato qualcosa
{
// Cerco di vedere se e' possibile la stampa etichette
int column_delta = 0;
const int dx = _report->section('B', b).size().x;
// Se dx > 0 ho una sezione a dimensione fissa
if (dx > 0 && _delta.x+2*dx <= _logical_page_width)
@ -1783,17 +1807,18 @@ bool TReport_book::add(TReport& rep, bool progind)
column_delta = dx;
last_body_height = dy;
}
print_subsections(b);
if (column_delta > 0)
_delta.x += column_delta;
else
{
_delta.x = 0;
_delta.y += dy;
last_body_height = 0; // Non servirebbe strettamente
}
}
if (column_delta > 0)
_delta.x += column_delta;
else
{
_delta.x = 0;
_delta.y += dy;
last_body_height = 0; // Non servirebbe strettamente
}
print_subsections(b);
}
if (pi != NULL)

View File

@ -89,7 +89,7 @@ protected:
virtual bool on_link(const TReport_link& lnk);
bool init(TReport& rep);
void reprint_group_headers();
void reprint_group_headers(const TReport_section& rs);
long print_section(TReport_section& rs);
long print_section(char type, int level);
void print_subsections(int father);

View File

@ -364,7 +364,7 @@ TMRP_line::TMRP_line(const char* art, const char* giac,
const char* mag, const char* magc,
const char* imp, const char* lin,
long codcli)
: _codart(art), _livgiac(giac),
: _codart(art), _livgiac(giac), _explosion_depth(0),
_codmag(mag), _codmag_coll(magc),
_codimp(imp), _codlin(lin), _codclifor(codcli),
_final_product(FALSE)
@ -440,11 +440,11 @@ TMRP_line* TMRP_lines::find(const TCodice_articolo& codart, const TString& gia,
_key.add(magc,3);
}
}
if (_ignore_imp)
if (_ignore_imp || imp.blank())
_key.add(" ",4);
else
_key.add(imp,4);
if (_ignore_lin)
if (_ignore_lin || lin.blank())
_key.add(" ",5);
else
_key.add(lin,5);
@ -680,24 +680,25 @@ TRiga_ordine::TRiga_ordine(const TDate& datadoc, const TDate& datacons, long for
// TMRP_docref / TMRP_docrefs
///////////////////////////////////////////////////////////
const TRectype& TMRP_docref::get_doc()
const TRectype& TMRP_docref::get_doc() const
{
TToken_string _key;
_key.add("D");
_key.add(_annodoc);
_key.add(_codnum);
_key.add(_numdoc);
return cache().get(LF_DOC,_key);
TToken_string key;
key.add("D");
key.add(_annodoc);
key.add(_codnum);
key.add(_numdoc);
return cache().get(LF_DOC,key);
}
const TRectype& TMRP_docref::get_rdoc()
const TRectype& TMRP_docref::get_rdoc() const
{
TToken_string _key;
_key.add(_codnum);
_key.add(_annodoc);
_key.add("D");
_key.add(_numdoc);
_key.add(_numrig);
return cache().get(LF_RIGHEDOC,_key);
TToken_string key;
key.add(_codnum);
key.add(_annodoc);
key.add("D");
key.add(_numdoc);
key.add(_numrig);
return cache().get(LF_RIGHEDOC, key);
}
const TDate& TMRP_docref::datadoc()
@ -902,6 +903,10 @@ protected:
static void print_orders_header(TPrinter& pr);
static void print_orders_body(TPrinter& pr, TToken_string *sheetrow);
static void set_body_order_line(TPrintrow &row, TToken_string *sheetrow);
TMRP_line* find_risalita_line(TToken_string &row);
const TRectype* irefs2rdoc(const TMRP_internalrefs& iref) const;
bool print_risalita(TToken_string &row, int backlevel, bool dett_ord);
bool print_risalita(const TMRP_line & line, const TDate & d, int backlevel, bool dett_ord);
int print_internal_ref(const TMRP_internalref &iref, int backlevel, bool dett_ord);
@ -2109,6 +2114,9 @@ bool TMatResPlanning::explode_articles()
son->set_description(distinta.describe(art));
}
line.add_son(riga.val(), son);
if (riga.livello() > line.explosion_depth())
line.set_explosion_depth(riga.livello());
distinta.describe(art);
}
}
@ -2649,40 +2657,56 @@ bool TMatResPlanning::print_planning(TMask &pmask)
return TRUE;
}
bool TMatResPlanning::print_risalita(TToken_string &row, int ris_level, bool dett_ord )
TMRP_line* TMatResPlanning::find_risalita_line(TToken_string &row)
{
TPrinter& pr = printer();
TMatResMask& m = *_mask;
TSheet_field& sf = m.sfield(F_ORDINI);
// rintraccia la TMRPline per la risalita
TString art;
TString16 liv;
TString8 mag, magc, imp, lin;
long codcf;
codcf = row.get_long(sf.cid2index(F_FORNITORE));
TSheet_field& sf = _mask->sfield(F_ORDINI);
TCodice_articolo art;
row.get(sf.cid2index(F_ARTICOLO), art);
if (art.blank())
return NULL;
TString16 liv;
for (int l= livelli_giacenza().last_level(); l>=1; l--)
livelli_giacenza().pack_grpcode(liv, row.get(sf.cid2index(F_LIV1+l-1)), l);
TString8 mag, magc, imp, lin;
add_magcode(mag, row.get(sf.cid2index(F_MAGAZZINO)));
add_depcode(mag, row.get(sf.cid2index(F_DEPOSITO )));
row.get(sf.cid2index(F_CODIMP), imp);
row.get(sf.cid2index(F_CODLIN), lin);
long codcf = row.get_long(sf.cid2index(F_FORNITORE));
TMRP_line* line = _articles.find(art, liv, mag, magc, imp, lin, codcf);
if (!line)
line = _articles.find(art, liv, mag, magc, imp, lin, 0L);
if (line)
if (line == NULL)
{
line = _articles.find(art, liv, mag, magc, imp, lin, 0L); // Riprovo senza clifo
if (line == NULL)
{
line = _articles.find(art, liv, mag, magc, imp, EMPTY_STRING, codcf); // Riprovo senza linea
if (line == NULL)
line = _articles.find(art, liv, mag, magc, imp, EMPTY_STRING, 0L); // Riprovo senza nulla
}
}
return line;
}
bool TMatResPlanning::print_risalita(TToken_string &row, int ris_level, bool dett_ord)
{
TMRP_line* line = find_risalita_line(row);
if (line != NULL)
{
const TSheet_field& sf = _mask->sfield(F_ORDINI);
print_risalita(*line, row.get(sf.cid2index(F_DATACONS)), ris_level, dett_ord);
return TRUE;
return true;
}
else
{
TPrintrow prow;
prow.put(format(FR("@32gRisalita: impossibile rintracciare la proposta originale")));
pr.print(prow);
return FALSE;
printer().print(prow);
return false;
}
}
@ -2940,8 +2964,38 @@ bool TMatResPlanning::ask_save()
return yes;
}
const TRectype* TMatResPlanning::irefs2rdoc(const TMRP_internalrefs& irefs) const
{
const TRectype* rdoc = NULL;
for (int i = irefs.items()-1; i >= 0 && rdoc == NULL; i--)
{
const TMRP_internalref& iref = irefs.get_ref(i);
const TMRP_line& line = *iref.line();
const int bucket = iref.bucket();
const TMRP_record& rec = line.record(bucket);
for (int i = 0; i < 3 && rdoc == NULL; i++)
{
TMRP_docrefs* refs = NULL;
switch (i)
{
case 0: refs = rec.requirements_refs(); break;
case 1: refs = rec.plans_refs(); break;
case 2: refs = rec.scheduls_refs(); break;
default: break;
}
if (refs != NULL && refs->items() > 0)
{
const TMRP_docref& docref = *refs->get_ref_ptr(0);
rdoc = &docref.get_rdoc();
}
}
}
return rdoc;
}
/////////// finished: 90%
/////////// tested : 90%
/////////// tested : 10%
// genera gli ordini di produzione o a fornitore
bool TMatResPlanning::emit_orders()
{
@ -2972,7 +3026,7 @@ bool TMatResPlanning::emit_orders()
TToken_string& riga = *row;
if (*riga.get(0) == 'X')
{
bool ok=TRUE;
bool ok = true;
const bool newdoc = riga.get_long(F_DOCNUM - FIRST_FIELD) == 0L;
const TDate datadoc = riga.get(sf.cid2index(F_DATADOC));
const TDate datacon = riga.get(sf.cid2index(F_DATACONS));
@ -3095,17 +3149,50 @@ bool TMatResPlanning::emit_orders()
if (!divide_by_date)
rdoc.put(RDOC_DATACONS,datacon.string());
// Cerca il codice di assoggettamento fiscale sul fornitore
TString16 cod;
if (forn > 0)
{
cod.format("F|%ld", forn);
cod = cache().get(LF_CFVEN, cod, CFV_ASSFIS);
}
// Se non lo trova lo cerca sull'articolo
if (cod.empty())
cod = cache().get(LF_ANAMAG, riga.get(sf.cid2index(F_ARTICOLO)), ANAMAG_CODIVA);
rdoc.put(RDOC_CODIVA, cod);
riga.add("X",sf.cid2index(F_OK));
// Cerca di impostare la riga di provenienza dell'ordine
if (rdoc.get(RDOC_DAPROVV).blank()) // Se e' una riga nuova...
{
TMRP_line* line = find_risalita_line(riga); // ... cerco la riga di risalita
if (line != NULL)
{
for (int bucket = line->last_bucket(); bucket >= 0; bucket--)
{
const TRectype* dardoc = NULL;
TMRP_internalrefs *irefs = line->record(bucket).internal_refs();
if (irefs != NULL && irefs->items() > 0)
dardoc = irefs2rdoc(*irefs);
if (dardoc == NULL)
{
TMRP_docrefs* gr_refs = line->record(bucket).requirements_refs();
if (gr_refs != NULL && gr_refs->items() > 0) // Esiste almeno una riga di risalita
{
const TMRP_docref& docref = *gr_refs->get_ref_ptr(0);
dardoc = &docref.get_rdoc();
}
}
if (dardoc != NULL)
{
rdoc.set_original_rdoc_key(*dardoc); // Imposto DAPROVV, DAANNO, DACODNUM, DANDOC, DAIDRIGA
rdoc.put(RDOC_QTAGG5, line->explosion_depth()); // Memorizzo la profondita' di esplosione
break;
}
}
}
}
}
}
}
@ -3141,26 +3228,15 @@ void TMatResPlanning::compute()
void TMatResPlanning::risalita(const TMask & m)
{
TSheet_field & sf= m.sfield(F_ORDINI);
TToken_string & row=sf.row(sf.selected());
TString art;
TString16 liv;
TString8 mag, magc, imp, lin;
long codcf;
codcf = row.get_long(sf.cid2index(F_FORNITORE));
row.get(sf.cid2index(F_ARTICOLO), art);
for (int l= livelli_giacenza().last_level(); l>=1; l--)
livelli_giacenza().pack_grpcode(liv, row.get(sf.cid2index(F_LIV1+l-1)), l);
add_magcode(mag, row.get(sf.cid2index(F_MAGAZZINO)));
add_depcode(mag, row.get(sf.cid2index(F_DEPOSITO )));
row.get(sf.cid2index(F_CODIMP), imp);
row.get(sf.cid2index(F_CODLIN), lin);
TToken_string& row=sf.row(sf.selected());
TCodice_articolo art;
row.get(sf.cid2index(F_ARTICOLO), art);
if (art.blank())
return;
TMRP_line* line = _articles.find(art, liv, mag, magc, imp, lin, codcf);
if (!line)
line = _articles.find(art, liv, mag, magc, imp, lin, 0L);
if (line)
TMRP_line* line = find_risalita_line(row);
if (line != NULL)
{
TDate todate(row.get(sf.cid2index(F_DATACONS)));
TDate fromdate = todate;
@ -3171,7 +3247,8 @@ void TMatResPlanning::risalita(const TMask & m)
rismask = new TRisalita_mask(line, fromdate, todate, fromdate <= _mask->get_date(F_DADATA),_mask->get_int(F_XTRA_LDTIME));
rismask->run();
delete rismask;
} else
}
else
message_box(TR("Impossibile rintracciare la riga d'ordine indicata tra quelle generate in MRP"));
}

View File

@ -97,8 +97,11 @@ class TMRP_line : public TSortable
TString8 _codlin;
long _codclifor;
bool _final_product;
static TArticolo_giacenza *_articolo_giac;
static TString16 _substr;
int _explosion_depth;
static TArticolo_giacenza *_articolo_giac;
static TString16 _substr;
protected:
TArray _req_per_bucket;
@ -108,7 +111,6 @@ protected:
TString _descr;
bool is_son(const TCodice_articolo& art) const;
void lotti_riordino(real & minimo, real & increm) const ;
public:
@ -129,9 +131,10 @@ public:
const TString& coddep() const { return _substr = _codmag.mid(3); }
const TString& coddep_coll() const { return _substr = _codmag_coll.mid(3); }
const TString& livgiac(int l) const { return _substr = _livgiac.mid(livelli_giacenza().code_start(l)-1, livelli_giacenza().code_length(l));}
int explosion_depth() const { return _explosion_depth; }
virtual int compare(const TSortable& s) const;
int first_bucket(int i) const { return _req_per_bucket.first(); }
int first_bucket() const { return _req_per_bucket.first(); }
int last_bucket() const { return _req_per_bucket.last(); }
int next_bucket(int i) const { return _req_per_bucket.succ(i); }
@ -200,6 +203,7 @@ public:
bool final_product() const { return _final_product; }
void set_final_product(bool f = TRUE) { _final_product = f;}
void set_imp_lin(const char* imp, const char* lin);
void set_explosion_depth(int depth) { _explosion_depth = depth; }
// capacity review
@ -252,12 +256,10 @@ class TMRP_docref : public TObject
real _qta;
real _prz;
private:
const TRectype& get_doc();
const TRectype& get_rdoc();
protected:
virtual TObject* dup() const;
public:
virtual TObject* dup() const;
// settaggio valori
void set_annodoc(int anno) {_annodoc = anno;}
void set_codnumdoc(const char * codnum) {_codnum = codnum;}
@ -266,17 +268,20 @@ public:
void set_um(const char *um) {_um = um;}
void set_qta_residua(real & q) {_qta = q;}
int annodoc() {return _annodoc;}
const TString& codnumdoc() {return _codnum;}
long numdoc() {return _numdoc;}
int numrig() {return _numrig;}
const TString& um() {return _um;}
const real & qta_residua() {return _qta;}
int annodoc() const { return _annodoc; }
const TString& codnumdoc() const { return _codnum; }
long numdoc() const { return _numdoc; }
int numrig() const { return _numrig; }
const TString& um() const { return _um; }
const real & qta_residua() const { return _qta; }
const TDate& datadoc();
const TDate& datacons();
const TString & tipodoc();
char statodoc();
const TRectype& get_doc() const;
const TRectype& get_rdoc() const;
TMRP_docref(int anno, const char * codnum,long numdoc,int nriga,
const char *um, const real & qta, const real &prz);
};
@ -316,8 +321,8 @@ public:
class TMRP_internalrefs : public TArray
{
public:
TMRP_internalref & get_ref(int n) {return (TMRP_internalref & )operator[](n);}
TMRP_internalref *get_ref_ptr(int n) {return (TMRP_internalref * )objptr(n);}
TMRP_internalref& get_ref(int n) const {return (TMRP_internalref & )operator[](n);}
TMRP_internalref* get_ref_ptr(int n) {return (TMRP_internalref * )objptr(n);}
};

View File

@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:/Release/Campo22/ba8.exe"
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:/Release/Campo21/ba8.exe"
# SUBTRACT LINK32 /map /debug /nodefaultlib
!ELSEIF "$(CFG)" == "ba8 - Win32 Debug"
@ -133,7 +133,7 @@ SOURCE=..\ba\ba8200a.uml
!IF "$(CFG)" == "ba8 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ba\ba8200a.uml
InputName=ba8200a
@ -145,7 +145,7 @@ InputName=ba8200a
!ELSEIF "$(CFG)" == "ba8 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ba\ba8200a.uml
InputName=ba8200a
@ -164,7 +164,7 @@ SOURCE=..\ba\ba8200b.uml
!IF "$(CFG)" == "ba8 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ba\ba8200b.uml
InputName=ba8200b
@ -176,7 +176,7 @@ InputName=ba8200b
!ELSEIF "$(CFG)" == "ba8 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ba\ba8200b.uml
InputName=ba8200b
@ -195,7 +195,7 @@ SOURCE=..\ba\ba8300a.uml
!IF "$(CFG)" == "ba8 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ba\ba8300a.uml
InputName=ba8300a
@ -207,7 +207,7 @@ InputName=ba8300a
!ELSEIF "$(CFG)" == "ba8 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ba\ba8300a.uml
InputName=ba8300a
@ -226,7 +226,7 @@ SOURCE=..\ba\ba8300b.uml
!IF "$(CFG)" == "ba8 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ba\ba8300b.uml
InputName=ba8300b
@ -238,7 +238,7 @@ InputName=ba8300b
!ELSEIF "$(CFG)" == "ba8 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ba\ba8300b.uml
InputName=ba8300b
@ -257,7 +257,7 @@ SOURCE=..\ba\ba8300c.uml
!IF "$(CFG)" == "ba8 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ba\ba8300c.uml
InputName=ba8300c
@ -269,7 +269,7 @@ InputName=ba8300c
!ELSEIF "$(CFG)" == "ba8 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ba\ba8300c.uml
InputName=ba8300c
@ -288,7 +288,7 @@ SOURCE=..\ba\ba8300d.uml
!IF "$(CFG)" == "ba8 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ba\ba8300d.uml
InputName=ba8300d
@ -300,7 +300,7 @@ InputName=ba8300d
!ELSEIF "$(CFG)" == "ba8 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ba\ba8300d.uml
InputName=ba8300d
@ -314,12 +314,43 @@ InputName=ba8300d
# End Source File
# Begin Source File
SOURCE=..\ba\ba8300e.uml
!IF "$(CFG)" == "ba8 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo21
InputPath=..\ba\ba8300e.uml
InputName=ba8300e
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ELSEIF "$(CFG)" == "ba8 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ba\ba8300e.uml
InputName=ba8300e
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\ba\ba8400a.uml
!IF "$(CFG)" == "ba8 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ba\ba8400a.uml
InputName=ba8400a
@ -331,7 +362,7 @@ InputName=ba8400a
!ELSEIF "$(CFG)" == "ba8 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ba\ba8400a.uml
InputName=ba8400a
@ -350,7 +381,7 @@ SOURCE=..\ba\ba8500a.uml
!IF "$(CFG)" == "ba8 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ba\ba8500a.uml
InputName=ba8500a
@ -362,7 +393,7 @@ InputName=ba8500a
!ELSEIF "$(CFG)" == "ba8 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ba\ba8500a.uml
InputName=ba8500a

View File

@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:\Release\Campo22/ce1.exe"
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:\Release\Campo21/ce1.exe"
# SUBTRACT LINK32 /map /debug /nodefaultlib
!ELSEIF "$(CFG)" == "ce1 - Win32 Debug"
@ -141,7 +141,7 @@ SOURCE=..\ce\ce1101a.uml
!IF "$(CFG)" == "ce1 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ce\ce1101a.uml
InputName=ce1101a
@ -153,7 +153,7 @@ InputName=ce1101a
!ELSEIF "$(CFG)" == "ce1 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ce\ce1101a.uml
InputName=ce1101a
@ -172,7 +172,7 @@ SOURCE=..\ce\ce1101b.uml
!IF "$(CFG)" == "ce1 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ce\ce1101b.uml
InputName=ce1101b
@ -184,7 +184,7 @@ InputName=ce1101b
!ELSEIF "$(CFG)" == "ce1 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ce\ce1101b.uml
InputName=ce1101b
@ -203,7 +203,7 @@ SOURCE=..\ce\ce1201a.uml
!IF "$(CFG)" == "ce1 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ce\ce1201a.uml
InputName=ce1201a
@ -215,7 +215,7 @@ InputName=ce1201a
!ELSEIF "$(CFG)" == "ce1 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ce\ce1201a.uml
InputName=ce1201a
@ -234,7 +234,7 @@ SOURCE=..\ce\ce1201b.uml
!IF "$(CFG)" == "ce1 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ce\ce1201b.uml
InputName=ce1201b
@ -246,7 +246,7 @@ InputName=ce1201b
!ELSEIF "$(CFG)" == "ce1 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ce\ce1201b.uml
InputName=ce1201b
@ -265,7 +265,7 @@ SOURCE=..\ce\ce1301a.uml
!IF "$(CFG)" == "ce1 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ce\ce1301a.uml
InputName=ce1301a
@ -277,7 +277,7 @@ InputName=ce1301a
!ELSEIF "$(CFG)" == "ce1 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ce\ce1301a.uml
InputName=ce1301a
@ -296,7 +296,7 @@ SOURCE=..\ce\ce1301b.uml
!IF "$(CFG)" == "ce1 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ce\ce1301b.uml
InputName=ce1301b
@ -308,7 +308,7 @@ InputName=ce1301b
!ELSEIF "$(CFG)" == "ce1 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ce\ce1301b.uml
InputName=ce1301b
@ -327,7 +327,7 @@ SOURCE=..\ce\ce1301c.uml
!IF "$(CFG)" == "ce1 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ce\ce1301c.uml
InputName=ce1301c
@ -339,7 +339,7 @@ InputName=ce1301c
!ELSEIF "$(CFG)" == "ce1 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ce\ce1301c.uml
InputName=ce1301c
@ -358,7 +358,7 @@ SOURCE=..\ce\ce1301d.uml
!IF "$(CFG)" == "ce1 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ce\ce1301d.uml
InputName=ce1301d
@ -370,7 +370,7 @@ InputName=ce1301d
!ELSEIF "$(CFG)" == "ce1 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ce\ce1301d.uml
InputName=ce1301d
@ -389,7 +389,7 @@ SOURCE=..\ce\ce1400a.uml
!IF "$(CFG)" == "ce1 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ce\ce1400a.uml
InputName=ce1400a
@ -401,7 +401,7 @@ InputName=ce1400a
!ELSEIF "$(CFG)" == "ce1 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ce\ce1400a.uml
InputName=ce1400a
@ -420,7 +420,7 @@ SOURCE=..\ce\ce1400b.uml
!IF "$(CFG)" == "ce1 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ce\ce1400b.uml
InputName=ce1400b
@ -432,7 +432,7 @@ InputName=ce1400b
!ELSEIF "$(CFG)" == "ce1 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ce\ce1400b.uml
InputName=ce1400b
@ -451,7 +451,7 @@ SOURCE=..\ce\ce1400c.uml
!IF "$(CFG)" == "ce1 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ce\ce1400c.uml
InputName=ce1400c
@ -463,7 +463,7 @@ InputName=ce1400c
!ELSEIF "$(CFG)" == "ce1 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ce\ce1400c.uml
InputName=ce1400c
@ -482,7 +482,7 @@ SOURCE=..\ce\ce1400d.uml
!IF "$(CFG)" == "ce1 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ce\ce1400d.uml
InputName=ce1400d
@ -494,7 +494,7 @@ InputName=ce1400d
!ELSEIF "$(CFG)" == "ce1 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ce\ce1400d.uml
InputName=ce1400d
@ -513,7 +513,7 @@ SOURCE=..\ce\ce1500a.uml
!IF "$(CFG)" == "ce1 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ce\ce1500a.uml
InputName=ce1500a
@ -525,7 +525,7 @@ InputName=ce1500a
!ELSEIF "$(CFG)" == "ce1 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ce\ce1500a.uml
InputName=ce1500a
@ -544,7 +544,7 @@ SOURCE=..\ce\ce1500b.uml
!IF "$(CFG)" == "ce1 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\ce\ce1500b.uml
InputName=ce1500b
@ -556,7 +556,7 @@ InputName=ce1500b
!ELSEIF "$(CFG)" == "ce1 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ce\ce1500b.uml
InputName=ce1500b
@ -572,6 +572,38 @@ InputName=ce1500b
# Begin Group "Headers"
# PROP Default_Filter "h"
# Begin Source File
SOURCE=..\ce\ce1.h
# End Source File
# Begin Source File
SOURCE=..\ce\ce1101a.h
# End Source File
# Begin Source File
SOURCE=..\ce\ce1101b.h
# End Source File
# Begin Source File
SOURCE=..\ce\ce1201a.h
# End Source File
# Begin Source File
SOURCE=..\ce\ce1201b.h
# End Source File
# Begin Source File
SOURCE=..\ce\ce1301a.h
# End Source File
# Begin Source File
SOURCE=..\ce\ce1400a.h
# End Source File
# Begin Source File
SOURCE=..\ce\ce1500a.h
# End Source File
# End Group
# Begin Source File

View File

@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:\Release\Campo22/cg5.exe"
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:\Release\Campo21/cg5.exe"
# SUBTRACT LINK32 /map /debug /nodefaultlib
!ELSEIF "$(CFG)" == "cg5 - Win32 Debug"
@ -136,6 +136,10 @@ SOURCE=..\cg\cg5700.cpp
# End Source File
# Begin Source File
SOURCE=..\cg\cg5800.cpp
# End Source File
# Begin Source File
SOURCE=..\cg\cglib01.cpp
# End Source File
# Begin Source File
@ -157,7 +161,7 @@ SOURCE=..\cg\cg5000a.uml
!IF "$(CFG)" == "cg5 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\cg\cg5000a.uml
InputName=cg5000a
@ -169,7 +173,7 @@ InputName=cg5000a
!ELSEIF "$(CFG)" == "cg5 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\cg\cg5000a.uml
InputName=cg5000a
@ -188,7 +192,7 @@ SOURCE=..\cg\cg5100a.uml
!IF "$(CFG)" == "cg5 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\cg\cg5100a.uml
InputName=cg5100a
@ -200,7 +204,7 @@ InputName=cg5100a
!ELSEIF "$(CFG)" == "cg5 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\cg\cg5100a.uml
InputName=cg5100a
@ -219,7 +223,7 @@ SOURCE=..\cg\cg5200a.uml
!IF "$(CFG)" == "cg5 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\cg\cg5200a.uml
InputName=cg5200a
@ -231,7 +235,7 @@ InputName=cg5200a
!ELSEIF "$(CFG)" == "cg5 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\cg\cg5200a.uml
InputName=cg5200a
@ -250,7 +254,7 @@ SOURCE=..\cg\cg5300a.uml
!IF "$(CFG)" == "cg5 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\cg\cg5300a.uml
InputName=cg5300a
@ -262,7 +266,7 @@ InputName=cg5300a
!ELSEIF "$(CFG)" == "cg5 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\cg\cg5300a.uml
InputName=cg5300a
@ -281,7 +285,7 @@ SOURCE=..\cg\cg5400a.uml
!IF "$(CFG)" == "cg5 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\cg\cg5400a.uml
InputName=cg5400a
@ -293,7 +297,7 @@ InputName=cg5400a
!ELSEIF "$(CFG)" == "cg5 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\cg\cg5400a.uml
InputName=cg5400a
@ -312,7 +316,7 @@ SOURCE=..\cg\cg5400b.uml
!IF "$(CFG)" == "cg5 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\cg\cg5400b.uml
InputName=cg5400b
@ -324,7 +328,7 @@ InputName=cg5400b
!ELSEIF "$(CFG)" == "cg5 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\cg\cg5400b.uml
InputName=cg5400b
@ -343,7 +347,7 @@ SOURCE=..\cg\cg5500a.uml
!IF "$(CFG)" == "cg5 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\cg\cg5500a.uml
InputName=cg5500a
@ -355,7 +359,7 @@ InputName=cg5500a
!ELSEIF "$(CFG)" == "cg5 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\cg\cg5500a.uml
InputName=cg5500a
@ -374,7 +378,7 @@ SOURCE=..\cg\cg5500b.uml
!IF "$(CFG)" == "cg5 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\cg\cg5500b.uml
InputName=cg5500b
@ -386,7 +390,7 @@ InputName=cg5500b
!ELSEIF "$(CFG)" == "cg5 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\cg\cg5500b.uml
InputName=cg5500b
@ -405,7 +409,7 @@ SOURCE=..\cg\cg5500c.uml
!IF "$(CFG)" == "cg5 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\cg\cg5500c.uml
InputName=cg5500c
@ -417,7 +421,7 @@ InputName=cg5500c
!ELSEIF "$(CFG)" == "cg5 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\cg\cg5500c.uml
InputName=cg5500c
@ -436,7 +440,7 @@ SOURCE=..\cg\cg5500d.uml
!IF "$(CFG)" == "cg5 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\cg\cg5500d.uml
InputName=cg5500d
@ -448,7 +452,7 @@ InputName=cg5500d
!ELSEIF "$(CFG)" == "cg5 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\cg\cg5500d.uml
InputName=cg5500d
@ -467,7 +471,7 @@ SOURCE=..\cg\cg5600a.uml
!IF "$(CFG)" == "cg5 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\cg\cg5600a.uml
InputName=cg5600a
@ -479,7 +483,7 @@ InputName=cg5600a
!ELSEIF "$(CFG)" == "cg5 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\cg\cg5600a.uml
InputName=cg5600a
@ -498,7 +502,7 @@ SOURCE=..\cg\cg5700a.uml
!IF "$(CFG)" == "cg5 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\cg\cg5700a.uml
InputName=cg5700a
@ -510,7 +514,7 @@ InputName=cg5700a
!ELSEIF "$(CFG)" == "cg5 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\cg\cg5700a.uml
InputName=cg5700a
@ -529,7 +533,7 @@ SOURCE=..\cg\cg5700b.uml
!IF "$(CFG)" == "cg5 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\cg\cg5700b.uml
InputName=cg5700b
@ -541,7 +545,7 @@ InputName=cg5700b
!ELSEIF "$(CFG)" == "cg5 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\cg\cg5700b.uml
InputName=cg5700b
@ -552,11 +556,117 @@ InputName=cg5700b
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\cg\cg5800a.uml
!IF "$(CFG)" == "cg5 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo21
InputPath=..\cg\cg5800a.uml
InputName=cg5800a
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ELSEIF "$(CFG)" == "cg5 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\cg\cg5800a.uml
InputName=cg5800a
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\cg\cg5800b.uml
!IF "$(CFG)" == "cg5 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo21
InputPath=..\cg\cg5800b.uml
InputName=cg5800b
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ELSEIF "$(CFG)" == "cg5 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\cg\cg5800b.uml
InputName=cg5800b
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "Headers"
# PROP Default_Filter "h"
# Begin Source File
SOURCE=..\cg\cg5.h
# End Source File
# Begin Source File
SOURCE=..\cg\cg5000a.h
# End Source File
# Begin Source File
SOURCE=..\cg\cg5100a.h
# End Source File
# Begin Source File
SOURCE=..\cg\cg5200.h
# End Source File
# Begin Source File
SOURCE=..\cg\cg5300a.h
# End Source File
# Begin Source File
SOURCE=..\cg\cg5400.h
# End Source File
# Begin Source File
SOURCE=..\cg\cg5500.h
# End Source File
# Begin Source File
SOURCE=..\cg\cg5500a.h
# End Source File
# Begin Source File
SOURCE=..\cg\cg5500t.h
# End Source File
# Begin Source File
SOURCE=..\cg\cg5700.h
# End Source File
# Begin Source File
SOURCE=..\cg\cg5800.h
# End Source File
# End Group
# Begin Group "Forms"
@ -568,7 +678,7 @@ SOURCE=..\cg\cg5700a.frm
!IF "$(CFG)" == "cg5 - Win32 Release"
# Begin Custom Build - Compiling form $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\cg\cg5700a.frm
InputName=cg5700a
@ -580,7 +690,7 @@ InputName=cg5700a
!ELSEIF "$(CFG)" == "cg5 - Win32 Debug"
# Begin Custom Build - Compiling form $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\cg\cg5700a.frm
InputName=cg5700a
@ -591,6 +701,45 @@ InputName=cg5700a
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\cg\cg5800a.frm
!IF "$(CFG)" == "cg5 - Win32 Release"
# Begin Custom Build - Compiling form $(InputPath)...
TargetDir=D:\Release\Campo21
InputPath=..\cg\cg5800a.frm
InputName=cg5800a
"$(TargetDir)\$(InputName).frm" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
frm32 $(InputPath) $(TargetDir)\$(InputName).frm
# End Custom Build
!ELSEIF "$(CFG)" == "cg5 - Win32 Debug"
# Begin Custom Build - Compiling form $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\cg\cg5800a.frm
InputName=cg5800a
"$(TargetDir)\$(InputName).frm" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
frm32 $(InputPath) $(TargetDir)\$(InputName).frm
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "Rep"
# PROP Default_Filter "rep"
# Begin Source File
SOURCE=..\cg\cg5800ra.rep
# End Source File
# End Group
# Begin Source File

16
projects/cpini32.bat Executable file
View File

@ -0,0 +1,16 @@
@echo off
echo Generating %1 ini file
copy ..\include\lffiles.h+%1 %TMP%\tmp.tmp
set oldinc=%include
set include=..\include;..\ve
cl /nologo /EP %TMP%\tmp.tmp >%TMP%\tmp.ini
set include=%oldinc
set oldinc=
fastrip %TMP%\tmp.ini %TMP%\tmp1.ini
copy %TMP%\tmp1.ini %2
del %TMP%\tmp.ini
del %TMP%\tmp1.ini
del %TMP%\tmp.tmp
cd ..\projects

View File

@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:\Release\Campo22/db0.exe"
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:\Release\Campo21/db0.exe"
# SUBTRACT LINK32 /map /debug /nodefaultlib
!ELSEIF "$(CFG)" == "db0 - Win32 Debug"
@ -137,7 +137,7 @@ SOURCE=..\db\db0500a.uml
!IF "$(CFG)" == "db0 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\db\db0500a.uml
InputName=db0500a
@ -149,7 +149,7 @@ InputName=db0500a
!ELSEIF "$(CFG)" == "db0 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\db\db0500a.uml
InputName=db0500a
@ -168,7 +168,7 @@ SOURCE=..\db\db0500b.uml
!IF "$(CFG)" == "db0 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\db\db0500b.uml
InputName=db0500b
@ -180,7 +180,7 @@ InputName=db0500b
!ELSEIF "$(CFG)" == "db0 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\db\db0500b.uml
InputName=db0500b
@ -199,7 +199,7 @@ SOURCE=..\db\db0500c.uml
!IF "$(CFG)" == "db0 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\db\db0500c.uml
InputName=db0500c
@ -211,7 +211,7 @@ InputName=db0500c
!ELSEIF "$(CFG)" == "db0 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\db\db0500c.uml
InputName=db0500c
@ -230,7 +230,7 @@ SOURCE=..\db\dbstlav.uml
!IF "$(CFG)" == "db0 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\db\dbstlav.uml
InputName=dbstlav
@ -242,7 +242,7 @@ InputName=dbstlav
!ELSEIF "$(CFG)" == "db0 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\db\dbstlav.uml
InputName=dbstlav
@ -261,7 +261,7 @@ SOURCE=..\db\dbstord.uml
!IF "$(CFG)" == "db0 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\db\dbstord.uml
InputName=dbstord
@ -273,7 +273,7 @@ InputName=dbstord
!ELSEIF "$(CFG)" == "db0 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\db\dbstord.uml
InputName=dbstord
@ -292,7 +292,7 @@ SOURCE=..\db\dbstvar.uml
!IF "$(CFG)" == "db0 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\db\dbstvar.uml
InputName=dbstvar
@ -304,7 +304,7 @@ InputName=dbstvar
!ELSEIF "$(CFG)" == "db0 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\db\dbstvar.uml
InputName=dbstvar
@ -323,7 +323,7 @@ SOURCE=..\db\dbtblav.uml
!IF "$(CFG)" == "db0 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\db\dbtblav.uml
InputName=dbtblav
@ -335,7 +335,7 @@ InputName=dbtblav
!ELSEIF "$(CFG)" == "db0 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\db\dbtblav.uml
InputName=dbtblav
@ -354,7 +354,7 @@ SOURCE=..\db\dbtbord.uml
!IF "$(CFG)" == "db0 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\db\dbtbord.uml
InputName=dbtbord
@ -366,7 +366,7 @@ InputName=dbtbord
!ELSEIF "$(CFG)" == "db0 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\db\dbtbord.uml
InputName=dbtbord
@ -385,7 +385,7 @@ SOURCE=..\db\dbtbvar.uml
!IF "$(CFG)" == "db0 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\db\dbtbvar.uml
InputName=dbtbvar
@ -397,7 +397,7 @@ InputName=dbtbvar
!ELSEIF "$(CFG)" == "db0 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\db\dbtbvar.uml
InputName=dbtbvar
@ -424,7 +424,7 @@ SOURCE=..\db\dbtblav.rpt
!IF "$(CFG)" == "db0 - Win32 Release"
# Begin Custom Build - Compiling rpt $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\db\dbtblav.rpt
InputName=dbtblav
@ -436,7 +436,7 @@ InputName=dbtblav
!ELSEIF "$(CFG)" == "db0 - Win32 Debug"
# Begin Custom Build - Compiling rpt $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\db\dbtblav.rpt
InputName=dbtblav
@ -455,7 +455,7 @@ SOURCE=..\db\dbtbord.rpt
!IF "$(CFG)" == "db0 - Win32 Release"
# Begin Custom Build - Compiling rpt $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\db\dbtbord.rpt
InputName=dbtbord
@ -467,7 +467,7 @@ InputName=dbtbord
!ELSEIF "$(CFG)" == "db0 - Win32 Debug"
# Begin Custom Build - Compiling rpt $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\db\dbtbord.rpt
InputName=dbtbord
@ -486,7 +486,7 @@ SOURCE=..\db\dbtbvar.rpt
!IF "$(CFG)" == "db0 - Win32 Release"
# Begin Custom Build - Compiling rpt $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\db\dbtbvar.rpt
InputName=dbtbvar
@ -498,7 +498,7 @@ InputName=dbtbvar
!ELSEIF "$(CFG)" == "db0 - Win32 Debug"
# Begin Custom Build - Compiling rpt $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\db\dbtbvar.rpt
InputName=dbtbvar

View File

@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:\Release\Campo22/db2.exe"
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:\Release\Campo21/db2.exe"
# SUBTRACT LINK32 /map /debug /nodefaultlib
!ELSEIF "$(CFG)" == "db2 - Win32 Debug"
@ -133,7 +133,7 @@ SOURCE=..\db\db2400a.uml
!IF "$(CFG)" == "db2 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\db\db2400a.uml
InputName=db2400a
@ -145,7 +145,7 @@ InputName=db2400a
!ELSEIF "$(CFG)" == "db2 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\db\db2400a.uml
InputName=db2400a

View File

@ -7,8 +7,10 @@ set include=..\include;..\at;..\ba;..\ce;..\cg;..\cm;..\db;..\dl;..\m770;..\mg;.
cl /nologo /EP %TMP%\tmp.tmp >%TMP%\tmp.frm
set include=%oldinc
set oldinc=
fastrip %TMP%\tmp.frm %2
del %TMP%\tmp.tmp
fastrip %TMP%\tmp.frm %TMP%\tmp1.frm
copy %TMP%\tmp1.frm %2
del %TMP%\tmp.frm
del %TMP%\tmp1.frm
del %TMP%\tmp.tmp

View File

@ -7,8 +7,10 @@ set include=..\include;..\ve
cl /nologo /EP %TMP%\tmp.tmp >%TMP%\tmp.ini
set include=%oldinc
set oldinc=
fastrip %TMP%\tmp.ini %2
fastrip %TMP%\tmp.ini %TMP%\tmp1.ini
copy %TMP%\tmp1.ini %2
del %TMP%\tmp.ini
del %TMP%\tmp1.ini
del %TMP%\tmp.tmp
cd ..\exed

View File

@ -10,8 +10,10 @@ copy ..\include\uml.h+%TMP%\tmp.msk %TMP%\tmp.uml
cl /nologo /EP %TMP%\tmp.uml >%TMP%\tmp.msk
set include=%oldinc
set oldinc=
fastrip %TMP%\tmp.msk %2
fastrip %TMP%\tmp.msk %TMP%\tmp1.msk
copy %TMP%\tmp1.msk %2
del %TMP%\tmp.msk
del %TMP%\tmp1.msk
del %TMP%\tmp.uml
del %TMP%\tmp.tmp
del %TMP%\tmp.msk

View File

@ -3,12 +3,13 @@ echo Compiling %1 into %2
copy ..\include\uml.h+%1 %TMP%\tmp.tmp
set oldinc=%include
set include=..\include;..\ab;..\aec;..\at;..\ba;..\ca;..\ce;..\cg;..\cm;..\db;..\dl;..\ef;..\in;..\m770;..\mg;..\mr;..\or;..\pr;..\sc;..\sv;..\ve;..\xvaga
set include=..\include;..\ab;..\aec;..\at;..\ba;..\ca;..\ce;..\cg;..\cm;..\db;..\dl;..\ef;..\in;..\m770;..\mg;..\mr;..\or;..\pr;..\ps;..\sc;..\si;..\sv;..\ve;..\xvaga
cl /nologo /EP %TMP%\tmp.tmp >%TMP%\tmp.msk
set include=%oldinc
set oldinc=
fastrip %TMP%\tmp.msk %2
fastrip %TMP%\tmp.msk %TMP%\tmp1.msk
copy %TMP%\tmp1.msk %2
del %TMP%\tmp.msk
del %TMP%\tmp1.msk
del %TMP%\tmp.tmp

View File

@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:\Release\Campo22/or1.exe"
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:\Release\Campo21/or1.exe"
# SUBTRACT LINK32 /map /debug /nodefaultlib
!ELSEIF "$(CFG)" == "or1 - Win32 Debug"
@ -71,7 +71,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\include" /I "..\xvaga" /I "..\xi" /D "_DEBUG" /D "WIN32" /D "DBG" /D "_WINDOWS" /D "__LONGDOUBLE__" /FR /FD /c
# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\include" /I "..\xvaga" /I "..\xi" /D "_DEBUG" /D "WIN32" /D "DBG" /D "_WINDOWS" /FR /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@ -193,7 +193,7 @@ SOURCE=..\or\or1100a.uml
!IF "$(CFG)" == "or1 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\or\or1100a.uml
InputName=or1100a
@ -205,7 +205,7 @@ InputName=or1100a
!ELSEIF "$(CFG)" == "or1 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\or\or1100a.uml
InputName=or1100a
@ -224,7 +224,7 @@ SOURCE=..\or\or1200a.uml
!IF "$(CFG)" == "or1 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\or\or1200a.uml
InputName=or1200a
@ -236,7 +236,7 @@ InputName=or1200a
!ELSEIF "$(CFG)" == "or1 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\or\or1200a.uml
InputName=or1200a
@ -275,7 +275,7 @@ SOURCE=..\or\or1100a.frm
!IF "$(CFG)" == "or1 - Win32 Release"
# Begin Custom Build - Compiling form $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\or\or1100a.frm
InputName=or1100a
@ -287,7 +287,7 @@ InputName=or1100a
!ELSEIF "$(CFG)" == "or1 - Win32 Debug"
# Begin Custom Build - Compiling form $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\or\or1100a.frm
InputName=or1100a
@ -306,7 +306,7 @@ SOURCE=..\or\or1100b.frm
!IF "$(CFG)" == "or1 - Win32 Release"
# Begin Custom Build - Compiling form $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\or\or1100b.frm
InputName=or1100b
@ -318,7 +318,7 @@ InputName=or1100b
!ELSEIF "$(CFG)" == "or1 - Win32 Debug"
# Begin Custom Build - Compiling form $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\or\or1100b.frm
InputName=or1100b
@ -337,7 +337,7 @@ SOURCE=..\or\or1100c.frm
!IF "$(CFG)" == "or1 - Win32 Release"
# Begin Custom Build - Compiling form $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\or\or1100c.frm
InputName=or1100c
@ -349,7 +349,7 @@ InputName=or1100c
!ELSEIF "$(CFG)" == "or1 - Win32 Debug"
# Begin Custom Build - Compiling form $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\or\or1100c.frm
InputName=or1100c
@ -368,7 +368,7 @@ SOURCE=..\or\or1100d.frm
!IF "$(CFG)" == "or1 - Win32 Release"
# Begin Custom Build - Compiling form $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\or\or1100d.frm
InputName=or1100d
@ -380,7 +380,7 @@ InputName=or1100d
!ELSEIF "$(CFG)" == "or1 - Win32 Debug"
# Begin Custom Build - Compiling form $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\or\or1100d.frm
InputName=or1100d
@ -399,7 +399,7 @@ SOURCE=..\or\or1200a.frm
!IF "$(CFG)" == "or1 - Win32 Release"
# Begin Custom Build - Compiling form $(InputPath)...
TargetDir=D:\Release\Campo22
TargetDir=D:\Release\Campo21
InputPath=..\or\or1200a.frm
InputName=or1200a
@ -411,7 +411,7 @@ InputName=or1200a
!ELSEIF "$(CFG)" == "or1 - Win32 Debug"
# Begin Custom Build - Compiling form $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\or\or1200a.frm
InputName=or1200a

196
projects/pd1579.dsp Executable file
View File

@ -0,0 +1,196 @@
# Microsoft Developer Studio Project File - Name="pd1579" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101
CFG=pd1579 - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "pd1579.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "pd1579.mak" CFG="pd1579 - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "pd1579 - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "pd1579 - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "pd1579 - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\release"
# PROP Intermediate_Dir "..\release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MT /W3 /O2 /I "..\include" /I "..\xvaga" /I "..\xi" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XVT" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x410 /d "NDEBUG"
# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:\Release\Campo21/pd1579.exe"
# SUBTRACT LINK32 /map /debug /nodefaultlib
!ELSEIF "$(CFG)" == "pd1579 - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\debug"
# PROP Intermediate_Dir "..\debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\include" /I "..\xvaga" /I "..\xi" /D "_DEBUG" /D "WIN32" /D "DBG" /D "_WINDOWS" /FR /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x410 /d "_DEBUG"
# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\exed\pd1579.exe" /pdbtype:sept
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
# Begin Target
# Name "pd1579 - Win32 Release"
# Name "pd1579 - Win32 Debug"
# Begin Group "Sources"
# PROP Default_Filter "cpp"
# Begin Source File
SOURCE=..\ps\pd1579.cpp
# End Source File
# Begin Source File
SOURCE=..\ps\pd1579100.cpp
# End Source File
# End Group
# Begin Group "Masks"
# PROP Default_Filter "uml"
# Begin Source File
SOURCE=..\ps\pd1579100a.uml
!IF "$(CFG)" == "pd1579 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo21
InputPath=..\ps\pd1579100a.uml
InputName=pd1579100a
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ELSEIF "$(CFG)" == "pd1579 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ps\pd1579100a.uml
InputName=pd1579100a
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "Headers"
# PROP Default_Filter "h"
# Begin Source File
SOURCE=..\ps\pd1579.h
# End Source File
# Begin Source File
SOURCE=..\ps\pd1579100a.h
# End Source File
# End Group
# Begin Group "Ini"
# PROP Default_Filter "ini"
# Begin Source File
SOURCE=..\ps\pd1579100a.ini
!IF "$(CFG)" == "pd1579 - Win32 Release"
!ELSEIF "$(CFG)" == "pd1579 - Win32 Debug"
# Begin Custom Build
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ps\pd1579100a.ini
InputName=pd1579100a
"$(TargetDir)\$(InputName).ini" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
cpini32 $(InputPath) $(TargetDir)\$(InputName).ini
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Source File
SOURCE=.\pd1579.rc
!IF "$(CFG)" == "pd1579 - Win32 Release"
# ADD BASE RSC /l 0x410
# ADD RSC /l 0x410
!ELSEIF "$(CFG)" == "pd1579 - Win32 Debug"
# ADD BASE RSC /l 0x410
# ADD RSC /l 0x410 /fo"..\Debug/pd1579.res"
!ENDIF
# End Source File
# End Target
# End Project

4
projects/pd1579.rc Executable file
View File

@ -0,0 +1,4 @@
"9012" ICON DISCARDABLE "../exed/res/exe.ico"
rcinclude ../../wx240/include/wx/msw/wx.rc

63
projects/ps.dsp Executable file
View File

@ -0,0 +1,63 @@
# Microsoft Developer Studio Project File - Name="ps" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Generic Project" 0x010a
CFG=ps - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "ps.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "ps.mak" CFG="ps - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "ps - Win32 Release" (based on "Win32 (x86) Generic Project")
!MESSAGE "ps - Win32 Debug" (based on "Win32 (x86) Generic Project")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
MTL=midl.exe
!IF "$(CFG)" == "ps - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
!ELSEIF "$(CFG)" == "ps - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "ps___Win32_Debug"
# PROP BASE Intermediate_Dir "ps___Win32_Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "ps___Win32_Debug"
# PROP Intermediate_Dir "ps___Win32_Debug"
# PROP Target_Dir ""
!ENDIF
# Begin Target
# Name "ps - Win32 Release"
# Name "ps - Win32 Debug"
# End Target
# End Project

92
projects/ps.dsw Executable file
View File

@ -0,0 +1,92 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "AgaLib"=.\AgaLib.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "pd1579"=.\pd1579.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name AgaLib
End Project Dependency
}}}
###############################################################################
Project: "ps"=.\ps.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name ps0816
End Project Dependency
Begin Project Dependency
Project_Dep_Name ps0872
End Project Dependency
}}}
###############################################################################
Project: "ps0816"=.\ps0816.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name AgaLib
End Project Dependency
}}}
###############################################################################
Project: "ps0872"=.\ps0872.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name AgaLib
End Project Dependency
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################

259
projects/ps0816.dsp Executable file
View File

@ -0,0 +1,259 @@
# Microsoft Developer Studio Project File - Name="ps0816" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101
CFG=ps0816 - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "ps0816.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "ps0816.mak" CFG="ps0816 - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "ps0816 - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "ps0816 - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "ps0816 - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\release"
# PROP Intermediate_Dir "..\release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MT /W3 /O2 /I "..\include" /I "..\xvaga" /I "..\xi" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XVT" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x410 /d "NDEBUG"
# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:\Release\Campo21/ps0816.exe"
# SUBTRACT LINK32 /map /debug /nodefaultlib
!ELSEIF "$(CFG)" == "ps0816 - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\debug"
# PROP Intermediate_Dir "..\debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\include" /I "..\xvaga" /I "..\xi" /D "_DEBUG" /D "WIN32" /D "DBG" /D "_WINDOWS" /FR /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x410 /d "_DEBUG"
# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\exed\ps0816.exe" /pdbtype:sept
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
# Begin Target
# Name "ps0816 - Win32 Release"
# Name "ps0816 - Win32 Debug"
# Begin Group "Sources"
# PROP Default_Filter "cpp"
# Begin Source File
SOURCE=..\ps\ps0816.cpp
# End Source File
# Begin Source File
SOURCE=..\ps\ps0816100.cpp
# End Source File
# End Group
# Begin Group "Masks"
# PROP Default_Filter "uml"
# Begin Source File
SOURCE=..\ps\ps0816100a.uml
!IF "$(CFG)" == "ps0816 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo21
InputPath=..\ps\ps0816100a.uml
InputName=ps0816100a
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ELSEIF "$(CFG)" == "ps0816 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ps\ps0816100a.uml
InputName=ps0816100a
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "Headers"
# PROP Default_Filter "h"
# Begin Source File
SOURCE=..\ps\ps0816.h
# End Source File
# Begin Source File
SOURCE=..\ps\ps0816100a.h
# End Source File
# End Group
# Begin Group "Ini"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\ps\ps0816101f.ini
!IF "$(CFG)" == "ps0816 - Win32 Release"
!ELSEIF "$(CFG)" == "ps0816 - Win32 Debug"
# Begin Custom Build - Compiling form $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ps\ps0816101f.ini
InputName=ps0816101f
"$(TargetDir)\$(InputName).ini" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
cpini32 $(InputPath) $(TargetDir)\$(InputName).ini
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\ps\ps0816101s.ini
!IF "$(CFG)" == "ps0816 - Win32 Release"
!ELSEIF "$(CFG)" == "ps0816 - Win32 Debug"
# Begin Custom Build - Compiling form $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ps\ps0816101s.ini
InputName=ps0816101s
"$(TargetDir)\$(InputName).ini" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
cpini32 $(InputPath) $(TargetDir)\$(InputName).ini
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\ps\ps0816102f.ini
!IF "$(CFG)" == "ps0816 - Win32 Release"
!ELSEIF "$(CFG)" == "ps0816 - Win32 Debug"
# Begin Custom Build - Compiling form $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ps\ps0816102f.ini
InputName=ps0816102f
"$(TargetDir)\$(InputName).ini" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
cpini32 $(InputPath) $(TargetDir)\$(InputName).ini
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\ps\ps0816102s.ini
!IF "$(CFG)" == "ps0816 - Win32 Release"
!ELSEIF "$(CFG)" == "ps0816 - Win32 Debug"
# Begin Custom Build - Compiling form $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ps\ps0816102s.ini
InputName=ps0816102s
"$(TargetDir)\$(InputName).ini" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
cpini32 $(InputPath) $(TargetDir)\$(InputName).ini
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Source File
SOURCE=.\ps0816.rc
!IF "$(CFG)" == "ps0816 - Win32 Release"
# ADD BASE RSC /l 0x410
# ADD RSC /l 0x410
!ELSEIF "$(CFG)" == "ps0816 - Win32 Debug"
# ADD BASE RSC /l 0x410
# ADD RSC /l 0x410 /fo"..\Debug/ps0816.res"
!ENDIF
# End Source File
# End Target
# End Project

4
projects/ps0816.rc Executable file
View File

@ -0,0 +1,4 @@
"9012" ICON DISCARDABLE "../exed/res/exe.ico"
rcinclude ../../wx240/include/wx/msw/wx.rc

200
projects/ps0872.dsp Executable file
View File

@ -0,0 +1,200 @@
# Microsoft Developer Studio Project File - Name="ps0872" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101
CFG=ps0872 - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "ps0872.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "ps0872.mak" CFG="ps0872 - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "ps0872 - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "ps0872 - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "ps0872 - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\release"
# PROP Intermediate_Dir "..\release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MT /W3 /O2 /I "..\include" /I "..\xvaga" /I "..\xi" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XVT" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x410 /d "NDEBUG"
# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:\Release\Campo21/ps0872.exe"
# SUBTRACT LINK32 /map /debug /nodefaultlib
!ELSEIF "$(CFG)" == "ps0872 - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\debug"
# PROP Intermediate_Dir "..\debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\include" /I "..\xvaga" /I "..\xi" /D "_DEBUG" /D "WIN32" /D "DBG" /D "_WINDOWS" /FR /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x410 /d "_DEBUG"
# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\exed\ps0872.exe" /pdbtype:sept
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
# Begin Target
# Name "ps0872 - Win32 Release"
# Name "ps0872 - Win32 Debug"
# Begin Group "Sources"
# PROP Default_Filter "cpp"
# Begin Source File
SOURCE=..\ps\ps0872.cpp
# End Source File
# Begin Source File
SOURCE=..\ps\ps0872100.cpp
# End Source File
# Begin Source File
SOURCE=..\ps\ps0872200.cpp
# End Source File
# End Group
# Begin Group "Masks"
# PROP Default_Filter "uml"
# Begin Source File
SOURCE=..\ps\ps0872100a.uml
!IF "$(CFG)" == "ps0872 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo21
InputPath=..\ps\ps0872100a.uml
InputName=ps0872100a
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ELSEIF "$(CFG)" == "ps0872 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ps\ps0872100a.uml
InputName=ps0872100a
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\ps\ps0872200a.uml
!IF "$(CFG)" == "ps0872 - Win32 Release"
!ELSEIF "$(CFG)" == "ps0872 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)
TargetDir=\u\D_02_01\exed
InputPath=..\ps\ps0872200a.uml
InputName=ps0872200a
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "Headers"
# PROP Default_Filter "h"
# Begin Source File
SOURCE=..\ps\ps0872.h
# End Source File
# Begin Source File
SOURCE=..\ps\ps0872100a.h
# End Source File
# Begin Source File
SOURCE=..\ps\ps0872200a.h
# End Source File
# End Group
# Begin Source File
SOURCE=.\ps0872.rc
!IF "$(CFG)" == "ps0872 - Win32 Release"
# ADD BASE RSC /l 0x410
# ADD RSC /l 0x410
!ELSEIF "$(CFG)" == "ps0872 - Win32 Debug"
# ADD BASE RSC /l 0x410
# ADD RSC /l 0x410 /fo"..\Debug/ps0872.res"
!ENDIF
# End Source File
# End Target
# End Project

4
projects/ps0872.rc Executable file
View File

@ -0,0 +1,4 @@
"9012" ICON DISCARDABLE "../exed/res/exe.ico"
rcinclude ../../wx240/include/wx/msw/wx.rc

View File

@ -7,9 +7,11 @@ set include=..\include;..\at;..\ba;..\ce;..\cg;..\db;..\ef;..\in;..\m770;..\mg;.
cl /nologo /EP %TMP%\tmp.tmp > %TMP%\tmp.rpt
set include=%oldinc
set oldinc=
fastrip %TMP%\tmp.rpt %2
del %TMP%\tmp.tmp
fastrip %TMP%\tmp.rpt %TMP%\tmp1.rpt
copy %TMP%\tmp1.rpt %2
del %TMP%\tmp.rpt
del %TMP%\tmp1.rpt
del %TMP%\tmp.tmp

View File

@ -1,3 +1,3 @@
34
0
$rdoc|0|0|453|31|Righe documenti di vendita|NDOC*3||
$rdoc|21|21|453|31|Righe documenti di vendita|NDOC*3||

View File

@ -52,7 +52,8 @@ DANDOC|3|7|0|Numero del documento originale
DAIDRIGA|3|6|0|Identificatore riga originale
CODCMS|1|20|0|Codice Commessa
FASCMS|1|10|0|Fase Commessa
3
4
CODNUM+ANNO+PROVV+NDOC+NRIGA|
CODNUM+ANNO+PROVV+CODART+LIVELLO+CODMAG|X
PROVV+ANNO+CODNUM+NDOC+NRIGA|X
DAPROVV+DAANNO+DACODNUM+DANDOC+DAIDRIGA|X

View File

@ -182,7 +182,7 @@ static bool handle_subcodice(TMask_field &fld, KEY k)
return true;
}
void create_browse1(TEdit_field& kfld, int level, short key_id, short des_id, const TCodart_livelli &cal)
void create_browse1(TEdit_field& kfld, int level, short key_id, short des_id, const TCodart_livelli &cal, const bool chktyp)
{
TFilename tmp; tmp.temp();
ofstream out(tmp);
@ -202,10 +202,14 @@ void create_browse1(TEdit_field& kfld, int level, short key_id, short des_id, co
out << "DI \"" << TR("Descrizione") << "@50\" S0" << endl;
out << "OU " << id << " CODTAB[2,0]" << endl;
out << "OU " << (des_id + level -1) << " S0" << endl;
if (level == 1)
out << "CH RE" << endl;
else
out << "CH NO" << endl;
if (chktyp)
{
if (level == 1)
out << "CH RE" << endl;
else
out << "CH NO" << endl;
}
out << "EN" << endl;
out.close();
@ -216,7 +220,7 @@ void create_browse1(TEdit_field& kfld, int level, short key_id, short des_id, co
xvt_fsys_removefile(tmp);
}
void create_browse2(TEdit_field& kfld, int level, short key_id, short des_id, const TCodart_livelli &cal)
void create_browse2(TEdit_field& kfld, int level, short key_id, short des_id, const TCodart_livelli &cal, const bool chktyp)
{
TFilename tmp; tmp.temp();
ofstream out(tmp);
@ -235,7 +239,8 @@ void create_browse2(TEdit_field& kfld, int level, short key_id, short des_id, co
out << "\" CODTAB[2,0]" << endl;
out << "CO OU " << (key_id + level -1) << endl;
out << "CH NO" << endl;
if (chktyp)
out << "CH NO" << endl;
out << "EN" << endl;
out.close();
@ -246,7 +251,7 @@ void create_browse2(TEdit_field& kfld, int level, short key_id, short des_id, co
xvt_fsys_removefile(tmp);
}
int create_fields(TMask& msk, int x, int y, short key_id, short des_id, const TCodart_livelli &cal)
int create_fields(TMask& msk, int x, int y, short key_id, short des_id, const TCodart_livelli &cal, const bool chktyp)
{
const int last_level = cal.last_level();
int tab0 = x;
@ -263,7 +268,7 @@ int create_fields(TMask& msk, int x, int y, short key_id, short des_id, const TC
TEdit_field& kfld = msk.add_string(kid, 0, "", tab0, y, picture.len(), flags);
kfld.set_key(1);
create_browse1(kfld, i, key_id, des_id, cal);
create_browse1(kfld, i, key_id, des_id, cal, chktyp);
kfld.set_handler(handle_subcodice);
tab0 += picture.len()+3;
@ -274,7 +279,7 @@ int create_fields(TMask& msk, int x, int y, short key_id, short des_id, const TC
const short did = des_id+i-1;
TEdit_field& dfld = msk.add_string(did, 0, "", 200, y, 50, "", 50);
dfld.set_key(1);
create_browse2(dfld, i, key_id, des_id, cal);
create_browse2(dfld, i, key_id, des_id, cal, chktyp);
}
return cal.last_level();
@ -451,7 +456,12 @@ TMask_anamag::TMask_anamag(TRelation * rel) : TMask("ve2400")
disable_page(PAGE_USER);
if(livelli_art->enabled())
create_fields(*this, 1, 1, F_LIVART1, F_DESLIVART1, *livelli_art);
{
create_fields(*this, 1, 1, F_LIVART1, F_DESLIVART1, *livelli_art, true);
first_focus(F_LIVART1);
}
else
first_focus(F_CODART);
}
void TMask_anamag::sheetsto_put(TSheet_field &sheet_sto, int item)
@ -1213,14 +1223,11 @@ bool TMask_anamag::handle_sheet_giac_valgiac(TMask_field &f, KEY k)
bool TMask_anamag::handle_sheet_stomag_stoval(TMask_field &f, KEY k)
{
if (k==K_TAB && f.dirty())
if (k == K_TAB && f.dirty())
{
TMask& m = f.mask();
real r1 = m.get_real(F_STOQUANT);
real r2 = m.get_real(F_STOVALUN);
TCurrency c(r1 * r2);
const real val = m.get_real(F_STOQUANT) * m.get_real(F_STOVALUN);
const TCurrency c(val);
m.set(F_STOVAL, c);
}
return TRUE;
@ -1761,7 +1768,7 @@ bool TAnagrafica_magazzino::handle_copia(TMask_field &fld, KEY k)
ask.set_handler(F_CODART, non_esiste_handler);
if(liv_art && liv_art->enabled())
{
create_fields(ask, 1, 1, F_LIVART1, F_DESLIVART1, *liv_art);
create_fields(ask, 1, 1, F_LIVART1, F_DESLIVART1, *liv_art, false);
for (int i = liv_art->last_level(); i > 0; i--)
{
const short id = F_LIVART1+i-1;

View File

@ -481,7 +481,7 @@ public:
bool sola_descrizione() const;
void forza_sola_descrizione();
void set_original_rdoc_key(const TRiga_documento& orig);
void set_original_rdoc_key(const TRectype& orig);
void reset_original_rdoc_key();
const TRectype* find_original_rdoc() const;

View File

@ -970,8 +970,9 @@ TArticolo_giacenza * TRiga_documento::articolo() const
return &(_articoli->art(codart));
}
void TRiga_documento::set_original_rdoc_key(const TRiga_documento& orig)
void TRiga_documento::set_original_rdoc_key(const TRectype& orig)
{
CHECK(orig.num() == LF_RIGHEDOC, "Bad document row");
put(RDOC_DACODNUM, orig.get(RDOC_CODNUM));
put(RDOC_DAANNO, orig.get(RDOC_ANNO));
put(RDOC_DAPROVV, orig.get(RDOC_PROVV));

View File

@ -513,7 +513,7 @@ void TDocumento_mask::cli2mask()
set(F_CODCABA, c.get(CLI_CODCAB));
if (id2pos(F_IBAN_STATO) > 0)
{
const TString16 iban = c.get(CLI_IBAN);
const TString80 iban = c.get(CLI_IBAN);
set(F_IBAN, iban);
efield(F_IBAN_STATO).validate(K_TAB);
if (iban.not_empty())
@ -746,6 +746,9 @@ void TDocumento_mask::reset_masks(const TString& tipo_doc)
void TDocumento_mask::doc2mask(bool reload_clifo)
{
TSheet_field& s = sfield(F_SHEET);
s.destroy( );
for (int p = fields()-1; p >= 0; p--)
{
TMask_field& f = fld(p);
@ -759,9 +762,6 @@ void TDocumento_mask::doc2mask(bool reload_clifo)
if (reload_clifo)
cli2mask();
TSheet_field& s = sfield(F_SHEET);
s.destroy( );
const int righe = doc().physical_rows();
for (int i = 0; i < righe; i++)
{

View File

@ -209,9 +209,9 @@ HBITMAP OsWin32_CreateBitmap(const wxImage& img, wxDC& dc)
static wxPalette pal;
HDC hDC = (HDC)dc.GetHDC();
int nDepth = ::GetDeviceCaps(hDC, BITSPIXEL);
int nDepth = dc.GetDepth();
if (nDepth == 1 && IsWin95()) // B/W printer?
if (nDepth == 1) // Altrimenti le stampanti in B/N perdono i toni di grigio
{
hDC = NULL;
nDepth = 24;
@ -542,7 +542,7 @@ BOOL CALLBACK EnumWindowsProc(HWND hwnd, LPARAM lParam)
GetWindowText(hwnd, str, sizeof(str));
wxString title = str;
title.MakeUpper();
if (title.find(w->_file) >= 0)
if (title.Find(w->_file) >= 0)
{
w->_hwnd = hwnd;
return FALSE;

View File

@ -3435,7 +3435,7 @@ static void FillMenuItem(const wxString& strValue, MENU_ITEM* mi)
if (mi->tag > 0)
{
const wxString& str = a[1];
const size_t accelera = str.Find('&');
const int accelera = str.Find('&');
if (accelera >= 0)
mi->mkey = str[accelera+1];
mi->text = xvt_str_duplicate(str);

View File

@ -353,13 +353,16 @@ public:
unsigned long TwxPrintOutCache::Signature(TPRINT_RCD* prcd) const
{
const unsigned char* data = (const unsigned char*)prcd;
unsigned long h = 0;
for (size_t c = 0; c < prcd->m_size; c++)
if (prcd != NULL)
{
h = (h << 2) + data[c];
const unsigned long i = h & 0xC0000000;
if (i) h = (h ^ (i >> 12)) & 0x3FFFFFFF;
const unsigned char* data = (const unsigned char*)prcd;
for (size_t c = 0; c < prcd->m_size; c++)
{
h = (h << 2) + data[c];
const unsigned long i = h & 0xC0000000;
if (i) h = (h ^ (i >> 12)) & 0x3FFFFFFF;
}
}
return h;
@ -674,6 +677,9 @@ BOOLEAN xvt_print_is_valid(PRINT_RCD* precp)
int xvt_print_get_name(PRINT_RCD* precp, char* name, int sz_s)
{
if (precp == NULL)
return 0;
#ifdef WIN32
wxString n = ((const char*)precp) + 4;
if (n.Length() >= 30)
@ -1009,15 +1015,7 @@ const char* xvt_fsys_get_campo_ini()
if (!bFound)
{
/* const char* pp = getenv("PREFPATH");
if (pp != NULL)
{
char dri[_MAX_DRIVE], dir[_MAX_PATH];
xvt_fsys_parse_pathname(pp, dri, dir, NULL, NULL, NULL);
xvt_fsys_build_pathname(path, dri, dir, "campo", "ini", NULL);
bFound = TRUE;
}*/
if (xvt_sys_get_os_version() == XVT_WS_WIN_SERVER)
if (OsWin32_IsWindowsServer())
{
xvt_fsys_build_pathname(path, NULL, wxGetHomeDir(), "campo", "ini", NULL);
bFound = xvt_fsys_file_exists(path);