diff --git a/CHANGELOG.md b/CHANGELOG.md index d81c324..82a94f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,10 +8,13 @@ release path documented in [`TODO.md`](TODO.md). ### Interactive parameter plots - Clicking a plotted marker in the parameter-plot window now opens a style editor at the pointer: colour, marker symbol, size, and opacity, applied - either to the clicked (data set, parameter) trace or to the whole data set - across every panel. Trace-level edits survive panel re-layouts; data-set - edits are shared by all panels showing that file. `Esc`/`Q` closes the - popover. + with an explicit **Apply** button either to the clicked (data set, + parameter) trace or to the whole data set across every panel. Trace-level + edits survive panel re-layouts; data-set edits are shared by all panels + showing that file. `Esc`/`Q` or **Close** dismisses the editor. +- Parameter-plot style edits now reach the traces: overlay entries carry the + same identity the style registry keys on, so a recorded colour/symbol/size/ + opacity is redrawn on exactly the intended panel or data set. - Parameter-plot panels can overlay several `*.dat` files at once: "Add file..." in **Plot options > Overlay data sets** opens a native multi-file dialog (Electron) or the browser multi-file picker (web). Files are @@ -33,6 +36,9 @@ release path documented in [`TODO.md`](TODO.md). `__MUSRFLOW_VERSION__` token that renders as "development build"). - Generated MSRs no longer credit the legacy `musrfit-gui` repository; the header now names muSRFlow, the author, the licence, and the muSRFlow site. +- `package.json` metadata and the bundled help no longer point at the old + `musrfit-gui` project: the repository, issues, and homepage URLs moved to + the `muSRFlow` repository. ## [1.0.0-rc.1] - 2026-09-10 diff --git a/ZGUI.css b/ZGUI.css index 8783ad4..6912ea7 100644 --- a/ZGUI.css +++ b/ZGUI.css @@ -2895,8 +2895,8 @@ body.electron-parameter-plot-page { .parameter-style-popover { position: fixed; z-index: 1200; - width: 210px; - padding: 0.6rem 0.7rem; + width: 288px; + padding: 0.7rem 0.8rem; background: #fff; border: 1px solid var(--mu-border); border-radius: 4px; @@ -2947,23 +2947,37 @@ body.electron-parameter-plot-page { outline-offset: 1px; } +.parameter-style-controls { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 0.4rem 0.8rem; + margin: 0.5rem 0 0.6rem; + align-items: center; +} + .parameter-style-control { display: flex; align-items: center; - gap: 0.4rem; - margin: 0.3rem 0; + gap: 0.35rem; font-size: 0.85rem; + white-space: nowrap; + min-width: 0; } .parameter-style-control select, .parameter-style-control input[type="number"] { - margin-left: auto; - width: 9.5rem; + flex: 1; + min-width: 0; + width: auto; } -.parameter-style-control input[type="range"] { - margin-left: auto; - width: 10.5rem; +.parameter-style-opacity { + grid-column: 1 / -1; +} + +.parameter-style-opacity input[type="range"] { + flex: 1; + min-width: 0; } .parameter-style-opacity-value { @@ -2975,11 +2989,20 @@ body.electron-parameter-plot-page { .parameter-style-actions { display: flex; justify-content: flex-end; - margin-top: 0.5rem; + gap: 0.45rem; + margin-top: 0.35rem; } .parameter-style-actions button { font-size: 0.8rem; + padding: 0.18rem 0.7rem; +} + +.parameter-style-actions .parameter-style-apply { + background: var(--mu-green); + color: #fff; + border-color: var(--mu-green); + font-weight: 600; } /* Rarely changed initialisation policy belongs with other application preferences. */ diff --git a/docs/_build/html/_sources/parameters-plots.rst.txt b/docs/_build/html/_sources/parameters-plots.rst.txt index 0341774..362d6f3 100644 --- a/docs/_build/html/_sources/parameters-plots.rst.txt +++ b/docs/_build/html/_sources/parameters-plots.rst.txt @@ -138,6 +138,8 @@ the pointer: (file, parameter) series only, or to every trace of that data set (all panels showing it); * colour swatches, marker **symbol**, **size**, and **opacity**; +* **Apply** -- commit the staged choices and redraw the affected panels; + **Close** hides the editor, and ESC (or ``Q``) dismisses it; * **Reset** -- restore the file's default colouring for that scope. Trace-level edits are keyed by (data set, panel, parameter), so they survive diff --git a/docs/_build/html/parameters-plots.html b/docs/_build/html/parameters-plots.html index b6e2902..86441a9 100644 --- a/docs/_build/html/parameters-plots.html +++ b/docs/_build/html/parameters-plots.html @@ -230,6 +230,8 @@ the pointer:

