Changeset 61a92d4 in sasview

Timestamp:

Apr 28, 2017 9:26:55 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

28a09b0

Parents:

0215e0a

Message:

Minor UI resizing.
Refactored ObjectFactory?

Location:

src/sas/qtgui

Files:

• MainWindow/UI/DataExplorerUI.ui (modified) (5 diffs)
• Perspectives/Fitting/FittingPerspective.py (modified) (3 diffs)
• Perspectives/Fitting/FittingWidget.py (modified) (2 diffs)
• Perspectives/Fitting/OptionsWidget.py (modified) (1 diff)
• Utilities/ObjectLibrary.py (moved) (moved from src/sas/qtgui/ObjectFactory.py) (1 diff)

src/sas/qtgui/MainWindow/UI/DataExplorerUI.ui

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>405</width>
+    <width>501</width>
     <height>630</height>
    </rect>
@@ -133 +133 @@
         </layout>
        </item>
-       <item row="0" column="1">
+       <item row="0" column="1" colspan="2">
         <spacer name="horizontalSpacer_7">
          <property name="orientation">
@@ -146 +146 @@
         </spacer>
        </item>
-       <item row="2" column="0">
+       <item row="1" column="0" colspan="3">
+        <widget class="QTreeView" name="treeView">
+         <property name="contextMenuPolicy">
+          <enum>Qt::NoContextMenu</enum>
+         </property>
+         <property name="acceptDrops">
+          <bool>true</bool>
+         </property>
+         <property name="editTriggers">
+          <set>QAbstractItemView::NoEditTriggers</set>
+         </property>
+         <property name="dragEnabled">
+          <bool>true</bool>
+         </property>
+         <property name="dragDropOverwriteMode">
+          <bool>true</bool>
+         </property>
+         <property name="dragDropMode">
+          <enum>QAbstractItemView::DropOnly</enum>
+         </property>
+         <property name="defaultDropAction">
+          <enum>Qt::CopyAction</enum>
+         </property>
+         <property name="selectionMode">
+          <enum>QAbstractItemView::ExtendedSelection</enum>
+         </property>
+         <attribute name="headerVisible">
+          <bool>false</bool>
+         </attribute>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="2">
         <layout class="QGridLayout" name="gridLayout_2">
          <item row="0" column="0" rowspan="2">
@@ -197 +228 @@
           <widget class="QComboBox" name="cbFitting">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
+           <property name="font">
+            <font>
+             <pointsize>12</pointsize>
+            </font>
+           </property>
            <property name="sizeAdjustPolicy">
             <enum>QComboBox::AdjustToContents</enum>
@@ -231 +267 @@
         </layout>
        </item>
-       <item row="1" column="0" colspan="2">
-        <widget class="QTreeView" name="treeView">
-         <property name="contextMenuPolicy">
-          <enum>Qt::NoContextMenu</enum>
-         </property>
-         <property name="acceptDrops">
-          <bool>true</bool>
-         </property>
-         <property name="editTriggers">
-          <set>QAbstractItemView::NoEditTriggers</set>
-         </property>
-         <property name="dragEnabled">
-          <bool>true</bool>
-         </property>
-         <property name="dragDropOverwriteMode">
-          <bool>true</bool>
-         </property>
-         <property name="dragDropMode">
-          <enum>QAbstractItemView::DropOnly</enum>
-         </property>
-         <property name="defaultDropAction">
-          <enum>Qt::CopyAction</enum>
-         </property>
-         <property name="selectionMode">
-          <enum>QAbstractItemView::ExtendedSelection</enum>
-         </property>
-         <attribute name="headerVisible">
-          <bool>false</bool>
-         </attribute>
-        </widget>
+       <item row="2" column="2">
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>160</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
        </item>
       </layout>

src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py

@@ -6 +6 @@
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
-import sas.qtgui.ObjectFactory as ObjectFactory
+import sas.qtgui.Utilities.ObjectLibrary as ObjectLibrary
 
 from FittingWidget import FittingWidget
@@ -75 +75 @@
         """
         tab     = FittingWidget(parent=self.parent, data=data, id=self.maxIndex+1)
-        # Add this tab to the object factory so it can be retrieved by scripting/jupyter
-        ObjectFactory.addObject(self.tabName(), tab)
+        # Add this tab to the object library so it can be retrieved by scripting/jupyter
+        ObjectLibrary.addObject(self.tabName(), tab)
         self.tabs.append(tab)
         self.maxIndex += 1
@@ -96 +96 @@
         if len(self.tabs) <= 1:
             return
-        ObjectFactory.deleteObject(self.tabs[index].accessibleName())
+        ObjectLibrary.deleteObjectByRef(self.tabs[index])
         del self.tabs[index]
         self.removeTab(index)

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -122 +122 @@
         self.model_parameters = None
         self.lstParams.setAlternatingRowColors(True)
+        stylesheet = """
+            QTreeView{
+                alternate-background-color: #f6fafb;
+                background: #e8f4fc;
+            }
+        """
+        self.lstParams.setStyleSheet(stylesheet)
 
         # Poly model displayed in poly list
@@ -572 +579 @@
         self.q_range_min, self.q_range_max, self.npts, self.log_points, self.weighting = \
             self.options_widget.state()
+        # set Q range labels on the main tab
+        self.lblMinRangeDef.setText(str(self.q_range_min))
+        self.lblMaxRangeDef.setText(str(self.q_range_max))
         self.onPlot()
 

src/sas/qtgui/Perspectives/Fitting/OptionsWidget.py

@@ -141 +141 @@
         #print "MODEL CHANGED for property: %s. The value is now: %s" % \
         #    (MODEL[top.row()], str(self.model.item(top.row()).text()))
+
         # update if there's something to update
-        if str(self.model.item(top.row()).text()): #and 'RANGE' in MODEL[top.row()]:
+        if str(self.model.item(top.row()).text()):
             self.plot_signal.emit()
 

src/sas/qtgui/Utilities/ObjectLibrary.py

@@ -8 +8 @@
     this._objects[obj_name] = obj
 
-def deleteObject(obj_name):
+def deleteObjectByRef(obj):
+    for name, object in this._objects.iteritems():
+        if object == obj:
+            del this._objects[name]
+            break
+
+def deleteObjectByName(obj_name):
     if obj_name in this._objects:
         del this._objects[obj_name]