diff --git a/pylot/core/active/asp3d_layout.py b/pylot/core/active/asp3d_layout.py index cb4e8d11..df75ae3c 100644 --- a/pylot/core/active/asp3d_layout.py +++ b/pylot/core/active/asp3d_layout.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'asp3d_layout.ui' # -# Created: Tue Jun 21 13:22:35 2016 +# Created: Thu Jun 23 11:47:12 2016 # by: pyside-uic 0.2.15 running on PySide 1.2.2 # # WARNING! All changes made in this file will be lost! @@ -38,7 +38,7 @@ class Ui_MainWindow(object): self.verticalLayout = QtGui.QVBoxLayout() self.verticalLayout.setObjectName("verticalLayout") self.label_2 = QtGui.QLabel(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_2.sizePolicy().hasHeightForWidth()) @@ -70,7 +70,7 @@ class Ui_MainWindow(object): self.horizontalLayout_2 = QtGui.QHBoxLayout() self.horizontalLayout_2.setObjectName("horizontalLayout_2") self.seisarray_active = QtGui.QLabel(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.seisarray_active.sizePolicy().hasHeightForWidth()) @@ -81,7 +81,7 @@ class Ui_MainWindow(object): self.seisarray_active.setObjectName("seisarray_active") self.horizontalLayout_2.addWidget(self.seisarray_active) self.label_5 = QtGui.QLabel(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_5.sizePolicy().hasHeightForWidth()) @@ -89,7 +89,7 @@ class Ui_MainWindow(object): self.label_5.setObjectName("label_5") self.horizontalLayout_2.addWidget(self.label_5) self.seisarray_on_survey_active = QtGui.QLabel(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.seisarray_on_survey_active.sizePolicy().hasHeightForWidth()) @@ -100,7 +100,7 @@ class Ui_MainWindow(object): self.seisarray_on_survey_active.setObjectName("seisarray_on_survey_active") self.horizontalLayout_2.addWidget(self.seisarray_on_survey_active) self.label_6 = QtGui.QLabel(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_6.sizePolicy().hasHeightForWidth()) @@ -117,7 +117,7 @@ class Ui_MainWindow(object): self.verticalLayout_2 = QtGui.QVBoxLayout() self.verticalLayout_2.setObjectName("verticalLayout_2") self.label_3 = QtGui.QLabel(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_3.sizePolicy().hasHeightForWidth()) @@ -143,7 +143,7 @@ class Ui_MainWindow(object): self.horizontalLayout = QtGui.QHBoxLayout() self.horizontalLayout.setObjectName("horizontalLayout") self.survey_active = QtGui.QLabel(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.survey_active.sizePolicy().hasHeightForWidth()) @@ -154,7 +154,7 @@ class Ui_MainWindow(object): self.survey_active.setObjectName("survey_active") self.horizontalLayout.addWidget(self.survey_active) self.label_4 = QtGui.QLabel(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_4.sizePolicy().hasHeightForWidth()) @@ -162,7 +162,7 @@ class Ui_MainWindow(object): self.label_4.setObjectName("label_4") self.horizontalLayout.addWidget(self.label_4) self.picked_active = QtGui.QLabel(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.picked_active.sizePolicy().hasHeightForWidth()) @@ -173,7 +173,7 @@ class Ui_MainWindow(object): self.picked_active.setObjectName("picked_active") self.horizontalLayout.addWidget(self.picked_active) self.label = QtGui.QLabel(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth()) @@ -190,7 +190,7 @@ class Ui_MainWindow(object): self.verticalLayout_3 = QtGui.QVBoxLayout() self.verticalLayout_3.setObjectName("verticalLayout_3") self.label_7 = QtGui.QLabel(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_7.sizePolicy().hasHeightForWidth()) @@ -218,7 +218,7 @@ class Ui_MainWindow(object): self.verticalLayout_4 = QtGui.QVBoxLayout() self.verticalLayout_4.setObjectName("verticalLayout_4") self.label_8 = QtGui.QLabel(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_8.sizePolicy().hasHeightForWidth()) @@ -258,7 +258,7 @@ class Ui_MainWindow(object): def retranslateUi(self, MainWindow): MainWindow.setWindowTitle(QtGui.QApplication.translate("MainWindow", "ActiveSeismoPick 3D", None, QtGui.QApplication.UnicodeUTF8)) self.label_2.setText(QtGui.QApplication.translate("MainWindow", "Seismic Array", None, QtGui.QApplication.UnicodeUTF8)) - self.gen_new_seisarray.setText(QtGui.QApplication.translate("MainWindow", "Generate new Seismic Array", None, QtGui.QApplication.UnicodeUTF8)) + self.gen_new_seisarray.setText(QtGui.QApplication.translate("MainWindow", "Create new Seismic Array", None, QtGui.QApplication.UnicodeUTF8)) self.load_seisarray.setText(QtGui.QApplication.translate("MainWindow", "Load Seismic Array", None, QtGui.QApplication.UnicodeUTF8)) self.save_seisarray.setText(QtGui.QApplication.translate("MainWindow", "Save Seismic Array", None, QtGui.QApplication.UnicodeUTF8)) self.interpolate_receivers.setText(QtGui.QApplication.translate("MainWindow", "Interpolate Receivers", None, QtGui.QApplication.UnicodeUTF8)) diff --git a/pylot/core/active/generate_seisarray_layout.py b/pylot/core/active/generate_seisarray_layout.py index ab13cad8..d6904455 100644 --- a/pylot/core/active/generate_seisarray_layout.py +++ b/pylot/core/active/generate_seisarray_layout.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'generate_seisarray_layout.ui' # -# Created: Thu Jun 16 12:10:38 2016 +# Created: Thu Jun 23 11:55:22 2016 # by: pyside-uic 0.2.15 running on PySide 1.2.2 # # WARNING! All changes made in this file will be lost! @@ -19,8 +19,8 @@ class Ui_generate_seisarray(object): generate_seisarray.setWindowIcon(icon) self.verticalLayout = QtGui.QVBoxLayout(generate_seisarray) self.verticalLayout.setObjectName("verticalLayout") - self.gridLayout = QtGui.QGridLayout() - self.gridLayout.setObjectName("gridLayout") + self.verticalLayout_3 = QtGui.QVBoxLayout() + self.verticalLayout_3.setObjectName("verticalLayout_3") self.label_rec = QtGui.QLabel(generate_seisarray) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) @@ -28,7 +28,7 @@ class Ui_generate_seisarray(object): sizePolicy.setHeightForWidth(self.label_rec.sizePolicy().hasHeightForWidth()) self.label_rec.setSizePolicy(sizePolicy) self.label_rec.setObjectName("label_rec") - self.gridLayout.addWidget(self.label_rec, 0, 0, 1, 1) + self.verticalLayout_3.addWidget(self.label_rec) self.horizontalLayout_4 = QtGui.QHBoxLayout() self.horizontalLayout_4.setObjectName("horizontalLayout_4") self.lineEdit_rec = QtGui.QLineEdit(generate_seisarray) @@ -37,10 +37,18 @@ class Ui_generate_seisarray(object): self.pushButton_rec = QtGui.QPushButton(generate_seisarray) self.pushButton_rec.setObjectName("pushButton_rec") self.horizontalLayout_4.addWidget(self.pushButton_rec) - self.gridLayout.addLayout(self.horizontalLayout_4, 1, 0, 1, 1) - self.verticalLayout.addLayout(self.gridLayout) - self.gridLayout_2 = QtGui.QGridLayout() - self.gridLayout_2.setObjectName("gridLayout_2") + self.verticalLayout_3.addLayout(self.horizontalLayout_4) + self.verticalLayout.addLayout(self.verticalLayout_3) + self.verticalLayout_2 = QtGui.QVBoxLayout() + self.verticalLayout_2.setObjectName("verticalLayout_2") + self.label_src = QtGui.QLabel(generate_seisarray) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.label_src.sizePolicy().hasHeightForWidth()) + self.label_src.setSizePolicy(sizePolicy) + self.label_src.setObjectName("label_src") + self.verticalLayout_2.addWidget(self.label_src) self.horizontalLayout_5 = QtGui.QHBoxLayout() self.horizontalLayout_5.setObjectName("horizontalLayout_5") self.lineEdit_src = QtGui.QLineEdit(generate_seisarray) @@ -49,18 +57,18 @@ class Ui_generate_seisarray(object): self.pushButton_src = QtGui.QPushButton(generate_seisarray) self.pushButton_src.setObjectName("pushButton_src") self.horizontalLayout_5.addWidget(self.pushButton_src) - self.gridLayout_2.addLayout(self.horizontalLayout_5, 1, 0, 1, 1) - self.label_src = QtGui.QLabel(generate_seisarray) + self.verticalLayout_2.addLayout(self.horizontalLayout_5) + self.verticalLayout.addLayout(self.verticalLayout_2) + self.verticalLayout_4 = QtGui.QVBoxLayout() + self.verticalLayout_4.setObjectName("verticalLayout_4") + self.label_obs = QtGui.QLabel(generate_seisarray) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.label_src.sizePolicy().hasHeightForWidth()) - self.label_src.setSizePolicy(sizePolicy) - self.label_src.setObjectName("label_src") - self.gridLayout_2.addWidget(self.label_src, 0, 0, 1, 1) - self.verticalLayout.addLayout(self.gridLayout_2) - self.gridLayout_3 = QtGui.QGridLayout() - self.gridLayout_3.setObjectName("gridLayout_3") + sizePolicy.setHeightForWidth(self.label_obs.sizePolicy().hasHeightForWidth()) + self.label_obs.setSizePolicy(sizePolicy) + self.label_obs.setObjectName("label_obs") + self.verticalLayout_4.addWidget(self.label_obs) self.horizontalLayout_6 = QtGui.QHBoxLayout() self.horizontalLayout_6.setObjectName("horizontalLayout_6") self.lineEdit_pts = QtGui.QLineEdit(generate_seisarray) @@ -69,16 +77,8 @@ class Ui_generate_seisarray(object): self.pushButton_obs = QtGui.QPushButton(generate_seisarray) self.pushButton_obs.setObjectName("pushButton_obs") self.horizontalLayout_6.addWidget(self.pushButton_obs) - self.gridLayout_3.addLayout(self.horizontalLayout_6, 1, 0, 1, 1) - self.label_obs = QtGui.QLabel(generate_seisarray) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.label_obs.sizePolicy().hasHeightForWidth()) - self.label_obs.setSizePolicy(sizePolicy) - self.label_obs.setObjectName("label_obs") - self.gridLayout_3.addWidget(self.label_obs, 0, 0, 1, 1) - self.verticalLayout.addLayout(self.gridLayout_3) + self.verticalLayout_4.addLayout(self.horizontalLayout_6) + self.verticalLayout.addLayout(self.verticalLayout_4) self.buttonBox = QtGui.QDialogButtonBox(generate_seisarray) self.buttonBox.setOrientation(QtCore.Qt.Horizontal) self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) @@ -94,8 +94,8 @@ class Ui_generate_seisarray(object): generate_seisarray.setWindowTitle(QtGui.QApplication.translate("generate_seisarray", "Generate new Seismic Array", None, QtGui.QApplication.UnicodeUTF8)) self.label_rec.setText(QtGui.QApplication.translate("generate_seisarray", "Measured Receivers", None, QtGui.QApplication.UnicodeUTF8)) self.pushButton_rec.setText(QtGui.QApplication.translate("generate_seisarray", "Browse", None, QtGui.QApplication.UnicodeUTF8)) - self.pushButton_src.setText(QtGui.QApplication.translate("generate_seisarray", "Browse", None, QtGui.QApplication.UnicodeUTF8)) self.label_src.setText(QtGui.QApplication.translate("generate_seisarray", "Measured Sources (optional)", None, QtGui.QApplication.UnicodeUTF8)) - self.pushButton_obs.setText(QtGui.QApplication.translate("generate_seisarray", "Browse", None, QtGui.QApplication.UnicodeUTF8)) + self.pushButton_src.setText(QtGui.QApplication.translate("generate_seisarray", "Browse", None, QtGui.QApplication.UnicodeUTF8)) self.label_obs.setText(QtGui.QApplication.translate("generate_seisarray", "Additional measured points (optional)", None, QtGui.QApplication.UnicodeUTF8)) + self.pushButton_obs.setText(QtGui.QApplication.translate("generate_seisarray", "Browse", None, QtGui.QApplication.UnicodeUTF8))