Changeset b10cf92 in sasview for src/sas/qtgui

Timestamp:

May 17, 2018 3:49:28 PM (7 years ago)

Author:

wojciech

Branches:

ESS_GUI, 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:

3aa3351, a0ed202

Parents:

6459916 (diff), 57be490 (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:

Merge branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

Location:

src/sas/qtgui

Files:

• Calculators/media/gen_gui_help.png (modified) (1 prop) (previous)
• Calculators/media/pdb_combo.png (added)
• Calculators/media/sas_calculator_help.rst (modified) (8 diffs)
• GUITests.py (modified) (2 diffs)
• MainWindow/GuiManager.py (modified) (5 diffs)
• Perspectives/Fitting/FittingPerspective.py (modified) (2 diffs)
• Perspectives/Fitting/FittingUtilities.py (modified) (2 diffs)
• Perspectives/Fitting/FittingWidget.py (modified) (5 diffs)
• Perspectives/Fitting/OptionsWidget.py (modified) (1 diff)
• Perspectives/Fitting/ReportPageLogic.py (added)
• Utilities/CategoryInstaller.py (modified) (1 diff)
• Utilities/GuiUtils.py (modified) (4 diffs)
• Utilities/ReportDialog.py (added)
• Utilities/UI/ReportDialogUI.ui (added)
• Utilities/UnitTesting/GuiUtilsTest.py (modified) (2 diffs)
• Utilities/UnitTesting/ReportDialogTest.py (added)
• convertUI.py (modified) (2 diffs, 1 prop)
• Calculators/media/density_tutor.png (modified) (previous)

src/sas/qtgui/Calculators/media/sas_calculator_help.rst

@@ -24 +24 @@
 
 Assuming that all the pixel sizes are the same, the elastic scattering
-intensity from the particle is
+intensity from the particle is defined as
 
 .. image:: gen_i.png
@@ -33 +33 @@
 the position of the $j^\text{th}$ pixel respectively.
 
-The total volume $V$
+The total volume $V$ is equal to
 
 .. math::
@@ -43 +43 @@
 density * Avogadro number) for the atomic structures).
 
-$V$ can be corrected by users. This correction is useful especially for an
-atomic structure (such as taken from a PDB file) to get the right normalization.
-
-*NOTE! $\beta_j$ displayed in the GUI may be incorrect but this will not
-affect the scattering computation if the correction of the total volume V is made.*
+$V$ can be corrected by users (input parameter `Total volume`). This correction
+is useful especially for an atomic structure (such as taken from a PDB file)
+to get the right normalization.
+
+*NOTE! $\beta_j$ displayed in the GUI may be incorrect (input parameter
+`solvent_SLD`) but this will not affect the scattering computation if the
+correction of the total volume V is made.*
 
 The scattering length density (SLD) of each pixel, where the SLD is uniform, is
@@ -99 +101 @@
 .. image:: mxp.png
 
+
+
 .. image:: myp.png
 
+
+
 .. image:: mzp.png
 
+
+
 .. image:: mqx.png
 
+
+
 .. image:: mqy.png
 
-Here the $M0_x$, $M0_y$ and $M0_z$ are the $x$, $y$ and $z$
+Here the $M_{0x}$, $M_{0y}$ and $M_{0z}$ are the $x$, $y$ and $z$
 components of the magnetisation vector in the laboratory $xyz$ frame.
+
+
+.. .. image:: Mxyzp.png
+
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
@@ -115 +129 @@
 --------------
 
-.. image:: gen_gui_help.png
-
-After computation the result will appear in the *Theory* box in the SasView
+.. figure:: gen_gui_help.png
+
+   ..
+
+   1) Load .sld, .txt, or .omf datafile
+   2) Select default shape of sample
+   3) Draw magnetization with arrows (not recommended for a large number of
+      pixels).
+   4) Ratio of (+/total) neutrons after analyser
+   5) Ratio of (+/total) neutrons before sample
+   6) Polarization angle in degrees
+   7) Default volume calculated from the pixel info
+      (or natural density of pdf file)
+   8) Compute the scattering pattern
+   9) Reset GUI to initial state
+   10) Display mean values or enter a new value if enabled
+   11) Save the sld data as sld format
+
+.. After computation the result will appear in the *Theory* box in the SasView
 *Data Explorer* panel.
 
