Changeset 469b4622 in sasview for src/sas/qtgui/Perspectives/Invariant

Timestamp:

Nov 7, 2016 5:50:04 AM (8 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:

49e124c

Parents:

ca8b853

Message:

Minor perspective related work

Location:

src/sas/qtgui/Perspectives/Invariant

Files:

• InvariantPerspective.py (modified) (5 diffs, 1 prop)
• UI/TabbedInvariantUI.py (modified) (2 diffs, 1 prop)
• UI/TabbedInvariantUI.ui (modified) (1 diff)

src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

@@ -15 +15 @@
 
 # local
-from UI.TabbedInvariantUI import tabbedInvariantUI
+from UI.TabbedInvariantUI import Ui_tabbedInvariantUI
 from InvariantDetails import DetailsDialog
 from InvariantUtils import WIDGETS
@@ -35 +35 @@
         self._model.appendRow(item)
 
-class InvariantWindow(tabbedInvariantUI):
+class InvariantWindow(QtGui.QDialog, Ui_tabbedInvariantUI):
     # The controller which is responsible for managing signal slots connections
     # for the gui and providing an interface to the data model.
     def __init__(self, manager=None, parent=None):
         super(InvariantWindow, self).__init__(parent)
+        self.setupUi(self)
+
         self.setWindowTitle("Invariant Perspective")
 
@@ -69 +71 @@
         self.communicate = GuiUtils.Communicate()
 
+        self._data = None
+        self._path = ""
+
         # Mask file selector
         ###################################################
-        self._path = "cyl_400_20.txt"
-        from sas.sascalc.dataloader.loader import  Loader
-        loader = Loader()
-        try:
-            self._data = loader.load(self._path)
-        except:
-            raise
+        #self._path = "cyl_400_20.txt"
+        #from sas.sascalc.dataloader.loader import  Loader
+        #loader = Loader()
+        #try:
+        #    self._data = loader.load(self._path)
+        #except:
+        #    raise
         ###################################################
 
@@ -422 +427 @@
 
         # add Q parameters to the model
-        qmin = min(self._data.x)
+        #qmin = min(self._data.x)
+        qmin = 0.0
         item = QtGui.QStandardItem(str(qmin))
         self.model.setItem(WIDGETS.W_QMIN, item)
-        item = QtGui.QStandardItem(str(max(self._data.x)))
+        qmax = 0.0
+        item = QtGui.QStandardItem(str(qmax))
         self.model.setItem(WIDGETS.W_QMAX, item)
 
@@ -523 +530 @@
         # Extract data on 1st child - this is the Data1D/2D component
         data = self._model_item.child(0).data().toPyObject()
+        self.model.item(WIDGETS.W_FILENAME).setData(QtCore.QVariant(self._model_item.text()))
+
+        ##### DEBUG ####
+        # set data in the debug tree view window
+        self.treeView.setModel(self.model)
 
         self.calculate(data_list=[data])

src/sas/qtgui/Perspectives/Invariant/UI/TabbedInvariantUI.py

@@ -310 +310 @@
         self.gridLayout_6.addWidget(self.groupBox_4, 1, 0, 1, 1)
         self.tabWidget.addTab(self.tabOptions, _fromUtf8(""))
+        self.tab = QtGui.QWidget()
+        self.tab.setObjectName(_fromUtf8("tab"))
+        self.treeView = QtGui.QTreeView(self.tab)
+        self.treeView.setGeometry(QtCore.QRect(5, 11, 431, 311))
+        self.treeView.setObjectName(_fromUtf8("treeView"))
+        self.tabWidget.addTab(self.tab, _fromUtf8(""))
         self.gridLayout_11.addWidget(self.tabWidget, 0, 0, 1, 1)
         spacerItem = QtGui.QSpacerItem(20, 2, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
@@ -384 +390 @@
         self.label_19.setText(_translate("tabbedInvariantUI", "Power:", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabOptions), _translate("tabbedInvariantUI", "Options", None))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("tabbedInvariantUI", "View on model", None))
         self.pushButton.setText(_translate("tabbedInvariantUI", "Calculate", None))
         self.pushButton_2.setText(_translate("tabbedInvariantUI", "Status", None))
         self.pushButton_3.setText(_translate("tabbedInvariantUI", "Help", None))
 
-
-class tabbedInvariantUI(QtGui.QDialog, Ui_tabbedInvariantUI):
-    def __init__(self, parent=None, f=QtCore.Qt.WindowFlags()):
-        QtGui.QDialog.__init__(self, parent, f)
-
-        self.setupUi(self)
-

src/sas/qtgui/Perspectives/Invariant/UI/TabbedInvariantUI.ui

@@ -569 +569 @@
        </item>
       </layout>
+     </widget>
+     <widget class="QWidget" name="tab">
+      <attribute name="title">
+       <string>View on model</string>
+      </attribute>
+      <widget class="QTreeView" name="treeView">
+       <property name="geometry">
+        <rect>
+         <x>5</x>
+         <y>11</y>
+         <width>431</width>
+         <height>311</height>
+        </rect>
+       </property>
+      </widget>
      </widget>
     </widget>