Changeset 9634f86 in sasview

Timestamp:

Oct 24, 2017 12:00:18 PM (7 years ago)

Author:

Adam Washington <adam.washington@…>

Children:

1bb879d

Parents:

e4a3302

Message:

All the numbers in the model

Location:

src/sas/qtgui/Perspectives/Corfunc

Files:

• CorfuncPerspective.py (modified) (5 diffs)
• CorfuncUtils.py (modified) (1 diff)

src/sas/qtgui/Perspectives/Corfunc/CorfuncPerspective.py

@@ -120 +120 @@
         self.calculateBgBtn.clicked.connect(self.calculateBackground)
 
-        self.hilbertBtn.clicked.connect(self.action)
-        self.fourierBtn.clicked.connect(self.action)
-
         self.model.itemChanged.connect(self.modelChanged)
 
@@ -144 +141 @@
         self.model.setItem(W.W_PORODSIGMA,
                            QtGui.QStandardItem("0.0"))
+        self.model.setItem(W.W_CORETHICK, QtGui.QStandardItem(str(0)))
+        self.model.setItem(W.W_INTTHICK, QtGui.QStandardItem(str(0)))
+        self.model.setItem(W.W_HARDBLOCK, QtGui.QStandardItem(str(0)))
+        self.model.setItem(W.W_CRYSTAL, QtGui.QStandardItem(str(0)))
+        self.model.setItem(W.W_POLY, QtGui.QStandardItem(str(0)))
+        self.model.setItem(W.W_PERIOD, QtGui.QStandardItem(str(0)))
 
     def modelChanged(self, item):
@@ -195 +198 @@
             self._realplot.drawRealSpace()
             params = self._calculator.extract_parameters(transform)
-            self.avgCoreThick.setValue(params["d0"])
-            self.avgHardBlock.setValue(params["Lc"])
-            self.avgIntThick.setValue(params["dtr"])
-            self.localCrystal.setValue(params["fill"])
-            self.polydisp.setValue(params["A"])
-            self.longPeriod.setValue(params["max"])
+            self.model.setItem(W.W_CORETHICK, QtGui.QStandardItem(str(params['d0'])))
+            self.model.setItem(W.W_INTTHICK, QtGui.QStandardItem(str(params['dtr'])))
+            self.model.setItem(W.W_HARDBLOCK, QtGui.QStandardItem(str(params['Lc'])))
+            self.model.setItem(W.W_CRYSTAL, QtGui.QStandardItem(str(params['fill'])))
+            self.model.setItem(W.W_POLY, QtGui.QStandardItem(str(params['A'])))
+            self.model.setItem(W.W_PERIOD, QtGui.QStandardItem(str(params['max'])))
 
         self._calculator.compute_transform(extrap, method, bg, completefn, updatefn)
@@ -220 +223 @@
         self.mapper.addMapping(self.porodSigma, W.W_PORODSIGMA)
 
+        self.mapper.addMapping(self.avgCoreThick, W.W_CORETHICK)
+        self.mapper.addMapping(self.avgIntThick, W.W_INTTHICK)
+        self.mapper.addMapping(self.avgHardBlock, W.W_HARDBLOCK)
+        self.mapper.addMapping(self.polydisp, W.W_POLY)
+        self.mapper.addMapping(self.longPeriod, W.W_PERIOD)
+        self.mapper.addMapping(self.localCrystal, W.W_CRYSTAL)
+
         self.mapper.toFirst()
 
@@ -226 +236 @@
         temp = QtGui.QStandardItem(str(bg))
         self.model.setItem(W.W_BACKGROUND, temp)
-
-    def action(self):
-        print("Called an action!")
-        print(self.model)
-        print(self.mapper)
 
     def allowBatch(self):

src/sas/qtgui/Perspectives/Corfunc/CorfuncUtils.py

@@ -12 +12 @@
                 'W_PORODK',
                 'W_PORODSIGMA',
+                'W_CORETHICK',
+                'W_INTTHICK',
+                'W_HARDBLOCK',
+                'W_CRYSTAL',
+                'W_POLY',
+                'W_PERIOD',
                 )