Changeset 94f0873f in sasview for src

Timestamp:

Nov 8, 2016 5:19:52 AM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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:

8fa53f7, a08b89b

Parents:

b0e0183

Message:

Removed default name and changed override status. Fixes #770

File:

• src/sas/sasgui/perspectives/calculator/model_editor.py (modified) (3 diffs)

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"