Changeset ae9b8bf in sasview

Timestamp:

Jan 10, 2017 1:52:45 PM (7 years ago)

Author:

krzywon

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

73cbeec, ca6cbc1c

Parents:

27aabc1

Message:

The corfunc perspective now saves and loads in files with the extension .crf instead of .cor. Fixes #832

Files:

• sasview/local_config.py (modified) (1 diff)
• src/sas/sasgui/perspectives/corfunc/corfunc.py (modified) (3 diffs)
• src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) (2 diffs)
• src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) (2 diffs)

sasview/local_config.py

@@ -97 +97 @@
 GUIFRAME_WIDTH = 1150
 GUIFRAME_HEIGHT = 840
-PLUGIN_STATE_EXTENSIONS = ['.fitv', '.inv', '.prv', '.cor']
+PLUGIN_STATE_EXTENSIONS = ['.fitv', '.inv', '.prv', '.crf']
 PLUGINS_WLIST = ['Fitting files (*.fitv)|*.fitv',
                  'Invariant files (*.inv)|*.inv',
                  'P(r) files (*.prv)|*.prv',
-                 'Corfunc files (*.cor)|*.cor']
+                 'Corfunc files (*.crf)|*.crf']
 PLOPANEL_WIDTH = 415
 PLOPANEL_HEIGTH = 370

src/sas/sasgui/perspectives/corfunc/corfunc.py

@@ -32 +32 @@
         self._always_active = True
         self.state_reader = Reader(self.set_state)
-        self._extensions = '.cor'
+        self._extensions = '.crf'
 
     def get_panels(self, parent):
@@ -48 +48 @@
 
         l = Loader()
-        l.associate_file_reader('.cor', self.state_reader)
+        l.associate_file_reader('.crf', self.state_reader)
 
         return [self.corfunc_panel]
@@ -81 +81 @@
     def set_state(self, state=None, datainfo=None):
         """
-        Callback for CorfuncState reader. Called when a .cor file is loaded
+        Callback for CorfuncState reader. Called when a .crf file is loaded
         """
         if isinstance(datainfo, list):

src/sas/sasgui/perspectives/corfunc/corfunc_panel.py

@@ -325 +325 @@
         dlg = wx.FileDialog(self, "Choose a file",
                             default_save_location, \
-                            self.window_caption, "*.cor", wx.SAVE)
+                            self.window_caption, "*.crf", wx.SAVE)
         if dlg.ShowModal() == wx.ID_OK:
             path = dlg.GetPath()
@@ -336 +336 @@
         dlg.Destroy()
         # MAC always needs the extension for saving
-        extens = ".cor"
+        extens = ".crf"
         # Make sure the ext included in the file name
         f_name = os.path.splitext(path)[0] + extens

src/sas/sasgui/perspectives/corfunc/corfunc_state.py

@@ -96 +96 @@
             self.background = value
 
-    def toXML(self, filename='corfunc_state.cor', doc=None, entry_node=None):
+    def toXML(self, filename='corfunc_state.crf', doc=None, entry_node=None):
         """
         Writes the state of the CorfuncPanel panel to file, as XML.
@@ -257 +257 @@
     type_name = "Corfunc"
 
-    type = ["Corfunc file (*.cor)|*.cor",
+    type = ["Corfunc file (*.crf)|*.crf",
             "SASView file (*.svs)|*.svs"]
 
-    ext = ['.cor', '.COR', '.svs', '.SVS']
+    ext = ['.crf', '.CRF', '.svs', '.SVS']
 
     def __init__(self, callback):