Skip to content

Commit 7888f17

Browse files
hsorbyhsorby
authored
Merge pull request #77 from hsorby/main
Set maximum number of contours to a very high number.
2 parents c1e1e06 + 16ba0df commit 7888f17

File tree

2 files changed

+49
-44
lines changed

2 files changed

+49
-44
lines changed

‎res/designer/graphicseditorwidget.ui

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
</property>
2222
<layout class="QVBoxLayout" name="main_verticalLayout">
2323
<property name="sizeConstraint">
24-
<enum>QLayout::SetDefaultConstraint</enum>
24+
<enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
2525
</property>
2626
<item>
2727
<widget class="QScrollArea" name="scrollArea">
2828
<property name="frameShape">
29-
<enum>QFrame::NoFrame</enum>
29+
<enum>QFrame::Shape::NoFrame</enum>
3030
</property>
3131
<property name="widgetResizable">
3232
<bool>true</bool>
@@ -36,16 +36,16 @@
3636
<rect>
3737
<x>0</x>
3838
<y>0</y>
39-
<width>548</width>
40-
<height>1295</height>
39+
<width>556</width>
40+
<height>1744</height>
4141
</rect>
4242
</property>
4343
<layout class="QVBoxLayout" name="verticalLayout">
4444
<property name="spacing">
4545
<number>6</number>
4646
</property>
4747
<property name="sizeConstraint">
48-
<enum>QLayout::SetDefaultConstraint</enum>
48+
<enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
4949
</property>
5050
<property name="leftMargin">
5151
<number>0</number>
@@ -69,7 +69,7 @@
6969
</property>
7070
<layout class="QFormLayout" name="formLayout_3">
7171
<property name="fieldGrowthPolicy">
72-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
72+
<enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
7373
</property>
7474
<property name="Margin" stdset="0">
7575
<number>7</number>
@@ -94,7 +94,7 @@
9494
<item row="4" column="1">
9595
<widget class="FieldChooserWidget" name="coordinate_field_chooser">
9696
<property name="sizeAdjustPolicy">
97-
<enum>QComboBox::AdjustToContents</enum>
97+
<enum>QComboBox::SizeAdjustPolicy::AdjustToContents</enum>
9898
</property>
9999
</widget>
100100
</item>
@@ -145,7 +145,7 @@
145145
<item row="10" column="1">
146146
<widget class="MaterialChooserWidget" name="material_chooser">
147147
<property name="sizeAdjustPolicy">
148-
<enum>QComboBox::AdjustToContents</enum>
148+
<enum>QComboBox::SizeAdjustPolicy::AdjustToContents</enum>
149149
</property>
150150
</widget>
151151
</item>
@@ -172,7 +172,7 @@
172172
<bool>false</bool>
173173
</property>
174174
<property name="sizeAdjustPolicy">
175-
<enum>QComboBox::AdjustToContents</enum>
175+
<enum>QComboBox::SizeAdjustPolicy::AdjustToContents</enum>
176176
</property>
177177
</widget>
178178
</item>
@@ -282,7 +282,7 @@
282282
</property>
283283
<layout class="QFormLayout" name="formLayout_2">
284284
<property name="fieldGrowthPolicy">
285-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
285+
<enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
286286
</property>
287287
<item row="3" column="1">
288288
<widget class="QLineEdit" name="isovalues_lineedit"/>
@@ -297,7 +297,7 @@
297297
<item row="0" column="1">
298298
<widget class="FieldChooserWidget" name="isoscalar_field_chooser">
299299
<property name="sizeAdjustPolicy">
300-
<enum>QComboBox::AdjustToContents</enum>
300+
<enum>QComboBox::SizeAdjustPolicy::AdjustToContents</enum>
301301
</property>
302302
</widget>
303303
</item>
@@ -316,7 +316,11 @@
316316
</widget>
317317
</item>
318318
<item row="1" column="1">
319-
<widget class="QSpinBox" name="range_number_spinBox"/>
319+
<widget class="QSpinBox" name="range_number_spinBox">
320+
<property name="maximum">
321+
<number>2147483646</number>
322+
</property>
323+
</widget>
320324
</item>
321325
</layout>
322326
</widget>
@@ -328,7 +332,7 @@
328332
</property>
329333
<layout class="QFormLayout" name="formLayout_5">
330334
<property name="fieldGrowthPolicy">
331-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
335+
<enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
332336
</property>
333337
<item row="0" column="0">
334338
<widget class="QLabel" name="stream_vector_field_label">
@@ -340,7 +344,7 @@
340344
<item row="0" column="1">
341345
<widget class="FieldChooserWidget" name="stream_vector_field_chooser">
342346
<property name="sizeAdjustPolicy">
343-
<enum>QComboBox::AdjustToContents</enum>
347+
<enum>QComboBox::SizeAdjustPolicy::AdjustToContents</enum>
344348
</property>
345349
</widget>
346350
</item>
@@ -384,7 +388,7 @@
384388
</property>
385389
<layout class="QFormLayout" name="formLayout_4">
386390
<property name="fieldGrowthPolicy">
387-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
391+
<enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
388392
</property>
389393
<item row="0" column="0">
390394
<widget class="QLabel" name="line_shape_label">
@@ -422,7 +426,7 @@
422426
</sizepolicy>
423427
</property>
424428
<property name="sizeAdjustPolicy">
425-
<enum>QComboBox::AdjustToContents</enum>
429+
<enum>QComboBox::SizeAdjustPolicy::AdjustToContents</enum>
426430
</property>
427431
</widget>
428432
</item>
@@ -452,7 +456,7 @@
452456
</property>
453457
<layout class="QFormLayout" name="formLayout">
454458
<property name="fieldGrowthPolicy">
455-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
459+
<enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
456460
</property>
457461
<item row="0" column="0">
458462
<widget class="QLabel" name="glyph_label">
@@ -464,7 +468,7 @@
464468
<item row="0" column="1">
465469
<widget class="GlyphChooserWidget" name="glyph_chooser">
466470
<property name="sizeAdjustPolicy">
467-
<enum>QComboBox::AdjustToContents</enum>
471+
<enum>QComboBox::SizeAdjustPolicy::AdjustToContents</enum>
468472
</property>
469473
</widget>
470474
</item>
@@ -488,7 +492,7 @@
488492
<item row="3" column="1">
489493
<widget class="FieldChooserWidget" name="point_orientation_scale_field_chooser">
490494
<property name="sizeAdjustPolicy">
491-
<enum>QComboBox::AdjustToContents</enum>
495+
<enum>QComboBox::SizeAdjustPolicy::AdjustToContents</enum>
492496
</property>
493497
</widget>
494498
</item>
@@ -509,7 +513,7 @@
509513
<item row="9" column="1">
510514
<widget class="FieldChooserWidget" name="label_field_chooser">
511515
<property name="sizeAdjustPolicy">
512-
<enum>QComboBox::AdjustToContents</enum>
516+
<enum>QComboBox::SizeAdjustPolicy::AdjustToContents</enum>
513517
</property>
514518
</widget>
515519
</item>
@@ -569,7 +573,7 @@
569573
<item row="7" column="1">
570574
<widget class="FieldChooserWidget" name="glyph_signed_scale_field_chooser">
571575
<property name="sizeAdjustPolicy">
572-
<enum>QComboBox::AdjustToContents</enum>
576+
<enum>QComboBox::SizeAdjustPolicy::AdjustToContents</enum>
573577
</property>
574578
</widget>
575579
</item>
@@ -590,7 +594,7 @@
590594
</property>
591595
<layout class="QFormLayout" name="formLayout_6">
592596
<property name="fieldGrowthPolicy">
593-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
597+
<enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
594598
</property>
595599
<property name="leftMargin">
596600
<number>9</number>
@@ -637,7 +641,7 @@
637641
<item>
638642
<spacer name="verticalSpacer">
639643
<property name="orientation">
640-
<enum>Qt::Vertical</enum>
644+
<enum>Qt::Orientation::Vertical</enum>
641645
</property>
642646
<property name="sizeHint" stdset="0">
643647
<size>

