Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

62 task dialog not displaying properly #66

Merged
merged 6 commits into from
Mar 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions General_BOM_Functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ def createBoMSpreadsheet(
Cell = f"{Column}1"
# Add the cell and header as a dict item to the dict AdditionalHeaders
CustomHeadersDict[Cell] = Header

# Set the headers with additional headers
Headers = Settings_BoM.ReturnHeaders(
Headers=Headers, AdditionalHeaders=CustomHeadersDict
Expand Down
22 changes: 20 additions & 2 deletions Resources/UI/BoM_Panel.ui
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>305</height>
</size>
</property>
<property name="palette">
<palette>
<active>
Expand Down Expand Up @@ -89,7 +95,7 @@
<property name="modal">
<bool>true</bool>
</property>
<widget class="QWidget" name="layoutWidget">
<widget class="QFrame" name="frame">
<property name="geometry">
<rect>
<x>0</x>
Expand All @@ -98,9 +104,21 @@
<height>291</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>271</width>
<height>291</height>
</size>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="sizeConstraint">
<enum>QLayout::SetNoConstraint</enum>
<enum>QLayout::SetMinimumSize</enum>
</property>
<property name="leftMargin">
<number>10</number>
Expand Down
88 changes: 49 additions & 39 deletions Resources/UI/BoM_Panel_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
QCheckBox,
QComboBox,
QDialog,
QFrame,
QGridLayout,
QLabel,
QLayout,
Expand All @@ -66,6 +67,7 @@ def setupUi(self, Dialog):
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(Dialog.sizePolicy().hasHeightForWidth())
Dialog.setSizePolicy(sizePolicy)
Dialog.setMinimumSize(QSize(0, 305))
palette = QPalette()
brush = QBrush(QColor(255, 255, 255, 255))
brush.setStyle(Qt.SolidPattern)
Expand All @@ -78,47 +80,55 @@ def setupUi(self, Dialog):
Dialog.setPalette(palette)
Dialog.setAutoFillBackground(True)
Dialog.setModal(True)
self.layoutWidget = QWidget(Dialog)
self.layoutWidget.setObjectName("layoutWidget")
self.layoutWidget.setGeometry(QRect(0, 0, 271, 291))
self.gridLayout = QGridLayout(self.layoutWidget)
self.frame = QFrame(Dialog)
self.frame.setObjectName("frame")
self.frame.setGeometry(QRect(0, 0, 271, 291))
sizePolicy1 = QSizePolicy(
QSizePolicy.MinimumExpanding, QSizePolicy.MinimumExpanding
)
sizePolicy1.setHorizontalStretch(0)
sizePolicy1.setVerticalStretch(0)
sizePolicy1.setHeightForWidth(self.frame.sizePolicy().hasHeightForWidth())
self.frame.setSizePolicy(sizePolicy1)
self.frame.setMinimumSize(QSize(271, 291))
self.gridLayout = QGridLayout(self.frame)
self.gridLayout.setSpacing(10)
self.gridLayout.setObjectName("gridLayout")
self.gridLayout.setSizeConstraint(QLayout.SetNoConstraint)
self.gridLayout.setSizeConstraint(QLayout.SetMinimumSize)
self.gridLayout.setContentsMargins(10, 10, 10, 10)
self.label_2 = QLabel(self.layoutWidget)
self.label_2 = QLabel(self.frame)
self.label_2.setObjectName("label_2")

self.gridLayout.addWidget(self.label_2, 0, 0, 1, 1)

self.label = QLabel(self.layoutWidget)
self.label = QLabel(self.frame)
self.label.setObjectName("label")

self.gridLayout.addWidget(self.label, 1, 0, 1, 1)

self.label_4 = QLabel(self.layoutWidget)
self.label_4 = QLabel(self.frame)
self.label_4.setObjectName("label_4")
self.label_4.setWordWrap(True)

self.gridLayout.addWidget(self.label_4, 3, 0, 1, 1)

self.SetColumns = QPushButton(self.layoutWidget)
self.SetColumns = QPushButton(self.frame)
self.SetColumns.setObjectName("SetColumns")
sizePolicy1 = QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
sizePolicy1.setHorizontalStretch(0)
sizePolicy1.setVerticalStretch(0)
sizePolicy1.setHeightForWidth(self.SetColumns.sizePolicy().hasHeightForWidth())
self.SetColumns.setSizePolicy(sizePolicy1)
sizePolicy2 = QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
sizePolicy2.setHorizontalStretch(0)
sizePolicy2.setVerticalStretch(0)
sizePolicy2.setHeightForWidth(self.SetColumns.sizePolicy().hasHeightForWidth())
self.SetColumns.setSizePolicy(sizePolicy2)

self.gridLayout.addWidget(self.SetColumns, 9, 2, 1, 1)

self.label_3 = QLabel(self.layoutWidget)
self.label_3 = QLabel(self.frame)
self.label_3.setObjectName("label_3")
self.label_3.setEnabled(True)

self.gridLayout.addWidget(self.label_3, 2, 0, 1, 1)

self.AssemblyType = QComboBox(self.layoutWidget)
self.AssemblyType = QComboBox(self.frame)
self.AssemblyType.addItem("")
self.AssemblyType.addItem("")
self.AssemblyType.addItem("")
Expand All @@ -131,44 +141,44 @@ def setupUi(self, Dialog):

self.gridLayout.addWidget(self.AssemblyType, 0, 1, 1, 2)

self.IndentedNumbering = QCheckBox(self.layoutWidget)
self.IndentedNumbering = QCheckBox(self.frame)
self.IndentedNumbering.setObjectName("IndentedNumbering")
self.IndentedNumbering.setChecked(True)

self.gridLayout.addWidget(self.IndentedNumbering, 3, 1, 1, 2)

self.label_6 = QLabel(self.layoutWidget)
self.label_6 = QLabel(self.frame)
self.label_6.setObjectName("label_6")
self.label_6.setAlignment(Qt.AlignLeading | Qt.AlignLeft | Qt.AlignTop)
self.label_6.setWordWrap(True)

self.gridLayout.addWidget(self.label_6, 6, 0, 2, 1)

self.CreateBOM = QPushButton(self.layoutWidget)
self.CreateBOM = QPushButton(self.frame)
self.CreateBOM.setObjectName("CreateBOM")
sizePolicy.setHeightForWidth(self.CreateBOM.sizePolicy().hasHeightForWidth())
self.CreateBOM.setSizePolicy(sizePolicy)

self.gridLayout.addWidget(self.CreateBOM, 10, 0, 1, 3)

self.label_5 = QLabel(self.layoutWidget)
self.label_5 = QLabel(self.frame)
self.label_5.setObjectName("label_5")
sizePolicy2 = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
sizePolicy2.setHorizontalStretch(0)
sizePolicy2.setVerticalStretch(0)
sizePolicy2.setHeightForWidth(self.label_5.sizePolicy().hasHeightForWidth())
self.label_5.setSizePolicy(sizePolicy2)
sizePolicy3 = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
sizePolicy3.setHorizontalStretch(0)
sizePolicy3.setVerticalStretch(0)
sizePolicy3.setHeightForWidth(self.label_5.sizePolicy().hasHeightForWidth())
self.label_5.setSizePolicy(sizePolicy3)
self.label_5.setWordWrap(True)

self.gridLayout.addWidget(self.label_5, 4, 0, 2, 1)

self.MaxLevel = QSpinBox(self.layoutWidget)
self.MaxLevel = QSpinBox(self.frame)
self.MaxLevel.setObjectName("MaxLevel")
sizePolicy3 = QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Ignored)
sizePolicy3.setHorizontalStretch(0)
sizePolicy3.setVerticalStretch(0)
sizePolicy3.setHeightForWidth(self.MaxLevel.sizePolicy().hasHeightForWidth())
self.MaxLevel.setSizePolicy(sizePolicy3)
sizePolicy4 = QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Ignored)
sizePolicy4.setHorizontalStretch(0)
sizePolicy4.setVerticalStretch(0)
sizePolicy4.setHeightForWidth(self.MaxLevel.sizePolicy().hasHeightForWidth())
self.MaxLevel.setSizePolicy(sizePolicy4)
self.MaxLevel.setMinimumSize(QSize(0, 0))
self.MaxLevel.setMaximumSize(QSize(16777215, 25))
self.MaxLevel.setBaseSize(QSize(0, 0))
Expand All @@ -177,27 +187,27 @@ def setupUi(self, Dialog):

