[segyio] 128/376: Merge pull request #59 from jepebe/layout_combo

[Jørgen Kvalsvik]

This is an automated email from the git hooks/post-receive script.

jokva-guest pushed a commit to branch debian
in repository segyio.

commit 0a5c9db9404ae177e642dc078054d01e9e45e1d9
Merge: ff94225 fa61a71
Author: Jean-Paul <jepebe at users.noreply.github.com>
Date:   Sat Nov 19 10:22:51 2016 +0100

    Merge pull request #59 from jepebe/layout_combo
    
    Added resources and LayoutCombo widget

 .travis.yml                                     |   2 +-
 CMakeLists.txt                                  |   1 +
 appveyor.yml                                    |   2 +-
 cmake/python.cmake                              |   1 +
 examples/CMakeLists.txt                         |   1 +
 examples/showcase_gui.py                        |  46 +++++++++++
 python/segyview/CMakeLists.txt                  |   1 +
 python/segyview/__init__.py                     |  20 +++++
 python/segyview/layoutcombo.py                  |  97 ++++++++++++++++++++++++
 resources/CMakeLists.txt                        |   1 +
 resources/img/CMakeLists.txt                    |  21 +++++
 resources/img/layouts_four_grid.png             | Bin 0 -> 1428 bytes
 resources/img/layouts_single.png                | Bin 0 -> 1246 bytes
 resources/img/layouts_three_bottom_grid.png     | Bin 0 -> 2345 bytes
 resources/img/layouts_three_horizontal_grid.png | Bin 0 -> 2228 bytes
 resources/img/layouts_three_top_grid.png        | Bin 0 -> 2397 bytes
 resources/img/layouts_three_vertical_grid.png   | Bin 0 -> 1408 bytes
 resources/img/layouts_two_horizontal_grid.png   | Bin 0 -> 2341 bytes
 resources/img/layouts_two_vertical_grid.png     | Bin 0 -> 2277 bytes
 resources/img/readme.txt                        |   7 ++
 tests/test_segyview.py                          |  23 ++----
 21 files changed, 205 insertions(+), 18 deletions(-)

diff --cc examples/CMakeLists.txt
index a48d185,4e52c01..89c59c9
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@@ -4,6 -4,6 +4,7 @@@ configure_file(../tests/test-data/small
  add_python_example(python.examples.about about.py test-data/small.sgy INLINE_3D CROSSLINE_3D)
  add_python_example(python.examples.write write.py test-data/small.sgy)
  add_python_example(python.examples.makefile make-file.py test-data/large-file.sgy 20 1 20 1 20)
 +add_python_example(python.examples.makepsfile make-ps-file.py test-data/small-prestack.sgy 10 1 5 1 4 1 3)
  add_python_example(python.examples.subcube copy-sub-cube.py test-data/small.sgy test-data/copy.sgy)
  add_python_example(python.examples.scan_min_max scan_min_max.py test-data/small.sgy)
+ add_python_example(python.examples.gui showcase_gui.py display_nothing)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/segyio.git