Merge pull request #87 from dragonyanglong/fix_win

Fix wxpython insert list error in windows

Author: dragonyanglong

src/diffpy/pdfgui/gui/design/plotpanel.wxg

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade 0.9.3 on Tue Aug 13 14:23:49 2019 -->
+<!-- generated by wxGlade 1.0.4 on Tue Feb 28 22:57:41 2023 -->
 
 <application encoding="ISO-8859-1" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" option="0" overwrite="0" path="../plotpanel.py" source_extension=".cpp" use_gettext="0" use_new_namespace="1">
     <object class="PlotPanel" name="panel_1" base="EditTopLevelPanel">

src/diffpy/pdfgui/gui/pdfguiglobals.py

@@ -23,7 +23,7 @@
 # Maximum number of files to be remembered
 MAXMRU = 5
 # The location of the configuration file
-configfilename = os.path.expanduser("~/.pdfgui.cfg")
+configfilename = os.path.expanduser("~/.pdfgui_py3.cfg")
 # Project modification flag
 isAltered = False
 

src/diffpy/pdfgui/gui/plotpanel.py

@@ -32,16 +32,45 @@ def __init__(self, *args, **kwds):
         kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
         wx.Panel.__init__(self, *args, **kwds)
         self.SetSize((456, 659))
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_3 = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, "X"), wx.HORIZONTAL)
+        sizer_1.Add(sizer_3, 0, wx.EXPAND, 0)
+
         self.xDataCombo = wx.ComboBox(self, wx.ID_ANY, choices=[], style=wx.CB_READONLY)
+        sizer_3.Add(self.xDataCombo, 1, wx.ALL, 5)
+
+        sizer_4 = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, "Y"), wx.HORIZONTAL)
+        sizer_1.Add(sizer_4, 1, wx.EXPAND, 0)
+
         self.yDataList = KeyEventsListCtrl(self, wx.ID_ANY, style=wx.BORDER_SUNKEN | wx.LC_NO_HEADER | wx.LC_REPORT)
+        sizer_4.Add(self.yDataList, 1, wx.ALL | wx.EXPAND, 5)
+
+        sizer_6 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_6, 0, wx.EXPAND, 0)
+
         self.offsetLabel = wx.StaticText(self, wx.ID_ANY, "offset", style=wx.ALIGN_RIGHT)
+        sizer_6.Add(self.offsetLabel, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.offsetTextCtrl = wx.TextCtrl(self, wx.ID_ANY, "-5", style=wx.TE_PROCESS_ENTER)
+        sizer_6.Add(self.offsetTextCtrl, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.static_line_1 = wx.StaticLine(self, wx.ID_ANY)
+        sizer_1.Add(self.static_line_1, 0, wx.BOTTOM | wx.EXPAND | wx.TOP, 5)
+
+        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_2, 0, wx.EXPAND, 0)
+
         self.plotButton = wx.Button(self, wx.ID_ANY, "Plot")
+        sizer_2.Add(self.plotButton, 0, wx.ALL, 5)
+
         self.resetButton = wx.Button(self, wx.ID_ANY, "Reset")
+        sizer_2.Add(self.resetButton, 0, wx.ALL, 5)
+
+        self.SetSizer(sizer_1)
 
-        self.__set_properties()
-        self.__do_layout()
+        self.Layout()
 
         self.Bind(wx.EVT_TEXT_ENTER, self.onEnter, self.offsetTextCtrl)
         self.Bind(wx.EVT_BUTTON, self.onPlot, self.plotButton)
@@ -52,33 +81,6 @@ def __init__(self, *args, **kwds):
         self.Bind(wx.EVT_LIST_ITEM_DESELECTED, self._check,  self.yDataList)
         self.__customProperties()
 
-    def __set_properties(self):
-        # begin wxGlade: PlotPanel.__set_properties
-        self.SetSize((456, 659))
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: PlotPanel.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_6 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4 = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, "Y"), wx.HORIZONTAL)
-        sizer_3 = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, "X"), wx.HORIZONTAL)
-        sizer_3.Add(self.xDataCombo, 1, wx.ALL, 5)
-        sizer_1.Add(sizer_3, 0, wx.EXPAND, 0)
-        sizer_4.Add(self.yDataList, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_1.Add(sizer_4, 1, wx.EXPAND, 0)
-        sizer_6.Add(self.offsetLabel, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        sizer_6.Add(self.offsetTextCtrl, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        sizer_1.Add(sizer_6, 0, wx.EXPAND, 0)
-        sizer_1.Add(self.static_line_1, 0, wx.BOTTOM | wx.EXPAND | wx.TOP, 5)
-        sizer_2.Add(self.plotButton, 0, wx.ALL, 5)
-        sizer_2.Add(self.resetButton, 0, wx.ALL, 5)
-        sizer_1.Add(sizer_2, 0, wx.EXPAND, 0)
-        self.SetSizer(sizer_1)
-        self.Layout()
-        # end wxGlade
-
     # USER CONFIGURATION CODE #################################################
     def __customProperties(self):
         """Custom Properties go here."""
@@ -196,7 +198,8 @@ def _represent(mixedNames):
         # Fill the List
         self.yDataList.DeleteAllItems()
         for val in yvals:
-            self.yDataList.InsertItem(sys.maxsize, str(val))
+            # self.yDataList.InsertItem(sys.maxsize, str(val)) #doesn't work for windows
+            self.yDataList.InsertItem(100000, str(val))
         self.yDataList.makeIDM()
         self.yDataList.initializeSorter()
         if yvals: