2107 idf plot selection #2145

lucas-wilkins · 2022-08-15T15:44:35Z

Goal: add the IDF plot as a tab

Added IDF tab to corfunc
Further refactored corfunc plotting
Added IDF to reports

wpotrzebowski

I have problems running it from the installer on Mac.

Traceback (most recent call last):
File "sasview.py", line 15, in
File "sas/qtgui/MainWindow/MainWindow.py", line 113, in run_sasview
File "sas/qtgui/MainWindow/MainWindow.py", line 44, in init
File "PyInstaller/loader/pyimod02_importers.py", line 493, in exec_module
File "sas/qtgui/MainWindow/GuiManager.py", line 35, in
ModuleNotFoundError: No module named 'sas.qtgui.Utilities.Reports'
[93029] Failed to execute script 'sasview' due to unhandled exception: No module named 'sas.qtgui.Utilities.Reports'
[93029] Traceback:
Traceback (most recent call last):
File "sasview.py", line 15, in
File "sas/qtgui/MainWindow/MainWindow.py", line 113, in run_sasview
File "sas/qtgui/MainWindow/MainWindow.py", line 44, in init
File "PyInstaller/loader/pyimod02_importers.py", line 493, in exec_module
File "sas/qtgui/MainWindow/GuiManager.py", line 35, in
ModuleNotFoundError: No module named 'sas.qtgui.Utilities.Reports'

Does it work on Windows?
I guess there maybe some path missing in pyinstaller file.

lucas-wilkins · 2022-08-16T08:08:06Z

@wpotrzebowski I think @krzywon has fixed this in the as-yet-unmerged #2139

lucas-wilkins · 2022-08-16T08:14:35Z

@wpotrzebowski Try it now?

rozyczko

Looks good, minor issues raised

src/sas/qtgui/Perspectives/Corfunc/CorfuncCanvas.py

src/sas/qtgui/Perspectives/Corfunc/CorfuncPerspective.py

rozyczko · 2022-08-16T09:14:58Z

src/sas/qtgui/Perspectives/Corfunc/RealSpaceCanvas.py

+        if self.data is not None:
+            if len(self.data) == 2:


can be squeezed into one line

Another comment on these two lines -> typing only gives a suggestion of what should be passed to a method, but isn't a requirement. If self.data is a string two characters long, what happens?

Its a suggestion in the same way that a police officer might suggest that you've had too much to drink and that its time to go home.

src/sas/sascalc/data_util/calcthread.py

wpotrzebowski · 2022-08-16T09:26:27Z

Indeed, it seems to work now (from installer)

wpotrzebowski · 2022-08-16T09:37:36Z

I've tried it on two files that I think it used to work before (see attached screen shot).
Also Corfunc window on laptop screen is too big (and cannot be minimized to fit available space).

11:25:29 - INFO: --- SasView session started, version 5.0.5, 2022 --- 11:25:29 - INFO: Python: 3.8.13 (default, Jul 22 2022, 10:40:33) [Clang 12.0.0 (clang-1200.0.32.29)] 11:30:49 - ERROR: 'list' object has no attribute 'x' Traceback (most recent call last): File "sas/qtgui/MainWindow/DataExplorer.py", line 785, in sendData File "sas/qtgui/Perspectives/Corfunc/CorfuncPerspective.py", line 469, in setData File "sas/qtgui/Perspectives/Corfunc/CorfuncCanvas.py", line 63, in data File "sas/qtgui/Perspectives/Corfunc/QSpaceCanvas.py", line 78, in draw_data AttributeError: 'list' object has no attribute 'x' 11:31:22 - ERROR: 'method' object is not connected Traceback (most recent call last): File "sas/qtgui/MainWindow/DataExplorer.py", line 785, in sendData File "sas/qtgui/Perspectives/Corfunc/CorfuncPerspective.py", line 454, in setData TypeError: 'method' object is not connected

rozyczko · 2022-08-16T10:18:24Z

Same behaviour on Windows (on sending a file to the corfunc perspective)

Traceback (most recent call last):
  File "sas\qtgui\MainWindow\DataExplorer.py", line 785, in sendData
  File "sas\qtgui\Perspectives\Corfunc\CorfuncPerspective.py", line 469, in setData
  File "sas\qtgui\Perspectives\Corfunc\CorfuncCanvas.py", line 63, in data
  File "sas\qtgui\Perspectives\Corfunc\QSpaceCanvas.py", line 78, in draw_data
AttributeError: 'list' object has no attribute 'x'

lucas-wilkins · 2022-08-16T10:44:45Z

@rozyczko @wpotrzebowski Ah, this was broken by the merge from main to fix the installer.

smk78

Functionality test on W10/x64.
Does what it advertises. Just one minor bug: the legend for the IDF does not appear.

The Log Explorer says:

 WARNING: No handles with labels found to put in legend.

rozyczko · 2022-08-16T11:53:48Z

@rozyczko @wpotrzebowski Ah, this was broken by the merge from main to fix the installer.

and it works now!