‎src/cmlibs/widgets/ui/ui_graphicseditorwidget.py

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@ def setupUi(self, GraphicsEditorWidget):
3535
GraphicsEditorWidget.setMinimumSize(QSize(580, 0))
3636
self.main_verticalLayout = QVBoxLayout(GraphicsEditorWidget)
3737
self.main_verticalLayout.setObjectName(u"main_verticalLayout")
38-
self.main_verticalLayout.setSizeConstraint(QLayout.SetDefaultConstraint)
38+
self.main_verticalLayout.setSizeConstraint(QLayout.SizeConstraint.SetDefaultConstraint)
3939
self.scrollArea = QScrollArea(GraphicsEditorWidget)
4040
self.scrollArea.setObjectName(u"scrollArea")
41-
self.scrollArea.setFrameShape(QFrame.NoFrame)
41+
self.scrollArea.setFrameShape(QFrame.Shape.NoFrame)
4242
self.scrollArea.setWidgetResizable(True)
4343
self.scrollAreaGraphicWidgetContents = QWidget()
4444
self.scrollAreaGraphicWidgetContents.setObjectName(u"scrollAreaGraphicWidgetContents")
45-
self.scrollAreaGraphicWidgetContents.setGeometry(QRect(0, 0, 548, 1295))
45+
self.scrollAreaGraphicWidgetContents.setGeometry(QRect(0, 0, 556, 1744))
4646
self.verticalLayout = QVBoxLayout(self.scrollAreaGraphicWidgetContents)
4747
self.verticalLayout.setSpacing(6)
4848
self.verticalLayout.setObjectName(u"verticalLayout")
49-
self.verticalLayout.setSizeConstraint(QLayout.SetDefaultConstraint)
49+
self.verticalLayout.setSizeConstraint(QLayout.SizeConstraint.SetDefaultConstraint)
5050
self.verticalLayout.setContentsMargins(0, 0, 7, 7)
5151
self.general_groupbox = QGroupBox(self.scrollAreaGraphicWidgetContents)
5252
self.general_groupbox.setObjectName(u"general_groupbox")
@@ -57,7 +57,7 @@ def setupUi(self, GraphicsEditorWidget):
5757
self.general_groupbox.setSizePolicy(sizePolicy)
5858
self.formLayout_3 = QFormLayout(self.general_groupbox)
5959
self.formLayout_3.setObjectName(u"formLayout_3")
60-
self.formLayout_3.setFieldGrowthPolicy(QFormLayout.AllNonFixedFieldsGrow)
60+
self.formLayout_3.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.AllNonFixedFieldsGrow)
6161
self.formLayout_3.setProperty("Margin", 7)
6262
self.coordinate_field_label = QLabel(self.general_groupbox)
6363
self.coordinate_field_label.setObjectName(u"coordinate_field_label")
@@ -76,7 +76,7 @@ def setupUi(self, GraphicsEditorWidget):
7676

