Commit df445fef authored by Samuel Debionne's avatar Samuel Debionne

Merge branch '6-missing-edffile-py-module-for-correction-plugins' into 'master'

Here the file, copied from SILX !!!

Closes #6

See merge request !25
parents 1faef666 5e31535f
Pipeline #5928 passed with stages
in 2 minutes and 4 seconds
......@@ -31,6 +31,7 @@ if (LIMA_ENABLE_PYTHON)
install(FILES LimaViewer.py DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/Lima/Server")
install(FILES AttrHelper.py DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/Lima/Server")
install(FILES EnvHelper.py DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/Lima/Server")
install(FILES EdfFile.py DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/Lima/Server")
install(DIRECTORY camera DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/Lima/Server")
install(DIRECTORY plugins DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/Lima/Server")
endif()
This diff is collapsed.
......@@ -73,10 +73,7 @@ from Lima.Server import camera
if len(sys.argv) >1: instance_name=sys.argv[1]
else: instance_name = ''
try:
import EdfFile
except ImportError:
EdfFile = None
from Lima.Server import EdfFile
TacoSpecificDict = {}
TacoSpecificName = []
......
......@@ -21,12 +21,9 @@
############################################################################
import PyTango
try:
import EdfFile
except ImportError:
EdfFile = None
from Lima import Core
from Lima.Server import EdfFile
def getDataFromFile(filepath,index = 0) :
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