…r in RealSpaceCanvas

lucas-wilkins · 2022-08-18T15:06:47Z

@wpotrzebowski @smk78 Better?

wpotrzebowski · 2022-08-19T06:59:08Z

Window scalling works fine now.

Two potential issues that arised while testing

Label and legend on IDF plot missing (as mentioned on the call on Tuesday)
When trying to generate report I get the following error:

8:52:20 - INFO:  --- SasView session started, version 5.0.5, 2022 ---
08:52:20 - INFO: Python: 3.8.13 (default, Jul 22 2022, 10:40:33) 
[Clang 12.0.0 (clang-1200.0.32.29)]
08:52:47 - WARNING: Background value results in negative intensities (1.051 > 0.44883)
08:54:14 - ERROR: Traceback (most recent call last):
  File "sas/qtgui/MainWindow/GuiManager.py", line 840, in actionReport
  File "sas/qtgui/Perspectives/Corfunc/CorfuncPerspective.py", line 788, in getReport
  File "sas/qtgui/Utilities/Reports/reports.py", line 106, in __init__
  File "importlib/resources.py", line 169, in read_text
  File "importlib/resources.py", line 125, in open_text
  File "PyInstaller/loader/pyimod02_importers.py", line 539, in open_resource
  File "pathlib.py", line 1222, in open
  File "pathlib.py", line 1078, in _opener
FileNotFoundError: [Errno 2] No such file or directory: '/private/var/folders/q3/5vy4nct93wg03ynnn836g49m0000gq/T/AppTranslocation/58FB7774-5D37-4038-9D15-6BD37D4AB3DB/d/SasView5.app/Contents/MacOS/sas/qtgui/Utilities/Reports/report_style.css'

lucas-wilkins · 2022-08-19T08:43:17Z

Label and legend on IDF plot missing (as mentioned on the call on Tuesday)

Legend was deleted, as there's only one curve on the IDF plot.

Axis label is not missing, it's just a long way to the left - it shows on my screen, which is perhaps wider than yours - if you have a sensible fix for it let me know.

When trying to generate report I get the following error:

Ooer, I'll look at that,, think its probably about packaging the CSS. I thought @krzywon's fix should have sorted that.

rozyczko · 2022-08-19T08:55:26Z

When trying to generate report I get the following error:

Ooer, I'll look at that,, think its probably about packaging the CSS. I thought @krzywon's fix should have sorted that.

I think the CSS file needs to be put somewhere more central than
SasView\\sas\\qtgui\\Utilities\\Reports\\report_style.css
We probably don't want to recreate this path in the installed app

smk78

Functionality test on W10/x64 using a 1920x1080 monitor.
When I first brought up the Corfunc perspective the bottom of the perspective was somewhere in the midst of the Lamellar Parameters dialog and I had to stretch the perspective downwards, which I was a little surprised about as there was plenty of screen real estate.
I note the (missing) IDF legend has now been removed completely. Which is fine. But as others have noted, the y-axis label is not initially displaying correctly:

However, stretching the perspective window to the right fixes this.
Saving extrapolated & transformed data to file worked fine.
Generating a report worked fine, and looked fine in the report dialog window, but the actual output is real ugly and needs looking at.
corfunc_report.pdf
At some point in what I was doing this appeared in the Console, possibly when I was 'reporting':

WARNING: getSize: Not a float '100%'

lucas-wilkins · 2022-08-19T10:55:42Z

When I first brought up the Corfunc perspective the bottom of the perspective was somewhere in the midst of the Lamellar Parameters dialog and I had to stretch the perspective downwards, which I was a little surprised about as there was plenty of screen real estate.

Yeah, it's either that or no scrolling. Unless you can think of a way of coercing the window to a good size.

lucas-wilkins · 2022-08-19T11:00:01Z

CSS file should now be included in the installers

lucas-wilkins · 2022-08-19T11:07:56Z

WARNING: getSize: Not a float '100%'

That's the html to pdf converter not liking how the width of the images is specified.

lucas-wilkins

@wpotrzebowski this should fix the report issue you had

smk78

Testing latest changes on W10/x64. Plots are now separated in the report.

lucas-wilkins · 2022-08-19T15:21:11Z

SasView can find the css file now, but doesn't have permission to read it for some reason.

…(source_file, target_directory)

lucas-wilkins · 2022-08-19T16:27:15Z

Woooooo, finally, reports bugs all squashed!

lucas-wilkins added 8 commits August 15, 2022 14:28

Main changes made

7b12817

Some debugging

e227f57

Default tab change

2bf848d

Default tab on load

bda4054

More debugging

5c391f6

Idiomatised calcthread, fixed bug

eb3c35a

Fixed test bug

78ac216

Fixed unnecessary circular import

7240c1c

lucas-wilkins linked an issue Aug 15, 2022 that may be closed by this pull request

IDF plot selection #2107

Closed

lucas-wilkins requested review from krzywon, rozyczko, smk78 and wpotrzebowski August 15, 2022 15:44

