Changes in / [cf2e6b4:aa4b4f05] in sasview

Files:

• sasview/sasview.spec (added)
• sasview/version.txt (added)
• src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) (1 diff)
• src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) (2 diffs)
• src/sas/sasgui/perspectives/calculator/model_editor.py (modified) (4 diffs)
• src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified) (1 diff)
• src/sas/sasgui/plottools/PlotPanel.py (modified) (1 diff)
• src/sas/sasgui/plottools/plottables.py (modified) (1 diff)
• test/sasdataloader/test/utest_ascii.py (modified) (1 diff)

src/sas/sascalc/dataloader/readers/ascii_reader.py

@@ -172 +172 @@
                 input_f.close()
                 if not is_data:
-                    return None
+                    msg = "ascii_reader: x has no data"
+                    raise RuntimeError, msg
                 # Sanity check
                 if has_error_dy == True and not len(ty) == len(tdy):

src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -65 +65 @@
         # context menu
         self._slicerpop = None
-
         self._available_data = []
         self._symbol_labels = self.get_symbol_label()
@@ -732 +731 @@
                 self.subplot.set_ylim(y_range)
                 self.subplot.figure.canvas.draw_idle()
+                self.is_zoomed = True
         d.Destroy()
 

src/sas/sasgui/perspectives/calculator/model_editor.py

@@ -632 +632 @@
         self.reader = None
         self.name = 'untitled'
-        self.overwrite_name = True
+        self.overwrite_name = False
         self.is_2d = False
         self.fname = None
@@ -684 +684 @@
         name_txt = wx.StaticText(self, -1, 'Function Name : ')
         overwrite_cb = wx.CheckBox(self, -1, "Overwrite existing plugin model of this name?", (10, 10))
-        overwrite_cb.SetValue(True)
+        overwrite_cb.SetValue(False)
         overwrite_cb.SetToolTipString("Overwrite it if already exists?")
         wx.EVT_CHECKBOX(self, overwrite_cb.GetId(), self.on_over_cb)
-        #overwrite_cb.Show(False)
         self.name_tcl = wx.TextCtrl(self, -1, size=(PANEL_WIDTH * 3 / 5, -1))
         self.name_tcl.Bind(wx.EVT_TEXT_ENTER, self.on_change_name)
-        self.name_tcl.SetValue('MyFunction')
+        self.name_tcl.SetValue('')
         self.name_tcl.SetFont(self.font)
         hint_name = "Unique Model Function Name."
@@ -947 +946 @@
         # First check for valid python name then if the name already exists
         if not name or not bool(re.match('^[A-Za-z0-9_]*$', name)):
-            msg = "is not a valid python name. Name must not be empty and \n"
+            msg = '"%s" '%name
+            msg += "is not a valid model name. Name must not be empty and \n"
             msg += "may include only alpha numeric or underline characters \n"
             msg += "and no spaces"
@@ -1152 +1152 @@
 
         _TreeLocation = "user/sasgui/perspectives/fitting/fitting_help.html"
-        _PageAnchor = "#New_Plugin_Model"
+        _PageAnchor = "#new-plugin-model"
         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, _PageAnchor,
                                           "Plugin Model Editor Help")

src/sas/sasgui/perspectives/invariant/media/invariant_help.rst

@@ -116 +116 @@
 Academic Press, New York, 1982
 
-http://physchem.kfunigraz.ac.at/sm/
+http://web.archive.org/web/20110824105537/http://physchem.kfunigraz.ac.at/sm/Service/Glatter_Kratky_SAXS_1982.zip
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ

src/sas/sasgui/plottools/PlotPanel.py

@@ -452 +452 @@
         """
         self.cusor_line(event)
-        if self.gotLegend == 1:
+        if self.gotLegend == 1 and self.leftdown:
             self._on_legend_motion(event)
             return

src/sas/sasgui/plottools/plottables.py

@@ -212 +212 @@
                 self.color += plottable.colors()
                 self.plottables[plottable] = self.color
+                plottable.custom_color = self.color
 
     def changed(self):

test/sasdataloader/test/utest_ascii.py

@@ -92 +92 @@
         """
         # Test .ABS file loaded as ascii
-        f = self.loader.load("ascii_test_6.txt")
+        f = None
+        try:
+            f = self.loader.load("ascii_test_6.txt")
         # The length of the data is 5
-        self.assertEqual(f, None)
+        except:
+            self.assertEqual(f, None)
         
 if __name__ == '__main__':