Merge pull request #31 from FireDynamics/development_sven

adds an acceptance test suit
can be started via python -m ledsa -atest

and much refactoring done

Author: O-Sven

ledsa/__main__.py

@@ -1,6 +1,8 @@
 # this file is executed if the package is run via python -m ledsa [arguments]
 
 import argparse
+import sys
+
 from .ledsa import LEDSA
 from .core import ledsa_conf as lc
 
@@ -21,14 +23,15 @@
 parser.add_argument('--coordinates', '-coord', action='store_true',
                     help='Calculates the 3D coordinates from the coordinates given in the configfile and the '
                          'reference image.')
+parser.add_argument('--atest', '-atest', action='store_true',
+                    help='Runs the acceptance test suit')
 args = parser.parse_args()
 
 print('ledsa runs with the following arguments:')
 print(args)
 
-if args.config is None and not args.s1 and not args.s2 and not args.s3 and not args.re and not args.coordinates:
-    args.config = []
-    args.s1 = args.s2 = args.s3 = True
+if len(sys.argv) == 1:
+    print('Please give an argument. Get help with --h')
 
 if args.config is not None:
     if len(args.config) == 0:
@@ -63,3 +66,7 @@
 if args.coordinates:
     from ledsa.ledpositions.coordinates import calculate_coordinates
     calculate_coordinates()
+
+if args.atest:
+    # noinspection PyUnresolvedReferences
+    import ledsa.tests.AcceptanceTests.__main__

ledsa/analysis/calculations.py

@@ -1,7 +1,7 @@
 from ..core.ledsa_conf import ConfigData
 import numpy as np
 import pandas as pd
-from ..core import _led_helper as led
+from ..core import led_helper as led
 import os
 
 # os path separator

ledsa/analysis/plot_functions.py

@@ -1,10 +1,11 @@
+import ledsa.core.model
 import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
 from PIL import Image
 
 from ledsa import LEDSA
-from ..core import _led_helper as led
+from ..core import led_helper as led
 import ledsa.analysis.calculations as calc
 from ..core.ledsa_conf import ConfigData as CD
 import os
@@ -146,8 +147,8 @@ def plot_model(fig, channel, img_id, led_id, window_radius):
     # load model
     model_params = load_model(img_id, led_id, channel, window_radius)
 
-    led_model = led.led_fit(mesh[0], mesh[1], model_params[0], model_params[1], model_params[2], model_params[3],
-                            model_params[4], model_params[5], model_params[6], model_params[7])
+    led_model = ledsa.core.model.led_fit(mesh[0], mesh[1], model_params[0], model_params[1], model_params[2], model_params[3],
+                                         model_params[4], model_params[5], model_params[6], model_params[7])
 
     current_fig = plt.gcf()
 

ledsa/analysis/ui.py

@@ -1,7 +1,7 @@
 import ledsa.analysis.plot_functions as pf
 import matplotlib.pyplot as plt
 import matplotlib
-import ledsa.core._led_helper as led
+import ledsa.core.led_helper as led
 import tkinter as tk
 import subprocess
 import os