From 895d4368078fe1439200878bff55d07660305a35 Mon Sep 17 00:00:00 2001 From: bbean Date: Wed, 24 Apr 2024 10:42:08 -0600 Subject: [PATCH] remove unused imports, fix test file location --- .../image_processor/AbstractAggregateImageProcessor.py | 5 ----- .../image_processor/AnnotationImageProcessor.py | 4 ---- .../cv/spot_analysis/image_processor/EchoImageProcessor.py | 1 - .../image_processor/ExposureDetectionImageProcessor.py | 3 --- .../spot_analysis/image_processor/LogScaleImageProcessor.py | 1 - .../image_processor/PopulationStatisticsImageProcessor.py | 2 -- .../{ => test}/TestConvolutionImageProcessor.py | 1 - 7 files changed, 17 deletions(-) rename opencsp/common/lib/cv/spot_analysis/image_processor/{ => test}/TestConvolutionImageProcessor.py (99%) diff --git a/opencsp/common/lib/cv/spot_analysis/image_processor/AbstractAggregateImageProcessor.py b/opencsp/common/lib/cv/spot_analysis/image_processor/AbstractAggregateImageProcessor.py index 96e91d1c5..ae6b2a7c9 100644 --- a/opencsp/common/lib/cv/spot_analysis/image_processor/AbstractAggregateImageProcessor.py +++ b/opencsp/common/lib/cv/spot_analysis/image_processor/AbstractAggregateImageProcessor.py @@ -1,18 +1,13 @@ from abc import ABC, abstractmethod -import dataclasses import re from typing import Callable import numpy as np -from opencsp.common.lib.cv.CacheableImage import CacheableImage -from opencsp.common.lib.cv.spot_analysis.SpotAnalysisImagesStream import ImageType from opencsp.common.lib.cv.spot_analysis.SpotAnalysisOperable import SpotAnalysisOperable from opencsp.common.lib.cv.spot_analysis.image_processor.AbstractSpotAnalysisImageProcessor import ( AbstractSpotAnalysisImagesProcessor, ) -import opencsp.common.lib.opencsp_path.opencsp_root_path as orp -import opencsp.common.lib.tool.file_tools as ft import opencsp.common.lib.tool.log_tools as lt diff --git a/opencsp/common/lib/cv/spot_analysis/image_processor/AnnotationImageProcessor.py b/opencsp/common/lib/cv/spot_analysis/image_processor/AnnotationImageProcessor.py index 7577b0aeb..23507aad5 100644 --- a/opencsp/common/lib/cv/spot_analysis/image_processor/AnnotationImageProcessor.py +++ b/opencsp/common/lib/cv/spot_analysis/image_processor/AnnotationImageProcessor.py @@ -1,10 +1,8 @@ import dataclasses -from typing import Callable import matplotlib.pyplot as plt import numpy as np -from opencsp.common.lib.cv.AbstractFiducials import AbstractFiducials from opencsp.common.lib.cv.CacheableImage import CacheableImage from opencsp.common.lib.cv.fiducials.PointFiducials import PointFiducials from opencsp.common.lib.cv.spot_analysis.SpotAnalysisOperable import SpotAnalysisOperable @@ -13,10 +11,8 @@ ) import opencsp.common.lib.geometry.Pxy as p2 import opencsp.common.lib.opencsp_path.opencsp_root_path as orp -import opencsp.common.lib.render.figure_management as fm import opencsp.common.lib.render_control.RenderControlPointSeq as rcps import opencsp.common.lib.tool.file_tools as ft -import opencsp.common.lib.tool.log_tools as lt class AnnotationImageProcessor(AbstractSpotAnalysisImagesProcessor): diff --git a/opencsp/common/lib/cv/spot_analysis/image_processor/EchoImageProcessor.py b/opencsp/common/lib/cv/spot_analysis/image_processor/EchoImageProcessor.py index acb61458e..7eb35c134 100644 --- a/opencsp/common/lib/cv/spot_analysis/image_processor/EchoImageProcessor.py +++ b/opencsp/common/lib/cv/spot_analysis/image_processor/EchoImageProcessor.py @@ -2,7 +2,6 @@ from opencsp.common.lib.cv.spot_analysis.image_processor.AbstractSpotAnalysisImageProcessor import ( AbstractSpotAnalysisImagesProcessor, ) -import opencsp.common.lib.tool.file_tools as ft import opencsp.common.lib.tool.log_tools as lt diff --git a/opencsp/common/lib/cv/spot_analysis/image_processor/ExposureDetectionImageProcessor.py b/opencsp/common/lib/cv/spot_analysis/image_processor/ExposureDetectionImageProcessor.py index 36a9ecde6..3a4a1ea09 100644 --- a/opencsp/common/lib/cv/spot_analysis/image_processor/ExposureDetectionImageProcessor.py +++ b/opencsp/common/lib/cv/spot_analysis/image_processor/ExposureDetectionImageProcessor.py @@ -1,8 +1,5 @@ -import dataclasses - import numpy as np -from opencsp.common.lib.cv.CacheableImage import CacheableImage from opencsp.common.lib.cv.spot_analysis.SpotAnalysisOperable import SpotAnalysisOperable from opencsp.common.lib.cv.spot_analysis.image_processor.AbstractSpotAnalysisImageProcessor import ( AbstractSpotAnalysisImagesProcessor, diff --git a/opencsp/common/lib/cv/spot_analysis/image_processor/LogScaleImageProcessor.py b/opencsp/common/lib/cv/spot_analysis/image_processor/LogScaleImageProcessor.py index 8b61d41e3..8b479e9ac 100644 --- a/opencsp/common/lib/cv/spot_analysis/image_processor/LogScaleImageProcessor.py +++ b/opencsp/common/lib/cv/spot_analysis/image_processor/LogScaleImageProcessor.py @@ -1,7 +1,6 @@ import dataclasses import numpy as np -import opencsp.common.lib.tool.image_tools as it from opencsp.common.lib.cv.spot_analysis.image_processor import AbstractSpotAnalysisImagesProcessor from opencsp.common.lib.cv.spot_analysis.SpotAnalysisOperable import SpotAnalysisOperable diff --git a/opencsp/common/lib/cv/spot_analysis/image_processor/PopulationStatisticsImageProcessor.py b/opencsp/common/lib/cv/spot_analysis/image_processor/PopulationStatisticsImageProcessor.py index 10a4d3581..8ac9905c7 100644 --- a/opencsp/common/lib/cv/spot_analysis/image_processor/PopulationStatisticsImageProcessor.py +++ b/opencsp/common/lib/cv/spot_analysis/image_processor/PopulationStatisticsImageProcessor.py @@ -1,13 +1,11 @@ import dataclasses import numpy as np -from opencsp.common.lib.cv.CacheableImage import CacheableImage from opencsp.common.lib.cv.spot_analysis.SpotAnalysisOperable import SpotAnalysisOperable from opencsp.common.lib.cv.spot_analysis.SpotAnalysisPopulationStatistics import SpotAnalysisPopulationStatistics from opencsp.common.lib.cv.spot_analysis.image_processor.AbstractSpotAnalysisImageProcessor import ( AbstractSpotAnalysisImagesProcessor, ) -import opencsp.common.lib.tool.file_tools as ft import opencsp.common.lib.tool.image_tools as it import opencsp.common.lib.tool.log_tools as lt diff --git a/opencsp/common/lib/cv/spot_analysis/image_processor/TestConvolutionImageProcessor.py b/opencsp/common/lib/cv/spot_analysis/image_processor/test/TestConvolutionImageProcessor.py similarity index 99% rename from opencsp/common/lib/cv/spot_analysis/image_processor/TestConvolutionImageProcessor.py rename to opencsp/common/lib/cv/spot_analysis/image_processor/test/TestConvolutionImageProcessor.py index a640f86cb..5c1b0c711 100644 --- a/opencsp/common/lib/cv/spot_analysis/image_processor/TestConvolutionImageProcessor.py +++ b/opencsp/common/lib/cv/spot_analysis/image_processor/test/TestConvolutionImageProcessor.py @@ -2,7 +2,6 @@ import unittest import numpy as np -import numpy.testing as nptest from opencsp.common.lib.cv.CacheableImage import CacheableImage from opencsp.common.lib.cv.spot_analysis.SpotAnalysisOperable import SpotAnalysisOperable