@@ -126 +156 @@
 of neutrons before the sample and at the analyzer, respectively.
 
-*NOTE 1. The values of* Up_frac_in *and* Up_frac_out *must be in the range
+*NOTE 1. The values of Up_frac_in and Up_frac_out must be in the range
 0.0 to 1.0. Both values are 0.5 for unpolarized neutrons.*
 
@@ -133 +163 @@
 
 *NOTE 3. For the nuclear scattering length density, only the real component
-is taken account.*
+is taken into account.*
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
@@ -151 +181 @@
 
 where $v_j \beta_j \equiv b_j$ is the scattering
-length of the $j^\text{th}$ atom. The calculation output is passed to the *Data Explorer*
+length of the $j^\text{th}$ atom.
+.. The calculation output is passed to the *Data Explorer*
 for further use.
 
-.. image:: pdb_combo.jpg
+.. figure:: pdb_combo.png
+
+   ..
+
+   1) PDB file loaded
+   2) disabled input for *Up_frac_in*, *Up_frac_oupt*, *Up_theta*
+   3) option to perform the calculations using "Fixed orientations" (2D output)
+      or "Averaging over all orientations using Debye equation" (1D output).
+      This choice is only available for PDB files.
+
+
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ

src/sas/qtgui/GUITests.py

@@ -49 +49 @@
 from Utilities.UnitTesting import TabbedModelEditorTest
 from Utilities.UnitTesting import AddMultEditorTest
+from Utilities.UnitTesting import ReportDialogTest
 
 # Unit Testing
@@ -109 +110 @@
         unittest.makeSuite(TabbedModelEditorTest.TabbedModelEditorTest,'test'),
         unittest.makeSuite(AddMultEditorTest.AddMultEditorTest, 'test'),
+        unittest.makeSuite(ReportDialogTest.ReportDialogTest,     'test'),
 
         # Calculators

src/sas/qtgui/MainWindow/GuiManager.py

@@ -23 +23 @@
 from sas.qtgui.Utilities.GridPanel import BatchOutputPanel
 
+from sas.qtgui.Utilities.ReportDialog import ReportDialog
 from sas.qtgui.MainWindow.UI.AcknowledgementsUI import Ui_Acknowledgements
 from sas.qtgui.MainWindow.AboutBox import AboutBox
@@ -65 +66 @@
         # Add signal callbacks
         self.addCallbacks()
+
+        # Assure model categories are available
+        self.addCategories()
 
         # Create the data manager
@@ -142 +146 @@
         self.ResolutionCalculator = ResolutionCalculatorPanel(self)
         self.DataOperation = DataOperationUtilityPanel(self)
+
+    def addCategories(self):
+        """
+        Make sure categories.json exists and if not compile it and install in ~/.sasview
+        """
+        try:
+            from sas.sascalc.fit.models import ModelManager
+            from sas.qtgui.Utilities.CategoryInstaller import CategoryInstaller
+            model_list = ModelManager().cat_model_list()
+            CategoryInstaller.check_install(model_list=model_list)
+        except Exception:
+            logger.error("%s: could not load SasView models")
+            logger.error(traceback.format_exc())
 
     def statusBarSetup(self):
@@ -472 +489 @@
     def actionSave_Analysis(self):
         """
-        """
-        print("actionSave_Analysis TRIGGERED")
-
-        pass
+        Menu File/Save Analysis
+        """
+        self.communicate.saveAnalysisSignal.emit()
 
     def actionQuit(self):
@@ -510 +526 @@
     def actionReport(self):
         """
-        """
-        print("actionReport TRIGGERED")
-        pass
+        Show the Fit Report dialog.
+        """
+        report_list = None
+        if getattr(self._current_perspective, "currentTab"):
+            try:
+                report_list = self._current_perspective.currentTab.getReport()
+            except Exception as ex:
+                logging.error("Report generation failed with: " + str(ex))
+
+        if report_list is not None:
+            self.report_dialog = ReportDialog(parent=self, report_list=report_list)
+            self.report_dialog.show()
 
     def actionReset(self):

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

