Skip to content

Commit f455445

Browse files
authored
Merge pull request #129 from FireDynamics/change_image_renamer
replace `photo_renamer.py` script with a Jupyter notebook for improve…
2 parents 7cb2006 + 90bafc0 commit f455445

5 files changed

Lines changed: 930 additions & 189 deletions

File tree

ledsa/__main__.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import sys
44
from typing import List
55

6-
from ledsa.core.parser_arguments_declaration import (add_parser_arguments_tools, add_parser_arguments_data_extraction,
6+
from ledsa.core.parser_arguments_declaration import (add_parser_arguments_data_extraction,
77
add_parser_arguments_testing, add_parser_arguments_demo, add_parser_argument_analysis)
8-
from ledsa.core.parser_arguments_run import run_tools_arguments, run_data_extraction_arguments, run_testing_arguments, run_demo_arguments, \
8+
from ledsa.core.parser_arguments_run import run_data_extraction_arguments, run_testing_arguments, run_demo_arguments, \
99
run_analysis_arguments, run_analysis_arguments_with_extinction_coefficient, run_stacked_analysis
1010

1111

@@ -18,7 +18,6 @@ def main(argv: List[str]) -> None:
1818
"""
1919
parser = argparse.ArgumentParser(description=
2020
'Allows the analysis of light dampening of LEDs behind a smoke screen.')
21-
add_parser_arguments_tools(parser)
2221
add_parser_arguments_data_extraction(parser)
2322
add_parser_argument_analysis(parser)
2423
add_parser_arguments_demo(parser)
@@ -36,7 +35,6 @@ def main(argv: List[str]) -> None:
3635
if args.demo:
3736
run_demo_arguments(args, parser)
3837
else:
39-
run_tools_arguments(args)
4038
run_data_extraction_arguments(args)
4139
run_analysis_arguments(args)
4240
run_analysis_arguments_with_extinction_coefficient(args)

ledsa/core/parser_arguments_declaration.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
11
import argparse
22

33

4-
def add_parser_arguments_tools(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
5-
"""
6-
Add parser arguments related to tools.
7-
8-
:param parser: ArgumentParser object to which the arguments are added.
9-
:type parser: argparse.ArgumentParser
10-
:return: Modified ArgumentParser object with added arguments.
11-
:rtype: argparse.ArgumentParser
12-
"""
13-
14-
parser.add_argument('--prepare_images', action='store_true')
15-
return parser
16-
174

185
def add_parser_arguments_data_extraction(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
196
"""

ledsa/core/parser_arguments_run.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import argparse
22
import os
33

4-
from ledsa.tools.photo_renamer import set_working_dir, get_files, rename_images_by_date
54
from ledsa.analysis import ExtinctionCoefficientsNonLinear as ECN
65
from ledsa.analysis import ExtinctionCoefficientsLinear as ECA
76

@@ -17,18 +16,6 @@
1716
from ledsa.data_extraction.DataExtractor import DataExtractor
1817

1918

20-
def run_tools_arguments(args: argparse.Namespace) -> None:
21-
"""
22-
Execute actions based on tools arguments.
23-
24-
:param args: Parsed command line arguments.
25-
:type args: argparse.Namespace
26-
"""
27-
if args.prepare_images:
28-
set_working_dir()
29-
image_df = get_files()
30-
rename_images_by_date(image_df)
31-
3219

3320
def run_data_extraction_arguments(args: argparse.Namespace) -> None:
3421
"""

0 commit comments

Comments
 (0)