You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by bo...@apache.org on 2015/09/04 00:50:58 UTC
[1/2] climate git commit: hide some parameter in parameter page
Repository: climate
Updated Branches:
refs/heads/master a3f3eafcc -> 7f34fc367
hide some parameter in parameter page
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/725ab839
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/725ab839
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/725ab839
Branch: refs/heads/master
Commit: 725ab83975418fe489f29b06a2a4262bda1b17af
Parents: a63049b
Author: Maziyar Boustani <bo...@jpl.nasa.gov>
Authored: Thu Sep 3 15:45:38 2015 -0700
Committer: Maziyar Boustani <bo...@jpl.nasa.gov>
Committed: Thu Sep 3 15:45:38 2015 -0700
----------------------------------------------------------------------
ocw-cli/cli_app.py | 34 ++++++++++++++++++++--------------
1 file changed, 20 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/725ab839/ocw-cli/cli_app.py
----------------------------------------------------------------------
diff --git a/ocw-cli/cli_app.py b/ocw-cli/cli_app.py
index 5f622d4..74eb4f9 100644
--- a/ocw-cli/cli_app.py
+++ b/ocw-cli/cli_app.py
@@ -288,22 +288,28 @@ def select_obs_screen(header): #TODO: if the observation is already selected,
screen.addstr(8, 2, "|D-ID| - |P-ID| - |Database")
screen.addstr(9, 2, "|----| - |----| - |--------")
all_obs_info = rcmed.get_parameters_metadata()
+ new_all_obs_info = []
+ for each in all_obs_info:
+ if not each['parameter_id'] in ['72', '73', '74', '75', '80', '42', '81', '84', '85', '86', '89', '90', '91', '94', '95', '96', '97', '98', '99', '100', '101', '103', '106']:
+ new_all_obs_info.append(each)
+ all_obs_info = new_all_obs_info
+ del new_all_obs_info
try:
for position, obs_info in enumerate(all_obs_info):
- dataset_id = obs_info['dataset_id']
- parameter_id = obs_info['parameter_id']
- database = obs_info['database']
- line = "|{0:>4}| - |{1:>4}| - |{2}".format(dataset_id, parameter_id, database)
- if position <= 25:
- screen.addstr(10 + position, 2, line)
- elif position > 25 and position <= 50:
- screen.addstr(8, 50, "|D-ID| - |P-ID| - |Database")
- screen.addstr(9, 50, "|----| - |----| - |--------")
- screen.addstr(10 + position - 26, 50, line)
- else:
- screen.addstr(8, 100, "|D-ID| - |P-ID| - |Database")
- screen.addstr(9, 100, "|----| - |----| - |--------")
- screen.addstr(10 + position - 51, 100, line)
+ dataset_id = obs_info['dataset_id']
+ parameter_id = obs_info['parameter_id']
+ database = obs_info['database']
+ line = "|{0:>4}| - |{1:>4}| - |{2}".format(dataset_id, parameter_id, database)
+ if position <= 25:
+ screen.addstr(10 + position, 2, line)
+ elif position > 25 and position <= 50:
+ screen.addstr(8, 50, "|D-ID| - |P-ID| - |Database")
+ screen.addstr(9, 50, "|----| - |----| - |--------")
+ screen.addstr(10 + position - 26, 50, line)
+ else:
+ screen.addstr(8, 100, "|D-ID| - |P-ID| - |Database")
+ screen.addstr(9, 100, "|----| - |----| - |--------")
+ screen.addstr(10 + position - 51, 100, line)
except:
ready_screen("select_obs_screen")
screen.addstr(1, 1, header + " > Select Observation ")
[2/2] climate git commit: Merge branch 'CLIMATE-665'
Posted by bo...@apache.org.
Merge branch 'CLIMATE-665'
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/7f34fc36
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/7f34fc36
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/7f34fc36
Branch: refs/heads/master
Commit: 7f34fc3679f7ac59fb89b9705e6058e3ffce19da
Parents: a3f3eaf 725ab83
Author: Maziyar Boustani <bo...@jpl.nasa.gov>
Authored: Thu Sep 3 15:50:48 2015 -0700
Committer: Maziyar Boustani <bo...@jpl.nasa.gov>
Committed: Thu Sep 3 15:50:48 2015 -0700
----------------------------------------------------------------------
ocw-cli/cli_app.py | 34 ++++++++++++++++++++--------------
1 file changed, 20 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/7f34fc36/ocw-cli/cli_app.py
----------------------------------------------------------------------