From c3839ea797401d740db64691c0b4922c935b131c Mon Sep 17 00:00:00 2001
From: adamhrv <adam@ahprojects.com>
Date: Sun, 16 Dec 2018 19:37:58 +0100
Subject: still sorting CSV vectors indexes

---
 megapixels/commands/datasets/lookup.py | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'megapixels/commands/datasets/lookup.py')

diff --git a/megapixels/commands/datasets/lookup.py b/megapixels/commands/datasets/lookup.py
index e84bdf3e..5a2a171e 100644
--- a/megapixels/commands/datasets/lookup.py
+++ b/megapixels/commands/datasets/lookup.py
@@ -6,8 +6,10 @@ from app.utils import click_utils
 from app.settings import app_cfg as cfg
 from app.utils.logger_utils import Logger
 
+log = Logger.getLogger()
+
 @click.command()
-@click.option('--index', 'opt_index', type=int,
+@click.option('--index', 'opt_index', type=int, required=True,
   help='Vector index to lookup')
 @click.option('--data_store', 'opt_data_store',
   type=cfg.DataStoreVar,
@@ -19,12 +21,8 @@ from app.utils.logger_utils import Logger
   required=True,
   show_default=True,
   help=click_utils.show_help(types.Dataset))
-@click.option('--metadata', 'opt_metadata_type', required=True,
-  type=cfg.MetadataVar,
-  show_default=True,
-  help=click_utils.show_help(types.Metadata))
 @click.pass_context
-def cli(ctx, opt_index, opt_data_store, opt_dataset, opt_metadata_type):
+def cli(ctx, opt_index, opt_data_store, opt_dataset):
   """Display image info"""
   
   import sys
@@ -37,22 +35,20 @@ def cli(ctx, opt_index, opt_data_store, opt_dataset, opt_metadata_type):
   import cv2 as cv
   from tqdm import tqdm
   
-  from app.utils import file_utils, im_utils, path_utils
+  from app.utils import file_utils, im_utils
+  from app.models.data_store import DataStore
 
   log = Logger.getLogger()
-  
-  log.info(f'creating dataset: {opt_dataset}')
-  dataset = Dataset(opt_dataset)
-  # loads all CSV files, may take a while
-  log.info(f'loading dataset...')
-  dataset.load(opt_data_store)  
+  # init dataset
+  dataset = Dataset(opt_data_store, opt_dataset)
+  # set data store and load files
+  dataset.load()
   # find image records
   image_record = dataset.roi_idx_to_record(opt_index)
   # debug
   image_record.summarize()
   # load image
-  fp_im = image_record.filepath
-  im = cv.imread(fp_im)
+  im = cv.imread(image_record.filepath)
   # display
   cv.imshow('', im)
   # cv gui
-- 
cgit v1.2.3-70-g09d2