flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-29 10:20:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

added partial progress to sort -- still not final...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2020-07-12 18:11:49 +03:00
parent 170cfc7242
commit 540de10ea0
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ui (gen4)/features/sort.js
View File

@ -292,11 +292,14 @@ module.SortActions = actions.Actions({
'name-sequence-overflow': function(){ 'name-sequence-overflow': function(){
var that = this var that = this
var logger = this.logger
&& this.logger.push('Sort indexing')
logger && logger.emit('queued', 'sequence sections')
// gap and gap length... // gap and gap length...
var gap = -1 var gap = -1
var l = 1 var l = 1
// XXX add progress reporting...
var lst = this.images var lst = this.images
.map(function(gid){ .map(function(gid){
return [gid, that.images.getImageNameSeq(gid)] }) return [gid, that.images.getImageNameSeq(gid)] })
@ -309,7 +312,6 @@ module.SortActions = actions.Actions({
// find largest gaps... // find largest gaps...
.map(function(e, i, lst){ .map(function(e, i, lst){
var c = (lst[i+1] || e)[1] - e[1] var c = (lst[i+1] || e)[1] - e[1]
//var c = (lst[i+1] || lst[0])[1] - e[1]
if(c > l){ if(c > l){
l = c l = c
gap = i } gap = i }
@ -333,9 +335,10 @@ module.SortActions = actions.Actions({
lst.forEach(function(e, i){ lst.forEach(function(e, i){
index[e[0]] = i }) index[e[0]] = i })
logger && logger.emit('done', 'sequence sections')
// return the lookup cmp... // return the lookup cmp...
return function(a, b){ return function(a, b){
// XXX is 0 as alternative here the correct way to go???
return (index[a] || 0) - (index[b] || 0) } }, return (index[a] || 0) - (index[b] || 0) } },
// Keep image order in each ribbon the same but sort ribbons (i.e. // Keep image order in each ribbon the same but sort ribbons (i.e.
@ -345,8 +348,14 @@ module.SortActions = actions.Actions({
// and before images in ribbons >N // and before images in ribbons >N
'sort-via-ribbons': function(reverse){ 'sort-via-ribbons': function(reverse){
var that = this var that = this
var logger = this.logger
&& this.logger.push('Sort indexing')
logger && logger.emit('queued', 'ribbon order')
var index = new Map( var index = new Map(
this.data.ribbon_order this.data.ribbon_order
// reverse?
.run(function(){ .run(function(){
return reverse ? return reverse ?
this.slice().reverse() this.slice().reverse()
@ -357,6 +366,9 @@ module.SortActions = actions.Actions({
.compact() .compact()
.map(function(e, i){ .map(function(e, i){
return [e, i] })) return [e, i] }))
logger && logger.emit('done', 'ribbon order')
return function(a, b){ return function(a, b){
a = index.get(a) a = index.get(a)
b = index.get(b) b = index.get(b)
@ -376,10 +388,18 @@ module.SortActions = actions.Actions({
// XXX legacy: this is added to every sort automatically... // XXX legacy: this is added to every sort automatically...
// ...do we still need this here??? // ...do we still need this here???
'keep-position': function(){ 'keep-position': function(){
var logger = this.logger
&& this.logger.push('Sort indexing')
logger && logger.emit('queued', 'position')
var order = new Map( var order = new Map(
this.data.order this.data.order
.map(function(e, i){ .map(function(e, i){
return [e, i] })) return [e, i] }))
logger && logger.emit('done', 'position')
return function(a, b){ return function(a, b){
return order.get(a) - order.get(b) } }, return order.get(a) - order.get(b) } },
}, },