Changeset 3c44c66 in sasview for sansview

Timestamp:

Jul 20, 2010 2:36:35 PM (14 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:

cb19af9f

Parents:

1b17a64

Message:

working on guiframe

Location:

sansview

Files:

• 2d_state.fitv (deleted)
• perspectives/fitting/basepage.py (modified) (5 diffs)
• perspectives/fitting/fitpage.py (modified) (1 diff)
• perspectives/fitting/fitpanel.py (modified) (2 diffs)
• perspectives/fitting/pagestate.py (modified) (3 diffs)
• welcome_panel.py (modified) (2 diffs)

sansview/perspectives/fitting/basepage.py

@@ -44 +44 @@
         #Set window's font size 
         self.SetWindowVariant(variant=FONT_VARIANT)
+       
         ## parent of the page
         self.parent = parent
@@ -160 +161 @@
         ## layout
         self.set_layout()
-       
+        
     class ModelTextCtrl(wx.TextCtrl):
         """
@@ -233 +234 @@
         def _silent_kill_focus(self,event):
             """
-            do nothing to kill focus
+            Save the state of the page
             """
+            
             event.Skip()
             pass
@@ -803 +805 @@
         self._copy_parameters_state(self.fittable_param, self.state.fittable_param)
         self._copy_parameters_state(self.fixed_param, self.state.fixed_param)
-    
-
+        #save chisqr
+        self.state.tcChi = self.tcChi.GetValue()
+        
     def save_current_state_fit(self):
         """
@@ -1008 +1011 @@
         ## draw the model with previous parameters value
         self._onparamEnter_helper()
+        #reset the value of chisqr when not consistent with the value computed
+        self.tcChi.SetValue(str(self.state.tcChi))
         ## reset context menu items
         self._reset_context_menu()
+        
         ## set the value of the current state to the state given as parameter
         self.state = state.clone() 

sansview/perspectives/fitting/fitpage.py

@@ -1936 +1936 @@
             self.tcChi.SetValue(str(format_number(output)))
 
-            self.state.tcChi =self.tcChi
+            self.state.tcChi = self.tcChi.GetValue()
         except:
             pass  

sansview/perspectives/fitting/fitpanel.py

@@ -200 +200 @@
         self.Center()
         
+    def set_data(self, list=[]):
+        """
+        Receive a list of data and create new 
+        """
+        if list==[]:
+            msg = "Please select data for Fitting perspective.\n"
+            dial = wx.MessageDialog(None, msg, 'Error Loading File', 
+                                    wx.OK | wx.ICON_EXCLAMATION)
+            dial.ShowModal() 
+            return 
+        for data, path in list:
+            self.manager.add_fit_page(data=data)
+            
     def set_state(self, state):
         """
@@ -415 +428 @@
                 return panel 
             else:
-                for name, panel in self.opened_pages.values():
-                    #Don't return any panel is the exact same page is created
-                    if name == page_info.window_name:
+                for value in self.opened_pages.values():
+                    if page_info.window_name == str(value[0]):
+                        #Don't return any panel is the exact same page is created
                         return None
-                    else:
-                        panel = self.add_page(page_info=page_info)
-                        return panel        
+                panel = self.add_page(page_info=page_info)
+                return panel        
         else:
             #a new type of page is created

sansview/perspectives/fitting/pagestate.py

@@ -362 +362 @@
         rep += "model  : %s\n\n"% str(self.model)
         rep += "number parameters(self.parameters): %s\n"%len(self.parameters)
-        rep += self._repr_helper( list=self.parameters, rep=rep)
+        rep = self._repr_helper( list=self.parameters, rep=rep)
         rep += "number orientation parameters"
         rep += "(self.orientation_params): %s\n"%len(self.orientation_params)
-        rep += self._repr_helper( list=self.orientation_params, rep=rep)
+        rep = self._repr_helper( list=self.orientation_params, rep=rep)
         rep += "number dispersity parameters"
         rep += "(self.orientation_params_disp): %s\n"%len(self.orientation_params_disp)
-        rep += self._repr_helper( list=self.orientation_params_disp, rep=rep)
+        rep = self._repr_helper( list=self.orientation_params_disp, rep=rep)
         
         return rep
@@ -1138 +1138 @@
                 output[0].filename = state.file
                 state.data = output[0]
-                state.data.name = state.data_name
+                state.data.name = output[0].filename #state.data_name
                 state.data.id = state.data_id
                 state.data.id = state.data_id
@@ -1182 +1182 @@
             fitstate.toXML(file=filename)
         
-"""     
-Example: ::
+
   
-    if __name__ == "__main__":
-        state = PageState(parent=None)
-        state.toXML()
-        print "state", state
+if __name__ == "__main__":
+    state = PageState(parent=None)
+    #state.toXML()
+    """
     
-"""
+    file = open("test_state", "w")
+    pickle.dump(state, file)
+    print pickle.dumps(state)
+    state.data_name = "hello---->"
+    pickle.dump(state, file)
+    file = open("test_state", "r")
+    new_state= pickle.load(file)
+    print "new state", new_state
+    new_state= pickle.load(file)
+    print "new state", new_state
+    #print "state", state
+    """
+    import bsddb
+    import pickle
+    db= bsddb.btopen('file_state.db', 'c')
+    val = (pickle.dumps(state), "hello", "hi")
+    db['state1']= pickle.dumps(val)
+    print pickle.loads(db['state1'])
+    state.data_name = "hello---->22"
+    db['state2']= pickle.dumps(state)
+    state.data_name = "hello---->2"
+    db['state3']= pickle.dumps(state)
+    del db['state3']
+    state.data_name = "hello---->3"
+    db['state4']= pickle.dumps(state)
+    new_state = pickle.loads(db['state1'])
+    #print db.last()
+    db.set_location('state2')
+    state.data_name = "hello---->5"
+    db['aastate5']= pickle.dumps(state)
+    db.keys().sort()
+    print pickle.loads(db['state2'])
+  
+    db.close()

sansview/welcome_panel.py

@@ -66 +66 @@
             self.parent.on_close_welcome_panel()
         event.Veto() 
-   
+        
+    def set_data(self, list=[]):
+        """
+        """
+        pass
+    
+    
 class WelcomePage(wx.Panel):
     """
@@ -127 +133 @@
         self.SetSizer(sizer_main)
         self.Fit()
-
+        
+    def set_data(self, list=[]):
+        """
+        """
+        pass
 
 class ViewApp(wx.App):