Skip to content

Commit

Permalink
Merge pull request #1796 from HEXRD/increase-canvas-size
Browse files Browse the repository at this point in the history 
Modify several settings to increase canvas size
  • Loading branch information
@saransh13
saransh13 authored Feb 28, 2025
2 parents 5363331 + 8e561d0 commit c8fc85c
Show file tree
Hide file tree
Showing 5 changed files with 645 additions and 677 deletions.
4 changes: 2 additions & 2 deletions hexrdgui/cal_tree_view.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,8 @@ def __init__(self, parent=None):
self.resizeColumnToContents(VALUE_COL)
self.resizeColumnToContents(STATUS_COL)

self.header().resizeSection(KEY_COL, 200)
self.header().resizeSection(VALUE_COL, 200)
self.header().resizeSection(KEY_COL, 180)
self.header().resizeSection(VALUE_COL, 170)

self.setup_connections()

Expand Down
167 changes: 82 additions & 85 deletions hexrdgui/resources/ui/color_map_editor.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>459</width>
<height>143</height>
<width>352</width>
<height>145</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
Expand Down Expand Up @@ -61,7 +61,7 @@
<property name="spacing">
<number>0</number>
</property>
<item row="7" column="1">
<item row="8" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
Expand All @@ -77,32 +77,28 @@
<item row="3" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Maximum Value: </string>
<string>Max:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QCheckBox" name="reverse">
<property name="text">
<string>reverse</string>
<item row="1" column="1">
<widget class="ScientificDoubleSpinBox" name="minimum">
<property name="keyboardTracking">
<bool>false</bool>
</property>
</widget>
</item>
<item row="3" column="5">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<property name="minimum">
<number>-999999999</number>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
<property name="maximum">
<number>999999999</number>
</property>
</spacer>
<property name="displayIntegerBase">
<number>10</number>
</property>
</widget>
</item>
<item row="3" column="3">
<spacer name="horizontalSpacer_2">
Expand All @@ -114,24 +110,14 @@
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Minimum Value: </string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="ScientificDoubleSpinBox" name="minimum">
<item row="3" column="1">
<widget class="ScientificDoubleSpinBox" name="maximum">
<property name="keyboardTracking">
<bool>false</bool>
</property>
Expand All @@ -141,61 +127,72 @@
<property name="maximum">
<number>999999999</number>
</property>
<property name="displayIntegerBase">
<number>10</number>
<property name="value">
<number>429</number>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="ScientificDoubleSpinBox" name="maximum">
<property name="keyboardTracking">
<bool>false</bool>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Colormap:</string>
</property>
<property name="minimum">
<number>-999999999</number>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="maximum">
<number>999999999</number>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Min:</string>
</property>
<property name="value">
<number>429</number>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QPushButton" name="bc_editor_button">
<property name="enabled">
<bool>false</bool>
<item row="3" column="5">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="4">
<widget class="QCheckBox" name="show_under">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Brightness and Contrast editor&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>Color under values as blue</string>
</property>
<property name="text">
<string>B&amp;&amp;C</string>
<string>show under</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<item row="1" column="4">
<widget class="QCheckBox" name="reverse">
<property name="text">
<string>Color Map: </string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<string>reverse</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="color_map">
<property name="styleSheet">
<string notr="true">combobox-popup: 0;</string>
<item row="5" column="4">
<widget class="QCheckBox" name="show_invalid">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Display invalid (nan) pixels with a specified color.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="maxVisibleItems">
<number>5</number>
<property name="text">
<string>show invalid</string>
</property>
</widget>
</item>
<item row="3" column="4">
<item row="4" column="4">
<widget class="QCheckBox" name="show_over">
<property name="toolTip">
<string>Color over values as red</string>
Expand All @@ -205,33 +202,39 @@
</property>
</widget>
</item>
<item row="5" column="3">
<item row="0" column="1" colspan="4">
<widget class="QComboBox" name="color_map">
<property name="styleSheet">
<string notr="true">combobox-popup: 0;</string>
</property>
<property name="maxVisibleItems">
<number>5</number>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="scaling_label">
<property name="text">
<string>Scaling:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="5" column="4">
<item row="5" column="1">
<widget class="QComboBox" name="scaling"/>
</item>
<item row="1" column="4">
<widget class="QCheckBox" name="show_under">
<property name="toolTip">
<string>Color under values as blue</string>
</property>
<property name="text">
<string>show under</string>
<item row="4" column="1">
<widget class="QPushButton" name="bc_editor_button">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="4" column="4">
<widget class="QCheckBox" name="show_invalid">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Display invalid (nan) pixels with a specified color.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Brightness and Contrast editor&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>show invalid</string>
<string>B&amp;&amp;C</string>
</property>
</widget>
</item>
Expand All @@ -251,14 +254,8 @@
</customwidgets>
<tabstops>
<tabstop>color_map</tabstop>
<tabstop>reverse</tabstop>
<tabstop>minimum</tabstop>
<tabstop>show_under</tabstop>
<tabstop>maximum</tabstop>
<tabstop>show_over</tabstop>
<tabstop>show_invalid</tabstop>
<tabstop>bc_editor_button</tabstop>
<tabstop>scaling</tabstop>
</tabstops>
<resources/>
<connections/>
Expand Down
Loading

0 comments on commit c8fc85c

Please sign in to comment.