Compare commits
24 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 29f63ccb75 | |||
| 71702f5f7a | |||
| fb623ee4fc | |||
| 44a113d85d | |||
| d0bc302915 | |||
| 4cf494982e | |||
| bba3ecf4c1 | |||
| 0d763f267c | |||
| e785db369f | |||
| 4783ec5a32 | |||
| 73b187b5a8 | |||
| 532e81f165 | |||
| 4babb18676 | |||
| e7118162d4 | |||
| 425c8125d2 | |||
| aeb7e2907f | |||
| b17b3200fc | |||
| aa31b65750 | |||
| 886f7e0972 | |||
| 5fb1d9fe5b | |||
| fcca4f08d4 | |||
| ce700a0c14 | |||
| ac9d3b3e22 | |||
| fd212a441d |
@@ -19,6 +19,8 @@ class Facility(IntEnum):
|
|||||||
SwissFEL = 1
|
SwissFEL = 1
|
||||||
SLS = 2
|
SLS = 2
|
||||||
HIPA = 3
|
HIPA = 3
|
||||||
|
PROSCAN = 4
|
||||||
|
ESS = 5
|
||||||
|
|
||||||
class MsgSeverity(IntEnum):
|
class MsgSeverity(IntEnum):
|
||||||
""" For use with message logger
|
""" For use with message logger
|
||||||
|
|||||||
1547
guiframe.py
1547
guiframe.py
File diff suppressed because it is too large
Load Diff
@@ -38,7 +38,6 @@ class QSaveHDF(QDialog):
|
|||||||
self.user_dict = {}
|
self.user_dict = {}
|
||||||
self.user_dict['Comment'] = None
|
self.user_dict['Comment'] = None
|
||||||
#self.file_name = None
|
#self.file_name = None
|
||||||
|
|
||||||
#self.excluded_input = ['Year', 'Month', 'Date']
|
#self.excluded_input = ['Year', 'Month', 'Date']
|
||||||
|
|
||||||
if 'Time in seconds' in input_options.keys():
|
if 'Time in seconds' in input_options.keys():
|
||||||
@@ -244,6 +243,7 @@ class QSaveHDF(QDialog):
|
|||||||
|
|
||||||
def save(self):
|
def save(self):
|
||||||
self.get_data()
|
self.get_data()
|
||||||
|
self.parent.hdf_user_dict = self.user_dict
|
||||||
self.parent.hdf_filename = self.user_dict['Destination']
|
self.parent.hdf_filename = self.user_dict['Destination']
|
||||||
self.parent.save_to_hdf(from_dialog=self.from_dialog)
|
self.parent.save_to_hdf(from_dialog=self.from_dialog)
|
||||||
self.close()
|
self.close()
|
||||||
|
|||||||
13
sendelog.py
13
sendelog.py
@@ -9,22 +9,13 @@ from qtpy.QtWidgets import (QComboBox, QDialog, QFileDialog, QHBoxLayout,
|
|||||||
QVBoxLayout)
|
QVBoxLayout)
|
||||||
|
|
||||||
import elog # https://github.com/paulscherrerinstitute/py_elog
|
import elog # https://github.com/paulscherrerinstitute/py_elog
|
||||||
from pyqtacc.bdbase.enumkind import MsgSeverity
|
from apps4ops.bdbase.enumkind import MsgSeverity
|
||||||
|
from apps4ops.bdbase.utils import _line
|
||||||
|
|
||||||
_version = "1.0.0"
|
_version = "1.0.0"
|
||||||
_pymodule = os.path.basename(__file__)
|
_pymodule = os.path.basename(__file__)
|
||||||
_appname, _appext = _pymodule.split(".")
|
_appname, _appext = _pymodule.split(".")
|
||||||
|
|
||||||
def _line():
|
|
||||||
"""Macro to return the current line number.
|
|
||||||
|
|
||||||
The current line number within the file is used when
|
|
||||||
reporting messages to the message logging window.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
int: Current line number.
|
|
||||||
"""
|
|
||||||
return inspect.currentframe().f_back.f_lineno
|
|
||||||
|
|
||||||
class QSendToELOG(QDialog):
|
class QSendToELOG(QDialog):
|
||||||
""" Graphical interface to elog
|
""" Graphical interface to elog
|
||||||
|
|||||||
@@ -9,22 +9,14 @@ from qtpy.QtWidgets import (
|
|||||||
QLineEdit, QPushButton, QTextEdit, QVBoxLayout)
|
QLineEdit, QPushButton, QTextEdit, QVBoxLayout)
|
||||||
|
|
||||||
import elog # https://github.com/paulscherrerinstitute/py_elog
|
import elog # https://github.com/paulscherrerinstitute/py_elog
|
||||||
from pyqtacc.bdbase.enumkind import MsgSeverity
|
|
||||||
|
from apps4ops.bdbase.enumkind import MsgSeverity
|
||||||
|
from apps4ops.bdbase.utils import _line
|
||||||
|
|
||||||
_version = "1.0.0"
|
_version = "1.0.0"
|
||||||
_pymodule = os.path.basename(__file__)
|
_pymodule = os.path.basename(__file__)
|
||||||
_appname, _appext = _pymodule.split(".")
|
_appname, _appext = _pymodule.split(".")
|
||||||
|
|
||||||
def _line():
|
|
||||||
"""Macro to return the current line number.
|
|
||||||
|
|
||||||
The current line number within the file is used when
|
|
||||||
reporting messages to the message logging window.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
int: Current line number.
|
|
||||||
"""
|
|
||||||
return inspect.currentframe().f_back.f_lineno
|
|
||||||
|
|
||||||
class QSendToELOGFrame(QDialog):
|
class QSendToELOGFrame(QDialog):
|
||||||
""" Graphical interface to elog
|
""" Graphical interface to elog
|
||||||
|
|||||||
32
setup_version
Normal file
32
setup_version
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
#to be executed from top directory
|
||||||
|
#create a directory with version number given below.
|
||||||
|
mkdir -p v1.7.0
|
||||||
|
cd v1.7.0
|
||||||
|
mkdir -p apps4ops
|
||||||
|
mkdir -p caqtwidgets
|
||||||
|
mkdir -p common
|
||||||
|
ln -s apps4ops pyqtacc
|
||||||
|
cd apps4ops
|
||||||
|
mkdir -p bdbase
|
||||||
|
mkdir -p qrc_resources
|
||||||
|
mkdir -p sf
|
||||||
|
mkdir -p sls
|
||||||
|
mkdir -p hipa
|
||||||
|
cd bdbase
|
||||||
|
git clone git@gitlab.psi.ch:pyqtacc/bdbase.git .
|
||||||
|
cd ../qrc_resources
|
||||||
|
git clone git@gitlab.psi.ch:pyqtacc/qrc_resources.git .
|
||||||
|
cd ../sf
|
||||||
|
git clone git@gitlab.psi.ch:pyqtacc/sf.git .
|
||||||
|
cd ../sls
|
||||||
|
git clone git@gitlab.psi.ch:pyqtacc/sls.git .
|
||||||
|
cd ../hipa
|
||||||
|
git clone git@gitlab.psi.ch:pyqtacc/hipa.git .
|
||||||
|
cd ../../
|
||||||
|
mkdir -p common
|
||||||
|
cd common
|
||||||
|
git clone git@gitlab.psi.ch:pyqtacc/common.git .
|
||||||
|
cd ../
|
||||||
|
cd caqtwidgets
|
||||||
|
git clone git@gitlab.psi.ch:cafe/caqtwidgets.git .
|
||||||
|
cd ../../
|
||||||
12
utils.py
12
utils.py
@@ -10,3 +10,15 @@ def _line():
|
|||||||
int: Current line number.
|
int: Current line number.
|
||||||
"""
|
"""
|
||||||
return currentframe().f_back.f_lineno
|
return currentframe().f_back.f_lineno
|
||||||
|
|
||||||
|
|
||||||
|
def line_no():
|
||||||
|
"""Macro to return the current line number.
|
||||||
|
|
||||||
|
The current line number within the file is used when
|
||||||
|
reporting messages to the message logging window.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
int: Current line number.
|
||||||
|
"""
|
||||||
|
return currentframe().f_back.f_lineno
|
||||||
|
|||||||
Reference in New Issue
Block a user