@@ -37 +37 @@
         self.maxIndex = 0
 
-        # Index of the current tab
-        self.currentTab = 0
+        ## Index of the current tab
+        #self.currentTab = 0
 
         # The default optimizer
@@ -318 +318 @@
 
         pass
+
+    @property
+    def currentTab(self):
+        """
+        Returns the tab widget currently shown
+        """
+        return self.currentWidget()
+

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

@@ -68 +68 @@
     multishell_parameters = getIterParams(parameters)
     multishell_param_name, _ = getMultiplicity(parameters)
+
     if is2D:
         params = [p for p in parameters.kernel_parameters if p.type != 'magnetic']
@@ -443 +444 @@
 
 
+def getStandardParam(model=None):
+    """
+    Returns a list with standard parameters for the current model
+    """
+    param = []
+    num_rows = model.rowCount()
+    if num_rows < 1:
+        return None
+
+    for row in range(num_rows):
+        param_name = model.item(row, 0).text()
+        checkbox_state = model.item(row,0).checkState() == QtCore.Qt.Checked
+        value= model.item(row, 1).text()
+        column_shift = 0
+        if model.columnCount() == 5: # no error column
+            error_state = False
+            error_value = 0.0
+        else:
+            error_state = True
+            error_value = model.item(row, 2).text()
+            column_shift = 1
+        min_state = True
+        max_state = True
+        min_value = model.item(row, 2+column_shift).text()
+        max_value = model.item(row, 3+column_shift).text()
+        unit = ""
+        if model.item(row, 4+column_shift) is not None:
+            unit = model.item(row, 4+column_shift).text()
+
+        param.append([checkbox_state, param_name, value, "",
+                        [error_state, error_value],
+                        [min_state, min_value],
+                        [max_state, max_value], unit])
+
+    return param
+
+def getOrientationParam(kernel_module=None):
+    """
+    Get the dictionary with orientation parameters
+    """
+    param = []
+    if kernel_module is None: 
+        return None
+    for param_name in list(kernel_module.params.keys()):
+        name = param_name
+        value = kernel_module.params[param_name]
+        min_state = True
+        max_state = True
+        error_state = False
+        error_value = 0.0
+        checkbox_state = True #??
+        details = kernel_module.details[param_name] #[unit, mix, max]
+        param.append([checkbox_state, name, value, "",
+                     [error_state, error_value],
+                     [min_state, details[1]],
+                     [max_state, details[2]], details[0]])
+
+    return param

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

@@ -1 +1 @@
 import json
 import os
+import copy
 from collections import defaultdict
 
@@ -21 +22 @@
 
 from sas.sascalc.fit.BumpsFitting import BumpsFit as Fit
+from sas.sascalc.fit.pagestate import PageState
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
@@ -45 +47 @@
 from sas.qtgui.Perspectives.Fitting.Constraint import Constraint
 from sas.qtgui.Perspectives.Fitting.MultiConstraint import MultiConstraint
+from sas.qtgui.Perspectives.Fitting.ReportPageLogic import ReportPageLogic
+
 
 
@@ -506 +510 @@
         # Signals from other widgets
         self.communicate.customModelDirectoryChanged.connect(self.onCustomModelChange)
+        self.communicate.saveAnalysisSignal.connect(self.savePageState)
+        #self.communicate.saveReportSignal.connect(self.saveReport)
 
     def modelName(self):
@@ -2633 +2639 @@
             self.page_stack.pop()
 
