Skip to content

Commit

Permalink
upping some of the default rings and slices
Browse files Browse the repository at this point in the history
  • Loading branch information
rerpha committed Jun 13, 2019
1 parent 3357774 commit c7e829b
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 16 deletions.
2 changes: 1 addition & 1 deletion cylinderwindow.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def createScene(self):
# Material
self.material = Qt3DExtras.QPhongMaterial(self.rootEntity)

def add_cylinder(self, radius, length, x, y, z, rings=5, slices=5):
def add_cylinder(self, radius, length, x, y, z, rings=10, slices=10):

cylinderEntity = Qt3DCore.QEntity(self.rootEntity)
cylinderMesh = Qt3DExtras.QCylinderMesh()
Expand Down
2 changes: 1 addition & 1 deletion spherewindow.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def createScene(self):
# Material
self.material = Qt3DExtras.QPhongMaterial(self.rootEntity)

def add_sphere(self, radius, x, y, z, rings=20, slices=20):
def add_sphere(self, radius, x, y, z, rings=10, slices=10):

sphereEntity = Qt3DCore.QEntity(self.rootEntity)

Expand Down
24 changes: 13 additions & 11 deletions ui/lotsofcylinders.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# Form implementation generated from reading ui file 'lotsofcylinders.ui',
# licensing of 'lotsofcylinders.ui' applies.
#
# Created: Fri May 31 16:09:45 2019
# by: pyside2-uic running on PySide2 5.12.1
# Created: Thu Jun 13 12:30:19 2019
# by: pyside2-uic running on PySide2 5.12.3
#
# WARNING! All changes made in this file will be lost!

Expand All @@ -21,25 +21,25 @@ def setupUi(self, Dialog):
self.horizontalLayout.addWidget(self.widget)
self.groupBox = QtWidgets.QGroupBox(Dialog)
self.groupBox.setObjectName("groupBox")
self.widget1 = QtWidgets.QWidget(self.groupBox)
self.widget1.setGeometry(QtCore.QRect(9, 26, 141, 74))
self.widget1.setObjectName("widget1")
self.formLayout = QtWidgets.QFormLayout(self.widget1)
self.layoutWidget = QtWidgets.QWidget(self.groupBox)
self.layoutWidget.setGeometry(QtCore.QRect(9, 26, 141, 74))
self.layoutWidget.setObjectName("layoutWidget")
self.formLayout = QtWidgets.QFormLayout(self.layoutWidget)
self.formLayout.setContentsMargins(0, 0, 0, 0)
self.formLayout.setObjectName("formLayout")
self.label = QtWidgets.QLabel(self.widget1)
self.label = QtWidgets.QLabel(self.layoutWidget)
self.label.setObjectName("label")
self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label)
self.ringslineedit = QtWidgets.QLineEdit(self.widget1)
self.ringslineedit = QtWidgets.QLineEdit(self.layoutWidget)
self.ringslineedit.setObjectName("ringslineedit")
self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.ringslineedit)
self.label_2 = QtWidgets.QLabel(self.widget1)
self.label_2 = QtWidgets.QLabel(self.layoutWidget)
self.label_2.setObjectName("label_2")
self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_2)
self.sliceslineedit = QtWidgets.QLineEdit(self.widget1)
self.sliceslineedit = QtWidgets.QLineEdit(self.layoutWidget)
self.sliceslineedit.setObjectName("sliceslineedit")
self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.sliceslineedit)
self.pushButton = QtWidgets.QPushButton(self.widget1)
self.pushButton = QtWidgets.QPushButton(self.layoutWidget)
self.pushButton.setObjectName("pushButton")
self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.pushButton)
self.horizontalLayout.addWidget(self.groupBox)
Expand All @@ -51,6 +51,8 @@ def retranslateUi(self, Dialog):
Dialog.setWindowTitle(QtWidgets.QApplication.translate("Dialog", "Dialog", None, -1))
self.groupBox.setTitle(QtWidgets.QApplication.translate("Dialog", "rings and slices", None, -1))
self.label.setText(QtWidgets.QApplication.translate("Dialog", "rings", None, -1))
self.ringslineedit.setText(QtWidgets.QApplication.translate("Dialog", "10", None, -1))
self.label_2.setText(QtWidgets.QApplication.translate("Dialog", "slices", None, -1))
self.sliceslineedit.setText(QtWidgets.QApplication.translate("Dialog", "10", None, -1))
self.pushButton.setText(QtWidgets.QApplication.translate("Dialog", "Add lots of cylinders", None, -1))

14 changes: 11 additions & 3 deletions ui/lotsofcylinders.ui
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<property name="title">
<string>rings and slices</string>
</property>
<widget class="QWidget" name="">
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>9</x>
Expand All @@ -40,7 +40,11 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="ringslineedit"/>
<widget class="QLineEdit" name="ringslineedit">
<property name="text">
<string>10</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
Expand All @@ -50,7 +54,11 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="sliceslineedit"/>
<widget class="QLineEdit" name="sliceslineedit">
<property name="text">
<string>10</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="pushButton">
Expand Down

0 comments on commit c7e829b

Please sign in to comment.