Adds setup routine

This commit add install routine.
Therefore the program has been modified to work as a module and was thus
moved into a subfolder.

.kcf

@@ -1,38 +0,0 @@
-#
-#     HEB   (Hot Electron Bolometer) Configuration file
-#
-#  (c) Karlsruhe Institute of Technology, 2014
-#  All rights reserved.
-#
-#  Applicable Firmware Version(s):
-#
-
-[Config]
-chip_delay_factor = 3
-th_delay = 3
-header = True
-adc_3_delay = 4
-chip_1_delay = 4
-th_to_adc_cycles = 7
-adc_delay_factor = 150
-fpga_delay_factor = 150
-fpga_delay_max = 15
-adc_1_delay_individual = -1
-adc_4_delay = 4
-chip_3_delay = 4
-th_delay_factor = 150
-adc_2_delay = 4
-orbits_skip = 2
-chip_2_delay = 4
-chip_4_delay = 4
-orbits_count = 10
-th_delay_max = 15
-fpga_delay = 0
-pilot_bunch = False
-adc_delay_max = 15
-orbits_observe = 100
-orbits_wait_time = 15
-chip_delay_max = 31
-adc_1_delay = 4
-build_spectrograms = False
-

base/backend/board.py → KCG/base/backend/board.py

@@ -5,7 +5,7 @@ import subprocess
 import ConfigParser
 import numpy as np
 import socket
-import config as kcg_config
+from ... import config as kcg_config
 
 log = logging.getLogger(__name__)
 
@@ -538,8 +538,8 @@ def acquire_data(filename, simulate=False):
 
 
 def wait_for_revolutions():
-    n = read_pci(1, '0x9020', decimal=True)[0]  # Get the amount of orbits to observe
-    # n = 1 # Use this for debugging purposes if no board is connected
+    # n = read_pci(1, '0x9020', decimal=True)[0]  # Get the amount of orbits to observe
+    n = 1 # Use this for debugging purposes if no board is connected
     spin_time_ns = kcg_config.tRev * n
     time.sleep(spin_time_ns * 1.4)  # 40% Safety margin
 

base/backend/dataset.py → KCG/base/backend/dataset.py

@@ -4,7 +4,7 @@ import time
 import numpy as np
 from numpy.polynomial.polynomial import polyval
 
-import config
+from ... import config
 
 
 def _pad_array(array):

base/backend/io.py → KCG/base/backend/io.py

@@ -4,7 +4,7 @@ import logging
 
 import numpy as np
 
-from config import bunches_per_turn as BUNCHES_PER_TURN
+from ...config import bunches_per_turn as BUNCHES_PER_TURN
 from board import HEADER_SIZE_BYTES
 from dataset import DataSet
 import board
