Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tabs, Batch Processing and 2D data slicing and processing for pr (rebase) #3137

Draft
wants to merge 123 commits into
base: main
Choose a base branch
from

Commits on Oct 25, 2024

  1. Adds Tab support for Pr. (Batch Mode not yet functional)

    issue #1448 - Enable batch processing for P(r)
    
    NOTE: This issue is not yet fixed.
    
    Feature:
    
    Selected data sent from the load data can now be sent to Pr window and a new tab will appear for each data set. Although the goal is batch calculate all data and neatly display in a table the current “non batch” tab method can be used for quick references of calculations for each file. In the nect commit I intend to implement a batch tab. Notes for those are in the bottom.
    
    Dev note
    
    -  1) Block automatic calculation after data is sent to Pr prospective whilst batch mode is deselected. (Allow users to hit calculate) Or block graphs from showing automatically as it clusters the interface.
    
    -  2) Fix batch Mode
    o  When batch mode is selected create only one tab (similar to fitting)
    o  New interface for batch / same interface could be used with the addition of “Fit” / ” Graph” button conjunction with the 1st TODO.
    
    3) Clean up Code. The current files ive modified/created are messy. Also comment code
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    27378dc View commit details
    Browse the repository at this point in the history
  2. Added Batch Processing for Pr, However the interface is currently slo…

    …w and efficient. also a way to display/export all the data in a table is still required
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    0ad4fdf View commit details
    Browse the repository at this point in the history
  3. Added Tabs and Batch Processing for Pr.

    Currently, Tabs works. Batch still has a little ironing out to do. mainly its interaction with setCurrentData(). Additionally, The data from Batch still needs to be sent to a Table and eventual reported/exported.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    89179b1 View commit details
    Browse the repository at this point in the history
  4. Added Batch Processing for Pr - work in progress

    files calculated using Pr can now be batch Processed and saved to a table. However, a lot of work is still left to fix optimise and automate specific parts of this feature.
    
    things still left to fix
    - [ ] calculate all files before showing the table
    - [ ] perform calculations without stop showing the plots as it slows down and clutters the interface
    - [ ] optimise, clean and comment the code
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    a71e28e View commit details
    Browse the repository at this point in the history
  5. Automatically Batch Process all selected files for Pr - work in progress

    Files imported into Pr interface can now automatically be processed and outputs displayed in a table. Code still requires to be optimised and cleaned. A better way to update the table is also required.
    
    things still left to fix
    - [x] calculate all files before showing the table
    - [x] perform calculations without stop showing the plots as it slows down and clutters the interface
    - [ ] optimise, clean and comment the code
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    1907480 View commit details
    Browse the repository at this point in the history
  6. Tab and Batch mode for Pr is now functional.

    However, im still getting errors with displayChange and setCurrentData even though the calculations and outputs are successful.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    a76efb8 View commit details
    Browse the repository at this point in the history
  7. Fixed Batch Tabs for Pr inversion.

     Batch Processing still not working properly. Cleaned a bit of the code(That I was working on). 2D data shows a plot of the data however calculations still cannot be made. in the process of coding the bit gets a slice of the 2D data.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    336bd0f View commit details
    Browse the repository at this point in the history
  8. 2D data to 1D data for Pr is now functional.

    when 2D data is loaded into Pr interface a raw data plot should pop up. Using the Pr interface, parameters for the conversions can be inputted and when calculated should update the graphs and calculate the Pr values for those specific slices.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    d3e1cb5 View commit details
    Browse the repository at this point in the history
  9. Sliced 2D data can be imported to Pr inverter and multiple slices can…

    … be plotted on a single plot.
    
    However, currently only one of the slices is calculated using Pr, this will be changed (Hopefully) in the next commit so that all sliced can be processed together similarly to 1D Batch and its outputs displayed in a table.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    4e2aace View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    8ce6ae4 View commit details
    Browse the repository at this point in the history
  11. 2D data has a new tab (Ui) with an outputs table.

    the table populates the slices created and the button when pressed need to show plots of the slice.
    
    calculate all button need to also be fixed. the data cannot be read as its not in the right object.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    1b94890 View commit details
    Browse the repository at this point in the history
  12. batch results are consistent now however there are a few bugs with up…

    …dating the gui and getting/setting parameters.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    6efc53a View commit details
    Browse the repository at this point in the history
  13. Batch results will display Number of terms, reg const and Max Distance.

     Furthermore, the data output ont the batch table will be from self._calculator. this means It's flexible for further expansions and is just as reliable as the gui. Although a few Issues still remain during calculation, one being Q range being set to 0 or bellow which causes the data set to not be calculated and the calculations of the previous data to be set for the 'current' data set (Hence you might see duplicate rows with different file names). In my previous commit in the branch 1D data could not be uploaded for individual calculation that bug has now been fixed. Code still needs to be cleaned up and commented.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    75d4dd8 View commit details
    Browse the repository at this point in the history
  14. got 2D data slices to Show up on batch table.

    this is a bit of a hacky way of getting it to work and is just to get an idea of how it might work. things to improve upon are :-
    
    - [ ] Getting the table in GridPanel.py to work flexibly for both 1D batch aswell as 2D slices.
    
    - [ ] cleaning up slices()
    
    - [ ] making showBatchOutput() more portable
    
    - [ ] creating batch like datalist support for 2D slices. (so that it can be batch processed just like 1D batch files)
    
    - [ ] SORTING OUT THE ERRORS
    
    - [ ] (Might need help) Fix the Wierd Parameter issue. (Currently set/default parameters change to estimates which makes it hard to use reliabely. Background, Qmin and Qmax is also not working as expected, it sets itself to a value bellow 0 causing it to not calculate for that slice.)
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    e0f6838 View commit details
    Browse the repository at this point in the history
  15. Working on Batch Processing for 2D slices.

    need to test, clean up code, and make sure that this doesn't affect 1D batch processing
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    babae42 View commit details
    Browse the repository at this point in the history
  16. Batch Pr processing of 1D data and 2D slices is now functional. Addit…

    …ionally, Q min and Q Max can be seen in the Batch results panel.
    
    However, further testing and Code cleaning is required. Newly created pop up windows such as the batch results, 1D slice plot, and 2D image plots need to be connected with the interface and made to fit in withing the UI.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    06310e8 View commit details
    Browse the repository at this point in the history
  17. Batch Pr processing of 1D data and 2D slices is now functional. Addit…

    …ionally, Q min and Q Max can be seen in the Batch results panel.
    
    However, further testing and Code cleaning is required. Newly created pop up windows such as the batch results, 1D slice plot, and 2D image plots need to be connected with the interface and made to fit in withing the UI.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    34147d7 View commit details
    Browse the repository at this point in the history
  18. Fixed new tab (first tab) from not being able to set data to. Enables…

    … Pr fit and I(q) plots.
    
    This Version should somewhat work besides the found bugs.
    Testing and code cleaning still required.
    
    - [ ]  Batch Processing might not yet be reliable. A row or 2 might duplicate if a parameter is not right eg: Qmax or NoOfTerms.
    
    - [ ] Dropdown menu Goes back to previous Item if user decides to change.
    
    - [ ] All New Windows Are outside the SasView Interface.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    01efd11 View commit details
    Browse the repository at this point in the history
  19. Parameters for individual data sets can be set using the dropdown men…

    …u. Additionally the dropdown menu used to not set to new selected data which has been fixed. however, in this version 2D data slicing is bracken this is due to some changes with how raw batch data is handles.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    1b70b11 View commit details
    Browse the repository at this point in the history
  20. set parameters for items in the dropdown menu of batch will saved for…

    … the dataset. when switched back to the dateset (using the dropdown menu) the parameters selected prevously will be set.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    abe24be View commit details
    Browse the repository at this point in the history
  21. Result Duplication Issue has slightly been patched by setting calcThr…

    …ead to a dir so each data file could be assigned to a thread instance. estimationThread and estimationThreadNT might also need to be changed as such. however more testing is required.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    60477e6 View commit details
    Browse the repository at this point in the history
  22. made a few changed to slicing and 1D batch.

    slicing: slices data are turned into model using the createModelItemWithPlot function.
    this is makes it much easier to move around as it can work just like 1D data.
    
    1D batch: Parameters set before batch processing is remembered and used when processed using batch mode.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    e4d19ec View commit details
    Browse the repository at this point in the history
  23. got batch processing to spit out actual calculations rather then "est…

    …imations".
    
    Parameters whilst, Batch Processing is also remembered.
    Estimated data doesn't mess with actual data unless suggested button is pressed.
    However, Duplication issue still remains.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    3b7b73b View commit details
    Browse the repository at this point in the history
  24. Calculations on batch interface is more reliable now. Calculations do…

    …ne using to Calculate all button is still a bit buggy.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    041483f View commit details
    Browse the repository at this point in the history
  25. Slicer works a bit smother now.

    Still a bit more tweaking is required for batch processing slices.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    155ca96 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    5a52223 View commit details
    Browse the repository at this point in the history
  27. fixed exporting from table issue, buttons in slicer now updates the 2…

    …D rawImage and shows slice using phi. Fixed buttons. Minor cleanups. fixed 2D slices from not being batched processed.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    7938604 View commit details
    Browse the repository at this point in the history
  28. Plots Behaviour is designed to be more dynamic.

    for Devs: Plots in Pr can be disabled using self._allowPlots
    
    Plot Behaviour:
    if Batch or Data2D Slices -> hide Plots
    if Button(Calculate) or Single Data1D -> show Plots
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    51c47c5 View commit details
    Browse the repository at this point in the history
  29. Cleaned and Added Comments to InversionWidget.py, broke down a few of…

    … the lager functions into smaller functions. And Changes the Warnings for GridPanel.py.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    8303ce6 View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    0e769d3 View commit details
    Browse the repository at this point in the history
  31. minor compatibility changes to allow changes made in the main branch …

    …during the time this branch was not updated with it.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    4cdf997 View commit details
    Browse the repository at this point in the history
  32. Few housekeeping changes. tried to fix 2D plotting issue, but I can't…

    … seem get to run with the following code
    
    ```
            GuiUtils.updateModelItemWithPlot(item, new_plot, new_plot.id)
    
            self.base.manager.communicator.plotUpdateSignal.emit([new_plot])
            self.base.manager.communicator.forcePlotDisplaySignal.emit([item, new_plot])
    ```
    
    changes made using feedback from:
    
    1) #2181 (comment)
    removed as it was something that I was testing out but didn't end up using.
    
    2) #2181 (comment)
    Moved closeEvent() from InversionWidget.py to InversionPerspective.py.
    
    3) #2181 (comment)
    changed `from sas.sascalc.dataloader.manipulations import SectorQ` to `from sasdata.data_util.manipulations import SectorQ`
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    6070541 View commit details
    Browse the repository at this point in the history
  33. Main errors corrected

    lucas-wilkins authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    17c2451 View commit details
    Browse the repository at this point in the history
  34. Adds Tab support for Pr. (Batch Mode not yet functional)

    issue #1448 - Enable batch processing for P(r)
    
    NOTE: This issue is not yet fixed.
    
    Feature:
    
    Selected data sent from the load data can now be sent to Pr window and a new tab will appear for each data set. Although the goal is batch calculate all data and neatly display in a table the current “non batch” tab method can be used for quick references of calculations for each file. In the nect commit I intend to implement a batch tab. Notes for those are in the bottom.
    
    Dev note
    
    -  1) Block automatic calculation after data is sent to Pr prospective whilst batch mode is deselected. (Allow users to hit calculate) Or block graphs from showing automatically as it clusters the interface.
    
    -  2) Fix batch Mode
    o  When batch mode is selected create only one tab (similar to fitting)
    o  New interface for batch / same interface could be used with the addition of “Fit” / ” Graph” button conjunction with the 1st TODO.
    
    3) Clean up Code. The current files ive modified/created are messy. Also comment code
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    064c1af View commit details
    Browse the repository at this point in the history
  35. Added Batch Processing for Pr, However the interface is currently slo…

    …w and efficient. also a way to display/export all the data in a table is still required
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    84d9f8d View commit details
    Browse the repository at this point in the history
  36. Added Tabs and Batch Processing for Pr.

    Currently, Tabs works. Batch still has a little ironing out to do. mainly its interaction with setCurrentData(). Additionally, The data from Batch still needs to be sent to a Table and eventual reported/exported.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    089fecf View commit details
    Browse the repository at this point in the history
  37. Added Batch Processing for Pr - work in progress

    files calculated using Pr can now be batch Processed and saved to a table. However, a lot of work is still left to fix optimise and automate specific parts of this feature.
    
    things still left to fix
    - [ ] calculate all files before showing the table
    - [ ] perform calculations without stop showing the plots as it slows down and clutters the interface
    - [ ] optimise, clean and comment the code
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    e21d8e7 View commit details
    Browse the repository at this point in the history
  38. Automatically Batch Process all selected files for Pr - work in progress

    Files imported into Pr interface can now automatically be processed and outputs displayed in a table. Code still requires to be optimised and cleaned. A better way to update the table is also required.
    
    things still left to fix
    - [x] calculate all files before showing the table
    - [x] perform calculations without stop showing the plots as it slows down and clutters the interface
    - [ ] optimise, clean and comment the code
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    3571ad5 View commit details
    Browse the repository at this point in the history
  39. Tab and Batch mode for Pr is now functional.

    However, im still getting errors with displayChange and setCurrentData even though the calculations and outputs are successful.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    440e8e1 View commit details
    Browse the repository at this point in the history
  40. Fixed Batch Tabs for Pr inversion.

     Batch Processing still not working properly. Cleaned a bit of the code(That I was working on). 2D data shows a plot of the data however calculations still cannot be made. in the process of coding the bit gets a slice of the 2D data.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    68e3eee View commit details
    Browse the repository at this point in the history
  41. 2D data to 1D data for Pr is now functional.

    when 2D data is loaded into Pr interface a raw data plot should pop up. Using the Pr interface, parameters for the conversions can be inputted and when calculated should update the graphs and calculate the Pr values for those specific slices.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    2f392d5 View commit details
    Browse the repository at this point in the history
  42. Sliced 2D data can be imported to Pr inverter and multiple slices can…

    … be plotted on a single plot.
    
    However, currently only one of the slices is calculated using Pr, this will be changed (Hopefully) in the next commit so that all sliced can be processed together similarly to 1D Batch and its outputs displayed in a table.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    883e208 View commit details
    Browse the repository at this point in the history
  43. Configuration menu
    Copy the full SHA
    b37eb12 View commit details
    Browse the repository at this point in the history
  44. 2D data has a new tab (Ui) with an outputs table.

    the table populates the slices created and the button when pressed need to show plots of the slice.
    
    calculate all button need to also be fixed. the data cannot be read as its not in the right object.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    7da173c View commit details
    Browse the repository at this point in the history
  45. batch results are consistent now however there are a few bugs with up…

    …dating the gui and getting/setting parameters.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    e07f315 View commit details
    Browse the repository at this point in the history
  46. Batch results will display Number of terms, reg const and Max Distance.

     Furthermore, the data output ont the batch table will be from self._calculator. this means It's flexible for further expansions and is just as reliable as the gui. Although a few Issues still remain during calculation, one being Q range being set to 0 or bellow which causes the data set to not be calculated and the calculations of the previous data to be set for the 'current' data set (Hence you might see duplicate rows with different file names). In my previous commit in the branch 1D data could not be uploaded for individual calculation that bug has now been fixed. Code still needs to be cleaned up and commented.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    bc460c2 View commit details
    Browse the repository at this point in the history
  47. got 2D data slices to Show up on batch table.

    this is a bit of a hacky way of getting it to work and is just to get an idea of how it might work. things to improve upon are :-
    
    - [ ] Getting the table in GridPanel.py to work flexibly for both 1D batch aswell as 2D slices.
    
    - [ ] cleaning up slices()
    
    - [ ] making showBatchOutput() more portable
    
    - [ ] creating batch like datalist support for 2D slices. (so that it can be batch processed just like 1D batch files)
    
    - [ ] SORTING OUT THE ERRORS
    
    - [ ] (Might need help) Fix the Wierd Parameter issue. (Currently set/default parameters change to estimates which makes it hard to use reliabely. Background, Qmin and Qmax is also not working as expected, it sets itself to a value bellow 0 causing it to not calculate for that slice.)
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    74ba00d View commit details
    Browse the repository at this point in the history
  48. Working on Batch Processing for 2D slices.

    need to test, clean up code, and make sure that this doesn't affect 1D batch processing
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    0647494 View commit details
    Browse the repository at this point in the history
  49. Batch Pr processing of 1D data and 2D slices is now functional. Addit…

    …ionally, Q min and Q Max can be seen in the Batch results panel.
    
    However, further testing and Code cleaning is required. Newly created pop up windows such as the batch results, 1D slice plot, and 2D image plots need to be connected with the interface and made to fit in withing the UI.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    4c4655a View commit details
    Browse the repository at this point in the history
  50. Batch Pr processing of 1D data and 2D slices is now functional. Addit…

    …ionally, Q min and Q Max can be seen in the Batch results panel.
    
    However, further testing and Code cleaning is required. Newly created pop up windows such as the batch results, 1D slice plot, and 2D image plots need to be connected with the interface and made to fit in withing the UI.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    13edf72 View commit details
    Browse the repository at this point in the history
  51. Fixed new tab (first tab) from not being able to set data to. Enables…

    … Pr fit and I(q) plots.
    
    This Version should somewhat work besides the found bugs.
    Testing and code cleaning still required.
    
    - [ ]  Batch Processing might not yet be reliable. A row or 2 might duplicate if a parameter is not right eg: Qmax or NoOfTerms.
    
    - [ ] Dropdown menu Goes back to previous Item if user decides to change.
    
    - [ ] All New Windows Are outside the SasView Interface.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    ecb0c9a View commit details
    Browse the repository at this point in the history
  52. Parameters for individual data sets can be set using the dropdown men…

    …u. Additionally the dropdown menu used to not set to new selected data which has been fixed. however, in this version 2D data slicing is bracken this is due to some changes with how raw batch data is handles.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    3843b56 View commit details
    Browse the repository at this point in the history
  53. set parameters for items in the dropdown menu of batch will saved for…

    … the dataset. when switched back to the dateset (using the dropdown menu) the parameters selected prevously will be set.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    e082544 View commit details
    Browse the repository at this point in the history
  54. Result Duplication Issue has slightly been patched by setting calcThr…

    …ead to a dir so each data file could be assigned to a thread instance. estimationThread and estimationThreadNT might also need to be changed as such. however more testing is required.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    6720d70 View commit details
    Browse the repository at this point in the history
  55. made a few changed to slicing and 1D batch.

    slicing: slices data are turned into model using the createModelItemWithPlot function.
    this is makes it much easier to move around as it can work just like 1D data.
    
    1D batch: Parameters set before batch processing is remembered and used when processed using batch mode.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    7096bde View commit details
    Browse the repository at this point in the history
  56. got batch processing to spit out actual calculations rather then "est…

    …imations".
    
    Parameters whilst, Batch Processing is also remembered.
    Estimated data doesn't mess with actual data unless suggested button is pressed.
    However, Duplication issue still remains.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    6a9e9d4 View commit details
    Browse the repository at this point in the history
  57. Calculations on batch interface is more reliable now. Calculations do…

    …ne using to Calculate all button is still a bit buggy.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    08741e1 View commit details
    Browse the repository at this point in the history
  58. Slicer works a bit smother now.

    Still a bit more tweaking is required for batch processing slices.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    315cf4b View commit details
    Browse the repository at this point in the history
  59. Configuration menu
    Copy the full SHA
    c98f971 View commit details
    Browse the repository at this point in the history
  60. fixed exporting from table issue, buttons in slicer now updates the 2…

    …D rawImage and shows slice using phi. Fixed buttons. Minor cleanups. fixed 2D slices from not being batched processed.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    39a5d72 View commit details
    Browse the repository at this point in the history
  61. Plots Behaviour is designed to be more dynamic.

    for Devs: Plots in Pr can be disabled using self._allowPlots
    
    Plot Behaviour:
    if Batch or Data2D Slices -> hide Plots
    if Button(Calculate) or Single Data1D -> show Plots
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    f87cfbd View commit details
    Browse the repository at this point in the history
  62. Cleaned and Added Comments to InversionWidget.py, broke down a few of…

    … the lager functions into smaller functions. And Changes the Warnings for GridPanel.py.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    1a201b6 View commit details
    Browse the repository at this point in the history
  63. Configuration menu
    Copy the full SHA
    93d18b9 View commit details
    Browse the repository at this point in the history
  64. minor compatibility changes to allow changes made in the main branch …

    …during the time this branch was not updated with it.
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    f8a0034 View commit details
    Browse the repository at this point in the history
  65. Few housekeeping changes. tried to fix 2D plotting issue, but I can't…

    … seem get to run with the following code
    
    ```
            GuiUtils.updateModelItemWithPlot(item, new_plot, new_plot.id)
    
            self.base.manager.communicator.plotUpdateSignal.emit([new_plot])
            self.base.manager.communicator.forcePlotDisplaySignal.emit([item, new_plot])
    ```
    
    changes made using feedback from:
    
    1) #2181 (comment)
    removed as it was something that I was testing out but didn't end up using.
    
    2) #2181 (comment)
    Moved closeEvent() from InversionWidget.py to InversionPerspective.py.
    
    3) #2181 (comment)
    changed `from sas.sascalc.dataloader.manipulations import SectorQ` to `from sasdata.data_util.manipulations import SectorQ`
    ru4en authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    f4171dd View commit details
    Browse the repository at this point in the history
  66. Main errors corrected

    lucas-wilkins authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    fd18f5d View commit details
    Browse the repository at this point in the history
  67. Move InversionWidget to PySide6

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    f3c0329 View commit details
    Browse the repository at this point in the history
  68. introduce DataRole in InversionWidget

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    9ee0b46 View commit details
    Browse the repository at this point in the history
  69. add tab_id to P(r) perspective

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    297dea6 View commit details
    Browse the repository at this point in the history
  70. Configuration menu
    Copy the full SHA
    e3b6dc5 View commit details
    Browse the repository at this point in the history
  71. fix saving when Pr absent

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    649633b View commit details
    Browse the repository at this point in the history
  72. fix Save Analysis for currentPage

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    301ab9e View commit details
    Browse the repository at this point in the history
  73. refactor capturing 2Dslicer for Inversion

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    6812ca3 View commit details
    Browse the repository at this point in the history
  74. toogle 2D Data tab

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    fc54da4 View commit details
    Browse the repository at this point in the history
  75. Configuration menu
    Copy the full SHA
    b082977 View commit details
    Browse the repository at this point in the history
  76. Configuration menu
    Copy the full SHA
    32adbc9 View commit details
    Browse the repository at this point in the history
  77. populate first tab with data

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    6728c52 View commit details
    Browse the repository at this point in the history
  78. fixing BatchTab naming

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    5b0f11b View commit details
    Browse the repository at this point in the history
  79. update q range when loading batch elements

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    66fc93d View commit details
    Browse the repository at this point in the history
  80. Configuration menu
    Copy the full SHA
    e882efc View commit details
    Browse the repository at this point in the history
  81. Configuration menu
    Copy the full SHA
    0fee630 View commit details
    Browse the repository at this point in the history
  82. add id to new plot

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    a713839 View commit details
    Browse the repository at this point in the history
  83. Configuration menu
    Copy the full SHA
    71de490 View commit details
    Browse the repository at this point in the history
  84. catch Corfunc bug when deleting data

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    7eb275c View commit details
    Browse the repository at this point in the history
  85. catch assertion error when deleting data

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    1b8b941 View commit details
    Browse the repository at this point in the history
  86. Configuration menu
    Copy the full SHA
    0aef8e5 View commit details
    Browse the repository at this point in the history
  87. set default values for 2D plots

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    3285f80 View commit details
    Browse the repository at this point in the history
  88. rename starting angle for 2D slicing

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    68f3b68 View commit details
    Browse the repository at this point in the history
  89. latest changes

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    08db9b5 View commit details
    Browse the repository at this point in the history
  90. Configuration menu
    Copy the full SHA
    275be29 View commit details
    Browse the repository at this point in the history
  91. simplify 2D slicer option, plotting not needed as 1D data exposed in …

    …Dataexplorer
    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    b33c822 View commit details
    Browse the repository at this point in the history
  92. emmbed 2D plot in Sasview

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    633b656 View commit details
    Browse the repository at this point in the history
  93. Configuration menu
    Copy the full SHA
    2e66019 View commit details
    Browse the repository at this point in the history
  94. set sector to initial values

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    fe607f0 View commit details
    Browse the repository at this point in the history
  95. Configuration menu
    Copy the full SHA
    6002cbf View commit details
    Browse the repository at this point in the history
  96. live update slicer on change of parameter

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    2b58c60 View commit details
    Browse the repository at this point in the history
  97. allow plots for Pr batch

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    2f4c7a6 View commit details
    Browse the repository at this point in the history
  98. modify Output Panel Parameter list

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    a5cee55 View commit details
    Browse the repository at this point in the history
  99. catch modified behaviour of numpy.lstsq

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    df29b81 View commit details
    Browse the repository at this point in the history
  100. Configuration menu
    Copy the full SHA
    6381e29 View commit details
    Browse the repository at this point in the history
  101. Configuration menu
    Copy the full SHA
    b8935e3 View commit details
    Browse the repository at this point in the history
  102. Configuration menu
    Copy the full SHA
    b462847 View commit details
    Browse the repository at this point in the history
  103. provide minimum value for dmax

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    ed493cf View commit details
    Browse the repository at this point in the history
  104. Configuration menu
    Copy the full SHA
    ccb865a View commit details
    Browse the repository at this point in the history
  105. Configuration menu
    Copy the full SHA
    bd75b96 View commit details
    Browse the repository at this point in the history
  106. use inline string formating for plotting

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    6d86cd8 View commit details
    Browse the repository at this point in the history
  107. Modified slider stuff

    lucas-wilkins authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    7209444 View commit details
    Browse the repository at this point in the history
  108. remove 2D processing for P(r)

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    e57fc49 View commit details
    Browse the repository at this point in the history
  109. check and moan when loading 2D data

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    59cbd5f View commit details
    Browse the repository at this point in the history
  110. Invertor, Corfunc not working on 2D data, initialise suggested values…

    … to Pr calculator
    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    726099b View commit details
    Browse the repository at this point in the history
  111. Fix error string

    lucas-wilkins authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    7df3bfd View commit details
    Browse the repository at this point in the history
  112. Configuration menu
    Copy the full SHA
    985d644 View commit details
    Browse the repository at this point in the history
  113. Configuration menu
    Copy the full SHA
    cbdfb93 View commit details
    Browse the repository at this point in the history
  114. Unused variable

    lucas-wilkins authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    7abff84 View commit details
    Browse the repository at this point in the history
  115. Alpha check rewrite

    lucas-wilkins authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    8c1192b View commit details
    Browse the repository at this point in the history
  116. Configuration menu
    Copy the full SHA
    dd89c68 View commit details
    Browse the repository at this point in the history
  117. making QRangeSlidersTest run

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    16a79e4 View commit details
    Browse the repository at this point in the history
  118. Configuration menu
    Copy the full SHA
    07f2f4b View commit details
    Browse the repository at this point in the history
  119. fixing incursion

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    6142cec View commit details
    Browse the repository at this point in the history
  120. catch data with dy=0 crashing Inversion

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    66fe351 View commit details
    Browse the repository at this point in the history
  121. Configuration menu
    Copy the full SHA
    9e3c343 View commit details
    Browse the repository at this point in the history
  122. reinstate batch table

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    9c6cbdc View commit details
    Browse the repository at this point in the history
  123. plot Pr and data from Batchresult table

    dehoni authored and krzywon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    75b4448 View commit details
    Browse the repository at this point in the history