Support wxpython 4 by pavoljuhas · Pull Request #34 · diffpy/diffpy.pdfgui

pavoljuhas · 2019-07-19T23:15:55Z

Work in progress

Implements #33.
This incorporates @dragonyanglong update_wxglade_version branch.

Status: PDFgui starts with plenty of wx deprecation warnings and
crashes with segfault after phase or dataset selection in the fit tree.

TODO

clean up deprecation warnings
make sure we stay compatible with wxpython3
Ubuntu 16 provides only wxpython 3.
track and fix segfaults in wxpython4
fix monospace font

Update `aboutdialog`, `calculation`, `datasetconfigure`, and `output` panels to wxGlade 0.9.3 and wxpython 4.0.4. No changes in code function.

Update all design files with wxglade 0.9.3.

Show relevant wxglade version and source-generation date.

OutputPanel was removed by editing generated code, but remained in the wxg file, which put it back on code refresh. Remove it now from both the code and wxg.

wxpython4 removed underscored plain functions.

`wx.grid.EVT_GRID_CMD_CELL_CHANGE` was removed.

Fix `wx.Font` arguments mismatch in wxpython 4.

sizer objects have been removed after upgrade to wxpython4.

Preserve compatibility with wxpython 3.

codecov · 2019-07-19T23:21:49Z

Codecov Report

Merging #34 into master will increase coverage by 31.75%.
The diff coverage is 90.41%.

@@             Coverage Diff             @@
##           master      #34       +/-   ##
===========================================
+ Coverage   27.86%   59.61%   +31.75%     
===========================================
  Files          89       98        +9     
  Lines       11717    11988      +271     
===========================================
+ Hits         3265     7147     +3882     
+ Misses       8452     4841     -3611

Impacted Files	Coverage Δ
src/diffpy/pdfgui/tests/TestPDFGuiControl.py	`58.33% <ø> (-41.67%)`	⬇️
src/diffpy/pdfgui/gui/supercelldialog.py	`0% <0%> (ø)`	⬆️
src/diffpy/pdfgui/gui/sgconstraindialog.py	`15.66% <0%> (+15.66%)`	⬆️
src/diffpy/pdfgui/gui/bondlengthdialog.py	`0% <0%> (ø)`	⬆️
src/diffpy/pdfgui/gui/sgstructuredialog.py	`0% <0%> (ø)`	⬆️
src/diffpy/pdfgui/gui/errorreportdialog.py	`21.81% <0%> (-0.21%)`	⬇️
src/diffpy/pdfgui/gui/phasepanelutils.py	`42.24% <0%> (+42.24%)`	⬆️
src/diffpy/pdfgui/tests/testinsertrowsdialog.py	`100% <100%> (ø)`
src/diffpy/pdfgui/gui/temperatureseriespanel.py	`62.1% <100%> (+62.1%)`	⬆️
src/diffpy/pdfgui/gui/calculationpanel.py	`63.69% <100%> (+63.69%)`	⬆️
... and 96 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3412cff...50943ae. Read the comment docs.

Must start with `FD_` prefix. Drop single `FD_OPEN` which is already the default style.

PyTextDataObject --> TextDataObject NamedColour --> Colour InsertStringItem --> InsertItem AddSimpleTool --> AddTool

Binding via event call is deprecated.

Fixes segmentation fault on SetBackgroundColour.

GetSizeTuple --> GetSize

GridCellAttr had under counted reference count. Use `attr.IncRef()` before each `SetSomething(attr)` call.

First column in ParametersPanel grid is read-write.

Context manager to temporarily override `webbrowser.open`.

Remove unnecessary uncovered code.

icons were not installed with `pip installation`.

Ensure icon paths are correctly resolved.

Disable ErrorReportDialog when testing GUI widgets.

Add `_expand_tooltip_aliases` utility to help with repeated tooltips.

Handle overload for plain superclass Append.

MenuItem.SetText --> SetItemLabel Window.GetPositionTuple --> GetPosition

Temporarily disable the PopupMenu method. Fix hanging tests on Linux and travis.

Replace with `InsertItem`. Keep as is for WX3.

