Changes in / [27689dc:93c79b5] in sasview

Files:

• installers/installer_generator.py (modified) (6 diffs, 1 prop)
• installers/sasview_qt5.spec (added)
• run.py (modified) (1 diff)
• src/sas/qtgui/MainWindow/MainWindow.py (modified) (2 diffs)
• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (7 diffs)
• src/sas/qtgui/Utilities/TabbedModelEditor.py (modified) (1 diff)

installers/installer_generator.py

@@ -55 +55 @@
         for item in wild_cards:
             #['All (*.*)|*.*']
-            file_type, ext = string.split(item, "|*", 1)
+            file_type, ext = item.split("|*", 1)
             if ext.strip() not in ['.*', ''] and ext.strip() not in list_data:
                 list_data.append((ext, 'string', file_type))
@@ -61 +61 @@
         pass
     try:
-        file_type, ext = string.split(local_config.APPLICATION_WLIST, "|*", 1)
+        file_type, ext = local_config.APPLICATION_WLIST.split("|*", 1)
         if ext.strip() not in ['.', ''] and ext.strip() not in list_app:
             list_app.append((ext, 'string', file_type))
@@ -68 +68 @@
     try:
         for item in local_config.PLUGINS_WLIST:
-            file_type, ext = string.split(item, "|*", 1)
+            file_type, ext = item.split("|*", 1)
             if ext.strip() not in ['.', ''] and ext.strip() not in list_app:
                 list_app.append((ext, 'string', file_type))
@@ -83 +83 @@
     msg = ""
     if data_extension is not None and data_extension:
+        msg = "\n\n[Registry]\n"
         openwithlist = "OpenWithList\%s" % str(APPLICATION)
-        msg = "\n\n[Registry]\n"
         for (ext, type, _) in data_extension:
             list = os.path.join(ext, openwithlist)
@@ -192 +192 @@
     return msg
 
-dist_path = "dist"
+dist_path = "dist\sasview"
 def write_file():
     """
@@ -200 +200 @@
     msg += """Source: "%s\%s";\t""" % (dist_path, str(APPLICATION))
     msg += """DestDir: "{app}";\tFlags: ignoreversion\n"""
-    msg += """Source: "dist\*";\tDestDir: "{app}";\t"""
+    msg += """Source: "dist\sasview\*";\tDestDir: "{app}";\t"""
     msg += """Flags: ignoreversion recursesubdirs createallsubdirs\n"""
-    msg += """Source: "dist\plugin_models\*";\tDestDir: "{userdesktop}\..\.sasview\plugin_models";\t"""
+    msg += """Source: "dist\sasview\plugin_models\*";\tDestDir: "{userdesktop}\..\.sasview\plugin_models";\t"""
     msg += """Flags: recursesubdirs createallsubdirs\n"""
-    msg += """Source: "dist\compiled_models\*";\tDestDir: "{userdesktop}\..\.sasmodels\compiled_models";\t"""
-    msg += """Flags: recursesubdirs createallsubdirs\n"""
-    msg += """Source: "dist\config\custom_config.py";\tDestDir: "{userdesktop}\..\.sasview\config";\t"""
+    msg += """Source: "dist\sasview\custom_config.py";\tDestDir: "{userdesktop}\..\.sasview\config";\t"""
     msg += """Flags: recursesubdirs createallsubdirs\n"""
     #msg += """Source: "dist\default_categories.json";    DestDir: "{userdesktop}\..\.sasview";\t"""

run.py

@@ -151 +151 @@
     logger.debug("Starting SASVIEW in debug mode.")
     prepare()
-    from sas.qtgui.MainWindow.MainWindow import run
-    run()
+    from sas.qtgui.MainWindow.MainWindow import run_sasview
+    run_sasview()
     logger.debug("Ending SASVIEW in debug mode.")

src/sas/qtgui/MainWindow/MainWindow.py

@@ -50 +50 @@
     return splashScreen
 
-def run():
+def run_sasview():
     app = QApplication([])
 
@@ -85 +85 @@
 
 if __name__ == "__main__":
-    run()
+    run_sasview()

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

@@ -191 +191 @@
         self.is_batch_fitting = False
         self.is_chain_fitting = False
+        # Is the fit job running?
+        self.fit_started=False
+        # The current fit thread
+        self.calc_fit = None
         # Current SasModel in view
         self.kernel_module = None
@@ -1200 +1204 @@
         Perform fitting on the current data
         """
+        if self.fit_started:
+            self.stopFit()
+            return
+
         # initialize fitter constants
         fit_id = 0
@@ -1226 +1234 @@
         completefn = self.batchFittingCompleted if self.is_batch_fitting else self.fittingCompleted
 
-        calc_fit = FitThread(handler=handler,
+        self.calc_fit = FitThread(handler=handler,
                             fn=fitters,
                             batch_inputs=batch_inputs,
@@ -1237 +1245 @@
         if LocalConfig.USING_TWISTED:
             # start the trhrhread with twisted
-            calc_thread = threads.deferToThread(calc_fit.compute)
+            calc_thread = threads.deferToThread(self.calc_fit.compute)
             calc_thread.addCallback(completefn)
             calc_thread.addErrback(self.fitFailed)
         else:
             # Use the old python threads + Queue
-            calc_fit.queue()
-            calc_fit.ready(2.5)
+            self.calc_fit.queue()
+            self.calc_fit.ready(2.5)
 
         self.communicate.statusBarUpdateSignal.emit('Fitting started...')
+        self.fit_started = True
         # Disable some elements
         self.setFittingStarted()
 
+    def stopFit(self):
+        """
+        Attempt to stop the fitting thread
+        """
+        if self.calc_fit is None or not self.calc_fit.isrunning():
+            return
+        self.calc_fit.stop()
+        #self.fit_started=False
+        #re-enable the Fit button
+        self.setFittingStopped()
+
+        msg = "Fitting cancelled."
+        self.communicate.statusBarUpdateSignal.emit(msg)
+
     def updateFit(self):
         """
@@ -1258 +1281 @@
         """
         """
-        print("FIT FAILED: ", reason)
-        pass
+        self.setFittingStopped()
+        msg = "Fitting failed with: "+ str(reason)
+        self.communicate.statusBarUpdateSignal.emit(msg)
 
     def batchFittingCompleted(self, result):
@@ -1309 +1333 @@
 
         elapsed = result[1]
-        msg = "Fitting completed successfully in: %s s.\n" % GuiUtils.formatNumber(elapsed)
+        if self.calc_fit._interrupting:
+            msg = "Fitting cancelled by user after: %s s." % GuiUtils.formatNumber(elapsed)
+            logging.warning("\n"+msg+"\n")
+        else:
+            msg = "Fitting completed successfully in: %s s." % GuiUtils.formatNumber(elapsed)
         self.communicate.statusBarUpdateSignal.emit(msg)
 
@@ -2386 +2414 @@
     def setFittingStarted(self):
         """
-        Set item enablement on fitting start
-        """
-        #disable the Fit button
-        self.cmdFit.setText('Running...')
-        self.cmdFit.setEnabled(False)
+        Set buttion caption on fitting start
+        """
+        # Notify the user that fitting is being run
+        # Allow for stopping the job
+        self.cmdFit.setStyleSheet('QPushButton {color: red;}')
+        self.cmdFit.setText('Stop fit')
 
     def setFittingStopped(self):
         """
-        Set item enablement on fitting stop
-        """
-        #enable the Fit button
+        Set button caption on fitting stop
+        """
+        # Notify the user that fitting is available
+        self.cmdFit.setStyleSheet('QPushButton {color: black;}')
         self.cmdFit.setText("Fit")
-        self.cmdFit.setEnabled(True)
+        self.fit_started = False
 
     def readFitPage(self, fp):

src/sas/qtgui/Utilities/TabbedModelEditor.py

@@ -126 +126 @@
         self.editor_widget.setEnabled(True)
         self.editor_widget.blockSignals(False)
-        self.filename, _ = os.path.splitext(os.path.basename(filename))
-
-        self.setWindowTitle(self.window_title + " - " + self.filename)
+        self.filename = filename
+        display_name, _ = os.path.splitext(os.path.basename(filename))
+
+        self.setWindowTitle(self.window_title + " - " + display_name)
 
     def onModifiedExit(self):