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

Patch level : 12.0 no patch

Browse Source 
Files correlati     : 
Commento            :

Corretti progress indicator dei cursori

git-svn-id: svn://10.65.10.50/branches/R_10_00@23333 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
bonazzi 2016-09-26 22:45:34 +00:00
parent 5dd5f371fa
commit 44ad50afa0
1 changed files with 3268 additions and 3247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/include/relation.cpp
View File

@ -1108,20 +1108,31 @@ TRecnotype TCursor::buildcursor(TRecnotype rp)
FILE* indf = NULL; FILE* indf = NULL;
const int l = strlen(to()); const int l = strlen(to());
double perc = 1.0;
if (l > 0 && DB_index_seek(fhnd, to()) >= 0)
perc = DB_pos_perc(fhnd);
int junk = DB_index_seek(fhnd, from()); int junk = DB_index_seek(fhnd, from());
if (junk < 0) junk=get_error(junk); if (junk < 0) junk=get_error(junk);
if (junk == _iseof) return 0; if (junk == _iseof) return 0;
perc -= DB_pos_perc(fhnd);
// DB_index_recno(fhnd); // A cosa cavolo serve? // DB_index_recno(fhnd); // A cosa cavolo serve?
_pos=-1; _pos=-1;
const bool filtered = has_filter(); const bool filtered = has_filter();
const bool simple_filter = filtered && has_simple_filter(); const bool simple_filter = filtered && has_simple_filter();
// Barra di + // Barra di progresso
const long items = (long)((double)_if->lfile().items() * perc);
TString msg("Elaborazione "); TString msg("Elaborazione ");
msg << relation()->lfile().name(); TDir d(_if->lfile().num());
TProgress_monitor pi(_if->lfile().items(), msg);
msg << d.des();
TProgress_monitor pi(items, msg);
while (!DB_index_eof(fhnd)) while (!DB_index_eof(fhnd))
{ {
@ -1980,6 +1991,10 @@ TRecnotype TSorted_cursor::buildcursor(TRecnotype rp)
sort.init(); sort.init();
l = strlen(to()); l = strlen(to());
double perc = 1.0;
if (l > 0 && DB_index_seek(handle, to()) >= 0)
perc = DB_pos_perc(handle);
junk=DB_index_seek(handle, (char*)(const char*) from()); junk=DB_index_seek(handle, (char*)(const char*) from());
if (junk < 0) junk=get_error(junk); if (junk < 0) junk=get_error(junk);
if (junk == _iseof) return 0; if (junk == _iseof) return 0;
@ -1987,10 +2002,16 @@ TRecnotype TSorted_cursor::buildcursor(TRecnotype rp)
pos = DB_index_recno(handle); pos = DB_index_recno(handle);
TCursor::pos()=-1; TCursor::pos()=-1;
perc -= DB_pos_perc(handle);
// Barra di progressione // Barra di progressione
const long items = (long)((double)relation()->lfile().items() * perc);
TString msg("Elaborazione "); TString msg("Elaborazione ");
msg << relation()->lfile().name(); TDir d(relation()->lfile().num());
TProgress_monitor pi(relation()->lfile().items(), msg);
msg << d.des();
TProgress_monitor pi(items, msg);
while (!DB_index_eof(handle)) while (!DB_index_eof(handle))
{ {