Changeset 1801

Timestamp:

Apr 21, 2015 2:01:23 PM (9 years ago)

Author:

toby

Message:

fix selection problem in G2MultiChoiceDialog; range selection broken -- at least on Mac

File:

• trunk/GSASIIctrls.py (modified) (9 diffs)

trunk/GSASIIctrls.py

@@ -1146 +1146 @@
         if event.GetKeyCode() == wx.WXK_SHIFT:
             self.trigger = True
+            print 'debug: Shift pressed'
         if self.timer.IsRunning():
             self.timer.Stop()
@@ -1165 +1166 @@
                 if iB < 0:
                     break
-        self.trigger = not self.trigger
+            self.trigger = False
         
     def Filter(self,event):
@@ -1365 +1366 @@
 
 ################################################################################
-#### Single choice Dialog with set all, toggle & filter options
+#### Single choice Dialog with filter options
 ################################################################################
 class G2SingleChoiceDialog(wx.Dialog):
@@ -1781 +1782 @@
             print 'Error: help lookup failed!',event.GetEventObject()
             print 'id=',event.GetId()
-        #elif helpType == 'OldTutorials': # this will go away
-            #ShowHelp(helpType,self.frame)
         elif helpType == 'Tutorials': 
             dlg = OpenTutorial(self.frame)
@@ -2365 +2364 @@
         sizer.Add(sizer1,0,wx.EXPAND|wx.ALL,0)
         sizer.Add((10,10))
-        #======================================================================
-        # # This is needed only until we get all the tutorials items moved
-        # btn = wx.Button(pnl, wx.ID_ANY, "Open older tutorials") 
-        # btn.Bind(wx.EVT_BUTTON, self.OpenOld)
-        # sizer.Add(btn,0,wx.ALIGN_CENTRE|wx.ALL)
-        #======================================================================
         self.BrowseMode = 1
         choices = [
@@ -2595 +2588 @@
     frm = wx.Frame(None) # create a frame
     frm.Show(True)
-    dlg = OpenTutorial(frm)
-    if dlg.ShowModal() == wx.ID_OK:
-        print "OK"
-    else:
-        print "Cancel"
-    dlg.Destroy()
-    import sys
-    sys.exit()
+    #dlg = OpenTutorial(frm)
+    #if dlg.ShowModal() == wx.ID_OK:
+    #    print "OK"
+    #else:
+    #    print "Cancel"
+    #dlg.Destroy()
+    #import sys
+    #sys.exit()
     #======================================================================
     # test ScrolledMultiEditor
@@ -2655 +2648 @@
     #print dictlst,"\n",elemlst
     #print Checkdictlst,"\n",Checkelemlst
-    dlg = ScrolledMultiEditor(
-        frm,dictlst,elemlst,prelbl,
-        checkdictlst=Checkdictlst,checkelemlst=Checkelemlst,
-        checklabel="Refine?",
-        header="test",CopyButton=True)
-    if dlg.ShowModal() == wx.ID_OK:
-        print "OK"
-    else:
-        print "Cancel"
+    # dlg = ScrolledMultiEditor(
+    #     frm,dictlst,elemlst,prelbl,
+    #     checkdictlst=Checkdictlst,checkelemlst=Checkelemlst,
+    #     checklabel="Refine?",
+    #     header="test",CopyButton=True)
+    # if dlg.ShowModal() == wx.ID_OK:
+    #     print "OK"
+    # else:
+    #     print "Cancel"
     #print 'after',Data3,'\n',Data2
 
@@ -2689 +2682 @@
     # test G2MultiChoiceDialog
     #======================================================================
-    # choices = []
-    # for i in range(21):
-    #     choices.append("option_"+str(i))
-    # dlg = G2MultiChoiceDialog(frm, 'Sequential refinement',
-    #                           'Select dataset to include',
-    #                           choices)
-    # sel = range(2,11,2)
-    # dlg.SetSelections(sel)
-    # dlg.SetSelections((1,5))
-    # if dlg.ShowModal() == wx.ID_OK:
-    #     for sel in dlg.GetSelections():
-    #         print sel,choices[sel]
+    choices = []
+    for i in range(21):
+        choices.append("option_"+str(i))
+    dlg = G2MultiChoiceDialog(frm, 'Sequential refinement',
+                              'Select dataset to include',
+                              choices)
+    sel = range(2,11,2)
+    dlg.SetSelections(sel)
+    dlg.SetSelections((1,5))
+    if dlg.ShowModal() == wx.ID_OK:
+        for sel in dlg.GetSelections():
+            print sel,choices[sel]
     
     #======================================================================
@@ -2715 +2708 @@
     #         print sel,choices[sel]
 
-    pnl = wx.Panel(frm)
-    siz = wx.BoxSizer(wx.VERTICAL)
-
-    td = {'Goni':200.,'a':1.,'calc':1./3.,'string':'s'}
-    for key in sorted(td):
-        txt = ValidatedTxtCtrl(pnl,td,key)
-        siz.Add(txt)
-    pnl.SetSizer(siz)
-    siz.Fit(frm)
-    app.MainLoop()
-    print td
+    # pnl = wx.Panel(frm)
+    # siz = wx.BoxSizer(wx.VERTICAL)
+
+    # td = {'Goni':200.,'a':1.,'calc':1./3.,'string':'s'}
+    # for key in sorted(td):
+    #     txt = ValidatedTxtCtrl(pnl,td,key)
+    #     siz.Add(txt)
+    # pnl.SetSizer(siz)
+    # siz.Fit(frm)
+    # app.MainLoop()
+    # print td