Expose WX4 failure due to renamed constant.

- `CHANGE_DIR` --> `FD_CHANGE_DIR` - `OVERWRITE_PROMPT` --> `FD_OVERWRITE_PROMPT` - `SAVE` --> `FD_SAVE`

As of matplotlib 1.2 the `NavigationToolbar2Wx.save` method was renamed to `save_figure`. The `save` function in the derived class ExtendedToolbar is thus never called.

Path resolution of libgsl.a has been fixed in pdffit2 1.2.

Replace with `ListCtrl.SetItem`.

Keep using `wx.NewId` in WX3.

Factor out `TestParametersPanel._clickcell` to a shared function.

Replace `wx.TheClipboard` with a dummy object to prevent clipboard modifications.

Avoid clipboard access from implied `canPasteIntoCells` call.

The `test__resampledPDFDataSet` method belongs to TestFitDataSet class. Also fix docstring typo.

dragonyanglong and others added 10 commits July 19, 2019 15:36

MAINT: update some wxGlade panels version

5e45d26

Update `aboutdialog`, `calculation`, `datasetconfigure`, and `output` panels to wxGlade 0.9.3 and wxpython 4.0.4. No changes in code function.

MNT: rebuild gui code for wxpython 3

ad0cd78

Update all design files with wxglade 0.9.3.

MNT: update wxglade-mark comments

767fc06

Show relevant wxglade version and source-generation date.

MNT: sync fitnotebookpanel.wxg with hardcoded change

d1899bf

OutputPanel was removed by editing generated code, but remained in the wxg file, which put it back on code refresh. Remove it now from both the code and wxg.

MNT: wx4 - migrate to renamed static functions

5cc141f

wxpython4 removed underscored plain functions.

MNT WX4: use EVT_GRID_CMD_CELL_CHANGED

0700f12

`wx.grid.EVT_GRID_CMD_CELL_CHANGE` was removed.

MNT WX4: fix configuration of monospace font

67508d7

Fix `wx.Font` arguments mismatch in wxpython 4.

MNT WX4: drop undefined flag wx.TR_EXTENDED

204c056

MNT WX4: remove tooltips for non-existant sizers

8b51578

sizer objects have been removed after upgrade to wxpython4.

MNT WX4: update GridEvent initialization

a11c511

Preserve compatibility with wxpython 3.

pavoljuhas added 19 commits July 22, 2019 18:26

MNT WX4: replace deprecated wx functions

8ab573c

MNT WX4: fix renamed FileDialog constants

33c1855

Must start with `FD_` prefix. Drop single `FD_OPEN` which is already the default style.

MNT WX4: rename deprecated functions

1220a31

PyTextDataObject --> TextDataObject NamedColour --> Colour InsertStringItem --> InsertItem AddSimpleTool --> AddTool

MNT WX4: use Bind instead of Event.__call__

ace9c86

Binding via event call is deprecated.

BUG WX4: replace method for text background color

8f95908

Fixes segmentation fault on SetBackgroundColour.

MNT WX4: replace deprecated function

5e37792

GetSizeTuple --> GetSize

BUG WX4: fix wxAssertionError on PDFgui exit

919ab2e

GridCellAttr had under counted reference count. Use `attr.IncRef()` before each `SetSomething(attr)` call.

MNT: remove long dead code

993cca4

First column in ParametersPanel grid is read-write.

TST: add overridewebbrowser helper function

7e7c72f

Context manager to temporarily override `webbrowser.open`.

TST: cover gui.aboutdialog module

4beb70c

MNT: prune code for showing about dialog

181db2a

Remove unnecessary uncovered code.

TST: clean up wx.App instances when done

a19512a

BLD: require wxpython 4 for conda build

f690097

BLD: fix conda recipe

d9c6186

icons were not installed with `pip installation`.

CI: use easy_install for native Linux on travis

0c61d8e

Ensure icon paths are correctly resolved.

TST: add GUITestCase specialized class

59b9a01

Disable ErrorReportDialog when testing GUI widgets.

TST: add stub test of PhaseConfigurePanel

bba709e

ENH: define more tooltips for phase panel

96e8c7d

