Commit b095547d441203dda2752f3738e3cb70ed54e8f0

Authored by caveenj
1 parent 7eef0bac
Exists in master and in 1 other branch odf2csvP3

Modification a la fonction montrant la sequence d'appel pour

tenir compte du fait que la moyenne n'est plus calculee
par defaut.
Elimination de messages de debogue
Showing 3 changed files with 8 additions and 9 deletions   Show diff stats
src/odf2csv.py
... ... @@ -354,7 +354,7 @@ if (CalculerMoyenne):
354 354  
355 355 if not DEPTH.search(var.getcode()) and not PRES.search(var.getcode()) and \
356 356 not QCFF.search(var.getcode()) and not QQQQ.search(var.getcode()):
357   - print "On traite:", var.getcode()
  357 + print "On traite - Converting:", var.getcode()
358 358 if(var_q.has_key(var)):
359 359 qualite = var_q.get(var)
360 360 qualite_dat = []
... ... @@ -391,7 +391,7 @@ if (CalculerMoyenne):
391 391 #On traite DEPTH et PRES
392 392 for var in varlist:
393 393 if DEPTH.search(var.getcode()) or PRES.search(var.getcode()):
394   - print "On traite:", var.getcode()
  394 + print "On traite - Converting:", var.getcode()
395 395 if(var_q.has_key(var)):
396 396 qualite = var_q.get(var)
397 397 qualite_dat = []
... ... @@ -492,12 +492,11 @@ fout.write(chaine)
492 492 for i in range(varlist[0].getnbval()):
493 493 chaine =''
494 494 for var in varlist:
495   - print "var = ", var.getcode()
496 495 if CalculerMoyenne and QCFF.search(var.getcode()):
497 496 pass
498 497 else:
499   - print "i = ", i
500 498 chaine = chaine + var.getvaleur(i) + '\t'
  499 +
501 500 chaine = chaine + '\n'
502 501 fout.write(chaine)
503 502  
... ...
src/odf_fcns.py
... ... @@ -48,16 +48,16 @@ def depth2pres(din,lat):
48 48 def usage():
49 49  
50 50 print "Usage: "
51   - print "odf2csv -i ficin -o ficout [-m interval | -a ] [-d] [-e ]"
  51 + print "odf2csv -i ficin -o ficout [-m interval] [-d] [-e ]"
52 52 print " ou:"
53   - print "odf2csv --input ficin --output ficout [--mean interval | --all] [--error] [--doubtfull]"
  53 + print "odf2csv --input ficin --output ficout [--mean interval] [--error] [--doubtfull]"
54 54 print ""
55 55 print "ficin : fichier entree (input file)"
56 56 print "ficout: fichier sortie (output file"
57 57 print "interval : intervale de profondeurs pour donnees moyennees"
58 58 print " (depth interval for mean data)"
59   - print "-d : eliminer donnees douteuses (discard data flaged as doubtfull)"
60   - print "-e : eliminer donnees erronnees (discard data flaged as erroneous)"
  59 + print "-d (--doubtfull) : eliminer donnees douteuses (discard data flaged as doubtfull)"
  60 + print "-e (--error) : eliminer donnees erronnees (discard data flaged as erroneous)"
61 61  
62 62  
63 63  
... ...
src/setup.py
... ... @@ -7,4 +7,4 @@ ver="1.0"
7 7 modules = ["class_variable","odf_fcns"]
8 8 script = ["odf2csv.py"]
9 9  
10   -setup(name=nom,author=auteur,version=ver,py_modules = modules,scripts=script)
  10 +setup(name=nom,author=auteur,version=ver,py_modules = modules,console=script)
... ...