From 203872841acab0ae641c674eca0085682a4b7922 Mon Sep 17 00:00:00 2001 From: bonaime Date: Fri, 3 Jul 2015 14:48:02 +0200 Subject: [PATCH 1/3] Check backtrace_time and x_scale compatibility --- seedlink_plotter/seedlink_plotter.py | 29 ++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/seedlink_plotter/seedlink_plotter.py b/seedlink_plotter/seedlink_plotter.py index 7a2834d..1ea44ff 100755 --- a/seedlink_plotter/seedlink_plotter.py +++ b/seedlink_plotter/seedlink_plotter.py @@ -459,10 +459,10 @@ def main(): '"m" for minutes, "h" for hours and "d" for days.', default=60) parser.add_argument('-b', '--backtrace_time', - help='the number of seconds to plot (3600=1h,86400=24h). The ' - 'following suffixes can be used as well: "m" for minutes, ' - '"h" for hours and "d" for days.', required=True, - type=_parse_time_with_suffix_to_seconds) + help='the number of seconds to plot (3600=1h,86400=24h). The ' + 'following suffixes can be used as well: "m" for minutes, ' + '"h" for hours and "d" for days.', required=True, + type=_parse_time_with_suffix_to_seconds) parser.add_argument('--x_position', type=int, help='the x position of the graph', required=False, default=0) parser.add_argument('--y_position', type=int, @@ -491,12 +491,12 @@ def main(): parser.add_argument( '--nb_rainbow_colors', help='the numbers of colors for rainbow mode', required=False, default=10) parser.add_argument( - '--update_time', - help='time in seconds between each graphic update.' - ' The following suffixes can be used as well: "s" for seconds, ' - '"m" for minutes, "h" for hours and "d" for days.', - required=False, default=10, - type=_parse_time_with_suffix_to_seconds) + '--update_time', + help='time in seconds between each graphic update.' + ' The following suffixes can be used as well: "s" for seconds, ' + '"m" for minutes, "h" for hours and "d" for days.', + required=False, default=10, + type=_parse_time_with_suffix_to_seconds) parser.add_argument('--events', required=False, default=None, type=float, help='plot events using obspy.neries, specify minimum magnitude') parser.add_argument( @@ -517,6 +517,15 @@ def main(): # parse the arguments args = parser.parse_args() + print args.backtrace_time + print args.x_scale + + # Check x_scale and backtrace_time in drum plot mode + if not args.line_plot and (args.backtrace_time % args.x_scale): + print"Backtrace_time should be a multiple of x_scale (default 60m)" + print "Aborting." + sys.exit() + if args.verbose: loglevel = logging.DEBUG else: From a276122977518e9a7b1fc231751a81a48d0fb6ff Mon Sep 17 00:00:00 2001 From: bonaime Date: Fri, 3 Jul 2015 14:50:00 +0200 Subject: [PATCH 2/3] unnecessary prints --- seedlink_plotter/seedlink_plotter.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/seedlink_plotter/seedlink_plotter.py b/seedlink_plotter/seedlink_plotter.py index 1ea44ff..bb339cc 100755 --- a/seedlink_plotter/seedlink_plotter.py +++ b/seedlink_plotter/seedlink_plotter.py @@ -517,10 +517,7 @@ def main(): # parse the arguments args = parser.parse_args() - print args.backtrace_time - print args.x_scale - - # Check x_scale and backtrace_time in drum plot mode + # Check x_scale and backtrace_time in drum plot mode if not args.line_plot and (args.backtrace_time % args.x_scale): print"Backtrace_time should be a multiple of x_scale (default 60m)" print "Aborting." From 68b104dab38f276039566295445bfe0fef05c9e8 Mon Sep 17 00:00:00 2001 From: bonaime Date: Wed, 8 Jul 2015 14:56:18 +0200 Subject: [PATCH 3/3] compare x_scale and backtrace_time in seconds --- seedlink_plotter/seedlink_plotter.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/seedlink_plotter/seedlink_plotter.py b/seedlink_plotter/seedlink_plotter.py index bb339cc..a368b01 100755 --- a/seedlink_plotter/seedlink_plotter.py +++ b/seedlink_plotter/seedlink_plotter.py @@ -518,10 +518,15 @@ def main(): args = parser.parse_args() # Check x_scale and backtrace_time in drum plot mode - if not args.line_plot and (args.backtrace_time % args.x_scale): + if not args.line_plot and (args.backtrace_time % (args.x_scale*60)): print"Backtrace_time should be a multiple of x_scale (default 60m)" print "Aborting." sys.exit() + if not args.line_plot and (args.backtrace_time % (args.x_scale*60)): + print"Backtrace_time should be a multiple of x_scale (default 60m)" + print "Aborting." + sys.exit() + if args.verbose: loglevel = logging.DEBUG