2 files changed, 37 insertions, 52 deletions

diff --git a/plugins/grapher.py b/plugins/grapher.py
index bd93205..b973653 100755
--- a/plugins/grapher.py
+++ b/plugins/grapher.py
@@ -1,50 +1,35 @@
 #!/usr/bin/python
 '''
 This script generates a data file that can be read by gnuplot or similar
-software. Columns, representing different data fields, may be generated via
-command line arguments. Current available columns include:
+software. The first column represent the date (cycle * epoch) of the Salis
+save file. The second column represents the number of organisms at that given
+dat.
 
-- current cycle:       always present
-- number of organisms: activate with '-o' flag
+To run it, you may call it from within the ./bin/ directory (or wherever you
+keep your auto-saved files) inside the SALIS main directory, such as:
 
-To run it, simply call it from within the ./bin/ directory inside the SALIS
-main directory, such as:
+../plugins/grapher.py def.sim.*.auto
 
-../plugins/grapher.py -o def.sim.*.auto
-
-Calling this will create a single DATA file including data from all files
-matching the given pattern. This file may, in turn, be passed into gnuplot
-for generating graphs.
+Calling this will create a single DATA file (output.data) including data from
+all files matching the given pattern. This file may, in turn, be passed into
+gnuplot for generating graphs.
 '''
 import os
 import sys
 from ctypes import *
 
-current_arg = 1
-data_flags  = []
-
-while sys.argv[current_arg][0] == '-':
-	if sys.argv[current_arg] == '-o':
-		data_flags.append('organism_count')
-		print('organism count will be graphed')
-	else:
-		print('{} is not a valid flag'.format(sys.argv[current_arg]))
-
-	current_arg += 1
-
-files = sys.argv[current_arg:]
 oname = 'output.data'
 salis = CDLL('libsalis.so')
-salis.s_getCycle.restype      = c_uint
-salis.s_getEpoch.restype      = c_uint
+salis.s_getCycle.restype  = c_uint
+salis.s_getEpoch.restype  = c_uint
 salis.sp_getCount.restype = c_uint
 
 with open(oname, 'w') as output:
-	for f in files:
-		salis.s_load(bytes(f, 'utf-8'))
+	for fileName in sys.argv[1:]:
+		salis.s_load(bytes(fileName, 'utf-8'))
 		cycle = salis.s_getCycle()
 		epoch = salis.s_getEpoch()
 		date  = cycle + (epoch * (2 ** 32))
 		output.write('{} {}\n'.format(date, salis.sp_getCount()))
-		print('info of date {} added to output.data'.format(date))
+		print('data of date {} added to \'output.data\''.format(date))
 		salis.s_quit()
diff --git a/plugins/imager.py b/plugins/imager.py
index fc7d77b..20d57d7 100755
--- a/plugins/imager.py
+++ b/plugins/imager.py
@@ -14,19 +14,20 @@ Calling this will create a PNG image for each file matching the given pattern.
 
 By default, this script ignores any existing simulation files whose name
 matches an existing image on the same directory. You may force it to overwrite
-existing images by passing the '-o' flag before the file list parameter.
+existing images by passing the '-o' or '--overwrite' flag. All other parameters
+are considered part of the file list.
 '''
 import os
 import sys
 from ctypes import *
 from PIL import Image
 
-if sys.argv[1] == '-o':
+if '-o' in sys.argv or '--overwrite' in sys.argv:
 	overwrite = True
-	files     = sys.argv[2:]
+	sys.argv.remove('-o')
+	sys.argv.remove('--overwrite')
 else:
 	overwrite = False
-	files     = sys.argv[1:]
 
 salis = CDLL('libsalis.so')
 salis.sm_getSize.restype = c_uint
@@ -37,22 +38,21 @@ def makeImage(iname):
 	if not overwrite:
 		if os.path.isfile('./' + oname):
 			print(oname + ' skipped')
-			return
-
-	salis.s_load(bytes(iname, 'utf-8'))
-	lsize  = int(salis.sm_getSize() ** 0.5)
-	image  = Image.new('L', (lsize, lsize), 'black')
-	pixels = image.load()
-
-	for y in range(lsize):
-		for x in range(lsize):
-			addr = (y * lsize) + x
-			byte = salis.sm_getByteAt(addr)
-			pixels[x, y] = byte
-
-	salis.s_quit()
-	image.save(oname)
-	print(oname + ' generated')
-
-for f in files:
-	makeImage(f)
+	else:
+		salis.s_load(bytes(iname, 'utf-8'))
+		lsize  = int(salis.sm_getSize() ** 0.5)
+		image  = Image.new('L', (lsize, lsize), 'black')
+		pixels = image.load()
+
+		for y in range(lsize):
+			for x in range(lsize):
+				addr = (y * lsize) + x
+				byte = salis.sm_getByteAt(addr)
+				pixels[x, y] = byte
+
+		salis.s_quit()
+		image.save(oname)
+		print(oname + ' generated')
+
+for fileName in sys.argv[1:]:
+	makeImage(fileName)