+    def getReport(self):
+        """
+        Create and return HTML report with parameters and charts
+        """
+        index = None
+        if self.all_data:
+            index = self.all_data[self.data_index]
+        report_logic = ReportPageLogic(self,
+                                       kernel_module=self.kernel_module,
+                                       data=self.data,
+                                       index=index,
+                                       model=self._model_model)
+
+        return report_logic.reportList()
+
+    def savePageState(self):
+        """
+        Create and serialize local PageState
+        """
+        from sas.sascalc.fit.pagestate import Reader
+        model = self.kernel_module
+
+        # Old style PageState object
+        state = PageState(model=model, data=self.data)
+
+        # Add parameter data to the state
+        self.getCurrentFitState(state)
+
+        # Create the filewriter, aptly named 'Reader'
+        state_reader = Reader(self.loadPageStateCallback)
+        filepath = self.saveAsAnalysisFile()
+        if filepath is None:
+            return
+        state_reader.write(filename=filepath, fitstate=state)
+        pass
+
+    def saveAsAnalysisFile(self):
+        """
+        Show the save as... dialog and return the chosen filepath
+        """
+        default_name = "FitPage"+str(self.tab_id)+".fitv"
+
+        wildcard = "fitv files (*.fitv)"
+        kwargs = {
+            'caption'   : 'Save As',
+            'directory' : default_name,
+            'filter'    : wildcard,
+            'parent'    : None,
+        }
+        # Query user for filename.
+        filename_tuple = QtWidgets.QFileDialog.getSaveFileName(**kwargs)
+        filename = filename_tuple[0]
+        return filename
+
+    def loadPageStateCallback(self,state=None, datainfo=None, format=None):
+        """
+        This is a callback method called from the CANSAS reader.
+        We need the instance of this reader only for writing out a file,
+        so there's nothing here.
+        Until Load Analysis is implemented, that is.
+        """
+        pass
+
+    def loadPageState(self, pagestate=None):
+        """
+        Load the PageState object and update the current widget
+        """
+        pass
+
+    def getCurrentFitState(self, state=None):
+        """
+        Store current state for fit_page
+        """
+        # save model option
+        #if self.model is not None:
+        #    self.disp_list = self.getDispParamList()
+        #    state.disp_list = copy.deepcopy(self.disp_list)
+        #    #state.model = self.model.clone()
+
+        # Comboboxes
+        state.categorycombobox = self.cbCategory.currentText()
+        state.formfactorcombobox = self.cbModel.currentText()
+        if self.cbStructureFactor.isEnabled():
+            state.structureCombobox = self.cbStructureFactor.currentText()
+        state.tcChi = self.chi2
+
+        state.enable2D = self.is2D
+
+        #state.weights = copy.deepcopy(self.weights)
+        # save data
+        state.data = copy.deepcopy(self.data)
+
+        # save plotting range
+        state.qmin = self.q_range_min
+        state.qmax = self.q_range_max
+        state.npts = self.npts
+
+        #    self.state.enable_disp = self.enable_disp.GetValue()
+        #    self.state.disable_disp = self.disable_disp.GetValue()
+
+        #    self.state.enable_smearer = \
+        #                        copy.deepcopy(self.enable_smearer.GetValue())
+        #    self.state.disable_smearer = \
+        #                        copy.deepcopy(self.disable_smearer.GetValue())
+
+        #self.state.pinhole_smearer = \
+        #                        copy.deepcopy(self.pinhole_smearer.GetValue())
+        #self.state.slit_smearer = copy.deepcopy(self.slit_smearer.GetValue())
+        #self.state.dI_noweight = copy.deepcopy(self.dI_noweight.GetValue())
+        #self.state.dI_didata = copy.deepcopy(self.dI_didata.GetValue())
+        #self.state.dI_sqrdata = copy.deepcopy(self.dI_sqrdata.GetValue())
+        #self.state.dI_idata = copy.deepcopy(self.dI_idata.GetValue())
+
+        p = self.model_parameters
+        # save checkbutton state and txtcrtl values
+        state.parameters = FittingUtilities.getStandardParam()
+        state.orientation_params_disp = FittingUtilities.getOrientationParam()
+
+        #self._copy_parameters_state(self.orientation_params_disp, self.state.orientation_params_disp)
+        #self._copy_parameters_state(self.parameters, self.state.parameters)
+        #self._copy_parameters_state(self.fittable_param, self.state.fittable_param)
+        #self._copy_parameters_state(self.fixed_param, self.state.fixed_param)
+
+

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