7777
self.coordinate_field_chooser = FieldChooserWidget(self.general_groupbox)
7878
self.coordinate_field_chooser.setObjectName(u"coordinate_field_chooser")
79-
self.coordinate_field_chooser.setSizeAdjustPolicy(QComboBox.AdjustToContents)
79+
self.coordinate_field_chooser.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents)
8080

8181
self.formLayout_3.setWidget(4, QFormLayout.FieldRole, self.coordinate_field_chooser)
8282

@@ -122,7 +122,7 @@ def setupUi(self, GraphicsEditorWidget):
122122

123123
self.material_chooser = MaterialChooserWidget(self.general_groupbox)
124124
self.material_chooser.setObjectName(u"material_chooser")
125-
self.material_chooser.setSizeAdjustPolicy(QComboBox.AdjustToContents)
125+
self.material_chooser.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents)
126126

127127
self.formLayout_3.setWidget(10, QFormLayout.FieldRole, self.material_chooser)
128128

@@ -144,7 +144,7 @@ def setupUi(self, GraphicsEditorWidget):
144144
self.data_field_chooser = FieldChooserWidget(self.general_groupbox)
145145
self.data_field_chooser.setObjectName(u"data_field_chooser")
146146
self.data_field_chooser.setEditable(False)
147-
self.data_field_chooser.setSizeAdjustPolicy(QComboBox.AdjustToContents)
147+
self.data_field_chooser.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents)
148148

149149
self.formLayout_3.setWidget(13, QFormLayout.FieldRole, self.data_field_chooser)
150150