Add `_expand_tooltip_aliases` utility to help with repeated tooltips.

MNT: use wx3/4 compatible tooltips for dopingseriespanel

b72f13f

pavoljuhas added 13 commits August 28, 2019 13:31

BUG: fix wx12.Menu.Append support for WX3

40ce7ea

Handle overload for plain superclass Append.

MNT: replace methods deprecated in WX4

3a84080

MenuItem.SetText --> SetItemLabel Window.GetPositionTuple --> GetPosition

TST: cover DataSetPanel.refreshSelectedPage

c038796

TST: avoid display of modal menu

22d1da1

Temporarily disable the PopupMenu method. Fix hanging tests on Linux and travis.

TST: partially cover DopingSeriesPanel class

3c2031b

MNT: replace deprecated ListCtrl.InsertStringItem

a2f4f5a

Replace with `InsertItem`. Keep as is for WX3.

MNT: correct name of a test case class

a0416a4

TST: partial cover of ExtendedPlotFrame

f2a66c9

MNT: support ToolBar.AddTool overload in wx3

547f7ca

TST: cover ExtendedPlotFrame.savePlotData

7d5d6ce

Expose WX4 failure due to renamed constant.

BUG: fix wx constants renamed in wx4

719e515

- `CHANGE_DIR` --> `FD_CHANGE_DIR` - `OVERWRITE_PROMPT` --> `FD_OVERWRITE_PROMPT` - `SAVE` --> `FD_SAVE`

MNT: remove dead code

24ba5b1

As of matplotlib 1.2 the `NavigationToolbar2Wx.save` method was renamed to `save_figure`. The `save` function in the derived class ExtendedToolbar is thus never called.

CI: remove obsolete workaround

4c8ea2d

Path resolution of libgsl.a has been fixed in pdffit2 1.2.

pavoljuhas force-pushed the support-wxpython-4 branch from c1eeab5 to 4c8ea2d Compare September 9, 2019 21:34

pavoljuhas added 13 commits September 10, 2019 11:07

TST: cover insertrowsdialog module

45b029c

TST: partially cover MainFrame.disableMainMenuItems

51754f3

TST: partially cover TemperatureSeriesPanel class

2834bad

MNT: replace deprecated ListCtrl.SetStringItem

eb4e0e6

Replace with `ListCtrl.SetItem`.

MNT: replace deprecated wx.NewId with wx.NewIdRef

87e9858

Keep using `wx.NewId` in WX3.

MNT: remove unused method

2d2c0f5

TST: cover ParametersPanel.popupMenu

d363b77

TST: skip failing test of deprecated feature

b7e395b

MNT: add shared test helper function clickcell

0fc384f

Factor out `TestParametersPanel._clickcell` to a shared function.

TST: cover PhaseConfigurePanel.popupMenu

e609247

TST: add helper context overrideclipboard

e2614a6

Replace `wx.TheClipboard` with a dummy object to prevent clipboard modifications.

TST: fix blocking test on Linux

97c9760

Avoid clipboard access from implied `canPasteIntoCells` call.

MNT: fix commented-out definition of TestFitDataSet

50943ae

The `test__resampledPDFDataSet` method belongs to TestFitDataSet class. Also fix docstring typo.

pavoljuhas merged commit 50943ae into diffpy:master Sep 24, 2019

pavoljuhas deleted the support-wxpython-4 branch September 24, 2019 15:24

pavoljuhas mentioned this pull request Dec 3, 2020

Support Python 3 in addition to Python 2 #42

Closed

1 task done

Navigation Menu

Repository navigation

Support wxpython 4 - #34

Support wxpython 4#34
pavoljuhas merged 93 commits into
diffpy:masterfrom
pavoljuhas:support-wxpython-4

pavoljuhas commented Jul 19, 2019 •

edited

Loading

Uh oh!

codecov Bot commented Jul 19, 2019 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

pavoljuhas commented Jul 19, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Work in progress

TODO

Uh oh!

codecov Bot commented Jul 19, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

pavoljuhas commented Jul 19, 2019 •

edited

Loading

codecov Bot commented Jul 19, 2019 •

edited

Loading