Changeset 912 for trunk/UTIL/PYTHON/planetoplot_v2

Timestamp:

Mar 25, 2013, 12:11:07 AM (12 years ago)

Author:

aslmd

Message:

UTIL PYTHON planetoplot_v2. options were missing in pp.py.

Location:

trunk/UTIL/PYTHON/planetoplot_v2

Files:

• dev/todo.txt (modified) (1 diff)
• pp.py (modified) (5 diffs)
• ppclass.py (modified) (1 diff)

trunk/UTIL/PYTHON/planetoplot_v2/dev/todo.txt

@@ -11 +11 @@
 
 - more complicated computations: derivatives, histograms, spectra, etc...
+
+- implement the operator 'and' to concatenate files over time
+

trunk/UTIL/PYTHON/planetoplot_v2/pp.py

@@ -6 +6 @@
 from optparse import OptionParser ### TBR by argparse
 from ppclass import pp, inspect
+import sys
 ##############################################
 
@@ -32 +33 @@
 parser.add_option('-m','--mult',action='store',dest='mult',type="float",default=None,help='')
 parser.add_option('-a','--add',action='store',dest='add',type="float",default=None,help='')
+parser.add_option('-o','--output',action='store',dest='filename',type="string",default="myplot",help='')
+parser.add_option('-d','--directory',action='store',dest='folder',type="string",default=None,help='')
 # plot --> upper case
 # -- generic
@@ -39 +42 @@
 parser.add_option('-D','--div',action='store',dest='div',type="int",default=20,help='')
 parser.add_option('-H','--trans',action='store',dest='trans',type="float",default=1.0,help='')
-parser.add_option('-O','--logy',action='store_true',dest='logy',default=False,help='')
+parser.add_option('-Z','--logy',action='store_true',dest='logy',default=False,help='')
+parser.add_option('-O','--save',action='store',dest='out',type="string",default="gui",help='')
 # -- 1D plot
 parser.add_option('-L','--lstyle',action='append',dest='lstyle',type="string",default=None,help='')
@@ -84 +88 @@
 if opt.add is not None: user = user + opt.add
 if opt.mult is not None: user = user * opt.mult
+# get some options
+user.superpose = opt.superpose
+user.filename = opt.filename
+user.folder = opt.folder
+user.out = opt.out
 # define plot
 user.defineplot()
@@ -90 +99 @@
 # make plot
 user.makeplot()
+
+####################################
+# save a .sh file with the command #
+####################################
+command = ""
+for arg in sys.argv: command = command + arg + ' '
+f = open(opt.filename+'.sh', 'w')
+f.write(command)

trunk/UTIL/PYTHON/planetoplot_v2/ppclass.py

@@ -748 +748 @@
     ###########################################################
     def getopt(self,opt):
-        self.superpose = opt.superpose
         # -- if only one, or less than the number of plots --> we take the first one
         # -- if as many as number of plots --> OK, each plot has its own setting