@@ -242,7 +242,7 @@ def setupUi(self, GraphicsEditorWidget):
242242
self.contours_groupbox.setFlat(False)
243243
self.formLayout_2 = QFormLayout(self.contours_groupbox)
244244
self.formLayout_2.setObjectName(u"formLayout_2")
245-
self.formLayout_2.setFieldGrowthPolicy(QFormLayout.AllNonFixedFieldsGrow)
245+
self.formLayout_2.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.AllNonFixedFieldsGrow)
246246
self.isovalues_lineedit = QLineEdit(self.contours_groupbox)
247247
self.isovalues_lineedit.setObjectName(u"isovalues_lineedit")
248248

@@ -255,7 +255,7 @@ def setupUi(self, GraphicsEditorWidget):
255255

256256
self.isoscalar_field_chooser = FieldChooserWidget(self.contours_groupbox)
257257
self.isoscalar_field_chooser.setObjectName(u"isoscalar_field_chooser")
258-
self.isoscalar_field_chooser.setSizeAdjustPolicy(QComboBox.AdjustToContents)
258+
self.isoscalar_field_chooser.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents)
259259

260260
self.formLayout_2.setWidget(0, QFormLayout.FieldRole, self.isoscalar_field_chooser)
261261

@@ -271,6 +271,7 @@ def setupUi(self, GraphicsEditorWidget):
271271

272272
self.range_number_spinBox = QSpinBox(self.contours_groupbox)
273273
self.range_number_spinBox.setObjectName(u"range_number_spinBox")
274+
self.range_number_spinBox.setMaximum(2147483646)
274275

275276
self.formLayout_2.setWidget(1, QFormLayout.FieldRole, self.range_number_spinBox)
276277

@@ -281,15 +282,15 @@ def setupUi(self, GraphicsEditorWidget):
281282
self.streamlines_groupbox.setObjectName(u"streamlines_groupbox")
282283
self.formLayout_5 = QFormLayout(self.streamlines_groupbox)
283284
self.formLayout_5.setObjectName(u"formLayout_5")
284-
self.formLayout_5.setFieldGrowthPolicy(QFormLayout.AllNonFixedFieldsGrow)
285+
self.formLayout_5.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.AllNonFixedFieldsGrow)
285286
self.stream_vector_field_label = QLabel(self.streamlines_groupbox)
286287
self.stream_vector_field_label.setObjectName(u"stream_vector_field_label")
287288

288289
self.formLayout_5.setWidget(0, QFormLayout.LabelRole, self.stream_vector_field_label)
289290

290291
self.stream_vector_field_chooser = FieldChooserWidget(self.streamlines_groupbox)
291292
self.stream_vector_field_chooser.setObjectName(u"stream_vector_field_chooser")
292-
self.stream_vector_field_chooser.setSizeAdjustPolicy(QComboBox.AdjustToContents)
293+
self.stream_vector_field_chooser.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents)
293294

294295
self.formLayout_5.setWidget(0, QFormLayout.FieldRole, self.stream_vector_field_chooser)
295296

@@ -330,7 +331,7 @@ def setupUi(self, GraphicsEditorWidget):
330331
self.lines_groupbox.setObjectName(u"lines_groupbox")
331332
self.formLayout_4 = QFormLayout(self.lines_groupbox)
332333
self.formLayout_4.setObjectName(u"formLayout_4")
333-
self.formLayout_4.setFieldGrowthPolicy(QFormLayout.AllNonFixedFieldsGrow)
334+
self.formLayout_4.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.AllNonFixedFieldsGrow)
334335
self.line_shape_label = QLabel(self.lines_groupbox)
335336
self.line_shape_label.setObjectName(u"line_shape_label")
336337

@@ -360,7 +361,7 @@ def setupUi(self, GraphicsEditorWidget):
360361
self.line_orientation_scale_field_chooser.setObjectName(u"line_orientation_scale_field_chooser")
361362
sizePolicy1.setHeightForWidth(self.line_orientation_scale_field_chooser.sizePolicy().hasHeightForWidth())
362363
self.line_orientation_scale_field_chooser.setSizePolicy(sizePolicy1)
363-
self.line_orientation_scale_field_chooser.setSizeAdjustPolicy(QComboBox.AdjustToContents)
364+
self.line_orientation_scale_field_chooser.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents)
364365

