[hdf-compass] 107/295: Merge branch 'add_namespace' of https://github.com/giumas/hdf-compass into giumas-add_namespace
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Sun May 8 10:35:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/master
in repository hdf-compass.
commit e9f2c462a52448b1304ad69cd979ee1a26bdf145
Merge: 6d80cf2 70bf2a6
Author: jreadey <jreadey at hdfgroup.org>
Date: Mon Oct 5 23:10:02 2015 -0700
Merge branch 'add_namespace' of https://github.com/giumas/hdf-compass into giumas-add_namespace
HDFCompass.py | 4 +-
HDFCompass.spec | 2 +-
filesystem_model/test.py | 8 --
hdf5_model/test.py | 8 --
hdf_compass/__init__.py | 9 +++
.../array_model}/__init__.py | 35 ++++----
{asc_model => hdf_compass/asc_model}/__init__.py | 26 +++---
.../compass_model}/__init__.py | 77 +++++-------------
.../compass_model}/icons/array_16.png | Bin
.../compass_model}/icons/array_64.png | Bin
.../compass_model}/icons/folder_16.png | Bin
.../compass_model}/icons/folder_64.png | Bin
.../compass_model}/icons/image_16.png | Bin
.../compass_model}/icons/image_64.png | Bin
.../compass_model}/icons/kv_16.png | Bin
.../compass_model}/icons/kv_64.png | Bin
.../compass_model}/icons/license.txt | 0
.../compass_model}/icons/readme.txt | 0
.../compass_model}/icons/unknown_16.png | Bin
.../compass_model}/icons/unknown_64.png | Bin
.../compass_model}/images.py | 0
.../compass_model}/test.py | 35 +++-----
.../compass_viewer}/__init__.py | 59 ++++++++++----
.../compass_viewer}/array/__init__.py | 88 +++++++++------------
.../compass_viewer}/array/plot.py | 19 ++---
.../compass_viewer}/container/__init__.py | 36 +++------
.../compass_viewer}/container/list.py | 30 +++----
.../compass_viewer}/events.py | 0
.../compass_viewer}/frame.py | 42 +++-------
.../compass_viewer}/icons/compass_32.png | Bin
.../compass_viewer}/icons/compass_48.png | Bin
.../compass_viewer}/icons/go_back_24.png | Bin
.../compass_viewer}/icons/go_back_32.png | Bin
.../compass_viewer}/icons/go_next_24.png | Bin
.../compass_viewer}/icons/go_next_32.png | Bin
.../compass_viewer}/icons/go_up_24.png | Bin
.../compass_viewer}/icons/go_up_32.png | Bin
.../compass_viewer}/icons/license.txt | 0
.../compass_viewer}/icons/logo.png | Bin
.../compass_viewer}/icons/logo.xcf | Bin
.../compass_viewer}/icons/readme.txt | 0
.../compass_viewer}/icons/view_icon_24.png | Bin
.../compass_viewer}/icons/view_icon_32.png | Bin
.../compass_viewer}/icons/view_list_24.png | Bin
.../compass_viewer}/icons/view_list_32.png | Bin
.../compass_viewer}/icons/view_tree_32.png | Bin
.../compass_viewer}/icons/viz_plot_24.png | Bin
.../compass_viewer}/icons/viz_plot_32.png | Bin
.../compass_viewer}/image/__init__.py | 9 ++-
.../compass_viewer}/images.py | 0
.../compass_viewer}/imagesupport.py | 8 +-
.../compass_viewer}/info.py | 14 ++--
.../compass_viewer}/keyvalue/__init__.py | 21 ++---
.../compass_viewer}/platform.py | 2 +-
{data => hdf_compass/data}/asc/sample.asc | 0
{data => hdf_compass/data}/hdf5/tall.h5 | Bin
.../filesystem_model}/__init__.py | 10 +--
hdf_compass/filesystem_model/test.py | 7 ++
{hdf5_model => hdf_compass/hdf5_model}/__init__.py | 66 ++--------------
hdf_compass/hdf5_model/test.py | 23 ++++++
.../opendap_model}/__init__.py | 10 +--
61 files changed, 260 insertions(+), 388 deletions(-)
diff --cc hdf_compass/compass_viewer/container/__init__.py
index 8d210ca,1df393c..9fe8196
--- a/hdf_compass/compass_viewer/container/__init__.py
+++ b/hdf_compass/compass_viewer/container/__init__.py
@@@ -74,13 -70,12 +73,13 @@@ class ContainerFrame(NodeFrame)
self.Bind(wx.EVT_MENU, lambda evt: self.list_view(), id=ID_VIEW_MENU_LIST)
self.Bind(wx.EVT_MENU, lambda evt: self.icon_view(), id=ID_VIEW_MENU_ICON)
- self.toolbar = self.CreateToolBar(wx.TB_HORIZONTAL|wx.NO_BORDER|wx.TB_FLAT|wx.TB_TEXT)
+ self.toolbar = self.CreateToolBar(wx.TB_HORIZONTAL | wx.NO_BORDER | wx.TB_FLAT | wx.TB_TEXT)
- tsize = (24,24)
- back_bmp = imagesupport.getbitmap('go_back_24')
+ tsize = (24, 24)
+ back_bmp = imagesupport.getbitmap('go_back_24')
next_bmp = imagesupport.getbitmap('go_next_24')
up_bmp = imagesupport.getbitmap('go_up_24')
+ top_bmp = imagesupport.getbitmap('go_top_24')
icon_bmp = imagesupport.getbitmap('view_icon_24')
list_bmp = imagesupport.getbitmap('view_list_24')
@@@ -89,10 -84,11 +88,12 @@@
self.toolbar.AddLabelTool(ID_GO_MENU_NEXT, "Next", next_bmp, shortHelp="New", longHelp="Long help for 'New'")
self.toolbar.AddSeparator()
self.toolbar.AddLabelTool(ID_GO_MENU_UP, "Up", up_bmp, shortHelp="New", longHelp="Long help for 'New'")
+ self.toolbar.AddLabelTool(ID_GO_MENU_TOP, "Top", top_bmp, shortHelp="New", longHelp="Long help for 'New'")
self.toolbar.AddStretchableSpace()
- self.toolbar.AddLabelTool(ID_VIEW_MENU_LIST, "List View", list_bmp, shortHelp="New", longHelp="Long help for 'New'")
- self.toolbar.AddLabelTool(ID_VIEW_MENU_ICON, "Icon View", icon_bmp, shortHelp="New", longHelp="Long help for 'New'")
+ self.toolbar.AddLabelTool(ID_VIEW_MENU_LIST, "List View", list_bmp, shortHelp="New",
+ longHelp="Long help for 'New'")
+ self.toolbar.AddLabelTool(ID_VIEW_MENU_ICON, "Icon View", icon_bmp, shortHelp="New",
+ longHelp="Long help for 'New'")
self.toolbar.Realize()
@@@ -141,15 -132,7 +137,14 @@@
parent = node.store.getparent(node.key)
if parent.key != node.key: # at the root item
self.go(parent)
+
+ def go_top(self):
+ """ Go to the root node """
+ node = self.history[self.history_ptr]
+ parent = node.store.root
+ if parent.key != node.key: # at the root item
+ self.go(parent)
-
def go(self, newnode):
""" Go to a particular node.
@@@ -171,9 -154,8 +166,9 @@@
self.update_info()
can_go_back = self.history_ptr > 0
- can_go_next = self.history_ptr < (len(self.history)-1)
+ can_go_next = self.history_ptr < (len(self.history) - 1)
can_go_up = self.node.store.getparent(self.node.key) is not None
+ can_go_top = self.node.key != self.node.store.root.key
self.go_menu.Enable(ID_GO_MENU_BACK, can_go_back)
self.go_menu.Enable(ID_GO_MENU_NEXT, can_go_next)
self.go_menu.Enable(ID_GO_MENU_UP, can_go_up)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/hdf-compass.git
More information about the debian-science-commits
mailing list