@@ -116 +116 @@
         self.mapper.addMapping(self.txtNpts,     MODEL.index('NPTS'))
         self.mapper.addMapping(self.chkLogData,  MODEL.index('LOG_SPACED'))
-        # FIXME DOESNT WORK WITH QT5
-        #self.mapper.toFirst()
+
+        self.mapper.toFirst()
 
     def toggleLogData(self, isChecked):

src/sas/qtgui/Utilities/CategoryInstaller.py

@@ -174 +174 @@
                                                           model_enabled_dict)
 
-            json.dump(master_category_dict, open(serialized_file, 'wb'))
+            json.dump(master_category_dict, open(serialized_file, "w", encoding="utf8"))
 

src/sas/qtgui/Utilities/GuiUtils.py

@@ +1 @@
+# -*- coding: utf-8 -*-
 """
 Global defaults and various utility functions usable by the general GUI
@@ -248 +249 @@
     sendDataToGridSignal = QtCore.pyqtSignal(list)
 
+    # Action Save Analysis triggered
+    saveAnalysisSignal = QtCore.pyqtSignal()
 
 def updateModelItemWithPlot(item, update_data, name=""):
@@ -378 +381 @@
                  if str(i.text()) == filename])
     return item[0] if len(item)>0 else None
+
+def plotsFromModel(model_name, model_item):
+    """
+    Returns the list of plots for the item with model name in the model
+    """
+    assert isinstance(model_item, QtGui.QStandardItem)
+    assert isinstance(model_name, str)
+
+    plot_data = []
+    # Iterate over model looking for named items
+    for index in range(model_item.rowCount()):
+        item = model_item.child(index)
+        if isinstance(item.data(), (Data1D, Data2D)):
+            plot_data.append(item.data())
+        if model_name in str(item.text()):
+            #plot_data.append(item.child(0).data())
+            # Going 1 level deeper only
+            for index_2 in range(item.rowCount()):
+                item_2 = item.child(index_2)
+                if item_2 and isinstance(item_2.data(), (Data1D, Data2D)):
+                    plot_data.append(item_2.data())
+
+    return plot_data
 
 def plotsFromFilename(filename, model_item):
@@ -841 +867 @@
     return output.lstrip().rstrip()
 
+def replaceHTMLwithUTF8(html):
+    """
+    Replace some important HTML-encoded characters
+    with their UTF-8 equivalents
+    """
+    # Angstrom
+    html_out = html.replace("Å", "Ã
+")
+    # infinity
+    html_out = html_out.replace("∞", "∞")
+    # +/-
+    html_out = html_out.replace("±", "±")
+
+    return html_out
+
+def replaceHTMLwithASCII(html):
+    """
+    Replace some important HTML-encoded characters
+    with their ASCII equivalents
+    """
+    # Angstrom
+    html_out = html.replace("Å", "Ang")
+    # infinity
+    html_out = html_out.replace("∞", "inf")
+    # +/-
+    html_out = html_out.replace("±", "+/-")
+
+    return html_out
+
+def convertUnitToUTF8(unit):
+    """
+    Convert ASCII unit display into UTF-8 symbol
+    """
+    if unit == "1/A":
+        return "Ã
+<sup>-1</sup>"
+    elif unit == "1/cm":
+        return "cm<sup>-1</sup>"
+    elif unit == "Ang":
+        return "Ã
+"
+    elif unit == "1e-6/Ang^2":
+        return "10<sup>-6</sup>/Ã
+<sup>2</sup>"
+    elif unit == "inf":
+        return "∞"
+    elif unit == "-inf":
+        return "-∞"
+    else:
+        return unit
+
 def convertUnitToHTML(unit):
     """

src/sas/qtgui/Utilities/UnitTesting/GuiUtilsTest.py

@@ +1 @@
+# -*- coding: utf-8 -*-
 import sys
 import unittest
@@ -446 +447 @@
         self.assertEqual(yscale, "log")
 
