24 Commits

Author SHA1 Message Date
29f63ccb75 no real change 2025-08-06 16:39:42 +02:00
71702f5f7a added possibility to plaxe Procedure box into Expert Panel 2025-04-09 15:13:55 +02:00
fb623ee4fc QStackedWidget which does not have tabBar in on_tab_change in guiframe.py 2025-03-31 14:12:30 +02:00
44a113d85d added QStackedWidget as an option in gui_frame.py, a varient of QTabWidget 2025-01-07 14:34:40 +01:00
d0bc302915 Position in gridlayout for measurement_wgt_tab is now configurable from client json file 2024-12-13 15:35:37 +01:00
4cf494982e user:dict['Comment'] 2024-09-15 13:59:31 +02:00
bba3ecf4c1 hdf tuneup 2024-07-03 16:19:24 +02:00
0d763f267c self.appversion for hdf 2024-07-03 11:27:26 +02:00
e785db369f Merge remote-tracking branch 'origin/master' 2024-07-03 09:49:34 +02:00
4783ec5a32 base, elog destination and file naming change 2024-07-03 09:02:11 +02:00
73b187b5a8 guiframe 2024-07-03 08:55:18 +02:00
532e81f165 Typo 2024-02-29 12:11:19 +01:00
4babb18676 Typo 2024-02-29 12:10:33 +01:00
e7118162d4 Type casting in Qt for Python 3.10 2024-02-29 12:09:17 +01:00
425c8125d2 Type casting in Qt for Python 3.10 2024-02-29 11:56:09 +01:00
aeb7e2907f Type casting in Qt for Python 3.10 2024-02-29 11:51:29 +01:00
b17b3200fc Type casting in Qt for Python 3.10 2024-02-29 11:50:30 +01:00
aa31b65750 Type casting in Qt for Python 3.10 2024-02-29 11:46:42 +01:00
886f7e0972 Type casting in Qt for Python 3.10 2024-02-29 11:43:25 +01:00
5fb1d9fe5b cast to Qt.AlignmentFlag when setAlignment includeds an OR 2024-02-27 15:04:40 +01:00
fcca4f08d4 proscan driven 2024-02-08 14:13:01 +01:00
ce700a0c14 check_status update and continued devl for proscan 2024-02-06 16:52:18 +01:00
ac9d3b3e22 check_status_list 2023-11-17 11:57:54 +01:00
fd212a441d line_no in utily.py to replace _line 2023-11-17 11:23:56 +01:00
8 changed files with 1108 additions and 1064 deletions

550
base.py

File diff suppressed because it is too large Load Diff

View File

@@ -19,6 +19,8 @@ class Facility(IntEnum):
SwissFEL = 1
SLS = 2
HIPA = 3
PROSCAN = 4
ESS = 5
class MsgSeverity(IntEnum):
""" For use with message logger

File diff suppressed because it is too large Load Diff

View File

@@ -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()

View File

@@ -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

View File

@@ -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

32
setup_version Normal file
View 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 ../../

View File

@@ -10,3 +10,15 @@ def _line():
int: Current line number.
"""
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