Changeset 4868 for trunk/exports/G2export_CIF.py

Timestamp:

Mar 30, 2021 5:45:34 PM (2 years ago)

Author:

toby

Message:

fix back print issue + some CIF fixes

File:

• trunk/exports/G2export_CIF.py (modified) (6 diffs)

trunk/exports/G2export_CIF.py

@@ -2678 +2678 @@
         self.msg=msg
         self.parent = parent
-        #self.helpwin = self.parent.helpwin
         self.helpwin = helpwin
         self.helptxt = helptxt
@@ -2684 +2683 @@
         'Respond to a button press by displaying the requested text'
         try:
-            #helptxt = self.helptxt
+            ww,wh = self.helpwin.GetSize()
             ow,oh = self.helptxt.GetSize()
             self.helptxt.SetLabel(self.msg)
+            self.helptxt.Wrap(ww-10)
             w,h = self.helptxt.GetSize()
-            if h > oh:
+            if h > oh: # resize the help area if needed, but avoid changing width
+                self.helptxt.SetMinSize((ww,h))
                 self.helpwin.GetSizer().Fit(self.helpwin)
         except: # error posting help, ignore
@@ -2801 +2802 @@
         savebtn.Bind(wx.EVT_BUTTON,self._onSave)
         OKbtn = wx.Button(self, wx.ID_OK, "Use")
+        OKbtn.Bind(wx.EVT_BUTTON, lambda x: self.EndModal(wx.ID_OK))
         OKbtn.SetDefault()
         OKbuttons.append(OKbtn)
@@ -2833 +2835 @@
             defaultFile=self.defaultname,
             wildcard="CIF (*.cif)|*.cif",
-            style=wx.SAVE)
+            style=wx.FD_SAVE)
         val = (dlg.ShowModal() == wx.ID_OK)
         fil = dlg.GetPath()
@@ -2919 +2921 @@
                 txt = wx.StaticText(self,wx.ID_ANY,item+"  ")
                 fbox.Add(txt,(0,i+1))
-                # if self.cifdic.get(item):
-                #     df = self.cifdic[item].get('_definition')
-                #     if df:
-                #         txt.SetToolTipString(G2IO.trim(df))
-                #         but = CIFdefHelp(self,
-                #                          "Definition for "+item+":\n\n"+G2IO.trim(df),
-                #                          self.parent,
-                #                          self.parent.helptxt)
-                #         fbox.Add(but,(1,i+1),flag=wx.ALIGN_CENTER)
                 for j,val in enumerate(self.cifblk[item]):
                     ent = self.CIFEntryWidget(self.cifblk[item],j,item)
@@ -2947 +2940 @@
             for i in range(rows):
                 txt = wx.StaticText(self,wx.ID_ANY,str(i+1))
-                fbox.Add(txt,(i+2,0))
+                fbox.Add(txt,(i+1,0))
             line = wx.StaticLine(self,wx.ID_ANY, size=(-1,3), style=wx.LI_HORIZONTAL)
             vbox.Add(line, 0, wx.EXPAND|wx.ALL, 10)