flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2026-01-02 16:31:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

reworked sortImagesByFileNameSeqWithOverflow(...) and added some docs...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-09-23 18:17:44 +04:00
parent 0bdc98b3e1
commit e214eeedaf
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ui/data.js
View File

@ -128,7 +128,6 @@ var BASE_URL_LIMIT = 10
var IMAGE_CACHE = [] var IMAGE_CACHE = []
// XXX make these usable for both saving and loading... // XXX make these usable for both saving and loading...
// XXX get these from config... // XXX get these from config...
var IMAGES_FILE_DEFAULT = 'images.json' var IMAGES_FILE_DEFAULT = 'images.json'
@ -150,6 +149,11 @@ var UPDATE_SYNC = false
// object to register all the worker queues... // object to register all the worker queues...
var WORKERS = {} var WORKERS = {}
// Used in sortImagesByFileNameSeqWithOverflow
var PROXIMITY = 30
var CHECK_1ST_PROXIMITY = false
var OVERFLOW_GAP = PROXIMITY * 5
/********************************************************************** /**********************************************************************
@ -1885,7 +1889,11 @@ function sortImagesByFileNameXPStyle(reverse){
// number of files in set // number of files in set
// XXX a simplification... // XXX a simplification...
// //
// NOTE: at this pint the gap size must be above proximity*10 // The gap size must be above overflow_gap, and if it is set to false
// then no limit is used (default: OVERFLOW_GAP).
// If check_1st is false then also check the lowest sequence number
// for proximity to 0001 (default: CHECK_1ST_PROXIMITY).
//
// NOTE: if any of the above conditions is not applicable this will // NOTE: if any of the above conditions is not applicable this will
// essentially revert to sortImagesByFileSeqOrName(...) // essentially revert to sortImagesByFileSeqOrName(...)
// NOTE: this will cut at the largest gap between sequence numbers. // NOTE: this will cut at the largest gap between sequence numbers.
@ -1898,8 +1906,10 @@ function sortImagesByFileNameXPStyle(reverse){
// ever know it's here, if we replace it with the thee line dumb // ever know it's here, if we replace it with the thee line dumb
// sortImagesByFileName(...) then things get "annoying" every 10K // sortImagesByFileName(...) then things get "annoying" every 10K
// images :) // images :)
function sortImagesByFileNameSeqWithOverflow(reverse, proximity){ function sortImagesByFileNameSeqWithOverflow(reverse, proximity, overflow_gap, check_1st){
proximity = proximity == null ? 10 : proximity proximity = proximity == null ? PROXIMITY : proximity
overflow_gap = overflow_gap == null ? OVERFLOW_GAP : overflow_gap
check_1st = check_1st == null ? CHECK_1ST_PROXIMITY : check_1st
// prepare to sort and check names... // prepare to sort and check names...
// NOTE: we do not usually have a filename seq 0000... // NOTE: we do not usually have a filename seq 0000...
@ -1928,7 +1938,7 @@ function sortImagesByFileNameSeqWithOverflow(reverse, proximity){
// find and fix the gap... // find and fix the gap...
if(need_to_fix if(need_to_fix
// check if first and last are close to 0001 and 9999 resp. // check if first and last are close to 0001 and 9999 resp.
&& getImageNameSeq(DATA.order[0]) <= proximity && (!check_1st || getImageNameSeq(DATA.order[0]) <= proximity)
&& getImageNameSeq(DATA.order[DATA.order.length-1]) >= 9999-proximity){ && getImageNameSeq(DATA.order[DATA.order.length-1]) >= 9999-proximity){
// find the largest gap position... // find the largest gap position...
var pos = null var pos = null
@ -1941,7 +1951,7 @@ function sortImagesByFileNameSeqWithOverflow(reverse, proximity){
} }
} }
// split and rearrange the order chunks... // split and rearrange the order chunks...
if(gap > proximity*10){ if(overflow_gap === false || gap > overflow_gap){
DATA.order = DATA.order.splice(pos).concat(DATA.order) DATA.order = DATA.order.splice(pos).concat(DATA.order)
} }
} }