butlerpd added the Discuss At The Call Issues to be discussed at the fortnightly call label Aug 15, 2022

wpotrzebowski reviewed Aug 16, 2022

View reviewed changes

Merge branch 'main' into 2107-idf-plot-selection

d972051

lucas-wilkins mentioned this pull request Aug 16, 2022

Use sasdata package in place of sas.sascalc.dataloader #2141

Merged

Merge branch 'main' into 2107-idf-plot-selection

1b1e750

rozyczko approved these changes Aug 16, 2022

View reviewed changes

lucas-wilkins added 2 commits August 16, 2022 11:39

removed unused input

a7852a0

Removed commented text

6220537

Fixed bug from merge

dc1a8d6

smk78 reviewed Aug 16, 2022

View reviewed changes

lucas-wilkins added 3 commits August 17, 2022 16:15

Reverted rename

c88ff8b

Fixed reversion bug

150f9b3

Removed empty legend

19b2e36

lucas-wilkins requested a review from krzywon August 17, 2022 15:36

lucas-wilkins and others added 2 commits August 17, 2022 16:40

Fixed empty legend in IDF, typing in CorfuncCanvas, and made one-line…

8bc0081

…r in RealSpaceCanvas

Merge branch 'main' into 2107-idf-plot-selection

38e170f

krzywon approved these changes Aug 18, 2022

View reviewed changes

Added scroll bar to corfunc window

806754e

lucas-wilkins requested review from wpotrzebowski and smk78 August 18, 2022 16:59

smk78 reviewed Aug 19, 2022

View reviewed changes

Missing comma prevented css addition

af975d2

Added <p> tags for each plot in report

a7517f4

lucas-wilkins commented Aug 19, 2022

View reviewed changes

Merge branch 'main' into 2107-idf-plot-selection

192954f

smk78 approved these changes Aug 19, 2022

View reviewed changes

lucas-wilkins added 2 commits August 19, 2022 15:30

Added .css to .spec

9f00160

Comma

c900a90

spec file can't cope with (source_file, target_file) format, must be …

2108910

…(source_file, target_directory)

lucas-wilkins merged commit 8514803 into main Aug 19, 2022

krzywon deleted the 2107-idf-plot-selection branch August 19, 2022 19:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

2107 idf plot selection #2145

2107 idf plot selection #2145

lucas-wilkins commented Aug 15, 2022 •

edited

Loading

wpotrzebowski left a comment

lucas-wilkins commented Aug 16, 2022

lucas-wilkins commented Aug 16, 2022

rozyczko left a comment

rozyczko Aug 16, 2022

krzywon Aug 16, 2022

lucas-wilkins Aug 17, 2022

wpotrzebowski commented Aug 16, 2022

wpotrzebowski commented Aug 16, 2022

rozyczko commented Aug 16, 2022

lucas-wilkins commented Aug 16, 2022

smk78 left a comment

rozyczko commented Aug 16, 2022

lucas-wilkins commented Aug 18, 2022

wpotrzebowski commented Aug 19, 2022

lucas-wilkins commented Aug 19, 2022

rozyczko commented Aug 19, 2022

smk78 left a comment

lucas-wilkins commented Aug 19, 2022

lucas-wilkins commented Aug 19, 2022

lucas-wilkins commented Aug 19, 2022

lucas-wilkins left a comment

smk78 left a comment

lucas-wilkins commented Aug 19, 2022

lucas-wilkins commented Aug 19, 2022

2107 idf plot selection #2145

2107 idf plot selection #2145

Conversation

lucas-wilkins commented Aug 15, 2022 • edited Loading

wpotrzebowski left a comment

Choose a reason for hiding this comment

lucas-wilkins commented Aug 16, 2022

lucas-wilkins commented Aug 16, 2022

rozyczko left a comment

Choose a reason for hiding this comment

rozyczko Aug 16, 2022

Choose a reason for hiding this comment

krzywon Aug 16, 2022

Choose a reason for hiding this comment

lucas-wilkins Aug 17, 2022

Choose a reason for hiding this comment

wpotrzebowski commented Aug 16, 2022

wpotrzebowski commented Aug 16, 2022

rozyczko commented Aug 16, 2022

lucas-wilkins commented Aug 16, 2022

smk78 left a comment

Choose a reason for hiding this comment

rozyczko commented Aug 16, 2022

lucas-wilkins commented Aug 18, 2022

wpotrzebowski commented Aug 19, 2022

lucas-wilkins commented Aug 19, 2022

rozyczko commented Aug 19, 2022

smk78 left a comment

Choose a reason for hiding this comment

lucas-wilkins commented Aug 19, 2022

lucas-wilkins commented Aug 19, 2022

lucas-wilkins commented Aug 19, 2022

lucas-wilkins left a comment

Choose a reason for hiding this comment

smk78 left a comment

Choose a reason for hiding this comment

lucas-wilkins commented Aug 19, 2022

lucas-wilkins commented Aug 19, 2022

lucas-wilkins commented Aug 15, 2022 •

edited

Loading