@@ -134,4 +134,4 @@ def read_from_string(raw_data, force=False, header=False, cache=False, cache_fil
         logging.info('Saving pre-computed data')
         np.save('{}.npy'.format(cache_filename), result)
 
-    return dataset
+    return dataset

base/backendinterface.py → KCG/base/backendinterface.py

@@ -18,7 +18,7 @@ from backend import io
 from backend import dataset
 from groupedelements import Checkboxes, Buttons, Elements, live_plot_windows
 import storage
-import config
+from .. import config
 import kcgwidget as kcgw
 from log import log
 
@@ -833,7 +833,7 @@ def _bif_stop_acquisition():
     board.acquisition_progressbar.remove(0)
     board.acquisition_timer.stop()
     for elem in Elements.getElements("acquireTrigger"):
-        elem.setIcon(QtGui.QIcon(config.startIcon))
+        elem.setIcon(QtGui.QIcon(config.install_path + config.startIcon))
         elem.setText(tr("Button", "Start Acquisition"))
     # self.continuous_read_checkbox.setEnabled(True)
     # self.acquisition_progressbar.reset()
@@ -850,7 +850,7 @@ def _bif_start_acquisition():
     board.status.acquisition = True
     Elements.setEnabled('acquire', False)
     for elem in Elements.getElements("acquireTrigger"):
-        elem.setIcon(QtGui.QIcon(config.stopIcon))
+        elem.setIcon(QtGui.QIcon(config.install_path + config.stopIcon))
         elem.setText(tr("Button", "Stop Acquisition"))
     board.acquisition_timer = QtCore.QTimer()
     num_acquisitions = board.config.get("orbits_count")

base/controlwidget.py → KCG/base/controlwidget.py

@@ -10,6 +10,7 @@ from backend import board
 from groupedelements import Checkboxes, Buttons, Elements
 import backendinterface as bif
 import storage
+from .. import config
 
 tr = kcgw.tr
 
@@ -224,7 +225,7 @@ class ControlWidget(kcgw.KCGWidgets):
 
         self.layout.addLayout(self.gridLayout)
         self.layout.addStretch(1)
-        self.layout.addWidget(self.createLabel(image=QtGui.QPixmap("style/KAPTURE.jpg")))
+        self.layout.addWidget(self.createLabel(image=QtGui.QPixmap(config.install_path+"style/KAPTURE.jpg")))
         self.log_area = QtGui.QTextEdit()
         self.log_area.setReadOnly(True)
         self.overlayout.addWidget(self.log_area)
@@ -332,4 +333,4 @@ class ControlWidget(kcgw.KCGWidgets):
 
         except IndexError:
             QtGui.QMessageBox.critical(self, "Status Update Error", "Not enough registers given for status update.")
-            return
+            return

base/kcg.py → KCG/base/kcg.py

@@ -15,19 +15,20 @@ from multiWidget import MultiWidget
 from groupedelements import MenuItems, Elements
 from multipage import MultiPage
 import bitsTable as bt
-from base import log
+import log
 # ---------[ Widgets IMPORTANT!!! ]------------------
 # this enables widgets. If this is not imported (even though it is not directly used) no widgets will be available
-from widgets import *
+from ..widgets import *
 # from widgets import *  # copy in case the above line gets removed by ide
 # ---------[ IMPORTANT ]---------------------
 
 tr = kcgw.tr
 
-import config
+from .. import config
 import time
 import getpass
 
+
 Elements.setFlags({'autoremove': True, 'warn': True, 'exception_on_deleted': False})
 
 def readconfig(parent):
@@ -39,9 +40,9 @@ def readconfig(parent):
     """
 
     nec_conf = ['acquireSettingsIcon', 'bunches_per_turn', 'default_log_entries', 'default_save_location', 'default_subdirectory_name',
-                 'epics_base_path', 'epics_log_entry_pvs', 'force_ask', 'guiIcon', 'language', 'logCommentIcon', 'logIcon',
-                 'newPlotDataIcon', 'newPlotLiveIcon', 'save_header', 'show_advanced_control', 'singleReadIcon', 'startIcon',
-                 'stopIcon', 'style', 'tRev', 'timingIcon', 'epics_test_pv']
+                 'epics_base_path', 'epics_log_entry_pvs', 'epics_test_pv', 'force_ask', 'guiIcon', 'language', 'logCommentIcon',
+                 'logIcon', 'newPlotDataIcon', 'newPlotLiveIcon', 'save_header', 'show_advanced_control', 'singleReadIcon', 'startIcon',
+                 'stopIcon', 'style', 'tRev', 'timingIcon']
     missing_conf = []
     for c in nec_conf:
         if c not in dir(config):
@@ -171,7 +172,7 @@ class Gui(QtGui.QMainWindow):
         :return: -
         """
         self.setWindowTitle("KCG - Kapture Control Gui")
-        self.setWindowIcon(QtGui.QIcon(config.guiIcon))
+        self.setWindowIcon(QtGui.QIcon(config.install_path + config.guiIcon))
 
         self.statusbar.showMessage(board.status.status_text)
 
@@ -195,10 +196,10 @@ class Gui(QtGui.QMainWindow):
         """
         self.populate_storage()
 
-        with open("style/style.css") as f:
+        with open(config.install_path+"style/style.css") as f:
             styleSheet = f.read()
         if config.style == 'blue':
-            with open('style/blue.css') as f:
+            with open(config.install_path+'style/blue.css') as f:
                 styleSheet += f.read()
         self.setStyleSheet(styleSheet)
 
@@ -244,18 +245,18 @@ class Gui(QtGui.QMainWindow):
         self.saveConfigAction = self.fileMenu.addAction(tr("Button", "Save Board Configuration"), self.saveConfig)
         self.saveConfigAction = self.fileMenu.addAction(tr("Button", "Load Board Configuration"), self.loadConfig)
         self.settingsAction = self.fileMenu.addAction(tr("Button", "Settings"), self.showSettings, "Ctrl+P")
-        self.quitAction = self.fileMenu.addAction(QtGui.QIcon("icons/exit.png"), tr("Button", "Quit"), self.close, "Ctrl+Q")
+        self.quitAction = self.fileMenu.addAction(QtGui.QIcon(config.install_path + "icons/exit.png"), tr("Button", "Quit"), self.close, "Ctrl+Q")
         self.menu.setCornerWidget(self.cw.pagesWidget.leftright)
 
         # ----------[ Page specific Menu Entries ]-------------
         self.multiMenu = self.menu.addMenu("&"+tr("Button", "Windows"))
         MenuItems.addMenuItem(_MultiView_Name_, self.multiMenu)
-        self.plotAction = self.multiMenu.addAction(QtGui.QIcon(config.newPlotLiveIcon), tr("Button", "New Plot"), self.cw.mainMultiWidget.leftBar.add_plot)
+        self.plotAction = self.multiMenu.addAction(QtGui.QIcon(config.install_path + config.newPlotLiveIcon), tr("Button", "New Plot"), self.cw.mainMultiWidget.leftBar.add_plot)
         self.addWindowMenuEntries()
 
         self.acquireMenu = self.menu.addMenu("&"+tr("Button", "Acquire"))
         MenuItems.addMenuItem(_MultiView_Name_, self.acquireMenu)
-        self.startAcquisitionAction = self.acquireMenu.addAction(QtGui.QIcon(config.startIcon), tr("Button", "Start Acquisition"), bif.bk_acquire)
+        self.startAcquisitionAction = self.acquireMenu.addAction(QtGui.QIcon(config.install_path + config.startIcon), tr("Button", "Start Acquisition"), bif.bk_acquire)
         self.startAcquisitionAction.setObjectName("start_acquisition_action")
 
         MenuItems.addMenuItem("continuous_read", self.startAcquisitionAction)
@@ -267,7 +268,7 @@ class Gui(QtGui.QMainWindow):
 
         self.help = self.menu.addMenu("&"+tr("Button", "Help"))
         import webbrowser
-        self.help.addAction(tr("Button", "Open Manual"), lambda: webbrowser.open("Documentation/build/html/index.html"))
+        self.help.addAction(tr("Button", "Open Manual"), lambda: webbrowser.open(config.install_path + "Documentation/build/html/index.html"))
         self.help.addAction(tr("Button", "About"), self.showAbout)
 
     def saveConfig(self):

base/kcgwidget.py → KCG/base/kcgwidget.py

@@ -3,6 +3,7 @@ Base Classes used in KCG.
 This module also contains various helpful Classes to make live easier ;)
 """
 from PyQt4 import QtGui, QtCore, QtSvg
+from .. import config
 
 
 def tr(_, x):
@@ -59,9 +60,9 @@ class switchLabel(QtGui.QLabel):
         :return: -
         """
         super(switchLabel, self).__init__()
-        self.leftSwitch = QtGui.QPixmap("icons/SwitchButtonLeft.png")
+        self.leftSwitch = QtGui.QPixmap(config.install_path+"icons/SwitchButtonLeft.png")
         self.leftSwitch = self.leftSwitch.scaled(40, 20, transformMode=QtCore.Qt.SmoothTransformation)
-        self.rightSwitch = QtGui.QPixmap("icons/SwitchButtonRight.png")
+        self.rightSwitch = QtGui.QPixmap(config.install_path+"icons/SwitchButtonRight.png")
         self.rightSwitch = self.rightSwitch.scaled(40, 20, transformMode=QtCore.Qt.SmoothTransformation)
         if startRight:
             self.setPixmap(self.rightSwitch)

base/leftbar.py → KCG/base/leftbar.py

@@ -6,7 +6,7 @@ from plotWidget import PlotWidget
 from backend import board
 from backend import io
 import storage
-import widgets.acquiresettings as acqs
+from ..widgets import acquiresettings as acqs
 from groupedelements import Buttons, Elements
 import backendinterface as bif
 import log
@@ -14,7 +14,7 @@ import log
 
 tr = kcgw.tr
 
-import config
+from .. import config
 
 LIVE = 1
 FILE = 2
@@ -63,10 +63,10 @@ class AcquisitionAndInfo(kcgw.KCGWidgets):
             connect=acqs.addAcquireSettingsWidgets
         )
         board.config.observe(self.orbitswait, lambda x: self.orbitswait.setText(tr("Label", "T_wait:")+ " " + str(x)), 'orbits_wait_time')
-        self.acquire = self.createButton(tr("Button", "Start Acquisition"), icon=QtGui.QIcon(config.startIcon), connect=bif.bk_acquire)
+        self.acquire = self.createButton(tr("Button", "Start Acquisition"), icon=QtGui.QIcon(config.install_path + config.startIcon), connect=bif.bk_acquire)
 
-        self.log = self.createButton(tr("Button", "Log"), icon=QtGui.QIcon(config.logIcon), connect=lambda: log.log(additional="Manual Log"), tooltip="Rightclick to Configure")
-        self.log_w_comment = self.createButton(tr("Button", "Log"), icon=QtGui.QIcon(config.logCommentIcon), connect=self.do_log_w_comment, tooltip="Log with Comment\nRightclick to Configure")
+        self.log = self.createButton(tr("Button", "Log"), icon=QtGui.QIcon(config.install_path + config.logIcon), connect=lambda: log.log(additional="Manual Log"), tooltip="Rightclick to Configure")
+        self.log_w_comment = self.createButton(tr("Button", "Log"), icon=QtGui.QIcon(config.install_path + config.logCommentIcon), connect=self.do_log_w_comment, tooltip="Log with Comment\nRightclick to Configure")
         self.log.contextMenuEvent = self.log_configure_context_menu
         self.log_w_comment.contextMenuEvent = self.log_configure_context_menu
 

base/log.py → KCG/base/log.py

@@ -5,10 +5,10 @@ This is a custom logfile creation module
 import datetime
 from PyQt4 import QtGui, QtCore
 import kcgwidget as kcgw
-from base.backend import board
+from backend import board
 import numpy as np
 import codecs
-import config
+from .. import config
 import storage
 import logging
 try:
@@ -191,7 +191,7 @@ class ConfigureLog(QtGui.QDialog):
         super(ConfigureLog, self).__init__()
 
         self.setWindowTitle("Configure Measurement Log Entries")
-        self.setWindowIcon(QtGui.QIcon(config.guiIcon))
+        self.setWindowIcon(QtGui.QIcon(config.install_path + config.guiIcon))
 
         self.sl = QtGui.QVBoxLayout()
         self.setLayout(self.sl)

base/multiWidget.py → KCG/base/multiWidget.py

@@ -3,7 +3,7 @@ from PyQt4 import QtGui, QtCore
 import kcgwidget as kcgw
 from leftbar import LeftBar
 import leftbar
-import config
+from .. import config
 
 tr = kcgw.tr
 
@@ -67,13 +67,13 @@ class MultiWidget(QtGui.QWidget):
         kcgw.area = self.area
 
         # --------[ ToolBar ]--------
-        self.new_live_action = QtGui.QAction(QtGui.QIcon(config.newPlotLiveIcon), tr("Button", "New Live Plot"), self)
+        self.new_live_action = QtGui.QAction(QtGui.QIcon(config.install_path + config.newPlotLiveIcon), tr("Button", "New Live Plot"), self)
         self.new_live_action.setShortcut("Ctrl+L")
         self.toolbar.addAction(self.new_live_action)
         self.new_live_action.triggered.connect(lambda: self.leftBar.add_plot(leftbar.LIVE))
         self.new_live_action.setToolTip(tr("Button", "New Live Plot") + "\n(Ctrl+L)")
 
-        self.new_data_action = QtGui.QAction(QtGui.QIcon(config.newPlotDataIcon), tr("Button", "New Data Plot"), self)
+        self.new_data_action = QtGui.QAction(QtGui.QIcon(config.install_path + config.newPlotDataIcon), tr("Button", "New Data Plot"), self)
         self.new_data_action.setShortcut("Ctrl+D")
         self.toolbar.addAction(self.new_data_action)
         self.new_data_action.triggered.connect(lambda: self.leftBar.add_plot(leftbar.FILE))

base/multipage.py → KCG/base/multipage.py

@@ -1,6 +1,7 @@
 from PyQt4 import QtGui, QtCore
 from groupedelements import Elements, MenuItems
 import kcgwidget as kcgw
+from .. import config
 
 class RightSwitch(kcgw.ClickableSVG):
     """
@@ -16,7 +17,7 @@ class RightSwitch(kcgw.ClickableSVG):
         :param hidden: (bool) whether this switch is shown or hidden
         :return: -
         """
-        super(RightSwitch, self).__init__("icons/chevron-right.svg", width, height, wwidth)
+        super(RightSwitch, self).__init__(config.install_path+"icons/chevron-right.svg", width, height, wwidth)
         self.setObjectName("right_switch")
         if not hidden:
             self.show()
@@ -37,7 +38,7 @@ class LeftSwitch(kcgw.ClickableSVG):
         :param hidden: (bool) whether this switch is shown or hidden
         :return: -
         """
-        super(LeftSwitch, self).__init__("icons/chevron-left.svg", width, height, wwidth)
+        super(LeftSwitch, self).__init__(config.install_path+"icons/chevron-left.svg", width, height, wwidth)
         self.setObjectName("left_switch")
         if not hidden:
             self.show()
@@ -69,14 +70,14 @@ class LeftRightSwitch(QtGui.QWidget):
         """
         # self.left.setStyleSheet("border-radius: 4px; background-color: lightgrey;")
         self.left.setStyleSheet("#leftright:hover { background-color: none;}")
-        self.left.changeSvg("icons/grey/chevron-left.svg")
+        self.left.changeSvg(config.install_path+"icons/grey/chevron-left.svg")
     def enable_left(self):
         """
         Enable the switch to the page left of the current one
         :return: -
         """
         self.left.setStyleSheet("")
-        self.left.changeSvg("icons/chevron-left.svg")
+        self.left.changeSvg(config.install_path+"icons/chevron-left.svg")
     def disable_right(self):
         """
         Disable the switch to the page right of the current one
@@ -84,14 +85,14 @@ class LeftRightSwitch(QtGui.QWidget):
         """
         # self.right.setStyleSheet("border-radius: 4px; background-color: lightgrey;")
         self.right.setStyleSheet("#leftright:hover { background-color: none;}")
-        self.right.changeSvg("icons/grey/chevron-right.svg")
+        self.right.changeSvg(config.install_path+"icons/grey/chevron-right.svg")
     def enable_right(self):
         """
         Enable the switch to the page right of the current one
         :return: -
         """
         self.right.setStyleSheet("")
-        self.right.changeSvg("icons/chevron-right.svg")
+        self.right.changeSvg(config.install_path+"icons/chevron-right.svg")
 
 
 class MultiPage(QtGui.QStackedWidget):

base/settings.py → KCG/base/settings.py

@@ -1,7 +1,7 @@
 from PyQt4 import QtGui, QtCore
 
 import kcgwidget as kcgw
-import config
+from .. import config
 
 tr = kcgw.tr
 
@@ -69,7 +69,7 @@ class Settings(kcgw.KCGWidgets):
         self.hbox.addWidget(self.applyButton)
         self.hbox.addWidget(self.cancelButton)
         self.setWindowTitle(tr("Heading", "KCG - Settings"))
-        self.setWindowIcon(QtGui.QIcon(config.guiIcon))
+        self.setWindowIcon(QtGui.QIcon(config.install_path + config.guiIcon))
 
     def build_new_setting(self, handle, value):
         """
@@ -122,4 +122,4 @@ class Settings(kcgw.KCGWidgets):
 
     def keyPressEvent(self, QKeyEvent):
         if QKeyEvent.key() == QtCore.Qt.Key_Escape:
-            self.close()
+            self.close()