Code

Various Multiplicity Model Fixes#2647

Code

Merged

butlerpd merged 36 commits intorelease_6.0.0SasView/sasview:release_6.0.0from 2369-multiplicity-copySasView/sasview:2369-multiplicity-copyCopy head branch name to clipboardMay 3, 2024

+187-176

Commits

Commits on Sep 21, 2023

• Simplify some of the logic for handling multiplicity models

  krzywon

  committed
  b3a21cc

  Copy full SHA for b3a21cc

• Fix issue related to copy parameters to file (latex/excel) for multiplicity models

  krzywon

  committed
  076bb8e

  Copy full SHA for 076bb8e

• Merge branch 'main' into 2369-multiplicity-copy

  krzywon

  committed
  d2f87cb

  Copy full SHA for d2f87cb

• Fix error thrown when multiplicity param is sent to F(Q)P(Q) calculation

  krzywon

  committed
  816c4cf

  Copy full SHA for 816c4cf

Commits on Sep 22, 2023

• Fix addition to poly model to ensure the polydispersity type combobox is always added to the proper row

  krzywon

  committed
  ea28ca8

  Copy full SHA for ea28ca8

• Only display Show SLD Profile button for multiplicity models with sld parameters

  krzywon

  committed
  58414a0

  Copy full SHA for 58414a0

Commits on Sep 27, 2023

• Merge branch 'release_6.0.0' into 2369-multiplicity-copy

  

  Wojciech Potrzebowski

  authored
  c6179b8

  Copy full SHA for c6179b8

Commits on Oct 2, 2023

• Missed replacement for variable removed from method call

  krzywon

  committed
  62833e4

  Copy full SHA for 62833e4

Commits on Oct 6, 2023

• Merge branch 'release_6.0.0' into 2369-multiplicity-copy

  

  Wojciech Potrzebowski

  authored
  de66a1b

  Copy full SHA for de66a1b

Commits on Oct 26, 2023

• Merge branch 'release_6.0.0' into 2369-multiplicity-copy

  

  Wojciech Potrzebowski

  authored
  11af8ed

  Copy full SHA for 11af8ed

Commits on Nov 6, 2023

• Merge branch 'release_6.0.0' into 2369-multiplicity-copy

  

  Wojciech Potrzebowski

  authored
  a8c3b11

  Copy full SHA for a8c3b11

Commits on Dec 3, 2023

• Merge branch 'release_6.0.0' into 2369-multiplicity-copy

  

  Wojciech Potrzebowski

  authored
  6554380

  Copy full SHA for 6554380

Commits on Dec 15, 2023

• Merge branch 'release_6.0.0' into 2369-multiplicity-copy

  

  Wojciech Potrzebowski

  authored
  93a56e9

  Copy full SHA for 93a56e9

Commits on Jan 15, 2024

• Merge branch 'release_6.0.0' into 2369-multiplicity-copy

  

  Wojciech Potrzebowski

  authored
  96bec1a

  Copy full SHA for 96bec1a

Commits on Mar 1, 2024

• Add suppressed model list and apply it to FittingWidget and AddMultEditor

  krzywon

  committed
  16a3db6

  Copy full SHA for 16a3db6

Commits on Mar 4, 2024

• Create a list of built-in layered models

  krzywon

  committed
  039b6ef

  Copy full SHA for 039b6ef

• Use list of layered models to generate a shortened list of models that is used when one of the add/multi editor models is in the layered list

  krzywon

  committed
  61700ea

  Copy full SHA for 61700ea

• Code cleanup and string reuse

  krzywon

  committed
  733bc85

  Copy full SHA for 733bc85

• Move list_models generation into updateModels

  krzywon

  committed
  521ef95

  Copy full SHA for 521ef95

• Check all models if multiplicity models and add them to add/multi editor list if so to allow combo box removal, regardless of category

  krzywon

  committed
  b9d3eab

  Copy full SHA for b9d3eab

Commits on Mar 5, 2024

• Merge branch 'release_6.0.0' into 2369-multiplicity-copy

  krzywon

  committed
  1a6c012

  Copy full SHA for 1a6c012

• Get name of parameter rather than form volume parameter name to prevent errors changing PD params for layered form volume parameters

  krzywon

  committed
  0ec0552

  Copy full SHA for 0ec0552

• Update add multiply editor documentation to better match current functionality, and include warnings and notes specific to different version and update the sum_model.png file

  krzywon

  committed
  7c4c8f7

  Copy full SHA for 7c4c8f7

• Do not update FittingWidget.n_shells_row in FittingWidget.updateFittedValues, they are managed in another method. This fixes an issue in the spherical_sld model where n_shells was being incremented…

  Show description for 8057060
  krzywon

  committed
  8057060

  Copy full SHA for 8057060

Commits on Mar 12, 2024

• Merge release_6.0.0 into 2369-multiplicity-copy and fix merge conflicts in FittingWidget.py

  krzywon

  committed
  c046134

  Copy full SHA for c046134

Commits on Apr 1, 2024

• Merge branch 'release_6.0.0' into 2369-multiplicity-copy

  krzywon

  committed
  933b252

  Copy full SHA for 933b252

Commits on Apr 5, 2024

• Small fixes for PD functionality

  krzywon

  committed
  a05ed2d

  Copy full SHA for a05ed2d

Commits on Apr 11, 2024

• Remove all if not dict: return statements from FittingWidget

  krzywon

  committed
  ff16216

  Copy full SHA for ff16216

Commits on Apr 15, 2024

• Copy params before modifying shell models to retain values after changing number of shells

  krzywon

  committed
  12c55d8

  Copy full SHA for 12c55d8

• Merge branch 'release_6.0.0' into 2369-multiplicity-copy

  krzywon

  authored
  6a512a6

  Copy full SHA for 6a512a6

Commits on Apr 23, 2024

• Merge branch 'release_6.0.0' into 2369-multiplicity-copy

  butlerpd

  authored
  812a10b

  Copy full SHA for 812a10b

Commits on Apr 29, 2024

• Use regex to check param names for SLD profile button

  krzywon

  committed
  54b4076

  Copy full SHA for 54b4076

• Merge branch 'release_6.0.0' into 2369-multiplicity-copy

  krzywon

  authored
  d9bcb75

  Copy full SHA for d9bcb75

Commits on Apr 30, 2024

• Fix regex for multiplicity models related to SLD profile button

  krzywon

  committed
  befe75e

  Copy full SHA for befe75e

• Merge branch 'release_6.0.0' into 2369-multiplicity-copy

  butlerpd

  authored
  322ec8f

  Copy full SHA for 322ec8f

• Fix SLD params regex - only catches layered params where final character is a number greater than 0. This eliminates magnetic SLDs that end in 0

  krzywon

  committed
  a5972fe

  Copy full SHA for a5972fe