Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 29f63ccb75 | |||
| 71702f5f7a | |||
| fb623ee4fc | |||
| 44a113d85d | |||
| d0bc302915 | |||
| 4cf494982e | |||
| bba3ecf4c1 | |||
| 0d763f267c | |||
| e785db369f | |||
| 4783ec5a32 | |||
| 73b187b5a8 | |||
| 532e81f165 | |||
| 4babb18676 | |||
| e7118162d4 | |||
| 425c8125d2 | |||
| aeb7e2907f | |||
| b17b3200fc | |||
| aa31b65750 | |||
| 886f7e0972 | |||
| 5fb1d9fe5b |
1519
guiframe.py
1519
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['Comment'] = None
|
||||
#self.file_name = None
|
||||
|
||||
#self.excluded_input = ['Year', 'Month', 'Date']
|
||||
|
||||
if 'Time in seconds' in input_options.keys():
|
||||
@@ -244,6 +243,7 @@ class QSaveHDF(QDialog):
|
||||
|
||||
def save(self):
|
||||
self.get_data()
|
||||
self.parent.hdf_user_dict = self.user_dict
|
||||
self.parent.hdf_filename = self.user_dict['Destination']
|
||||
self.parent.save_to_hdf(from_dialog=self.from_dialog)
|
||||
self.close()
|
||||
|
||||
13
sendelog.py
13
sendelog.py
@@ -9,22 +9,13 @@ from qtpy.QtWidgets import (QComboBox, QDialog, QFileDialog, QHBoxLayout,
|
||||
QVBoxLayout)
|
||||
|
||||
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"
|
||||
_pymodule = os.path.basename(__file__)
|
||||
_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):
|
||||
""" Graphical interface to elog
|
||||
|
||||
@@ -9,22 +9,14 @@ from qtpy.QtWidgets import (
|
||||
QLineEdit, QPushButton, QTextEdit, QVBoxLayout)
|
||||
|
||||
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"
|
||||
_pymodule = os.path.basename(__file__)
|
||||
_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):
|
||||
""" Graphical interface to elog
|
||||
|
||||
Reference in New Issue
Block a user