Changeset 60132ef in sasview for sansview/perspectives/fitting/basepage.py

Timestamp:

Apr 15, 2009 3:35:39 PM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

dcd330b

Parents:

6063b16

Message:

working on dispersity

File:

• sansview/perspectives/fitting/basepage.py (modified) (9 diffs)

sansview/perspectives/fitting/basepage.py

@@ -1 +1 @@
 
-import sys
+import sys, os
 import wx
 import numpy
@@ -57 +57 @@
         ## list of orientation parameters
         self.orientation_params=[]
+        self.orientation_params_disp=[]
         if self.model !=None:
             self.disp_list= self.model.getDispParamList()
@@ -76 +77 @@
         self.saved_states={}
         self.slicerpop = wx.Menu()
-        
+        ## Default locations
+        self._default_save_location = os.getcwd()     
         ## save initial state on context menu
         self.onSave(event=None)
@@ -263 +265 @@
                         self.disp_cb_dict[p].SetValue(False)
                         return
-                    
+                    try:
+                        self._default_save_location = os.path.dirname(path)
+                    except:
+                        pass 
                     try:
                         values,weights = self.read_file(path)
@@ -289 +294 @@
                     #TODO: refactor model to clean this up?
                     self._disp_obj_dict[p] = disp_model
-                    
+                    print "dispersity------>",p
                     # Set the new model as the dispersion object for the selected parameter
                     self.model.set_dispersion(p, disp_model)
@@ -432 +437 @@
         if hasattr(self,"cb1"):
             self.state.cb1= self.cb1.GetValue()
-            print "save current state ",self.state.cb1
+           
         if hasattr(self,"enable_disp"):
             self.state.enable_disp= self.enable_disp.GetValue()
@@ -447 +452 @@
         self.state.fittable_param=[]
         self.state.fixed_param=[]
+       
         self._copy_parameters_state(self.parameters, self.state.parameters)
         self._copy_parameters_state(self.fittable_param, self.state.fittable_param)
@@ -501 +507 @@
         """
         import os
-        dlg = wx.FileDialog(self, "Choose a weight file", os.getcwd(), "", "*.*", wx.OPEN)
+        dlg = wx.FileDialog(self, "Choose a weight file",
+                                self._default_save_location , "", "*.*", wx.OPEN)
         path = None
         if dlg.ShowModal() == wx.ID_OK:
@@ -1183 +1190 @@
             draw sizer with array dispersity  parameters
         """
+        self.orientation_params_disp=[]
         self.sizer4_4.Clear(True) 
         ix=0