Changeset ca8b853 in sasview

Timestamp:

Nov 3, 2016 8:55:38 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:

469b4622

Parents:

e4676c8

Message:

Modified behaviour of theory freeze

Location:

src/sas/qtgui

Files:

• DataExplorer.py (modified) (2 diffs, 1 prop)
• UI/DataExplorerUI.ui (modified) (3 diffs)

src/sas/qtgui/DataExplorer.py

@@ -324 +324 @@
         Freeze selected theory rows.
 
-        "Freezing" means taking the plottable data from the filename item
-        and copying it to a separate top-level item.
-        """
-        # Figure out which _inner_ rows are checked
+        "Freezing" means taking the plottable data from the Theory item
+        and copying it to a separate top-level item in Data.
+        """
+        # Figure out which rows are checked
         # Use 'while' so the row count is forced at every iteration
         outer_index = -1
         theories_copied = 0
-        while outer_index < self.model.rowCount():
+        while outer_index < self.theory_model.rowCount():
             outer_index += 1
-            outer_item = self.model.item(outer_index)
+            outer_item = self.theory_model.item(outer_index)
             if not outer_item:
                 continue
-            # Should be just two rows: data and Info
-            for inner_index in xrange(outer_item.rowCount()):
-                subitem = outer_item.child(inner_index)
-                if subitem and \
-                   subitem.isCheckable() and \
-                   subitem.checkState() == QtCore.Qt.Checked:
-                    theories_copied += 1
-                    new_item = self.recursivelyCloneItem(subitem)
-                    # Append a "unique" descriptor to the name
-                    time_bit = str(time.time())[7:-1].replace('.', '')
-                    new_name = new_item.text() + '_@' + time_bit
-                    new_item.setText(new_name)
-                    self.theory_model.appendRow(new_item)
-            self.theory_model.reset()
+            if outer_item.isCheckable() and \
+                   outer_item.checkState() == QtCore.Qt.Checked:
+                theories_copied += 1
+                new_item = self.recursivelyCloneItem(outer_item)
+                # Append a "unique" descriptor to the name
+                time_bit = str(time.time())[7:-1].replace('.', '')
+                new_name = new_item.text() + '_@' + time_bit
+                new_item.setText(new_name)
+                self.model.appendRow(new_item)
+            self.model.reset()
 
         freeze_msg = ""
@@ -355 +351 @@
             return
         elif theories_copied == 1:
-            freeze_msg = "1 theory copied to the Theory tab as a data set"
+            freeze_msg = "1 theory copied from the Theory tab as a data set"
         elif theories_copied > 1:
-            freeze_msg = "%i theories copied to the Theory tab as data sets" % theories_copied
+            freeze_msg = "%i theories copied from the Theory tab as data sets" % theories_copied
         else:
             freeze_msg = "Unexpected number of theories copied: %i" % theories_copied

src/sas/qtgui/UI/DataExplorerUI.ui

@@ -143 +143 @@
         <layout class="QHBoxLayout" name="horizontalLayout">
          <item>
-          <widget class="QPushButton" name="cmdFreeze">
-           <property name="text">
-            <string>Freeze Theory</string>
-           </property>
-          </widget>
-         </item>
-         <item>
           <spacer name="horizontalSpacer">
            <property name="orientation">
@@ -295 +288 @@
         <layout class="QHBoxLayout" name="horizontalLayout_3">
          <item>
+          <widget class="QPushButton" name="cmdFreeze">
+           <property name="text">
+            <string>Freeze Theory</string>
+           </property>
+          </widget>
+         </item>
+         <item>
           <spacer name="horizontalSpacer_5">
            <property name="orientation">
@@ -301 +301 @@
            <property name="sizeHint" stdset="0">
             <size>
-             <width>353</width>
+             <width>218</width>
              <height>20</height>
             </size>