Commit 744ab90b authored by Lars Bittrich's avatar Lars Bittrich

legacyConvert.py: fixed relative import

binary module tsp removed!
ramancontrol.py: fixed default
parent a1f9b4a1
...@@ -36,7 +36,7 @@ def legacyConversion(dset, recreatefullimage=False): ...@@ -36,7 +36,7 @@ def legacyConversion(dset, recreatefullimage=False):
print("This may take some time") print("This may take some time")
# local imports as these functions are only needed for the rare occasion of legacy conversion # local imports as these functions are only needed for the rare occasion of legacy conversion
from opticalscan import loadAndPasteImage from .opticalscan import loadAndPasteImage
# try to load png and check for detection contours # try to load png and check for detection contours
recreatefullimage = recreatefullimage or not os.path.exists(dset.getLegacyImageName()) recreatefullimage = recreatefullimage or not os.path.exists(dset.getLegacyImageName())
......
...@@ -29,7 +29,7 @@ defaultPath = os.path.dirname(os.path.split(__file__)[0]) ...@@ -29,7 +29,7 @@ defaultPath = os.path.dirname(os.path.split(__file__)[0])
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.read(os.path.join(defaultPath, 'gepard.cfg')) config.read(os.path.join(defaultPath, 'gepard.cfg'))
interface = "RENISHAW_CONTROL" interface = "SIMULATED_RAMAN_CONTROL"
try: try:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment