Skip to content

Commit 5be562e

Browse files
authored
Merge pull request #15 from domengorjup/master
MIT license, small showcase fixes
2 parents b903d9b + 65b199f commit 5be562e

File tree

2 files changed

+42
-12
lines changed

2 files changed

+42
-12
lines changed

LICENSE

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2024 LADISK
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

Showcase.ipynb

+21-12
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"cells": [
33
{
44
"cell_type": "code",
5-
"execution_count": 25,
5+
"execution_count": 1,
66
"metadata": {},
77
"outputs": [],
88
"source": [
@@ -43,9 +43,18 @@
4343
},
4444
{
4545
"cell_type": "code",
46-
"execution_count": 8,
46+
"execution_count": 2,
4747
"metadata": {},
48-
"outputs": [],
48+
"outputs": [
49+
{
50+
"name": "stderr",
51+
"output_type": "stream",
52+
"text": [
53+
"d:\\workspace\\_PY_PACKAGES\\pymraw\\pyMRAW.py:104: UserWarning: Clipped footage! (Total frame: 4, Original total frame: 400)\n",
54+
" warnings.warn('Clipped footage! (Total frame: {}, Original total frame: {})'.format(cih['Total Frame'], cih['Original Total Frame'] ))\n"
55+
]
56+
}
57+
],
4958
"source": [
5059
"images, info = pyMRAW.load_video('data/beam.cihx')"
5160
]
@@ -59,7 +68,7 @@
5968
},
6069
{
6170
"cell_type": "code",
62-
"execution_count": 10,
71+
"execution_count": 3,
6372
"metadata": {},
6473
"outputs": [
6574
{
@@ -68,7 +77,7 @@
6877
"(numpy.memmap, dtype('uint16'), (4, 80, 1024))"
6978
]
7079
},
71-
"execution_count": 10,
80+
"execution_count": 3,
7281
"metadata": {},
7382
"output_type": "execute_result"
7483
}
@@ -86,7 +95,7 @@
8695
},
8796
{
8897
"cell_type": "code",
89-
"execution_count": 11,
98+
"execution_count": 4,
9099
"metadata": {},
91100
"outputs": [
92101
{
@@ -107,7 +116,7 @@
107116
" 'Comment Text': None}"
108117
]
109118
},
110-
"execution_count": 11,
119+
"execution_count": 4,
111120
"metadata": {},
112121
"output_type": "execute_result"
113122
}
@@ -125,7 +134,7 @@
125134
},
126135
{
127136
"cell_type": "code",
128-
"execution_count": 12,
137+
"execution_count": 5,
129138
"metadata": {},
130139
"outputs": [
131140
{
@@ -134,7 +143,7 @@
134143
"(numpy.memmap, dtype('uint16'), (80, 1024))"
135144
]
136145
},
137-
"execution_count": 12,
146+
"execution_count": 5,
138147
"metadata": {},
139148
"output_type": "execute_result"
140149
}
@@ -146,7 +155,7 @@
146155
},
147156
{
148157
"cell_type": "code",
149-
"execution_count": 13,
158+
"execution_count": 7,
150159
"metadata": {},
151160
"outputs": [
152161
{
@@ -211,9 +220,9 @@
211220
"cell_type": "markdown",
212221
"metadata": {},
213222
"source": [
214-
" The expected image format is and appropriately shaped, `(N_images, height, width)`, integer Numpy arrays.\n",
223+
" The expected image format is an appropriately shaped, `(N_images, height, width)`, integer Numpy array.\n",
215224
"\n",
216-
" 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`."
225+
" 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`."
217226
]
218227
}
219228
],

0 commit comments

Comments
 (0)