mirror of
				https://github.com/flynx/ImageGrid.git
				synced 2025-10-31 03:10:07 +00:00 
			
		
		
		
	several tweeks + updated (and moved) exportdirs.py...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
		
							parent
							
								
									90022b2641
								
							
						
					
					
						commit
						4b6d62a837
					
				| @ -1,7 +1,7 @@ | |||||||
| #======================================================================= | #======================================================================= | ||||||
| 
 | 
 | ||||||
| __version__ = '''0.0.01''' | __version__ = '''0.0.01''' | ||||||
| __sub_version__ = '''20130520030454''' | __sub_version__ = '''20130522224356''' | ||||||
| __copyright__ = '''(c) Alex A. Naanou 2011''' | __copyright__ = '''(c) Alex A. Naanou 2011''' | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @ -31,7 +31,8 @@ def build_dirs(data, path, rewrite=None): | |||||||
| 
 | 
 | ||||||
| 	# gen3 | 	# gen3 | ||||||
| 	if version == '2.0': | 	if version == '2.0': | ||||||
| 		images = json.load(open(data['image_file'], 'r')) | 		#images = json.load(open(data['image_file'], 'r')) | ||||||
|  | 		images = json.load(urllib2.urlopen(data['image_file'])) | ||||||
| 		def get_image(gid, _): | 		def get_image(gid, _): | ||||||
| 			return images[gid] | 			return images[gid] | ||||||
| 
 | 
 | ||||||
| @ -83,7 +84,8 @@ def build_dirs(data, path, rewrite=None): | |||||||
| if __name__ == '__main__': | if __name__ == '__main__': | ||||||
| 	from optparse import OptionParser | 	from optparse import OptionParser | ||||||
| 
 | 
 | ||||||
| 	parser = OptionParser() | 	parser = OptionParser( | ||||||
|  | 			usage='%prog [options] DATAJSON TARGETDIR') | ||||||
| 
 | 
 | ||||||
| 	##!!! need to define the path so that it shoes up in -h | 	##!!! need to define the path so that it shoes up in -h | ||||||
| 
 | 
 | ||||||
| @ -1,5 +1,6 @@ | |||||||
| [_] 18% Gen 3 current todo | [_] 18% Gen 3 current todo | ||||||
| 	[_] 37% High priority | 	[_] 37% High priority | ||||||
|  | 		[_] ASAP: support relative paths in cache... | ||||||
| 		[_] BUG: sometimes duplicate images get loaded... | 		[_] BUG: sometimes duplicate images get loaded... | ||||||
| 		| this happens when jumping back and forth on the mid ribbon until | 		| this happens when jumping back and forth on the mid ribbon until | ||||||
| 		| the last element shows up and then moving left until the frame | 		| the last element shows up and then moving left until the frame | ||||||
|  | |||||||
| @ -711,7 +711,10 @@ function saveFile(name){ | |||||||
| 		if(DATA.image_file == null){ | 		if(DATA.image_file == null){ | ||||||
| 			DATA.image_file = name + '-images.json' | 			DATA.image_file = name + '-images.json' | ||||||
| 		} | 		} | ||||||
| 		CEF_dumpJSON(DATA.image_file, IMAGES) | 		//CEF_dumpJSON(DATA.image_file, IMAGES)
 | ||||||
|  | 		// XXX this will overwrite the images...
 | ||||||
|  | 		//CEF_dumpJSON(name + '-images.json', IMAGES)
 | ||||||
|  | 		//DATA.image_file = name + '-images.json'
 | ||||||
| 		CEF_dumpJSON(name + '-data.json', DATA) | 		CEF_dumpJSON(name + '-data.json', DATA) | ||||||
| 		CEF_dumpJSON(name + '-marked.json', MARKED) | 		CEF_dumpJSON(name + '-marked.json', MARKED) | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user