Skip to content

Commit

Permalink
Merge pull request #15 from domengorjup/master
Browse files Browse the repository at this point in the history
MIT license, small showcase fixes
  • Loading branch information
jankoslavic authored Nov 4, 2024
2 parents b903d9b + 65b199f commit 5be562e
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 12 deletions.
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2024 LADISK

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
33 changes: 21 additions & 12 deletions Showcase.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"cells": [
{
"cell_type": "code",
"execution_count": 25,
"execution_count": 1,
"metadata": {},
"outputs": [],
"source": [
Expand Down Expand Up @@ -43,9 +43,18 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": 2,
"metadata": {},
"outputs": [],
"outputs": [
{
"name": "stderr",
"output_type": "stream",
"text": [
"d:\\workspace\\_PY_PACKAGES\\pymraw\\pyMRAW.py:104: UserWarning: Clipped footage! (Total frame: 4, Original total frame: 400)\n",
" warnings.warn('Clipped footage! (Total frame: {}, Original total frame: {})'.format(cih['Total Frame'], cih['Original Total Frame'] ))\n"
]
}
],
"source": [
"images, info = pyMRAW.load_video('data/beam.cihx')"
]
Expand All @@ -59,7 +68,7 @@
},
{
"cell_type": "code",
"execution_count": 10,
"execution_count": 3,
"metadata": {},
"outputs": [
{
Expand All @@ -68,7 +77,7 @@
"(numpy.memmap, dtype('uint16'), (4, 80, 1024))"
]
},
"execution_count": 10,
"execution_count": 3,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -86,7 +95,7 @@
},
{
"cell_type": "code",
"execution_count": 11,
"execution_count": 4,
"metadata": {},
"outputs": [
{
Expand All @@ -107,7 +116,7 @@
" 'Comment Text': None}"
]
},
"execution_count": 11,
"execution_count": 4,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -125,7 +134,7 @@
},
{
"cell_type": "code",
"execution_count": 12,
"execution_count": 5,
"metadata": {},
"outputs": [
{
Expand All @@ -134,7 +143,7 @@
"(numpy.memmap, dtype('uint16'), (80, 1024))"
]
},
"execution_count": 12,
"execution_count": 5,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -146,7 +155,7 @@
},
{
"cell_type": "code",
"execution_count": 13,
"execution_count": 7,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -211,9 +220,9 @@
"cell_type": "markdown",
"metadata": {},
"source": [
" The expected image format is and appropriately shaped, `(N_images, height, width)`, integer Numpy arrays.\n",
" The expected image format is an appropriately shaped, `(N_images, height, width)`, integer Numpy array.\n",
"\n",
" The `info_dict` argument is a dictionary of metadata you wish to assign to your video. Default values for key metadata entries, required to view the MRAW video using Photron's PFV software, are used if they are not provided vie `info_dict`."
" The `info_dict` argument is a dictionary of metadata you wish to assign to your video. Default values for key metadata entries, required to view the MRAW video using Photron's PFV software, are used if they are not provided via `info_dict`."
]
}
],
Expand Down

0 comments on commit 5be562e

Please sign in to comment.