Changeset d7adf97 in sasview for src/sas/qtgui/Perspectives/Inversion/UI

Timestamp:

Sep 19, 2018 1:55:07 AM (6 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

42d79fc

Parents:

68dc2873 (diff), fc5d2d7f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI_Pr_fixes

Location:

src/sas/qtgui/Perspectives/Inversion/UI

Files:

• DMaxExplorer.ui (modified) (2 diffs)
• TabbedInversionUI.ui (modified) (2 diffs)

src/sas/qtgui/Perspectives/Inversion/UI/DMaxExplorer.ui

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>394</width>
-    <height>426</height>
+    <width>586</width>
+    <height>538</height>
    </rect>
   </property>
@@ -21 +21 @@
        <property name="orientation">
         <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>305</height>
-        </size>
        </property>
       </spacer>

src/sas/qtgui/Perspectives/Inversion/UI/TabbedInversionUI.ui

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>390</width>
-    <height>409</height>
+    <width>446</width>
+    <height>480</height>
    </rect>
   </property>
@@ -740 +740 @@
       <widget class="QPushButton" name="calculateAllButton">
        <property name="enabled">
-        <bool>true</bool>
+        <bool>false</bool>
        </property>
        <property name="sizePolicy">