diff --git a/core_tools/data/ds/data_set.py b/core_tools/data/ds/data_set.py index 1d3064c1d82f6a42a06736f2c95c0ef7ceab040f..7b808d87db7b10a52b897733634db2e9a6ef1f0c 100644 --- a/core_tools/data/ds/data_set.py +++ b/core_tools/data/ds/data_set.py @@ -1,5 +1,6 @@ from core_tools.data.ds.data_set_core import data_set_raw, data_set from core_tools.data.SQL.SQL_database_mgr import SQL_database_manager +import qcodes as qc def load_by_id(exp_id): ''' @@ -30,6 +31,9 @@ def create_new_data_set(experiment_name, *m_params): ''' ds = data_set_raw(exp_name=experiment_name) + if qc.Station.default is not None: + ds.snapshot = qc.Station.default.snapshot() + # intialize the buffers for the measurement for m_param in m_params: m_param.init_data_dataclass() diff --git a/core_tools/data/gui/plot_mgr.py b/core_tools/data/gui/plot_mgr.py index 8ccc27ace62d1018db9ee9382af1292af35a2e29..6483922463d616546dc56fa47a17467c8940d114 100644 --- a/core_tools/data/gui/plot_mgr.py +++ b/core_tools/data/gui/plot_mgr.py @@ -94,7 +94,6 @@ class ui_box_mgr(): for plot in self.plot_widgets: plot.update() - print('updating plot') if __name__ == '__main__': @@ -106,6 +105,5 @@ if __name__ == '__main__': set_up_local_storage('stephan', 'magicc', 'test', 'Intel Project', 'F006', 'SQ38328342') - ds = load_by_id(14) + ds = load_by_uuid(1603957754478631616) p = data_plotter(ds) - print('pass') diff --git a/core_tools/data/gui/ui_files/plotter_basic_autgen.py b/core_tools/data/gui/ui_files/plotter_basic_autgen.py index a0cc7345aea91f060416db6e8e8ad3d5d0566664..ad8ff4ac3fd0814f5782bb0095dc521c79468d7f 100644 --- a/core_tools/data/gui/ui_files/plotter_basic_autgen.py +++ b/core_tools/data/gui/ui_files/plotter_basic_autgen.py @@ -24,26 +24,33 @@ class Ui_MainWindow(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.scrollArea.sizePolicy().hasHeightForWidth()) self.scrollArea.setSizePolicy(sizePolicy) - self.scrollArea.setMaximumSize(QtCore.QSize(300, 16777215)) + self.scrollArea.setMaximumSize(QtCore.QSize(350, 16777215)) self.scrollArea.setWidgetResizable(True) self.scrollArea.setObjectName("scrollArea") self.scrollAreaWidgetContents_4 = QtWidgets.QWidget() - self.scrollAreaWidgetContents_4.setGeometry(QtCore.QRect(0, 0, 320, 774)) + self.scrollAreaWidgetContents_4.setGeometry(QtCore.QRect(0, 0, 348, 788)) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.scrollAreaWidgetContents_4.sizePolicy().hasHeightForWidth()) + self.scrollAreaWidgetContents_4.setSizePolicy(sizePolicy) + self.scrollAreaWidgetContents_4.setMinimumSize(QtCore.QSize(0, 0)) + self.scrollAreaWidgetContents_4.setMaximumSize(QtCore.QSize(16777215, 16777215)) self.scrollAreaWidgetContents_4.setObjectName("scrollAreaWidgetContents_4") self.gridLayout = QtWidgets.QGridLayout(self.scrollAreaWidgetContents_4) self.gridLayout.setObjectName("gridLayout") self.data_content_layout = QtWidgets.QVBoxLayout() self.data_content_layout.setObjectName("data_content_layout") self.label = QtWidgets.QLabel(self.scrollAreaWidgetContents_4) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth()) self.label.setSizePolicy(sizePolicy) - self.label.setMinimumSize(QtCore.QSize(300, 0)) - self.label.setMaximumSize(QtCore.QSize(300, 16777215)) + self.label.setMinimumSize(QtCore.QSize(300, 50)) + self.label.setMaximumSize(QtCore.QSize(16777215, 16777215)) font = QtGui.QFont() - font.setPointSize(14) + font.setPointSize(16) self.label.setFont(font) self.label.setObjectName("label") self.data_content_layout.addWidget(self.label) @@ -66,7 +73,7 @@ class Ui_MainWindow(object): def retranslateUi(self, MainWindow): _translate = QtCore.QCoreApplication.translate MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow")) - self.label.setText(_translate("MainWindow", "Content")) + self.label.setText(_translate("MainWindow", "Dataset Content")) if __name__ == "__main__": diff --git a/core_tools/data/gui/ui_files/plotter_basic_ui.ui b/core_tools/data/gui/ui_files/plotter_basic_ui.ui index 148eab9a9628a66244cf4f564fc72a7dc24f0b87..f8e68bc3359c4499194b11d7475fd6db2ff3c9c4 100644 --- a/core_tools/data/gui/ui_files/plotter_basic_ui.ui +++ b/core_tools/data/gui/ui_files/plotter_basic_ui.ui @@ -25,7 +25,7 @@ </property> <property name="maximumSize"> <size> - <width>300</width> + <width>350</width> <height>16777215</height> </size> </property> @@ -37,17 +37,35 @@ <rect> <x>0</x> <y>0</y> - <width>320</width> - <height>774</height> + <width>348</width> + <height>788</height> </rect> </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>16777215</height> + </size> + </property> <layout class="QGridLayout" name="gridLayout"> <item row="0" column="1"> <layout class="QVBoxLayout" name="data_content_layout"> <item> <widget class="QLabel" name="label"> <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Preferred"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -55,22 +73,22 @@ <property name="minimumSize"> <size> <width>300</width> - <height>0</height> + <height>50</height> </size> </property> <property name="maximumSize"> <size> - <width>300</width> + <width>16777215</width> <height>16777215</height> </size> </property> <property name="font"> <font> - <pointsize>14</pointsize> + <pointsize>16</pointsize> </font> </property> <property name="text"> - <string>Content</string> + <string>Dataset Content</string> </property> </widget> </item>