Changeset d84bc69 in sasview for src/sas/qtgui/Perspectives/Fitting

Timestamp:

Feb 16, 2017 9:40:53 AM (8 years ago)

Author:

wojciech

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:

6a9559d

Parents:

dba6e57 (diff), 83d6249 (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:

Conflict resolved

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingPerspective.py (moved) (moved from src/sas/qtgui/Perspectives/Fitting/Fitting.py) (3 diffs)
• UI/FittingUI.ui (moved) (moved from src/sas/qtgui/Perspectives/Fitting/UI/fitting.ui) (3 diffs)
• UI/__init__.py (added)
• UI/convert_ui.sh (added)
• __init__.py (added)

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

@@ -5 +5 @@
 from PyQt4 import QtCore
 
-from UI.fitting import Ui_Dialog
+from UI.FittingUI import Ui_FittingUI
 
 from sasmodels import generate
@@ -13 +13 @@
 from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller
 
-class prototype(QtGui.QDialog, Ui_Dialog):
-    def __init__(self):
-        super(prototype, self).__init__()
+class FittingWindow(QtGui.QDialog, Ui_FittingUI):
+    name = "Fitting" # For displaying in the combo box
+    def __init__(self, manager=None, parent=None):
+        super(FittingWindow, self).__init__()
         self._model_model = QtGui.QStandardItemModel()
         self._poly_model = QtGui.QStandardItemModel()
@@ -175 +176 @@
 if __name__ == "__main__":
     app = QtGui.QApplication([])
-    dlg = prototype()
+    dlg = FittingWindow()
     dlg.show()
     sys.exit(app.exec_())

src/sas/qtgui/Perspectives/Fitting/UI/FittingUI.ui

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>Dialog</class>
- <widget class="QDialog" name="Dialog">
+ <class>FittingUI</class>
+ <widget class="QDialog" name="FittingUI">
   <property name="geometry">
    <rect>
@@ -12 +12 @@
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Fitting Perspective</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../../../UI/main_resources.qrc">
+    <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_15">
@@ -642 +646 @@
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../../../UI/main_resources.qrc"/>
+ </resources>
  <connections/>
 </ui>