365366
self.formLayout_4.setWidget(2, QFormLayout.FieldRole, self.line_orientation_scale_field_chooser)
366367

@@ -382,15 +383,15 @@ def setupUi(self, GraphicsEditorWidget):
382383
self.points_groupbox.setMaximumSize(QSize(16777215, 16777215))
383384
self.formLayout = QFormLayout(self.points_groupbox)
384385
self.formLayout.setObjectName(u"formLayout")
385-
self.formLayout.setFieldGrowthPolicy(QFormLayout.AllNonFixedFieldsGrow)
386+
self.formLayout.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.AllNonFixedFieldsGrow)
386387
self.glyph_label = QLabel(self.points_groupbox)
387388
self.glyph_label.setObjectName(u"glyph_label")
388389

389390
self.formLayout.setWidget(0, QFormLayout.LabelRole, self.glyph_label)
390391

391392
self.glyph_chooser = GlyphChooserWidget(self.points_groupbox)
392393
self.glyph_chooser.setObjectName(u"glyph_chooser")
393-
self.glyph_chooser.setSizeAdjustPolicy(QComboBox.AdjustToContents)
394+
self.glyph_chooser.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents)
394395

395396
self.formLayout.setWidget(0, QFormLayout.FieldRole, self.glyph_chooser)
396397

@@ -411,7 +412,7 @@ def setupUi(self, GraphicsEditorWidget):
411412

412413
self.point_orientation_scale_field_chooser = FieldChooserWidget(self.points_groupbox)
413414
self.point_orientation_scale_field_chooser.setObjectName(u"point_orientation_scale_field_chooser")
414-
self.point_orientation_scale_field_chooser.setSizeAdjustPolicy(QComboBox.AdjustToContents)
415+
self.point_orientation_scale_field_chooser.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents)
415416

416417
self.formLayout.setWidget(3, QFormLayout.FieldRole, self.point_orientation_scale_field_chooser)
417418

@@ -427,7 +428,7 @@ def setupUi(self, GraphicsEditorWidget):
427428

428429
self.label_field_chooser = FieldChooserWidget(self.points_groupbox)
429430
self.label_field_chooser.setObjectName(u"label_field_chooser")
430-
self.label_field_chooser.setSizeAdjustPolicy(QComboBox.AdjustToContents)
431+
self.label_field_chooser.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents)
431432

432433
self.formLayout.setWidget(9, QFormLayout.FieldRole, self.label_field_chooser)
433434

@@ -488,7 +489,7 @@ def setupUi(self, GraphicsEditorWidget):
488489

489490
self.glyph_signed_scale_field_chooser = FieldChooserWidget(self.points_groupbox)
490491
self.glyph_signed_scale_field_chooser.setObjectName(u"glyph_signed_scale_field_chooser")
491-
self.glyph_signed_scale_field_chooser.setSizeAdjustPolicy(QComboBox.AdjustToContents)
492+
self.glyph_signed_scale_field_chooser.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents)
492493

493494
self.formLayout.setWidget(7, QFormLayout.FieldRole, self.glyph_signed_scale_field_chooser)
494495

@@ -504,7 +505,7 @@ def setupUi(self, GraphicsEditorWidget):
504505
self.sampling_groupbox.setObjectName(u"sampling_groupbox")
505506
self.formLayout_6 = QFormLayout(self.sampling_groupbox)
506507
self.formLayout_6.setObjectName(u"formLayout_6")
507-
self.formLayout_6.setFieldGrowthPolicy(QFormLayout.AllNonFixedFieldsGrow)
508+
self.formLayout_6.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.AllNonFixedFieldsGrow)
508509
self.formLayout_6.setContentsMargins(9, 9, 9, -1)
509510
self.sampling_mode_label = QLabel(self.sampling_groupbox)
510511
self.sampling_mode_label.setObjectName(u"sampling_mode_label")
@@ -539,7 +540,7 @@ def setupUi(self, GraphicsEditorWidget):
539540

540541
self.verticalLayout.addWidget(self.sampling_groupbox)
541542

542-
self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding)
543+
self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Expanding, QSizePolicy.Minimum)
543544

544545
self.verticalLayout.addItem(self.verticalSpacer)
545546

0 commit comments

Comments
 (0)