+    def testReplaceHTMLwithUTF8(self):
+        ''' test single character replacement '''
+        s = None
+        with self.assertRaises(AttributeError):
+            result = replaceHTMLwithUTF8(s)
+
+        s = ""
+        self.assertEqual(replaceHTMLwithUTF8(s), s)
+
+        s = "aaaa"
+        self.assertEqual(replaceHTMLwithUTF8(s), s)
+
+        s = "Å ∞      ±"
+        self.assertEqual(replaceHTMLwithUTF8(s), "Ã
+ ∞      ±")
+
+    def testReplaceHTMLwithASCII(self):
+        ''' test single character replacement'''
+        s = None
+        with self.assertRaises(AttributeError):
+            result = replaceHTMLwithASCII(s)
+
+        s = ""
+        self.assertEqual(replaceHTMLwithASCII(s), s)
+
+        s = "aaaa"
+        self.assertEqual(replaceHTMLwithASCII(s), s)
+
+        s = "Å ∞      ±"
+        self.assertEqual(replaceHTMLwithASCII(s), "Ang inf      +/-")
+
+    def testConvertUnitToUTF8(self):
+        ''' test unit string replacement'''
+        s = None
+        self.assertIsNone(convertUnitToUTF8(s))
+
+        s = ""
+        self.assertEqual(convertUnitToUTF8(s), s)
+
+        s = "aaaa"
+        self.assertEqual(convertUnitToUTF8(s), s)
+
+        s = "1/A"
+        self.assertEqual(convertUnitToUTF8(s), "Ã
+<sup>-1</sup>")
+
+        s = "Ang"
+        self.assertEqual(convertUnitToUTF8(s), "Ã
+")
+
+        s = "1e-6/Ang^2"
+        self.assertEqual(convertUnitToUTF8(s), "10<sup>-6</sup>/Ã
+<sup>2</sup>")
+
+        s = "inf"
+        self.assertEqual(convertUnitToUTF8(s), "∞")
+
+        s = "1/cm"
+        self.assertEqual(convertUnitToUTF8(s), "cm<sup>-1</sup>")
+
+    def testConvertUnitToHTML(self):
+        ''' test unit string replacement'''
+        s = None
+        self.assertIsNone(convertUnitToHTML(s))
+
+        s = ""
+        self.assertEqual(convertUnitToHTML(s), s)
+
+        s = "aaaa"
+        self.assertEqual(convertUnitToHTML(s), s)
+
+        s = "1/A"
+        self.assertEqual(convertUnitToHTML(s), "&#x212B;<sup>-1</sup>")
+
+        s = "Ang"
+        self.assertEqual(convertUnitToHTML(s), "&#x212B;")
+
+        s = "1e-6/Ang^2"
+        self.assertEqual(convertUnitToHTML(s), "10<sup>-6</sup>/&#x212B;<sup>2</sup>")
+
+        s = "inf"
+        self.assertEqual(convertUnitToHTML(s), "&#x221e;")
+        s = "-inf"
+
+        self.assertEqual(convertUnitToHTML(s), "-&#x221e;")
+
+        s = "1/cm"
+        self.assertEqual(convertUnitToHTML(s), "cm<sup>-1</sup>")
+
     def testParseName(self):
         '''test parse out a string from the beinning of a string'''

src/sas/qtgui/convertUI.py

@@ -1 +1 @@
 # Convert all .ui files in all subdirectories of the current script
 import os
+import sys
 
 def pyrrc(in_file, out_file):
@@ -21 +22 @@
 
 # RC file in UI directory
-ui_root = 'UI'
+execute_root = os.path.split(sys.modules[__name__].__file__)[0]
+ui_root = os.path.join(execute_root, 'UI')
 rc_file = 'main_resources.qrc'
 out_file = 'main_resources_rc.py'
+
 pyrrc(os.path.join(ui_root, rc_file), os.path.join(ui_root, out_file))
 
 # Images
-images_root = 'images'
+images_root = os.path.join(execute_root, 'images')
 rc_file = 'images.qrc'
 out_file = 'images_rc.py'
-pyrrc(os.path.join(images_root, rc_file), os.path.join(ui_root, out_file))
+pyrrc(os.path.join(images_root, rc_file), os.path.join(images_root, out_file))