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

Patch level : 10.0 706

Browse Source 
Files correlati     : VE2.exe
Ricompilazione Demo : [ ]
Commento            :

corretta generazione ordinata della descrizione sui codici guidati


git-svn-id: svn://10.65.10.50/trunk@20351 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2010-04-18 22:55:27 +00:00
parent 062a39d7b4
commit 334db7f03d
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ve/ve2401.cpp
View File

@ -242,18 +242,17 @@ bool advanced_codart_ask(TString& code, TString& desc)
int order[20]; int order[20];
int elements = 0; int elements = 0;
int id; int id;
const bool add_des = m.add_descr();
const int start_id = add_des ? 101 : 102;
for (id = 101; m.id2pos(id) >= 0; id++, elements++) order[0] = 0;
for (id = start_id; m.id2pos(id) >= 0; id++, elements++)
{ {
const int el = id - 101; const int el = id - 101;
order[el] = m.get_descr_order(el); order[el] = m.get_descr_order(el);
code << m.get(id); code << m.get(id);
} }
const bool add_des = m.add_descr();
const int start_id = add_des ? 101 : 102;
if (!add_des)
elements--;
while (elements-- > 0) while (elements-- > 0)
{ {
int ord = 1000; int ord = 1000;
@ -261,9 +260,9 @@ bool advanced_codart_ask(TString& code, TString& desc)
for (id = start_id; m.id2pos(id) >= 0; id++) for (id = start_id; m.id2pos(id) >= 0; id++)
{ {
if (order[id - start_id] < ord) if (order[id - 101] < ord)
{ {
el = id - start_id; el = id - 101;
ord = order[el]; ord = order[el];
} }
} }
@ -273,7 +272,6 @@ bool advanced_codart_ask(TString& code, TString& desc)
order[el] = 1001; order[el] = 1001;
if (desc.full()) if (desc.full())
desc << m.get_descr_separator(el); desc << m.get_descr_separator(el);
if (dlg >= start_id)
desc << esc(m.get(dlg + 100)); desc << esc(m.get(dlg + 100));
} }
} }