version update

Author: ES-Alexander

build/lib/pcv/helpers.py build/lib/pcv/process.pybuild/lib/pcv/helpers.py renamed to build/lib/pcv/process.py

@@ -8,7 +8,7 @@ def downsize(img, ratio):
                       tuple(dim // ratio for dim in reversed(img.shape[:2])),
                       interpolation = cv2.INTER_AREA)
 
-def channel_options(img, rank=False):
+def channel_options(img):
     ''' Create a composite image of img in all of opencv's colour channels
 
     |img| -> | blue       | green      | red         |
@@ -17,15 +17,6 @@ def channel_options(img, rank=False):
              | lightness  | green-red  | blue-yellow |
              | lightness2 | u          | v           |
 
-    'rank' is a boolean? specifying whether to also return a ranking of each
-        channel by variability/sharpness/contrast/other? !NOT YET IMPLEMENTED!
-        TODO
-        -> make a string maybe, with several options available, or select
-            multiple options in a list and get back an array or dataframe or
-            something
-        -> important to make nicely stackable to run on video and determine
-           statistics on the best option for a given use case
-
     '''
     B,G,R = cv2.split(img)
     H,S,V = cv2.split(cv2.cvtColor(img, cv2.COLOR_BGR2HSV))

build/lib/pcv/vidIO.py

@@ -3,7 +3,7 @@
 import cv2
 import signal
 import numpy as np
-from time import time
+from time import perf_counter
 from queue import Queue
 from threading import Thread, Event
 from pcv.interact import DoNothing, waitKey
@@ -227,7 +227,7 @@ def __exit__(self, *args):
         if self._verbose_exit and not self._write_queue.empty():
             print(f'Writing {self._write_queue.qsize()} remaining frames.')
             print('Force quitting may result in a corrupted video file.')
-            waited = time()
+            waited = perf_counter()
 
         # finish writing all frames
         self._write_queue.join()
@@ -237,7 +237,7 @@ def __exit__(self, *args):
 
         # if wait occurred, inform of completion
         if waited and self._verbose_exit:
-            print(f'Writing complete in {time()-waited:.3f}s.')
+            print(f'Writing complete in {perf_counter()-waited:.3f}s.')
 
 
 class OutOfFrames(StopIteration):
@@ -458,10 +458,10 @@ def measure_framerate(self, frames):
                 cv2.imshow(self.display, frame)
             count += 1
             if count == 1:
-                start = time() # avoid timing opening the window
+                start = perf_counter() # avoid timing opening the window
             if count > frames:
                 # desired frames reached, set fps as average framerate
-                return count / (time() - start)
+                return count / (perf_counter() - start)
 
     def __repr__(self):
         return f"{self.__class__.__name__}(camera_id={repr(self._id)})"
@@ -723,7 +723,7 @@ def _initialise_playback(self, start, end, skip_frames, verbose):
         # ensure time between frames is ignored while paused
         class LogDict(dict):
             def get(this, *args, **kwargs):
-                self._prev = time() - (self._period - self.MIN_DELAY) / 1e3
+                self._prev = perf_counter() - (self._period - self.MIN_DELAY) / 1e3
                 return dict.get(this, *args, **kwargs)
 
         self._pause_effects = LogDict(self._pause_effects)
@@ -918,15 +918,15 @@ def timestamp_to_ms(timestamp):
 
     def __iter__(self):
         if self._delay is not None:
-            self._prev  = time()
+            self._prev  = perf_counter()
             self._error = 0
             self._delay = 1
         return self
 
     def __next__(self):
         if self._delay is not None:
             # auto-adjust to get closer to desired fps
-            now = time()
+            now = perf_counter()
             diff = 1e3 * (now - self._prev) # s to ms
             self._error += diff - self._timestep
 

dist/pythonic-cv-1.1.1.tar.gz

@@ -1,15 +1,15 @@
 Metadata-Version: 2.1
 Name: pythonic-cv
-Version: 1.1.1
+Version: 1.1.2
 Summary: Performant pythonic wrapper of unnecessarily painful opencv functionality
 Home-page: https://github.com/ES-Alexander/pythonic-cv
 Author: ES-Alexander
 Author-email: sandman.esalexander@gmail.com
 License: UNKNOWN
 Description: _________________________________
-         Version: 1.1.1                 
+         Version: 1.1.2                 
          Author: ES Alexander            
-         Release Date: 29/Jul/2020       
+         Release Date: 12/Aug/2020       
         _________________________________
 
         # About
@@ -90,7 +90,7 @@ Description: _________________________________
         ### Basic Camera Stream
         ```python
         from pcv.vidIO import Camera
-        from pcv.helpers import channel_options, downsize
+        from pcv.process import channel_options, downsize
 
         # start streaming camera 0 (generally laptop webcam/primary camera), and destroy 'frame'
         #   window (default streaming window) when finished.
@@ -117,7 +117,7 @@ Description: _________________________________
         ### VideoReader
         ```python
         from pcv.vidIO import VideoReader
-        from pcv.helpers import downsize
+        from pcv.process import downsize
 
         # just play (simple)
         with VideoReader('my_vid.mp4') as vid:

dist/pythonic-cv-1.1.2.tar.gz

@@ -1,8 +1,8 @@
 README.md
 setup.py
 pcv/__init__.py
-pcv/helpers.py
 pcv/interact.py
+pcv/process.py
 pcv/something_fishy.py
 pcv/vidIO.py
 pythonic_cv.egg-info/PKG-INFO

dist/pythonic_cv-1.1.1-py3-none-any.whl

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name='pythonic-cv',
-    version='1.1.1',
+    version='1.1.2',
     author='ES-Alexander',
     author_email='sandman.esalexander@gmail.com',
     description='Performant pythonic wrapper of unnecessarily painful opencv functionality',