self.gridLayout.addWidget(self.MaxLevel, 4, 1, 4, 2)

self.DetectAssemblyType = QPushButton(self.layoutWidget)
self.DetectAssemblyType = QPushButton(self.frame)
self.DetectAssemblyType.setObjectName("DetectAssemblyType")
sizePolicy4 = QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Expanding)
sizePolicy4.setHorizontalStretch(0)
sizePolicy4.setVerticalStretch(0)
sizePolicy4.setHeightForWidth(
sizePolicy5 = QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Expanding)
sizePolicy5.setHorizontalStretch(0)
sizePolicy5.setVerticalStretch(0)
sizePolicy5.setHeightForWidth(
self.DetectAssemblyType.sizePolicy().hasHeightForWidth()
)
self.DetectAssemblyType.setSizePolicy(sizePolicy4)
self.DetectAssemblyType.setSizePolicy(sizePolicy5)

self.gridLayout.addWidget(self.DetectAssemblyType, 9, 0, 1, 2)

self.BoMType = QComboBox(self.layoutWidget)
self.BoMType = QComboBox(self.frame)
self.BoMType.addItem("")
self.BoMType.addItem("")
self.BoMType.addItem("")
self.BoMType.setObjectName("BoMType")

self.gridLayout.addWidget(self.BoMType, 1, 1, 1, 2)

self.IncludeBodies = QCheckBox(self.layoutWidget)
self.IncludeBodies = QCheckBox(self.frame)
self.IncludeBodies.setObjectName("IncludeBodies")

self.gridLayout.addWidget(self.IncludeBodies, 2, 1, 1, 2)
Expand Down
2 changes: 1 addition & 1 deletion package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<description>An extension for the TechDraw workbench to fill a TitleBlock with the aid of the Spreadsheet workbench.</description>

<version>0.0.7.1</version>
<version>0.0.7.2</version>

<date>2024-01-03</date>

Expand Down