mirror of
https://github.com/flynx/ImageGrid.git
synced 2025-10-29 10:20:08 +00:00
some refactoring...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
65cef61880
commit
4a77371662
@ -1446,6 +1446,11 @@ module.CropActions = actions.Actions({
|
||||
|
||||
crop_stack: null,
|
||||
|
||||
// true if current viewer is cropped...
|
||||
get cropped(){
|
||||
return this.crop_stack
|
||||
&& this.crop_stack.length > 0 },
|
||||
|
||||
clear: [function(){
|
||||
delete this.crop_stack }],
|
||||
|
||||
@ -1462,14 +1467,11 @@ module.CropActions = actions.Actions({
|
||||
mode = mode || 'current'
|
||||
|
||||
return function(res){
|
||||
if(mode == 'base'
|
||||
&& this.crop_stack
|
||||
&& this.crop_stack.length > 0){
|
||||
if(this.cropped){
|
||||
if(mode == 'base'){
|
||||
res.data = this.crop_stack[0].dumpJSON()
|
||||
}
|
||||
if(mode == 'full'
|
||||
&& this.crop_stack
|
||||
&& this.crop_stack.length > 0){
|
||||
|
||||
} else if(mode == 'full'){
|
||||
res.crop_stack = this.crop_stack.map(function(c){
|
||||
return c
|
||||
.dumpJSON()
|
||||
@ -1478,6 +1480,7 @@ module.CropActions = actions.Actions({
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}],
|
||||
// load the crop stack if present...
|
||||
load: [function(state){
|
||||
@ -1506,10 +1509,6 @@ module.CropActions = actions.Actions({
|
||||
}
|
||||
}],
|
||||
|
||||
// true if current viewer is cropped...
|
||||
get cropped(){
|
||||
return this.crop_stack != null },
|
||||
|
||||
// crop...
|
||||
//
|
||||
// XXX check undo... do we actually need it???
|
||||
@ -1573,8 +1572,7 @@ module.CropActions = actions.Actions({
|
||||
}
|
||||
}],
|
||||
uncrop: ['Crop/Uncrop',
|
||||
{browseMode: function(){
|
||||
return (this.crop_stack && this.crop_stack.length > 0) || 'disabled' }},
|
||||
{browseMode: function(){ return this.cropped || 'disabled' }},
|
||||
function(level, restore_current, keep_crop_order){
|
||||
level = level || 1
|
||||
|
||||
@ -1721,6 +1719,22 @@ module.CropActions = actions.Actions({
|
||||
}],
|
||||
|
||||
|
||||
// crop edit actions...
|
||||
// XXX
|
||||
removeFromCrop: ['- Crop/',
|
||||
function(gids){
|
||||
if(!this.cropped){
|
||||
return
|
||||
}
|
||||
|
||||
gids = arguments.length > 1 ? [].slice.call(arguments) : gids
|
||||
gids = gids || 'current'
|
||||
gids = gids instanceof Array ? gids : [gids]
|
||||
|
||||
gids = this.data.normalizeGIDs(gids)
|
||||
|
||||
// XXX
|
||||
}]
|
||||
})
|
||||
|
||||
|
||||
|
||||
@ -198,6 +198,7 @@ module.CLI = core.ImageGridFeatures.Feature({
|
||||
})
|
||||
|
||||
.option('repl, --repl', 'start an ImageGrid REPL', function(){
|
||||
// XXX this is broken in node for some reason...
|
||||
var repl = requirejs('repl')
|
||||
|
||||
// setup the global ns...
|
||||
|
||||
@ -1359,7 +1359,7 @@ var UICollectionActions = actions.Actions({
|
||||
})
|
||||
})
|
||||
})],
|
||||
browseImageCollections: ['Collections|Image/$Collections...',
|
||||
browseImageCollections: ['Collections|Image/Image $collections...',
|
||||
{dialogTitle: 'Image Collections...'},
|
||||
widgets.makeUIDialog(function(gid){
|
||||
var that = this
|
||||
|
||||
@ -133,12 +133,16 @@ module.GLOBAL_KEYBOARD = {
|
||||
//ctrl_S: 'saveAsCollection',
|
||||
|
||||
W: 'testAction2 -- XXX DEBUG: remove when done...',
|
||||
|
||||
// XXX should we add image level manipulation here, like "remove image"???
|
||||
},
|
||||
|
||||
'Collection': {
|
||||
pattern: '.collection-mode',
|
||||
|
||||
Esc: 'loadCollection: "ALL" -- Load all images',
|
||||
|
||||
Del: 'uncollect',
|
||||
},
|
||||
|
||||
'Range': {
|
||||
|
||||
@ -348,12 +348,12 @@ var ImageMarkEditActions = actions.Actions({
|
||||
shiftMarked('down')],
|
||||
|
||||
// XXX undo...
|
||||
shiftMarkedAfter: ['Mark|Ribbon/Shift marked after',
|
||||
shiftMarkedAfter: ['Mark|Ribbon|Image/Shift marked after',
|
||||
{browseMode: 'cropMarked'},
|
||||
function(target){
|
||||
this.shiftImageTo(this.marked, target || 'current', 'after') }],
|
||||
// XXX undo...
|
||||
shiftMarkedBefore: ['Mark|Ribbon/Shift marked before',
|
||||
shiftMarkedBefore: ['Mark|Ribbon|Image/Shift marked before',
|
||||
{browseMode: 'cropMarked'},
|
||||
function(target){
|
||||
this.shiftImageTo(this.marked, target || 'current', 'before') }],
|
||||
|
||||
@ -2504,6 +2504,12 @@ var WidgetTestActions = actions.Actions({
|
||||
.attr(attrs))
|
||||
}],
|
||||
|
||||
// a normal method...
|
||||
testMethod: function(){
|
||||
console.log('test method:', [].slice.call(arguments))
|
||||
return 'test result'
|
||||
},
|
||||
|
||||
// XXX does not work -- see actions.Actions(..) for details...
|
||||
testAlias: ['Test/Action alias',
|
||||
'focusImage: "prev"'],
|
||||
|
||||
@ -221,6 +221,42 @@ var DataPrototype = {
|
||||
|
||||
/******************************************************* Utils ***/
|
||||
|
||||
// Normalize gids...
|
||||
//
|
||||
// Get all gids...
|
||||
// .normalizeGIDs('all')
|
||||
// -> gids
|
||||
// NOTE: this is a shorthand for .getImages('all')
|
||||
//
|
||||
// Get all loaded gids...
|
||||
// .normalizeGIDs('loaded')
|
||||
// -> gids
|
||||
// NOTE: this is a shorthand for .getImages('loaded')
|
||||
//
|
||||
// Normalize list of gids/keywords
|
||||
// .normalizeGIDs(gid|keyword, ..)
|
||||
// .normalizeGIDs([gid|keyword, ..])
|
||||
// -> gids
|
||||
//
|
||||
//
|
||||
// Supported keywords are the same as for .getImage(..)
|
||||
//
|
||||
// XXX is this needed here???
|
||||
normalizeGIDs: function(gids){
|
||||
var that = this
|
||||
// direct keywords...
|
||||
if(gids == 'all' || gids == 'loaded'){
|
||||
return this.getImages(gids)
|
||||
}
|
||||
|
||||
gids = arguments.length > 1 ? [].slice.call(arguments) : gids
|
||||
gids = gids instanceof Array ? gids : [gids]
|
||||
|
||||
return gids
|
||||
.map(function(gid){ return that.getImage(gid) })
|
||||
},
|
||||
|
||||
|
||||
// Make a sparse list of image gids...
|
||||
//
|
||||
// Make sparse list out of gids...
|
||||
@ -492,6 +528,8 @@ var DataPrototype = {
|
||||
// cleared...
|
||||
// thus setting appropriate .base and .current values is the
|
||||
// responsibility of the caller.
|
||||
//
|
||||
// XXX should this support gid keywords like 'current'???
|
||||
clear: function(gids, deep, clear_empty){
|
||||
var that = this
|
||||
gids = gids || 'all'
|
||||
@ -1389,13 +1427,15 @@ var DataPrototype = {
|
||||
|
||||
// Merge ribbons
|
||||
//
|
||||
// Merge all the ribbons...
|
||||
// .mergeRibbons('all')
|
||||
//
|
||||
// Merge ribbons...
|
||||
// .mergeRibbons(ribbon, ribbon, ...)
|
||||
// -> data
|
||||
//
|
||||
// If 'all' is the first argument, this will merge all the ribbons.
|
||||
//
|
||||
// This will merge the ribbons into the first.
|
||||
//
|
||||
mergeRibbons: function(target){
|
||||
var targets = target == 'all' ? this.ribbon_order.slice() : arguments
|
||||
var base = targets[0]
|
||||
@ -1571,116 +1611,46 @@ var DataPrototype = {
|
||||
// -> data
|
||||
//
|
||||
// NOTE: if mode is 'vertical' then place is ignored...
|
||||
//
|
||||
// XXX this is very similar to .placeImage(..) should keep one...
|
||||
gatherImages: function(gids, reference, place, mode){
|
||||
gids = this.makeSparseImages(gids)
|
||||
|
||||
// NOTE: this is a different interface to .placeImage(..)
|
||||
gatherImages: function(images, reference, place, mode){
|
||||
var that = this
|
||||
var args = [].slice.call(arguments)
|
||||
|
||||
var modes = /vertical|horizontal|both/
|
||||
var placements = /before|after|auto/
|
||||
|
||||
// parse arguments...
|
||||
var _mode = mode
|
||||
mode = modes.test(reference) ? reference
|
||||
: modes.test(place) ? place
|
||||
: mode
|
||||
mode = mode || 'both'
|
||||
// get trailing args first, if given...
|
||||
mode = modes.test(args.slice(-1)[0]) ? args.pop() : mode
|
||||
place = placements.test(args.slice(-1)[0]) ? args.pop() : place
|
||||
place = place || 'after'
|
||||
|
||||
place = placements.test(reference) ? reference
|
||||
: placements.test(_mode) ? _mode
|
||||
: place
|
||||
place = place == 'auto' ? null : place
|
||||
reference = args[1] || 'current'
|
||||
reference = (reference == 'first' || reference == 'last') ?
|
||||
this.makeSparseImages(images).compact()[reference == 'first' ? 0 : images.length-1]
|
||||
: this.getImage(reference)
|
||||
|
||||
reference = modes.test(reference) || placements.test(reference) ? null : reference
|
||||
reference = reference == 'first' ? gids[0]
|
||||
: reference == 'last' ? gids.slice(-1)[0]
|
||||
: reference
|
||||
|
||||
//console.log('reference:', reference, '\nplace:', place, '\nmode:', mode)
|
||||
|
||||
// shift all gids to a reference ribbon...
|
||||
if(mode == 'both' || mode == 'vertical'){
|
||||
var ref = this.getRibbon(reference)
|
||||
|
||||
var ribbons = this.ribbons
|
||||
gids.forEach(function(gid, i){
|
||||
var r = that.getRibbon(gid)
|
||||
|
||||
// do the move...
|
||||
if(r != ref){
|
||||
ribbons[ref][i] = gid
|
||||
delete ribbons[r][i]
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// shift all gids to a reference image...
|
||||
if(mode == 'both' || mode == 'horizontal'){
|
||||
var order = this.order
|
||||
var ref = this.getImage(reference)
|
||||
|
||||
place = gids.indexOf(ref) < 0 && place == null ? 'after' : place
|
||||
|
||||
// NOTE: the reference index will not move as nothing will
|
||||
// ever change it's position relative to it...
|
||||
var ri = this.order.indexOf(ref)
|
||||
var l = ri
|
||||
|
||||
gids.forEach(function(gid){
|
||||
if(gid == ref){
|
||||
return
|
||||
}
|
||||
|
||||
// we need to get this live as we are moving images around...
|
||||
var f = this.order.indexOf(gid)
|
||||
|
||||
// target is left of the reference -- place at reference...
|
||||
// NOTE: we are moving left to right, thus the final order
|
||||
// of images will stay the same.
|
||||
if(f < ri){
|
||||
if(place == 'after'){
|
||||
order.splice(l, 0, order.splice(f, 1)[0])
|
||||
|
||||
} else {
|
||||
order.splice(ri-1, 0, order.splice(f, 1)[0])
|
||||
}
|
||||
|
||||
// target is right of the reference -- place each new image
|
||||
// at an offset from reference, the offset is equal to
|
||||
// the number of the target image the right of the reference
|
||||
} else {
|
||||
if(place == 'before'){
|
||||
order.splice(l, 0, order.splice(f, 1)[0])
|
||||
l += 1
|
||||
|
||||
} else {
|
||||
l += 1
|
||||
order.splice(l, 0, order.splice(f, 1)[0])
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// NOTE: this is cheating, but if it's fast and simple I do
|
||||
// not care ;)
|
||||
this.updateImagePositions()
|
||||
}
|
||||
|
||||
return this
|
||||
return this.placeImage(
|
||||
images,
|
||||
mode == 'horizontal' ?
|
||||
'keep' :
|
||||
this.getRibbon(reference),
|
||||
mode == 'vertical' ?
|
||||
'keep'
|
||||
: reference,
|
||||
place)
|
||||
},
|
||||
|
||||
// Place image at position...
|
||||
//
|
||||
// Place imagess at order into ribbon...
|
||||
// Place images at order into ribbon...
|
||||
// .placeImage(images, ribbon, order)
|
||||
// -> data
|
||||
//
|
||||
// Place images at order but do not touch ribbon position...
|
||||
// Place images at order but do not touch ribbon position... (horizontal)
|
||||
// .placeImage(images, 'keep', order)
|
||||
// -> data
|
||||
//
|
||||
// Place images to ribbon but do not touch order...
|
||||
// Place images to ribbon but do not touch order... (vertical)
|
||||
// .placeImage(images, ribbon, 'keep')
|
||||
// -> data
|
||||
//
|
||||
@ -1688,14 +1658,16 @@ var DataPrototype = {
|
||||
// ribbon is .getRibbon(..) compatible or 'keep'.
|
||||
// order is .getImageOrder(..) compatible or 'keep'.
|
||||
//
|
||||
// This will not change the order of images unless (special case)
|
||||
// the target image is in the images.
|
||||
//
|
||||
//
|
||||
// NOTE: if images is a list, all images will be placed in the order
|
||||
// they are given.
|
||||
// NOTE: this can affect element indexes, thus for example element
|
||||
// at input order may be at a different position after this is
|
||||
// run.
|
||||
//
|
||||
// XXX this is very similar to .gatherImages(..) should keep one...
|
||||
placeImage: function(images, ribbon, order, mode){
|
||||
placeImage: function(images, ribbon, reference, mode){
|
||||
var that = this
|
||||
mode = mode || 'before'
|
||||
|
||||
@ -1705,11 +1677,9 @@ var DataPrototype = {
|
||||
return this
|
||||
}
|
||||
|
||||
images = images instanceof Array ? images : [images]
|
||||
images = images.map(function(img){ return that.getImage(img) })
|
||||
images = this.normalizeGIDs(images)
|
||||
|
||||
// vertical shift...
|
||||
// NOTE: this will gather all the images to the target ribbon...
|
||||
// vertical shift -- gather images to the target ribbon...
|
||||
if(ribbon != 'keep'){
|
||||
var to = this.getRibbon(ribbon)
|
||||
this.makeSparseImages(images)
|
||||
@ -1722,36 +1692,50 @@ var DataPrototype = {
|
||||
})
|
||||
}
|
||||
|
||||
// horizontal shift...
|
||||
// NOTE: this will gather the images horizontally...
|
||||
if(order != 'keep'){
|
||||
var reorder = false
|
||||
order = this.getImage(this.getImageOrder(order)
|
||||
+ (mode == 'after' ? 1 : 0))
|
||||
images.forEach(function(img){
|
||||
var f = that.order.indexOf(img)
|
||||
var t = order == null ?
|
||||
// special case: add after last element...
|
||||
that.order.length
|
||||
: that.order.indexOf(order)
|
||||
// horizontal shift -- gather the images horizontally...
|
||||
if(reference != 'keep'){
|
||||
var ref = this.getImage(reference)
|
||||
|
||||
if(f > t){
|
||||
that.order.splice(t, 0, that.order.splice(f, 1)[0])
|
||||
reorder = true
|
||||
// NOTE: the reference index will not move as nothing will
|
||||
// ever change it's position relative to it...
|
||||
var ri = order.indexOf(ref)
|
||||
var l = ri
|
||||
|
||||
} else if(f < t){
|
||||
// NOTE: need to compensate for when we are remoing
|
||||
// an image before where we want to place it...
|
||||
that.order.splice(t-1, 0, that.order.splice(f, 1)[0])
|
||||
reorder = true
|
||||
images
|
||||
.forEach(function(gid){
|
||||
if(gid == ref){
|
||||
return
|
||||
}
|
||||
|
||||
// we need to get this live as we are moving images around...
|
||||
var f = order.indexOf(gid)
|
||||
|
||||
// target is left of the reference -- place at reference...
|
||||
// NOTE: we are moving left to right, thus the final order
|
||||
// of images will stay the same.
|
||||
if(f < ri){
|
||||
order.splice(mode == 'after' ? l : ri-1, 0, order.splice(f, 1)[0])
|
||||
|
||||
// target is right of the reference -- place each new image
|
||||
// at an offset from reference, the offset is equal to
|
||||
// the number of the target image the right of the reference
|
||||
} else {
|
||||
if(mode == 'before'){
|
||||
order.splice(l, 0, order.splice(f, 1)[0])
|
||||
l += 1
|
||||
|
||||
} else {
|
||||
l += 1
|
||||
order.splice(l, 0, order.splice(f, 1)[0])
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// update the rest of sparse data...
|
||||
if(reorder){
|
||||
// update the order data...
|
||||
this.order.splice.apply(this.order, [0, this.order.length].concat(order))
|
||||
|
||||
this.updateImagePositions()
|
||||
}
|
||||
}
|
||||
|
||||
return this
|
||||
},
|
||||
@ -3128,7 +3112,7 @@ var DataWithTagsPrototype = {
|
||||
// selectors...
|
||||
getTaggedByAny: function(tags){
|
||||
tags = arguments.length > 1 ? [].slice.call(arguments) : tags
|
||||
gids = gids instanceof Array ? gids : [gids]
|
||||
tags = tags instanceof Array ? tags : [tags]
|
||||
|
||||
var res = []
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
"fs-walk": "^0.0.1",
|
||||
"glob": "^4.0.6",
|
||||
"guarantee-events": "^1.0.0",
|
||||
"ig-actions": "^3.5.5",
|
||||
"ig-actions": "^3.8.0",
|
||||
"ig-features": "^3.2.7",
|
||||
"ig-object": "^1.0.2",
|
||||
"openseadragon": "^2.3.0",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user