(file, parameter) series only, or to every trace of that data set (all panels showing it);

  • colour swatches, marker symbol, size, and opacity;

  • +
  • Apply – commit the staged choices and redraw the affected panels; +Close hides the editor, and ESC (or Q) dismisses it;

  • Reset – restore the file’s default colouring for that scope.

  • Trace-level edits are keyed by (data set, panel, parameter), so they survive diff --git a/docs/_build/html/searchindex.js b/docs/_build/html/searchindex.js index fe5f10e..07466ca 100644 --- a/docs/_build/html/searchindex.js +++ b/docs/_build/html/searchindex.js @@ -1 +1 @@ -Search.setIndex({"alltitles":{"A first fit":[[7,"a-first-fit"]],"Command log":[[11,"command-log"]],"Configuration sharing":[[0,null]],"Constraints":[[1,null],[1,"id1"]],"Contents":[[4,null]],"Custom parameters":[[1,"custom-parameters"]],"Desktop installation":[[2,"desktop-installation"]],"Editing trace styles":[[8,"editing-trace-styles"]],"Example: couple the magnetic field to the Larmor frequency":[[1,"example-couple-the-magnetic-field-to-the-larmor-frequency"]],"Execution details":[[11,"execution-details"]],"File handling":[[6,"file-handling"]],"Fit and Plot":[[12,"fit-and-plot"]],"Fit model":[[12,"fit-model"]],"Fit options":[[12,"fit-options"]],"Fit or plot will not start":[[14,"fit-or-plot-will-not-start"]],"Fit range":[[12,"fit-range"]],"Fitted parameters look wrong or unchanged":[[14,"fitted-parameters-look-wrong-or-unchanged"]],"General notes":[[5,"general-notes"]],"Getting started":[[2,null]],"Glossary":[[3,null]],"Keyboard shortcuts":[[5,null],[8,"keyboard-shortcuts"]],"MSR editor":[[5,"msr-editor"],[6,null]],"Notes":[[0,"notes"]],"On the desktop":[[0,"on-the-desktop"]],"On the web":[[0,"on-the-web"]],"Opening the web edition":[[2,"opening-the-web-edition"]],"Outcome dialog":[[11,"outcome-dialog"]],"Overlay data sets (multiple files in one panel)":[[8,"overlay-data-sets-multiple-files-in-one-panel"]],"Overview":[[7,null]],"Ownership: GUI or editor":[[6,"ownership-gui-or-editor"]],"Parameter plot hangs on \u201cPreparing plot files\u201d":[[14,"parameter-plot-hangs-on-preparing-plot-files"]],"Parameter plot is empty or missing data":[[14,"parameter-plot-is-empty-or-missing-data"]],"Parameter selection (Parameters tab)":[[5,"parameter-selection-parameters-tab"]],"Parameter-plot window":[[5,"parameter-plot-window"]],"Parameters and parameter plots":[[8,null]],"Per-run statistics":[[12,"per-run-statistics"]],"Plot options":[[8,"plot-options"]],"Preferences":[[10,null]],"Prerequisites":[[2,"prerequisites"]],"Preview":[[1,"preview"]],"Reporting problems":[[14,"reporting-problems"]],"Restored configuration differs from the original machine":[[14,"restored-configuration-differs-from-the-original-machine"]],"Result files":[[11,"result-files"]],"Results and diagnostics":[[11,null]],"Run log window":[[11,"run-log-window"]],"Run selection":[[12,"run-selection"]],"Running the desktop app":[[2,"running-the-desktop-app"]],"Runs and fitting":[[12,null]],"Selecting parameters for plotting":[[8,"selecting-parameters-for-plotting"]],"Series fit actions":[[12,"series-fit-actions"]],"Some links start with a different prefix":[[14,"some-links-start-with-a-different-prefix"]],"Support":[[2,"support"]],"Template and series presets":[[8,"template-and-series-presets"]],"The Choose X axis dialog":[[8,"the-choose-x-axis-dialog"]],"The Quick Start guide":[[2,"the-quick-start-guide"]],"The Shared column":[[8,"the-shared-column"]],"The parameter table":[[8,"the-parameter-table"]],"The parameter-plot window":[[8,"the-parameter-plot-window"]],"The status bar":[[11,"the-status-bar"]],"Troubleshooting":[[14,null]],"Two editions":[[7,"two-editions"]],"Under the hood":[[7,"under-the-hood"]],"View settings":[[12,"view-settings"]],"Web and desktop editions":[[9,null]],"Web page cannot load data":[[14,"web-page-cannot-load-data"]],"What is shared":[[0,"what-is-shared"]],"What you get":[[7,"what-you-get"]],"Workflow":[[6,"workflow"]],"muSRFlow User Manual":[[4,null]],"t0 / background":[[13,null]],"\u201cNothing to fit\u201d":[[14,"nothing-to-fit"]]},"docnames":["configuration-sharing","constraints","getting-started","glossary","index","keyboard-shortcuts","msr-editor","overview","parameters-plots","platforms","preferences","results-diagnostics","runs-fitting","t0-background","troubleshooting"],"envversion":{"sphinx":65,"sphinx.domains.c":3,"sphinx.domains.changeset":1,"sphinx.domains.citation":1,"sphinx.domains.cpp":9,"sphinx.domains.index":1,"sphinx.domains.javascript":3,"sphinx.domains.math":2,"sphinx.domains.python":4,"sphinx.domains.rst":2,"sphinx.domains.std":2},"filenames":["configuration-sharing.rst","constraints.rst","getting-started.rst","glossary.rst","index.rst","keyboard-shortcuts.rst","msr-editor.rst","overview.rst","parameters-plots.rst","platforms.rst","preferences.rst","results-diagnostics.rst","runs-fitting.rst","t0-background.rst","troubleshooting.rst"],"indexentries":{},"objects":{},"objnames":{},"objtypes":{},"terms":{"":[3,5,6,8,10,12,14],"0":12,"01":12,"012":11,"1":[8,11,12],"100":12,"12":12,"16":12,"1998":12,"2":[8,12],"24":12,"3":8,"5":12,"514":[3,12],"515":[3,12],"516":12,"520":12,"525":12,"540":12,"7":12,"8":12,"A":[0,1,3,4,10,11,12,14],"For":[2,6,8,11,12],"If":[4,8,11,12,14],"In":[5,7,8,14],"It":[0,1,4,6,7,11],"Its":[5,7],"On":[2,3,4,6,7,9,11,12,14],"One":[3,12],"The":[0,1,3,4,5,6,7,9,10,12,13,14],"Then":8,"There":2,"These":4,"To":[1,12],"With":[5,8],"_asi":10,"_singlehist":10,"abov":8,"abragamco":12,"accept":14,"access":9,"accumul":12,"across":[7,8],"action":[3,4,5,7,8,10,11,14],"activ":[2,5,6,7,8,14],"actor":6,"actual":[12,13],"ad":[10,12],"add":[1,5,8,11,12,14],"addrun":[3,12],"adjust":[7,8,13],"affect":8,"after":[8,12,14],"afterward":[8,11],"again":[7,12,14],"against":14,"aggreg":[11,12],"agre":14,"align":8,"all":[2,3,8,11,12,14],"alreadi":[2,12],"also":[2,6,8],"amplitud":8,"an":[1,2,3,4,6,7,8,10,11,12,13,14],"analysi":[0,3,6,7,11,14],"anchor":5,"ani":[1,6,7,8,9,11,12,13],"anoth":[0,3,7,8,14],"anyon":0,"anyth":[4,10],"apod":[3,12],"app":4,"appear":[2,11],"append":[3,10],"appimag":2,"appli":[0,1,3,5,8,9,12],"applic":4,"approxim":10,"ar":[0,1,2,4,7,8,10,12,13,14],"area":[5,11],"argument":11,"arithmet":1,"around":4,"arrang":8,"artifact":[6,9,10,11],"ask":[6,8],"assign":8,"asymmetri":[10,12],"attempt":[6,14],"authorit":[11,12,14],"auto":[8,10],"automat":[3,5,8,12],"auxiliari":9,"avail":[1,4,8],"avoid":[1,10],"awar":2,"ax":[5,8],"axi":[4,12,14],"back":[6,8,12],"background":[4,7],"backward":[0,12],"bar":[0,2,4,5,7,8,12,14],"base":8,"becom":[1,6,8],"been":5,"befor":[1,8,12,14],"behaviour":[4,11,13],"behind":9,"below":[11,12],"bench":14,"besid":9,"best":[11,12],"between":[5,8,12],"beyond":8,"bfield":1,"bg":[7,13],"bin":12,"bind":1,"blob":8,"block":[1,3,11,12],"bold":8,"both":[1,3,4,7,9,14],"bottom":11,"box":[5,8],"browser":[0,2,3,4,7,8,9,14],"bug":2,"build":[2,4,8],"built":[4,6,8],"button":[0,1,2,3,4,6,7,8,9,11,12],"c":[0,14],"cach":12,"calcul":12,"came":12,"can":[0,1,3,6,7,8,12],"cancel":10,"cannot":[0,4,8,11,12],"canva":[3,7,9,11,12],"canvas":3,"carri":[0,3,8,12,14],"cfg":14,"cgi":[2,4,9,14],"ch":[0,2,10,14],"chain":0,"chang":[1,6,8,10,12,14],"chapter":[2,7,9],"chart":5,"check":[8,14],"checkbox":8,"checkout":2,"chip":[3,8,12,14],"choic":[8,12],"choos":[0,1,2,4,7,10],"chosen":[8,12],"clash":10,"classic":[7,12],"click":[5,6,7,8,11,12,14],"clipboard":5,"clone":8,"close":[5,6,8,10,11,14],"closest":8,"cmd":[5,8],"code":11,"collaps":11,"colleagu":0,"collect":[7,11],"collid":5,"colon":12,"colour":8,"column":[3,12,14],"combin":12,"come":9,"comma":12,"command":[3,4,7,9,12,14],"common":8,"compact":[0,14],"companion":3,"compar":8,"compat":12,"complet":[6,11],"compon":[0,1,8,12,14],"compos":12,"compress":[0,3,14],"concentr":4,"concern":9,"concret":8,"configur":[3,4,7,9,10],"confirm":[6,12,14],"constant":1,"constrain":1,"constraint":[0,3,4,6,7,8,12],"contact":[2,4,14],"contain":[1,8,11],"content":12,"context":11,"contigu":[8,12],"contrast":12,"control":[1,6,7,8,13,14],"conveni":12,"convent":10,"converg":[11,12],"convert":7,"copi":[0,6,8,9],"correct":[3,12],"correspond":2,"could":14,"count":[8,12],"coupl":4,"covari":12,"cover":[4,14],"creat":4,"ctrl":[5,8],"current":[0,2,3,6,7,8,10,12,13,14],"cursor":5,"custom":[4,7,8,12],"cycl":12,"dai":7,"damp":8,"dash":12,"dat":[3,7,8,11],"data":[0,2,3,4,7,9,10,11,12],"dc":12,"default":[8,10,12,13],"defin":1,"degre":12,"depend":[5,12],"deploi":14,"deploy":[2,4],"deriv":10,"describ":[2,3,4,8,12],"deselect":[5,8],"desk":4,"desktop":[3,4,6,7,8,10,11,12,14],"desktop_deploy":[2,4],"detail":[4,7,12,14],"detect":10,"detector":[12,13],"diagnos":11,"diagnost":4,"dialog":[0,2,3,4,7,9,10,14],"did":[11,12],"differ":[4,7,9,12,13],"direct":[3,12],"directli":[1,6,7,8],"directori":[0,7,9,10,11,14],"disabl":12,"disappear":[8,12],"disclosur":12,"disk":[6,12],"displai":[3,6,7,8,9,11,12],"dist":2,"distinct":12,"do":[6,12,13,14],"doc":[2,4],"document":[2,3,4,5,6,7,10,11,12,13,14],"doe":[0,4,6,7,8,11,12],"dolli":12,"domain":[3,12],"dot":12,"download":[5,8,11],"drawn":[3,7,8,9,12],"drive":8,"driven":5,"dropdown":[1,8,12,14],"dump_head":[3,4,7],"dynam":12,"e":[2,12],"each":[2,3,8,11,12],"edit":[3,4,5,6,10,12,13,14],"editor":[3,4,7,8,9,12,14],"effect":[10,13],"effici":12,"either":12,"electron":[0,2,4,6,7,9,10],"element":11,"empti":[4,8,12],"enabl":[8,10,12],"encod":[0,7],"end":[4,12],"endpoint":[9,14],"engin":[3,7,9],"enter":[2,5,6,7],"entri":[3,5,8],"equal":1,"equival":8,"eras":11,"error":[8,12],"esc":[5,8],"event":5,"everi":[3,5,7,8,11,12,14],"everydai":5,"everyth":[1,12],"evolv":7,"exact":12,"exactli":1,"exampl":[4,8,10,11,12],"exce":12,"execut":[4,7],"exist":[10,12,13],"exit":11,"expand":[2,7,8,12],"expert":[7,13],"explain":11,"explicitli":9,"exponenti":12,"exponentialbessel":12,"exponentialco":12,"expos":[0,6,7,9,10,12,14],"express":[1,12],"extern":2,"extra":8,"factor":12,"factori":7,"fail":[11,12,14],"fast":3,"fastest":14,"featur":10,"fed":7,"feed":[7,8,11],"fetch":14,"few":5,"fft":[0,3,7,12],"field":[4,5,6,8,10,12],"file":[0,2,3,4,7,9,10,12],"final":7,"finish":[11,14],"first":[2,4,6,8,10,12,14],"fit":[0,1,2,3,4,6,8,9,11,13],"fitparamet":3,"fix":[9,14],"flame":12,"flip":12,"flow":12,"focu":5,"focus":[5,8],"follow":12,"form":[3,14],"format":3,"forward":12,"four":8,"fourier":[3,12],"fragment":[0,3],"frame":[3,12],"frequenc":[3,4,8,10,12],"fresh":6,"freshli":12,"from":[0,1,2,3,4,5,6,7,8,9,10,11,12,13],"frq":1,"full":[5,7,11],"function":[1,3,12],"further":12,"g":[2,12],"gain":12,"gamma_mu":1,"gauss":12,"gaussian":12,"gaussianbessel":12,"gaussianco":12,"gbgco":12,"gbgexp":12,"gbgsexp":12,"gbgzf":12,"gdktlf":12,"gener":[1,3,4,6,7,10,11,12,13],"get":[0,4],"give":11,"glfexp":12,"glfsexp":12,"global":[3,8],"glossari":4,"gp":12,"gpd":12,"graphic":4,"grid":8,"group":[10,12],"grow":8,"guess":[3,7,8,10],"gui":[1,4,7,11,12,14],"guid":[4,7],"gyromagnet":1,"ha":[3,5,8,12,14],"hal":12,"hand":[5,6,11,12,14],"handl":[0,4,9],"hang":4,"hash":0,"have":12,"header":10,"health":14,"help":[4,9,14],"hess":12,"hide":[8,12],"highlight":[7,12],"hint":10,"hist":12,"histogram":[10,12],"hold":[5,8,12,14],"hood":4,"host":[2,13],"hover":11,"how":[7,12],"http":[0,2],"i":[1,2,3,4,5,6,7,8,9,10,11,12],"icon":[0,6],"ident":8,"identifi":[8,12],"idl":11,"ignor":[5,14],"imaginari":12,"immedi":[1,11],"includ":[1,12,14],"independ":[2,3,8,9,11,12,14],"indic":8,"individu":8,"inform":12,"initi":[3,7,10],"inlin":[8,12],"input":[3,5],"insid":[3,7,12],"inspect":[4,7,11],"instal":[4,10,12,14],"instanc":0,"instead":[1,8,10,11,14],"instrument":[0,2,7,10,12],"interact":[5,7,8],"interfac":7,"invalid":11,"invok":11,"involv":14,"issu":2,"its":[0,2,3,7,8,9,11,12,13,14],"j":2,"join":3,"jsroot":[3,7,9,12],"just":[5,6],"keep":[6,8,11,12,13],"kei":[5,8],"kept":[11,12],"keyboard":4,"khz":12,"kt":12,"kubo":12,"label":[8,12],"lack":14,"lai":8,"lam_2255":8,"larg":11,"larger":8,"larmor":4,"lasso":5,"last":11,"later":[2,11],"layout":8,"ldktlf":12,"leak":8,"least":14,"leav":[8,10,12,13],"legaci":[12,14],"legend":8,"lem":12,"let":8,"level":8,"lgkt":12,"lgktexp":12,"lgktsexp":12,"librari":9,"lifetim":12,"like":[1,13],"likelihood":12,"limit":[3,7,8,12],"line":[3,4,7,8,9,11,14],"linear":8,"link":[0,2,3,4,7,9,11],"linux":2,"list":[1,6,8,11,12,14],"liter":1,"live":[1,7,9,11,12],"llfexp":12,"llfsexp":12,"lmu":10,"load":[4,8,13],"local":[0,2,7,9,14],"lock":[6,14],"log":[4,7,12,14],"logarithm":[8,12],"long":0,"look":[4,7,10],"lose":12,"lower":8,"ltf":12,"machin":[0,2,4,7,11],"made":3,"magnet":4,"mai":[0,6,14],"mailto":[2,14],"main":[1,2,4,7,8,9,11],"make":12,"manag":7,"manual":[2,3,7,9],"map":8,"mark":[3,12],"marker":8,"match":[3,4,8,10,14],"matter":7,"max":12,"mc":12,"md":[2,4,14],"mean":[6,12],"measur":[3,8],"mechan":[3,8],"median":12,"medium":12,"menu":[6,7,9,10],"merg":12,"messag":[11,14],"metadata":[3,7,10],"mhz":12,"microsecond":12,"might":12,"migrad":12,"minim":12,"minimis":12,"mino":12,"minuit2":12,"mirror":4,"miss":4,"mode":[5,8,10],"model":[0,1,2,4,6,7,8,9,14],"modeless":[2,9,11],"modern":7,"monochrom":8,"more":[7,8,12,14],"most":5,"mous":5,"msr":[1,2,3,4,7,9,10,11,12,13,14],"msr2data":[3,4,7],"multi":[3,8,12],"multipl":6,"multipli":1,"muon":[1,3,7],"musrfit":[1,2,3,4,7,8,10,11,12],"musrfit_startup":10,"musrflow":[0,2,3,5,6,7,10,11,14],"musrus":[0,2],"musrview":[3,4,7,9,12],"must":[2,13,14],"name":[1,3,5,7,8,10,12],"nativ":[3,7,8,9,12],"ndf":[11,12],"need":[2,7,8],"never":[0,5,8,10,14],"new":[8,12,14],"next":[1,2,6,8,10,12,13],"node":2,"none":12,"normal":[1,5,12,13],"note":[4,8,14],"noth":[0,2,4,12],"notic":11,"npm":2,"number":[2,7,8],"numer":[8,12],"object":12,"off":12,"offer":[8,11,12],"offset":12,"old":12,"omit":8,"onc":[1,2,6,8,12],"one":[1,2,3,5,6,7,9,12,14],"ones":[2,12],"onli":[1,2,8,11,12,14],"onto":8,"opac":8,"open":[0,4,6,7,8,9,10,11,12,14],"oper":11,"opt":12,"option":[0,2,3,4,7,14],"order":[11,12],"ordinari":1,"organis":4,"origin":4,"oscil":12,"other":[1,8,11,13],"out":[8,11,12],"outcom":[4,14],"outlier":12,"output":[3,10,11,12],"over":[7,11,12],"overlai":14,"overlaid":[8,14],"overrid":[8,12],"overview":4,"overwrit":6,"own":[0,3,6,7,9,12],"ownership":[4,5],"pack":12,"packag":[2,4,7,11,12],"padlock":6,"page":[3,4,7,9,12],"palett":8,"pan":[5,8],"pane":[1,11],"panel":[5,14],"par":[3,7,11,12],"par4":12,"par7":12,"paramet":[0,2,3,4,6,7,9,10,11,12],"parr":12,"part":[1,3],"parti":0,"pass":0,"past":[0,9],"pastel":8,"path":[2,8,9,10,12],"payload":0,"per":[1,8,9,11],"perform":14,"perman":11,"phase":[3,12],"physic":[7,12],"pick":8,"picker":8,"place":14,"plot":[0,3,4,6,7,9,11,13],"plotli":[5,8],"plottabl":14,"plu":[3,8,12],"point":[2,14],"pointer":8,"polici":12,"pop":11,"popul":[0,8],"portabl":[3,7,10],"power":12,"predefin":8,"prefer":[0,4,7,9,14],"prefix":[4,8],"prepar":[3,4,6,12],"prerequisit":4,"press":[1,2,5,7],"preview":[4,6,12],"previou":12,"primari":11,"print":3,"problem":4,"process":11,"produc":[2,3,7,9,11,12],"progress":12,"project":[2,3],"protocol":9,"provid":[5,7,8],"psi":[0,2,10,14],"public":10,"q":[5,8],"qualiti":12,"question":2,"quick":[4,7,9],"ran":11,"rang":[0,3,4,5,6,7,8],"rate":12,"rather":[8,12],"ratio":1,"re":[8,12,14],"reachabl":14,"read":[1,3,7,10,12,14],"readabl":[11,14],"readm":[4,14],"real":[6,12,14],"reason":14,"rebuild":[12,14],"rebuilt":[0,8],"recognis":[6,8],"recolour":8,"record":[3,11,12,14],"recreat":0,"redraw":8,"refer":[0,1,3,7,12],"referenc":1,"refin":1,"refit":[3,8,12,14],"reflect":1,"refresh":[8,14],"regener":6,"regular":12,"reimplement":7,"relat":[0,1],"relax":12,"releas":2,"relev":[7,11],"remain":0,"rememb":8,"remov":[1,8,12],"render":[1,7],"replac":[6,8,12],"report":[2,4,12],"repositori":[2,4],"repres":1,"reproduc":[0,11],"requir":[2,12],"reread":[8,14],"reset":[5,8,14],"resolut":[12,14],"resolv":[3,7,8,10,12,14],"respect":12,"rest":8,"restor":[0,3,4,7,8,9],"restyl":8,"result":[2,4,6,7,8,10,12,14],"return":[6,12,13],"reus":[3,12,14],"right":[2,7,8],"role":8,"root":[3,7,9,10,11,12,14],"rotat":[3,12],"rout":[8,12],"row":[1,8,12,14],"rpm":2,"rrf":[0,3,7,12],"run":[0,1,3,4,6,7,8,9,10,14],"runner":2,"runtim":2,"sai":9,"salman":[2,4,14],"same":[0,1,2,3,4,5,7,8,10,11,12,14],"save":[6,7,9,10,12],"scale":12,"scan":8,"scana_par":8,"scanb_par":8,"scatter":8,"scope":8,"section":[2,7],"see":[0,3,4,5,7,8,11,12,14],"seed":[3,10],"select":[0,2,4,6,7,11],"sensibl":10,"sent":0,"separ":[4,8,12],"sequenc":12,"seri":[3,4,11,14],"serial":8,"serv":2,"server":[0,2,4,6,7,9,10,11,14],"session":[0,2,7,10],"set":[0,3,4,5,6,7,9,10,13,14],"setup":[0,10,14],"sever":8,"sgkt":12,"share":[3,4,7,9,12,14],"shift":[5,8],"ship":0,"short":[2,7,11],"shortcut":4,"shorten":11,"should":14,"show":[1,3,6,7,8,10,11,12,13,14],"shown":[6,8,12],"side":[8,9,11,14],"signal":[3,12],"silent":[6,12],"simplex":12,"singl":[0,3,7,8,10,12],"six":12,"size":8,"skip":[3,8,12,14],"slkt":12,"small":8,"so":[0,1,3,5,6,7,8,9,11,12,13],"some":[4,12],"sourc":[6,8,14],"space":5,"special":3,"specialis":10,"specif":[8,9,10],"spectra":[3,7,9,11,12],"spectromet":12,"spectroscopi":[3,7],"speed":5,"spin":[3,12],"split":1,"spread":12,"squar":8,"stack":8,"stai":[8,11],"stand":12,"standard":[5,10,13],"start":[3,4,7,8,9,10,11,12],"startup":[10,14],"state":[5,8,11,12],"static":12,"statist":[3,11],"statu":[4,12,14],"step":[3,7,8,9,12,14],"still":[8,12],"store":10,"strategi":12,"stretch":12,"stretchco":12,"strictli":12,"stripe":[8,14],"strkt":12,"strktexp":12,"strktsexp":12,"strong":12,"style":[],"subtract":3,"success":[11,12],"suffix":[8,10],"sum":12,"summari":12,"summaris":12,"support":4,"surrend":6,"surviv":8,"swatch":8,"switch":12,"symbol":8,"sync":8,"synchronis":[7,11],"syntax":[1,12],"t0":[4,7],"tab":[0,1,2,4,6,7,8,9,11,12,13],"tabl":[0,2,3,4,7,11,12,14],"take":[8,10,12,13],"target":0,"task":5,"templat":[6,11],"ters":11,"tesla":12,"text":[1,3,5,6,9,11,12,14],"tf":8,"than":[8,12],"thei":[1,2,4,5,7,8,11,12,13],"them":[1,8,10,13,14],"theori":[1,3,12],"therefor":0,"thi":[0,1,2,3,4,6,7,8,9,10,11,12,13,14],"third":0,"those":14,"three":[1,8,12],"through":[3,6,9,12],"tick":8,"time":[1,7,12,13],"titl":8,"togeth":12,"toggl":[5,8],"tool":[2,3,4,5,7,9,14],"toolbar":[6,7,8,12],"top":[0,8],"toward":8,"toyab":12,"trace":[],"track":2,"transform":[3,12],"transient":11,"treat":3,"tree":[2,7,9,10,12,14],"troubleshoot":4,"truth":6,"twice":[8,12],"two":[3,4,6,8,12,14],"type":[1,3,5,8,12],"typic":[1,7],"u":[5,8],"unaffect":12,"uncertainti":[3,8],"unchang":[4,13],"uncheck":[8,14],"under":[1,4,8,9,10,11,14],"underneath":8,"unexpect":11,"uniform":12,"unit":[3,12],"unlock":[6,14],"unmatch":8,"unspecifi":12,"until":[6,14],"untouch":[0,12],"up":[5,8,11,12],"updat":[1,8],"upper":8,"url":[0,2,3],"us":[0,1,3,4,6,7,8,10,11,12,13,14],"usabl":11,"user":[8,9],"usual":5,"valid":[12,14],"valu":[1,3,7,8,10,11,12,13,14],"vari":7,"variant":12,"varieti":12,"verifi":[1,7,14],"version":14,"via":[9,12],"view":[0,3,4,7],"viewer":[3,7],"visibl":[6,8],"visual":12,"vm":12,"wa":[0,6,11,14],"wai":[11,12],"warn":[12,14],"weak":12,"web":[3,4,6,7,8,10,11,12],"webpag":9,"well":[0,5],"went":11,"were":11,"what":[1,4,9,11,14],"whatev":0,"when":[2,10,11,12,13],"whenev":8,"where":[9,10,12,14],"whether":[5,8,11],"which":[3,6,8,12],"while":[0,5,6,8,11,12],"who":0,"whole":11,"whose":12,"window":[2,3,4,7,9,12],"without":[1,8,10,11,12],"work":[0,2,5,7,8,10,12,14],"workflow":[1,4,7,9],"worst":[11,12],"would":6,"wrap":[2,4],"writabl":14,"write":[2,3,6,7,10,12],"written":[10,13],"wrong":[4,11],"x":[4,5,12,14],"xml":[10,14],"y":[5,8,12],"year":[0,2,7,12],"yet":8,"you":[1,4,6,8,10,12,13,14],"your":[0,2,7,11,12],"zaher":[2,4,14],"zoom":[5,8],"\u00b5sr":7,"\u03bb\u2081":8,"\u03c7\u00b2":[11,12]},"titles":["Configuration sharing","Constraints","Getting started","Glossary","muSRFlow User Manual","Keyboard shortcuts","MSR editor","Overview","Parameters and parameter plots","Web and desktop editions","Preferences","Results and diagnostics","Runs and fitting","t0 / background","Troubleshooting"],"titleterms":{"A":7,"On":0,"The":[2,8,11],"action":12,"app":2,"axi":8,"background":13,"bar":11,"cannot":14,"choos":8,"column":8,"command":11,"configur":[0,14],"constraint":1,"content":4,"coupl":1,"custom":1,"data":[8,14],"desktop":[0,2,9],"detail":11,"diagnost":11,"dialog":[8,11],"differ":14,"edit":[2,7,8,9],"editor":[5,6],"empti":14,"exampl":1,"execut":11,"field":1,"file":[6,8,11,14],"first":7,"fit":[7,12,14],"frequenc":1,"from":14,"gener":5,"get":[2,7],"glossari":3,"gui":6,"guid":2,"handl":6,"hang":14,"hood":7,"i":[0,14],"instal":2,"keyboard":[5,8],"larmor":1,"link":14,"load":14,"log":11,"look":14,"machin":14,"magnet":1,"manual":4,"miss":14,"model":12,"msr":[5,6],"multipl":8,"musrflow":4,"note":[0,5],"noth":14,"one":8,"open":2,"option":[8,12],"origin":14,"outcom":11,"overlai":8,"overview":7,"ownership":6,"page":14,"panel":8,"paramet":[1,5,8,14],"per":12,"plot":[5,8,12,14],"prefer":10,"prefix":14,"prepar":14,"prerequisit":2,"preset":8,"preview":1,"problem":14,"quick":2,"rang":12,"report":14,"restor":14,"result":11,"run":[2,11,12],"select":[5,8,12],"seri":[8,12],"set":[8,12],"share":[0,8],"shortcut":[5,8],"some":14,"start":[2,14],"statist":12,"statu":11,"style":8,"support":2,"t0":13,"tab":5,"tabl":8,"templat":8,"trace":8,"troubleshoot":14,"two":7,"unchang":14,"under":7,"user":4,"view":12,"web":[0,2,9,14],"what":[0,7],"window":[5,8,11],"workflow":6,"wrong":14,"x":8,"you":7}}) \ No newline at end of file +Search.setIndex({"alltitles":{"A first fit":[[7,"a-first-fit"]],"Command log":[[11,"command-log"]],"Configuration sharing":[[0,null]],"Constraints":[[1,null],[1,"id1"]],"Contents":[[4,null]],"Custom parameters":[[1,"custom-parameters"]],"Desktop installation":[[2,"desktop-installation"]],"Editing trace styles":[[8,"editing-trace-styles"]],"Example: couple the magnetic field to the Larmor frequency":[[1,"example-couple-the-magnetic-field-to-the-larmor-frequency"]],"Execution details":[[11,"execution-details"]],"File handling":[[6,"file-handling"]],"Fit and Plot":[[12,"fit-and-plot"]],"Fit model":[[12,"fit-model"]],"Fit options":[[12,"fit-options"]],"Fit or plot will not start":[[14,"fit-or-plot-will-not-start"]],"Fit range":[[12,"fit-range"]],"Fitted parameters look wrong or unchanged":[[14,"fitted-parameters-look-wrong-or-unchanged"]],"General notes":[[5,"general-notes"]],"Getting started":[[2,null]],"Glossary":[[3,null]],"Keyboard shortcuts":[[5,null],[8,"keyboard-shortcuts"]],"MSR editor":[[5,"msr-editor"],[6,null]],"Notes":[[0,"notes"]],"On the desktop":[[0,"on-the-desktop"]],"On the web":[[0,"on-the-web"]],"Opening the web edition":[[2,"opening-the-web-edition"]],"Outcome dialog":[[11,"outcome-dialog"]],"Overlay data sets (multiple files in one panel)":[[8,"overlay-data-sets-multiple-files-in-one-panel"]],"Overview":[[7,null]],"Ownership: GUI or editor":[[6,"ownership-gui-or-editor"]],"Parameter plot hangs on \u201cPreparing plot files\u201d":[[14,"parameter-plot-hangs-on-preparing-plot-files"]],"Parameter plot is empty or missing data":[[14,"parameter-plot-is-empty-or-missing-data"]],"Parameter selection (Parameters tab)":[[5,"parameter-selection-parameters-tab"]],"Parameter-plot window":[[5,"parameter-plot-window"]],"Parameters and parameter plots":[[8,null]],"Per-run statistics":[[12,"per-run-statistics"]],"Plot options":[[8,"plot-options"]],"Preferences":[[10,null]],"Prerequisites":[[2,"prerequisites"]],"Preview":[[1,"preview"]],"Reporting problems":[[14,"reporting-problems"]],"Restored configuration differs from the original machine":[[14,"restored-configuration-differs-from-the-original-machine"]],"Result files":[[11,"result-files"]],"Results and diagnostics":[[11,null]],"Run log window":[[11,"run-log-window"]],"Run selection":[[12,"run-selection"]],"Running the desktop app":[[2,"running-the-desktop-app"]],"Runs and fitting":[[12,null]],"Selecting parameters for plotting":[[8,"selecting-parameters-for-plotting"]],"Series fit actions":[[12,"series-fit-actions"]],"Some links start with a different prefix":[[14,"some-links-start-with-a-different-prefix"]],"Support":[[2,"support"]],"Template and series presets":[[8,"template-and-series-presets"]],"The Choose X axis dialog":[[8,"the-choose-x-axis-dialog"]],"The Quick Start guide":[[2,"the-quick-start-guide"]],"The Shared column":[[8,"the-shared-column"]],"The parameter table":[[8,"the-parameter-table"]],"The parameter-plot window":[[8,"the-parameter-plot-window"]],"The status bar":[[11,"the-status-bar"]],"Troubleshooting":[[14,null]],"Two editions":[[7,"two-editions"]],"Under the hood":[[7,"under-the-hood"]],"View settings":[[12,"view-settings"]],"Web and desktop editions":[[9,null]],"Web page cannot load data":[[14,"web-page-cannot-load-data"]],"What is shared":[[0,"what-is-shared"]],"What you get":[[7,"what-you-get"]],"Workflow":[[6,"workflow"]],"muSRFlow User Manual":[[4,null]],"t0 / background":[[13,null]],"\u201cNothing to fit\u201d":[[14,"nothing-to-fit"]]},"docnames":["configuration-sharing","constraints","getting-started","glossary","index","keyboard-shortcuts","msr-editor","overview","parameters-plots","platforms","preferences","results-diagnostics","runs-fitting","t0-background","troubleshooting"],"envversion":{"sphinx":65,"sphinx.domains.c":3,"sphinx.domains.changeset":1,"sphinx.domains.citation":1,"sphinx.domains.cpp":9,"sphinx.domains.index":1,"sphinx.domains.javascript":3,"sphinx.domains.math":2,"sphinx.domains.python":4,"sphinx.domains.rst":2,"sphinx.domains.std":2},"filenames":["configuration-sharing.rst","constraints.rst","getting-started.rst","glossary.rst","index.rst","keyboard-shortcuts.rst","msr-editor.rst","overview.rst","parameters-plots.rst","platforms.rst","preferences.rst","results-diagnostics.rst","runs-fitting.rst","t0-background.rst","troubleshooting.rst"],"indexentries":{},"objects":{},"objnames":{},"objtypes":{},"terms":{"":[3,5,6,8,10,12,14],"0":12,"01":12,"012":11,"1":[8,11,12],"100":12,"12":12,"16":12,"1998":12,"2":[8,12],"24":12,"3":8,"5":12,"514":[3,12],"515":[3,12],"516":12,"520":12,"525":12,"540":12,"7":12,"8":12,"A":[0,1,3,4,10,11,12,14],"For":[2,6,8,11,12],"If":[4,8,11,12,14],"In":[5,7,8,14],"It":[0,1,4,6,7,11],"Its":[5,7],"On":[2,3,4,6,7,9,11,12,14],"One":[3,12],"The":[0,1,3,4,5,6,7,9,10,12,13,14],"Then":8,"There":2,"These":4,"To":[1,12],"With":[5,8],"_asi":10,"_singlehist":10,"abov":8,"abragamco":12,"accept":14,"access":9,"accumul":12,"across":[7,8],"action":[3,4,5,7,8,10,11,14],"activ":[2,5,6,7,8,14],"actor":6,"actual":[12,13],"ad":[10,12],"add":[1,5,8,11,12,14],"addrun":[3,12],"adjust":[7,8,13],"affect":8,"after":[8,12,14],"afterward":[8,11],"again":[7,12,14],"against":14,"aggreg":[11,12],"agre":14,"align":8,"all":[2,3,8,11,12,14],"alreadi":[2,12],"also":[2,6,8],"amplitud":8,"an":[1,2,3,4,6,7,8,10,11,12,13,14],"analysi":[0,3,6,7,11,14],"anchor":5,"ani":[1,6,7,8,9,11,12,13],"anoth":[0,3,7,8,14],"anyon":0,"anyth":[4,10],"apod":[3,12],"app":4,"appear":[2,11],"append":[3,10],"appimag":2,"appli":[0,1,3,5,8,9,12],"applic":4,"approxim":10,"ar":[0,1,2,4,7,8,10,12,13,14],"area":[5,11],"argument":11,"arithmet":1,"around":4,"arrang":8,"artifact":[6,9,10,11],"ask":[6,8],"assign":8,"asymmetri":[10,12],"attempt":[6,14],"authorit":[11,12,14],"auto":[8,10],"automat":[3,5,8,12],"auxiliari":9,"avail":[1,4,8],"avoid":[1,10],"awar":2,"ax":[5,8],"axi":[4,12,14],"back":[6,8,12],"background":[4,7],"backward":[0,12],"bar":[0,2,4,5,7,8,12,14],"base":8,"becom":[1,6,8],"been":5,"befor":[1,8,12,14],"behaviour":[4,11,13],"behind":9,"below":[11,12],"bench":14,"besid":9,"best":[11,12],"between":[5,8,12],"beyond":8,"bfield":1,"bg":[7,13],"bin":12,"bind":1,"blob":8,"block":[1,3,11,12],"bold":8,"both":[1,3,4,7,9,14],"bottom":11,"box":[5,8],"browser":[0,2,3,4,7,8,9,14],"bug":2,"build":[2,4,8],"built":[4,6,8],"button":[0,1,2,3,4,6,7,8,9,11,12],"c":[0,14],"cach":12,"calcul":12,"came":12,"can":[0,1,3,6,7,8,12],"cancel":10,"cannot":[0,4,8,11,12],"canva":[3,7,9,11,12],"canvas":3,"carri":[0,3,8,12,14],"cfg":14,"cgi":[2,4,9,14],"ch":[0,2,10,14],"chain":0,"chang":[1,6,8,10,12,14],"chapter":[2,7,9],"chart":5,"check":[8,14],"checkbox":8,"checkout":2,"chip":[3,8,12,14],"choic":[8,12],"choos":[0,1,2,4,7,10],"chosen":[8,12],"clash":10,"classic":[7,12],"click":[5,6,7,8,11,12,14],"clipboard":5,"clone":8,"close":[5,6,8,10,11,14],"closest":8,"cmd":[5,8],"code":11,"collaps":11,"colleagu":0,"collect":[7,11],"collid":5,"colon":12,"colour":8,"column":[3,12,14],"combin":12,"come":9,"comma":12,"command":[3,4,7,9,12,14],"commit":8,"common":8,"compact":[0,14],"companion":3,"compar":8,"compat":12,"complet":[6,11],"compon":[0,1,8,12,14],"compos":12,"compress":[0,3,14],"concentr":4,"concern":9,"concret":8,"configur":[3,4,7,9,10],"confirm":[6,12,14],"constant":1,"constrain":1,"constraint":[0,3,4,6,7,8,12],"contact":[2,4,14],"contain":[1,8,11],"content":12,"context":11,"contigu":[8,12],"contrast":12,"control":[1,6,7,8,13,14],"conveni":12,"convent":10,"converg":[11,12],"convert":7,"copi":[0,6,8,9],"correct":[3,12],"correspond":2,"could":14,"count":[8,12],"coupl":4,"covari":12,"cover":[4,14],"creat":4,"ctrl":[5,8],"current":[0,2,3,6,7,8,10,12,13,14],"cursor":5,"custom":[4,7,8,12],"cycl":12,"dai":7,"damp":8,"dash":12,"dat":[3,7,8,11],"data":[0,2,3,4,7,9,10,11,12],"dc":12,"default":[8,10,12,13],"defin":1,"degre":12,"depend":[5,12],"deploi":14,"deploy":[2,4],"deriv":10,"describ":[2,3,4,8,12],"deselect":[5,8],"desk":4,"desktop":[3,4,6,7,8,10,11,12,14],"desktop_deploy":[2,4],"detail":[4,7,12,14],"detect":10,"detector":[12,13],"diagnos":11,"diagnost":4,"dialog":[0,2,3,4,7,9,10,14],"did":[11,12],"differ":[4,7,9,12,13],"direct":[3,12],"directli":[1,6,7,8],"directori":[0,7,9,10,11,14],"disabl":12,"disappear":[8,12],"disclosur":12,"disk":[6,12],"dismiss":8,"displai":[3,6,7,8,9,11,12],"dist":2,"distinct":12,"do":[6,12,13,14],"doc":[2,4],"document":[2,3,4,5,6,7,10,11,12,13,14],"doe":[0,4,6,7,8,11,12],"dolli":12,"domain":[3,12],"dot":12,"download":[5,8,11],"drawn":[3,7,8,9,12],"drive":8,"driven":5,"dropdown":[1,8,12,14],"dump_head":[3,4,7],"dynam":12,"e":[2,12],"each":[2,3,8,11,12],"edit":[3,4,5,6,10,12,13,14],"editor":[3,4,7,8,9,12,14],"effect":[10,13],"effici":12,"either":12,"electron":[0,2,4,6,7,9,10],"element":11,"empti":[4,8,12],"enabl":[8,10,12],"encod":[0,7],"end":[4,12],"endpoint":[9,14],"engin":[3,7,9],"enter":[2,5,6,7],"entri":[3,5,8],"equal":1,"equival":8,"eras":11,"error":[8,12],"esc":[5,8],"event":5,"everi":[3,5,7,8,11,12,14],"everydai":5,"everyth":[1,12],"evolv":7,"exact":12,"exactli":1,"exampl":[4,8,10,11,12],"exce":12,"execut":[4,7],"exist":[10,12,13],"exit":11,"expand":[2,7,8,12],"expert":[7,13],"explain":11,"explicitli":9,"exponenti":12,"exponentialbessel":12,"exponentialco":12,"expos":[0,6,7,9,10,12,14],"express":[1,12],"extern":2,"extra":8,"factor":12,"factori":7,"fail":[11,12,14],"fast":3,"fastest":14,"featur":10,"fed":7,"feed":[7,8,11],"fetch":14,"few":5,"fft":[0,3,7,12],"field":[4,5,6,8,10,12],"file":[0,2,3,4,7,9,10,12],"final":7,"finish":[11,14],"first":[2,4,6,8,10,12,14],"fit":[0,1,2,3,4,6,8,9,11,13],"fitparamet":3,"fix":[9,14],"flame":12,"flip":12,"flow":12,"focu":5,"focus":[5,8],"follow":12,"form":[3,14],"format":3,"forward":12,"four":8,"fourier":[3,12],"fragment":[0,3],"frame":[3,12],"frequenc":[3,4,8,10,12],"fresh":6,"freshli":12,"from":[0,1,2,3,4,5,6,7,8,9,10,11,12,13],"frq":1,"full":[5,7,11],"function":[1,3,12],"further":12,"g":[2,12],"gain":12,"gamma_mu":1,"gauss":12,"gaussian":12,"gaussianbessel":12,"gaussianco":12,"gbgco":12,"gbgexp":12,"gbgsexp":12,"gbgzf":12,"gdktlf":12,"gener":[1,3,4,6,7,10,11,12,13],"get":[0,4],"give":11,"glfexp":12,"glfsexp":12,"global":[3,8],"glossari":4,"gp":12,"gpd":12,"graphic":4,"grid":8,"group":[10,12],"grow":8,"guess":[3,7,8,10],"gui":[1,4,7,11,12,14],"guid":[4,7],"gyromagnet":1,"ha":[3,5,8,12,14],"hal":12,"hand":[5,6,11,12,14],"handl":[0,4,9],"hang":4,"hash":0,"have":12,"header":10,"health":14,"help":[4,9,14],"hess":12,"hide":[8,12],"highlight":[7,12],"hint":10,"hist":12,"histogram":[10,12],"hold":[5,8,12,14],"hood":4,"host":[2,13],"hover":11,"how":[7,12],"http":[0,2],"i":[1,2,3,4,5,6,7,8,9,10,11,12],"icon":[0,6],"ident":8,"identifi":[8,12],"idl":11,"ignor":[5,14],"imaginari":12,"immedi":[1,11],"includ":[1,12,14],"independ":[2,3,8,9,11,12,14],"indic":8,"individu":8,"inform":12,"initi":[3,7,10],"inlin":[8,12],"input":[3,5],"insid":[3,7,12],"inspect":[4,7,11],"instal":[4,10,12,14],"instanc":0,"instead":[1,8,10,11,14],"instrument":[0,2,7,10,12],"interact":[5,7,8],"interfac":7,"invalid":11,"invok":11,"involv":14,"issu":2,"its":[0,2,3,7,8,9,11,12,13,14],"j":2,"join":3,"jsroot":[3,7,9,12],"just":[5,6],"keep":[6,8,11,12,13],"kei":[5,8],"kept":[11,12],"keyboard":4,"khz":12,"kt":12,"kubo":12,"label":[8,12],"lack":14,"lai":8,"lam_2255":8,"larg":11,"larger":8,"larmor":4,"lasso":5,"last":11,"later":[2,11],"layout":8,"ldktlf":12,"leak":8,"least":14,"leav":[8,10,12,13],"legaci":[12,14],"legend":8,"lem":12,"let":8,"level":8,"lgkt":12,"lgktexp":12,"lgktsexp":12,"librari":9,"lifetim":12,"like":[1,13],"likelihood":12,"limit":[3,7,8,12],"line":[3,4,7,8,9,11,14],"linear":8,"link":[0,2,3,4,7,9,11],"linux":2,"list":[1,6,8,11,12,14],"liter":1,"live":[1,7,9,11,12],"llfexp":12,"llfsexp":12,"lmu":10,"load":[4,8,13],"local":[0,2,7,9,14],"lock":[6,14],"log":[4,7,12,14],"logarithm":[8,12],"long":0,"look":[4,7,10],"lose":12,"lower":8,"ltf":12,"machin":[0,2,4,7,11],"made":3,"magnet":4,"mai":[0,6,14],"mailto":[2,14],"main":[1,2,4,7,8,9,11],"make":12,"manag":7,"manual":[2,3,7,9],"map":8,"mark":[3,12],"marker":8,"match":[3,4,8,10,14],"matter":7,"max":12,"mc":12,"md":[2,4,14],"mean":[6,12],"measur":[3,8],"mechan":[3,8],"median":12,"medium":12,"menu":[6,7,9,10],"merg":12,"messag":[11,14],"metadata":[3,7,10],"mhz":12,"microsecond":12,"might":12,"migrad":12,"minim":12,"minimis":12,"mino":12,"minuit2":12,"mirror":4,"miss":4,"mode":[5,8,10],"model":[0,1,2,4,6,7,8,9,14],"modeless":[2,9,11],"modern":7,"monochrom":8,"more":[7,8,12,14],"most":5,"mous":5,"msr":[1,2,3,4,7,9,10,11,12,13,14],"msr2data":[3,4,7],"multi":[3,8,12],"multipl":6,"multipli":1,"muon":[1,3,7],"musrfit":[1,2,3,4,7,8,10,11,12],"musrfit_startup":10,"musrflow":[0,2,3,5,6,7,10,11,14],"musrus":[0,2],"musrview":[3,4,7,9,12],"must":[2,13,14],"name":[1,3,5,7,8,10,12],"nativ":[3,7,8,9,12],"ndf":[11,12],"need":[2,7,8],"never":[0,5,8,10,14],"new":[8,12,14],"next":[1,2,6,8,10,12,13],"node":2,"none":12,"normal":[1,5,12,13],"note":[4,8,14],"noth":[0,2,4,12],"notic":11,"npm":2,"number":[2,7,8],"numer":[8,12],"object":12,"off":12,"offer":[8,11,12],"offset":12,"old":12,"omit":8,"onc":[1,2,6,8,12],"one":[1,2,3,5,6,7,9,12,14],"ones":[2,12],"onli":[1,2,8,11,12,14],"onto":8,"opac":8,"open":[0,4,6,7,8,9,10,11,12,14],"oper":11,"opt":12,"option":[0,2,3,4,7,14],"order":[11,12],"ordinari":1,"organis":4,"origin":4,"oscil":12,"other":[1,8,11,13],"out":[8,11,12],"outcom":[4,14],"outlier":12,"output":[3,10,11,12],"over":[7,11,12],"overlai":14,"overlaid":[8,14],"overrid":[8,12],"overview":4,"overwrit":6,"own":[0,3,6,7,9,12],"ownership":[4,5],"pack":12,"packag":[2,4,7,11,12],"padlock":6,"page":[3,4,7,9,12],"palett":8,"pan":[5,8],"pane":[1,11],"panel":[5,14],"par":[3,7,11,12],"par4":12,"par7":12,"paramet":[0,2,3,4,6,7,9,10,11,12],"parr":12,"part":[1,3],"parti":0,"pass":0,"past":[0,9],"pastel":8,"path":[2,8,9,10,12],"payload":0,"per":[1,8,9,11],"perform":14,"perman":11,"phase":[3,12],"physic":[7,12],"pick":8,"picker":8,"place":14,"plot":[0,3,4,6,7,9,11,13],"plotli":[5,8],"plottabl":14,"plu":[3,8,12],"point":[2,14],"pointer":8,"polici":12,"pop":11,"popul":[0,8],"portabl":[3,7,10],"power":12,"predefin":8,"prefer":[0,4,7,9,14],"prefix":[4,8],"prepar":[3,4,6,12],"prerequisit":4,"press":[1,2,5,7],"preview":[4,6,12],"previou":12,"primari":11,"print":3,"problem":4,"process":11,"produc":[2,3,7,9,11,12],"progress":12,"project":[2,3],"protocol":9,"provid":[5,7,8],"psi":[0,2,10,14],"public":10,"q":[5,8],"qualiti":12,"question":2,"quick":[4,7,9],"ran":11,"rang":[0,3,4,5,6,7,8],"rate":12,"rather":[8,12],"ratio":1,"re":[8,12,14],"reachabl":14,"read":[1,3,7,10,12,14],"readabl":[11,14],"readm":[4,14],"real":[6,12,14],"reason":14,"rebuild":[12,14],"rebuilt":[0,8],"recognis":[6,8],"recolour":8,"record":[3,11,12,14],"recreat":0,"redraw":8,"refer":[0,1,3,7,12],"referenc":1,"refin":1,"refit":[3,8,12,14],"reflect":1,"refresh":[8,14],"regener":6,"regular":12,"reimplement":7,"relat":[0,1],"relax":12,"releas":2,"relev":[7,11],"remain":0,"rememb":8,"remov":[1,8,12],"render":[1,7],"replac":[6,8,12],"report":[2,4,12],"repositori":[2,4],"repres":1,"reproduc":[0,11],"requir":[2,12],"reread":[8,14],"reset":[5,8,14],"resolut":[12,14],"resolv":[3,7,8,10,12,14],"respect":12,"rest":8,"restor":[0,3,4,7,8,9],"restyl":8,"result":[2,4,6,7,8,10,12,14],"return":[6,12,13],"reus":[3,12,14],"right":[2,7,8],"role":8,"root":[3,7,9,10,11,12,14],"rotat":[3,12],"rout":[8,12],"row":[1,8,12,14],"rpm":2,"rrf":[0,3,7,12],"run":[0,1,3,4,6,7,8,9,10,14],"runner":2,"runtim":2,"sai":9,"salman":[2,4,14],"same":[0,1,2,3,4,5,7,8,10,11,12,14],"save":[6,7,9,10,12],"scale":12,"scan":8,"scana_par":8,"scanb_par":8,"scatter":8,"scope":8,"section":[2,7],"see":[0,3,4,5,7,8,11,12,14],"seed":[3,10],"select":[0,2,4,6,7,11],"sensibl":10,"sent":0,"separ":[4,8,12],"sequenc":12,"seri":[3,4,11,14],"serial":8,"serv":2,"server":[0,2,4,6,7,9,10,11,14],"session":[0,2,7,10],"set":[0,3,4,5,6,7,9,10,13,14],"setup":[0,10,14],"sever":8,"sgkt":12,"share":[3,4,7,9,12,14],"shift":[5,8],"ship":0,"short":[2,7,11],"shortcut":4,"shorten":11,"should":14,"show":[1,3,6,7,8,10,11,12,13,14],"shown":[6,8,12],"side":[8,9,11,14],"signal":[3,12],"silent":[6,12],"simplex":12,"singl":[0,3,7,8,10,12],"six":12,"size":8,"skip":[3,8,12,14],"slkt":12,"small":8,"so":[0,1,3,5,6,7,8,9,11,12,13],"some":[4,12],"sourc":[6,8,14],"space":5,"special":3,"specialis":10,"specif":[8,9,10],"spectra":[3,7,9,11,12],"spectromet":12,"spectroscopi":[3,7],"speed":5,"spin":[3,12],"split":1,"spread":12,"squar":8,"stack":8,"stage":8,"stai":[8,11],"stand":12,"standard":[5,10,13],"start":[3,4,7,8,9,10,11,12],"startup":[10,14],"state":[5,8,11,12],"static":12,"statist":[3,11],"statu":[4,12,14],"step":[3,7,8,9,12,14],"still":[8,12],"store":10,"strategi":12,"stretch":12,"stretchco":12,"strictli":12,"stripe":[8,14],"strkt":12,"strktexp":12,"strktsexp":12,"strong":12,"style":[],"subtract":3,"success":[11,12],"suffix":[8,10],"sum":12,"summari":12,"summaris":12,"support":4,"surrend":6,"surviv":8,"swatch":8,"switch":12,"symbol":8,"sync":8,"synchronis":[7,11],"syntax":[1,12],"t0":[4,7],"tab":[0,1,2,4,6,7,8,9,11,12,13],"tabl":[0,2,3,4,7,11,12,14],"take":[8,10,12,13],"target":0,"task":5,"templat":[6,11],"ters":11,"tesla":12,"text":[1,3,5,6,9,11,12,14],"tf":8,"than":[8,12],"thei":[1,2,4,5,7,8,11,12,13],"them":[1,8,10,13,14],"theori":[1,3,12],"therefor":0,"thi":[0,1,2,3,4,6,7,8,9,10,11,12,13,14],"third":0,"those":14,"three":[1,8,12],"through":[3,6,9,12],"tick":8,"time":[1,7,12,13],"titl":8,"togeth":12,"toggl":[5,8],"tool":[2,3,4,5,7,9,14],"toolbar":[6,7,8,12],"top":[0,8],"toward":8,"toyab":12,"trace":[],"track":2,"transform":[3,12],"transient":11,"treat":3,"tree":[2,7,9,10,12,14],"troubleshoot":4,"truth":6,"twice":[8,12],"two":[3,4,6,8,12,14],"type":[1,3,5,8,12],"typic":[1,7],"u":[5,8],"unaffect":12,"uncertainti":[3,8],"unchang":[4,13],"uncheck":[8,14],"under":[1,4,8,9,10,11,14],"underneath":8,"unexpect":11,"uniform":12,"unit":[3,12],"unlock":[6,14],"unmatch":8,"unspecifi":12,"until":[6,14],"untouch":[0,12],"up":[5,8,11,12],"updat":[1,8],"upper":8,"url":[0,2,3],"us":[0,1,3,4,6,7,8,10,11,12,13,14],"usabl":11,"user":[8,9],"usual":5,"valid":[12,14],"valu":[1,3,7,8,10,11,12,13,14],"vari":7,"variant":12,"varieti":12,"verifi":[1,7,14],"version":14,"via":[9,12],"view":[0,3,4,7],"viewer":[3,7],"visibl":[6,8],"visual":12,"vm":12,"wa":[0,6,11,14],"wai":[11,12],"warn":[12,14],"weak":12,"web":[3,4,6,7,8,10,11,12],"webpag":9,"well":[0,5],"went":11,"were":11,"what":[1,4,9,11,14],"whatev":0,"when":[2,10,11,12,13],"whenev":8,"where":[9,10,12,14],"whether":[5,8,11],"which":[3,6,8,12],"while":[0,5,6,8,11,12],"who":0,"whole":11,"whose":12,"window":[2,3,4,7,9,12],"without":[1,8,10,11,12],"work":[0,2,5,7,8,10,12,14],"workflow":[1,4,7,9],"worst":[11,12],"would":6,"wrap":[2,4],"writabl":14,"write":[2,3,6,7,10,12],"written":[10,13],"wrong":[4,11],"x":[4,5,12,14],"xml":[10,14],"y":[5,8,12],"year":[0,2,7,12],"yet":8,"you":[1,4,6,8,10,12,13,14],"your":[0,2,7,11,12],"zaher":[2,4,14],"zoom":[5,8],"\u00b5sr":7,"\u03bb\u2081":8,"\u03c7\u00b2":[11,12]},"titles":["Configuration sharing","Constraints","Getting started","Glossary","muSRFlow User Manual","Keyboard shortcuts","MSR editor","Overview","Parameters and parameter plots","Web and desktop editions","Preferences","Results and diagnostics","Runs and fitting","t0 / background","Troubleshooting"],"titleterms":{"A":7,"On":0,"The":[2,8,11],"action":12,"app":2,"axi":8,"background":13,"bar":11,"cannot":14,"choos":8,"column":8,"command":11,"configur":[0,14],"constraint":1,"content":4,"coupl":1,"custom":1,"data":[8,14],"desktop":[0,2,9],"detail":11,"diagnost":11,"dialog":[8,11],"differ":14,"edit":[2,7,8,9],"editor":[5,6],"empti":14,"exampl":1,"execut":11,"field":1,"file":[6,8,11,14],"first":7,"fit":[7,12,14],"frequenc":1,"from":14,"gener":5,"get":[2,7],"glossari":3,"gui":6,"guid":2,"handl":6,"hang":14,"hood":7,"i":[0,14],"instal":2,"keyboard":[5,8],"larmor":1,"link":14,"load":14,"log":11,"look":14,"machin":14,"magnet":1,"manual":4,"miss":14,"model":12,"msr":[5,6],"multipl":8,"musrflow":4,"note":[0,5],"noth":14,"one":8,"open":2,"option":[8,12],"origin":14,"outcom":11,"overlai":8,"overview":7,"ownership":6,"page":14,"panel":8,"paramet":[1,5,8,14],"per":12,"plot":[5,8,12,14],"prefer":10,"prefix":14,"prepar":14,"prerequisit":2,"preset":8,"preview":1,"problem":14,"quick":2,"rang":12,"report":14,"restor":14,"result":11,"run":[2,11,12],"select":[5,8,12],"seri":[8,12],"set":[8,12],"share":[0,8],"shortcut":[5,8],"some":14,"start":[2,14],"statist":12,"statu":11,"style":8,"support":2,"t0":13,"tab":5,"tabl":8,"templat":8,"trace":8,"troubleshoot":14,"two":7,"unchang":14,"under":7,"user":4,"view":12,"web":[0,2,9,14],"what":[0,7],"window":[5,8,11],"workflow":6,"wrong":14,"x":8,"you":7}}) \ No newline at end of file diff --git a/docs/source/parameters-plots.rst b/docs/source/parameters-plots.rst index 0341774..362d6f3 100644 --- a/docs/source/parameters-plots.rst +++ b/docs/source/parameters-plots.rst @@ -138,6 +138,8 @@ the pointer: (file, parameter) series only, or to every trace of that data set (all panels showing it); * colour swatches, marker **symbol**, **size**, and **opacity**; +* **Apply** -- commit the staged choices and redraw the affected panels; + **Close** hides the editor, and ESC (or ``Q``) dismisses it; * **Reset** -- restore the file's default colouring for that scope. Trace-level edits are keyed by (data set, panel, parameter), so they survive diff --git a/muSRFitParameterPlot.js b/muSRFitParameterPlot.js index 623f985..e49af97 100644 --- a/muSRFitParameterPlot.js +++ b/muSRFitParameterPlot.js @@ -695,6 +695,7 @@ function parameterOverlayEntries(panel, registry) { if (panel.dataset) { entries.push({ key: panel.dataSetKey, + dataSetKey: panel.dataSetKey, label: (panel.source && panel.source.label) || "Parameter data", dataset: panel.dataset, colorIndex: 0 @@ -706,6 +707,7 @@ function parameterOverlayEntries(panel, registry) { if (!entry) continue; entries.push({ key: entry.key, + dataSetKey: entry.key, label: entry.label, dataset: entry.dataset || null, colorIndex: entry.colorIndex @@ -740,6 +742,7 @@ function buildMusrfitParameterOverlayTraces(dataSets, xName, yNames, mode, optio continue; } let entryColorIndex = Number.isFinite(entry.colorIndex) ? entry.colorIndex : i; + let dataSetKey = entry.dataSetKey || entry.key || ""; let nameOffset = 0; for (let name of yNames) { let yIndex = musrfitParameterColumnIndex(dataset, name); @@ -747,9 +750,9 @@ function buildMusrfitParameterOverlayTraces(dataSets, xName, yNames, mode, optio let colorIndex = overlayMode ? entryColorIndex : nameOffset; let fallbackColor = entry.color || musrfitParameterPaletteColor(paletteId, colorIndex); let style = { color: fallbackColor }; - if (options.styleRegistry && entry.dataSetKey) { + if (options.styleRegistry && dataSetKey) { style = musrfitParameterTraceStyle( - options.styleRegistry, options.styleKeyOf && options.styleKeyOf(entry.dataSetKey, name) || "", entry.dataSetKey, style); + options.styleRegistry, options.styleKeyOf && options.styleKeyOf(dataSetKey, name) || "", dataSetKey, style); } let trace = buildMusrfitParameterTrace(dataset, xIndex, yIndex, mode, style); if (overlayMode) trace.name = (entry.label ? entry.label + ": " : "") + trace.name; @@ -1619,13 +1622,15 @@ function showMusrfitParameterPlotWindow(parameterPath, jobName = "", preferredPa for (let other of swatches.querySelectorAll(".parameter-style-swatch")) { other.classList.toggle("selected", other === swatch); } - applyParameterStyleAndRedraw(panel, yName); }); swatches.appendChild(swatch); } } picker.appendChild(swatches); + let controls = document.createElement("div"); + controls.className = "parameter-style-controls"; + let symbolLabel = document.createElement("label"); symbolLabel.className = "parameter-style-control"; symbolLabel.appendChild(document.createTextNode("Symbol ")); @@ -1639,10 +1644,9 @@ function showMusrfitParameterPlotWindow(parameterPath, jobName = "", preferredPa symbolSelect.value = current.symbol || ""; symbolSelect.addEventListener("change", function() { picker.dataset.symbol = symbolSelect.value; - applyParameterStyleAndRedraw(panel, yName); }); symbolLabel.appendChild(symbolSelect); - picker.appendChild(symbolLabel); + controls.appendChild(symbolLabel); let sizeLabel = document.createElement("label"); sizeLabel.className = "parameter-style-control"; @@ -1655,13 +1659,12 @@ function showMusrfitParameterPlotWindow(parameterPath, jobName = "", preferredPa sizeInput.value = String(current.size); sizeInput.addEventListener("input", function() { picker.dataset.size = sizeInput.value; - applyParameterStyleAndRedraw(panel, yName); }); sizeLabel.appendChild(sizeInput); - picker.appendChild(sizeLabel); + controls.appendChild(sizeLabel); let opacityLabel = document.createElement("label"); - opacityLabel.className = "parameter-style-control"; + opacityLabel.className = "parameter-style-control parameter-style-opacity"; opacityLabel.appendChild(document.createTextNode("Opacity ")); let opacityInput = document.createElement("input"); opacityInput.type = "range"; @@ -1675,14 +1678,22 @@ function showMusrfitParameterPlotWindow(parameterPath, jobName = "", preferredPa opacityInput.addEventListener("input", function() { opacityValue.textContent = opacityInput.value; picker.dataset.opacity = opacityInput.value; - applyParameterStyleAndRedraw(panel, yName); }); opacityLabel.appendChild(opacityInput); opacityLabel.appendChild(opacityValue); - picker.appendChild(opacityLabel); + controls.appendChild(opacityLabel); + + picker.appendChild(controls); let actions = document.createElement("div"); actions.className = "parameter-style-actions"; + + let closeButton = document.createElement("button"); + closeButton.type = "button"; + closeButton.textContent = "Close"; + closeButton.addEventListener("click", closeParameterStylePicker); + actions.appendChild(closeButton); + let resetButton = document.createElement("button"); resetButton.type = "button"; resetButton.textContent = "Reset"; @@ -1695,6 +1706,16 @@ function showMusrfitParameterPlotWindow(parameterPath, jobName = "", preferredPa closeParameterStylePicker(); }); actions.appendChild(resetButton); + + let applyButton = document.createElement("button"); + applyButton.type = "button"; + applyButton.className = "parameter-style-apply"; + applyButton.textContent = "Apply"; + applyButton.addEventListener("click", function() { + applyParameterStyleAndRedraw(panel, yName); + }); + actions.appendChild(applyButton); + picker.appendChild(actions); let scopeRadios = picker.querySelectorAll('input[type="radio"]'); @@ -1715,8 +1736,8 @@ function showMusrfitParameterPlotWindow(parameterPath, jobName = "", preferredPa }); } - // Hold uncommitted edits in the dataset attribute; each change commits - // immediately so the plot reflects the choice without an extra button. + // The popover stages edits in its dataset attributes; Apply commits the + // staged choices to the style registry and redraws the affected panels. applyParameterStyleAndRedraw = function(panel, yName) { let scope = picker.querySelector('input[type="radio"]:checked'); let scopeValue = scope && scope.value === "dataset" ? "dataset" : "trace"; @@ -1725,8 +1746,10 @@ function showMusrfitParameterPlotWindow(parameterPath, jobName = "", preferredPa if (picker.dataset.symbol) override.symbol = picker.dataset.symbol; if (picker.dataset.size !== undefined && picker.dataset.size !== "") override.size = picker.dataset.size; if (picker.dataset.opacity !== undefined && picker.dataset.opacity !== "") override.opacity = picker.dataset.opacity; - recordParameterStyle(styleRegistry, parameterStyleScopeKeys(panel, yName, scopeValue), override, false); - redrawParameterStyleTargets(panel, scopeValue); + if (Object.keys(override).length) { + recordParameterStyle(styleRegistry, parameterStyleScopeKeys(panel, yName, scopeValue), override, false); + redrawParameterStyleTargets(panel, scopeValue); + } }; content.appendChild(picker); @@ -1734,8 +1757,8 @@ function showMusrfitParameterPlotWindow(parameterPath, jobName = "", preferredPa let sizeY = pointerEvent && Number.isFinite(pointerEvent.clientY) ? pointerEvent.clientY : 40; let maxX = typeof window.innerWidth === "number" ? window.innerWidth : 800; let maxY = typeof window.innerHeight === "number" ? window.innerHeight : 600; - picker.style.left = Math.max(8, Math.min(sizeX, maxX - 230)) + "px"; - picker.style.top = Math.max(8, Math.min(sizeY, maxY - 240)) + "px"; + picker.style.left = Math.max(8, Math.min(sizeX, maxX - 320)) + "px"; + picker.style.top = Math.max(8, Math.min(sizeY, maxY - 320)) + "px"; stylePicker = picker; // One-shot outside click / focus elsewhere closes the picker. diff --git a/package.json b/package.json index 873e80d..50478ba 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ }, "repository": { "type": "git", - "url": "git+ssh://git@bitbucket.org/zaher-salman/musrfit-gui.git" + "url": "git+ssh://git@bitbucket.org/zaher-salman/muSRFlow.git" }, "keywords": [ "musrfit", @@ -23,9 +23,9 @@ "author": "Zaher Salman", "license": "GPL-3.0-or-later", "bugs": { - "url": "https://bitbucket.org/zaher-salman/musrfit-gui/issues" + "url": "https://bitbucket.org/zaher-salman/muSRFlow/issues" }, - "homepage": "https://bitbucket.org/zaher-salman/musrfit-gui#readme", + "homepage": "https://bitbucket.org/zaher-salman/muSRFlow#readme", "devDependencies": { "electron": "^44.0.0" }, diff --git a/tests/help-window.test.js b/tests/help-window.test.js index 6790954..157f483 100644 --- a/tests/help-window.test.js +++ b/tests/help-window.test.js @@ -43,7 +43,7 @@ function testSharedHelpWindowInfrastructure() { assert.match(deploy, /quick-start\.html/); assert.match(deploy, /__MUSRFLOW_VERSION__/); assert.match(deploy, /node -p 'require\(process\.argv\[1\]\)\.version'/); - assert.doesNotMatch(lib, /musrfit-gui|bitbucket\.org\/zaher-salman/); + assert.doesNotMatch(lib, /musrfit-gui|bitbucket\.org\/zaher-salman\/musrfit-gui/); } testSharedHelpWindowInfrastructure(); diff --git a/tests/parameter-plot.test.js b/tests/parameter-plot.test.js index 8db9592..d683e1e 100644 --- a/tests/parameter-plot.test.js +++ b/tests/parameter-plot.test.js @@ -760,8 +760,10 @@ function testDataSetRegistryFoundation() { const entries = lib.parameterOverlayEntries(panel, registry); assert.strictEqual(entries.length, 2); assert.strictEqual(entries[0].key, entryA.key); + assert.strictEqual(entries[0].dataSetKey, entryA.key); assert.strictEqual(entries[0].colorIndex, 0); assert.strictEqual(entries[1].key, entryB.key); + assert.strictEqual(entries[1].dataSetKey, entryB.key); assert.strictEqual(entries[1].dataset, null); // A panel without a dataset resolves to no entries. @@ -784,6 +786,27 @@ function testDataSetRegistryFoundation() { assert.strictEqual(overlay.traces[0].marker.color, "#1f77b4"); assert.strictEqual(overlay.traces[1].marker.color, "#ff7f0e"); + // Styles the user records must reach traces whose overlay entries carry only + // a `key` (the exact shape parameterOverlayEntries produces). Looking for + // entry.dataSetKey there silently ignored every user edit. + const styles = {}; + styles[lib.parameterDataSetStyleKey(entryB.key)] = { color: "#008837", symbol: "star", size: 14, opacity: 0.6 }; + const styled = lib.buildMusrfitParameterOverlayTraces( + [{ key: entryA.key, label: "Scan A", dataset: scanA, colorIndex: 0 }, + { key: entryB.key, label: "Scan B", dataset: scanB, colorIndex: 4 }], + "dataT", ["Alpha"], "markers", { + paletteId: "default", + styleRegistry: styles, + styleKeyOf: function(key, name) { + return lib.parameterTraceStyleKey(key, "pp1", name); + } + }); + assert.strictEqual(styled.traces[1].marker.color, "#008837"); + assert.strictEqual(styled.traces[1].marker.symbol, "star"); + assert.strictEqual(styled.traces[1].marker.size, 14); + assert.strictEqual(styled.traces[1].marker.opacity, 0.6); + assert.strictEqual(styled.traces[0].marker.color, "#1f77b4"); + // A single data set keeps per-parameter color cycling (original look). const solo = lib.buildMusrfitParameterOverlayTraces( [{ key: entryA.key, label: "Scan A", dataset: scanA, colorIndex: 0 }],