Skip to content

Commit b8f0cdc

Browse files
goettlicgoettlic
committed
fix ui file after rebase conflict resolution
1 parent 14e2f71 commit b8f0cdc

1 file changed

Lines changed: 91 additions & 75 deletions

File tree

‎DataPlotly/ui/dataplotly_dockwidget_base.ui‎

Lines changed: 91 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -320,9 +320,9 @@ QListWidget::item::selected {
320320
<property name="geometry">
321321
<rect>
322322
<x>0</x>
323-
<y>-479</y>
323+
<y>0</y>
324324
<width>673</width>
325-
<height>1194</height>
325+
<height>1222</height>
326326
</rect>
327327
</property>
328328
<layout class="QGridLayout" name="gridLayout_9">
@@ -360,41 +360,43 @@ QListWidget::item::selected {
360360
<item row="10" column="1" colspan="2">
361361
<widget class="QgsFieldExpressionWidget" name="y_combo"/>
362362
</item>
363-
<item row="3" column="1">
364-
<widget class="QgsPropertyOverrideButton" name="feature_subset_defined_button">
365-
<property name="text">
366-
<string>...</string>
363+
<item row="0" column="1" colspan="2">
364+
<widget class="QgsMapLayerComboBox" name="layer_combo">
365+
<property name="sizePolicy">
366+
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
367+
<horstretch>0</horstretch>
368+
<verstretch>0</verstretch>
369+
</sizepolicy>
367370
</property>
368371
</widget>
369372
</item>
373+
<item row="12" column="1" colspan="2">
374+
<widget class="QgsFieldExpressionWidget" name="z_combo"/>
375+
</item>
370376
<item row="4" column="0">
371377
<widget class="QLabel" name="label_linked_map">
372378
<property name="text">
373379
<string>Linked map</string>
374380
</property>
375381
</widget>
376382
</item>
377-
<item row="10" column="0">
378-
<widget class="QLabel" name="y_label">
379-
<property name="text">
380-
<string>Y field</string>
381-
</property>
382-
</widget>
383+
<item row="7" column="1" colspan="2">
384+
<widget class="QgsFieldExpressionWidget" name="x_combo"/>
383385
</item>
384-
<item row="2" column="1">
385-
<widget class="QCheckBox" name="selected_feature_check">
386-
<property name="enabled">
387-
<bool>true</bool>
388-
</property>
386+
<item row="11" column="1" colspan="2">
387+
<widget class="QgsCheckableComboBox" name="y_fields_combo"/>
388+
</item>
389+
<item row="6" column="1" colspan="2">
390+
<widget class="QCheckBox" name="filter_by_atlas_check">
389391
<property name="text">
390-
<string>Use only selected features</string>
392+
<string>Use only features inside atlas feature</string>
391393
</property>
392394
</widget>
393395
</item>
394-
<item row="5" column="1" colspan="2">
395-
<widget class="QCheckBox" name="filter_by_map_check">
396+
<item row="11" column="0">
397+
<widget class="QLabel" name="y_fields_label">
396398
<property name="text">
397-
<string>Use only features visible in map</string>
399+
<string>Y fields</string>
398400
</property>
399401
</widget>
400402
</item>
@@ -408,53 +410,36 @@ QListWidget::item::selected {
408410
</property>
409411
</widget>
410412
</item>
411-
<item row="7" column="0">
412-
<widget class="QLabel" name="x_label">
413-
<property name="sizePolicy">
414-
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
415-
<horstretch>0</horstretch>
416-
<verstretch>0</verstretch>
417-
</sizepolicy>
418-
</property>
419-
<property name="minimumSize">
420-
<size>
421-
<width>20</width>
422-
<height>0</height>
423-
</size>
424-
</property>
425-
<property name="maximumSize">
426-
<size>
427-
<width>70</width>
428-
<height>16777215</height>
429-
</size>
430-
</property>
413+
<item row="9" column="0">
414+
<widget class="QLabel" name="y_radar_label">
431415
<property name="text">
432-
<string>X field</string>
416+
<string>Y label</string>
433417
</property>
434418
</widget>
435419
</item>
436-
<item row="11" column="0">
437-
<widget class="QLabel" name="y_fields_label">
420+
<item row="0" column="0">
421+
<widget class="QLabel" name="layer_label">
438422
<property name="text">
439-
<string>Y fields</string>
423+
<string>Layer</string>
440424
</property>
441425
</widget>
442426
</item>
443-
<item row="4" column="1" colspan="2">
444-
<widget class="QgsLayoutItemComboBox" name="linked_map_combo"/>
427+
<item row="9" column="1" colspan="2">
428+
<widget class="QgsFieldExpressionWidget" name="y_combo_radar_label"/>
445429
</item>
446-
<item row="12" column="0">
447-
<widget class="QLabel" name="z_label">
430+
<item row="5" column="1" colspan="2">
431+
<widget class="QCheckBox" name="filter_by_map_check">
448432
<property name="text">
449-
<string>Z field</string>
433+
<string>Use only features visible in map</string>
450434
</property>
451435
</widget>
452436
</item>
453-
<item row="7" column="1" colspan="2">
454-
<widget class="QgsFieldExpressionWidget" name="x_combo"/>
455-
</item>
456-
<item row="11" column="1" colspan="2">
457-
<widget class="QgsCheckableComboBox" name="y_fields_combo"/>
437+
<item row="10" column="0">
438+
<widget class="QLabel" name="y_label">
439+
<property name="text">
440+
<string>Y field</string>
441+
</property>
442+
</widget>
458443
</item>
459444
<item row="3" column="0">
460445
<widget class="QLabel" name="label_feature_subset">
@@ -463,43 +448,74 @@ QListWidget::item::selected {
463448
</property>
464449
</widget>
465450
</item>
466-
<item row="6" column="1" colspan="2">
467-
<widget class="QCheckBox" name="filter_by_atlas_check">
451+
<item row="2" column="1">
452+
<widget class="QCheckBox" name="selected_feature_check">
453+
<property name="enabled">
454+
<bool>true</bool>
455+
</property>
468456
<property name="text">
469-
<string>Use only features inside atlas feature</string>
457+
<string>Use only selected features</string>
470458
</property>
471459
</widget>
472460
</item>
473-
<item row="0" column="1" colspan="2">
474-
<widget class="QgsMapLayerComboBox" name="layer_combo">
461+
<item row="12" column="0">
462+
<widget class="QLabel" name="z_label">
463+
<property name="text">
464+
<string>Z field</string>
465+
</property>
466+
</widget>
467+
</item>
468+
<item row="3" column="1">
469+
<widget class="QgsPropertyOverrideButton" name="feature_subset_defined_button">
470+
<property name="text">
471+
<string>...</string>
472+
</property>
473+
</widget>
474+
</item>
475+
<item row="4" column="1" colspan="2">
476+
<widget class="QgsLayoutItemComboBox" name="linked_map_combo"/>
477+
</item>
478+
<item row="7" column="0">
479+
<widget class="QLabel" name="x_label">
475480
<property name="sizePolicy">
476-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
481+
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
477482
<horstretch>0</horstretch>
478483
<verstretch>0</verstretch>
479484
</sizepolicy>
480485
</property>
481-
</widget>
482-
</item>
483-
<item row="12" column="1" colspan="2">
484-
<widget class="QgsFieldExpressionWidget" name="z_combo"/>
485-
</item>
486-
<item row="0" column="0">
487-
<widget class="QLabel" name="layer_label">
486+
<property name="minimumSize">
487+
<size>
488+
<width>20</width>
489+
<height>0</height>
490+
</size>
491+
</property>
492+
<property name="maximumSize">
493+
<size>
494+
<width>70</width>
495+
<height>16777215</height>
496+
</size>
497+
</property>
488498
<property name="text">
489-
<string>Layer</string>
499+
<string>X field</string>
490500
</property>
491501
</widget>
492502
</item>
493-
<item row="9" column="0">
494-
<widget class="QLabel" name="y_radar_label">
503+
<item row="13" column="1">
504+
<widget class="QCheckBox" name="skip_null_values_check">
505+
<property name="enabled">
506+
<bool>true</bool>
507+
</property>
508+
<property name="toolTip">
509+
<string>If unchecked, NULL values are passed to Plotly and may appear as gaps or missing values.</string>
510+
</property>
495511
<property name="text">
496-
<string>Y label</string>
512+
<string>Skip NULL-values</string>
513+
</property>
514+
<property name="checked">
515+
<bool>true</bool>
497516
</property>
498517
</widget>
499518
</item>
500-
<item row="9" column="1" colspan="2">
501-
<widget class="QgsFieldExpressionWidget" name="y_combo_radar_label"/>
502-
</item>
503519
</layout>
504520
</widget>
505521
</item>

0 commit comments

Comments
 (0)