Fix rebase issues between all three branches

borevitzlab · Jun 30, 2014 · 067b307 · 067b307
1 parent 7aea9f2
commit 067b307
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/timestream/manipulate/pipecomponents.py b/timestream/manipulate/pipecomponents.py
@@ -422,4 +422,3 @@ def __call__(self, context, *args):
 
     def show(self):
         pass
-
diff --git a/timestream/manipulate/pipeline.py b/timestream/manipulate/pipeline.py
@@ -66,3 +66,21 @@ def process(self, contArgs, initArgs, visualise = False):
     def printCompList(cls):
         for clKey, clVal in ImagePipeline.complist.iteritems():
             print (clVal.info())
+
+#def test():
+#    from timestream.parse import ts_iter_images
+#    settingFile = "/home/chuong/Workspace/traitcapture-bin/unwarp_rectify/data/pipeline.yml"
+#    imageRootPath = '/mnt/phenocam/a_data/TimeStreams/BorevitzTest/BVZ0036/BVZ0036-GC02L~fullres-orig/'
+#
+#    img_iter = ts_iter_images(imageRootPath)
+#    for i in range(750):
+#        img_iter.next()
+#    currentImage = cv2.imread(img_iter.next())[:,:,::-1]
+#
+#    ipl = ImagePipeline(settingFile)
+#    context = {"filePath": os.path.dirname(settingFile)}
+#    args = [currentImage]
+#    ipl.process(context, args)
+#
+#if __name__ == "__main__":
+#    test()
diff --git a/util/pipeline_demo.py b/util/pipeline_demo.py
@@ -62,5 +62,4 @@
         # set visualise to False to run in batch mode
         context = {"rts":ts, "wts":ts_out, "img":img}
         result = pl.process(context, [img])
-
         print("Done")