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

2531 add mumag to tools #2825

Open
wants to merge 46 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
1fbf193
test update
Funkmich008 Sep 17, 2023
b2ea064
connected MuMag Fitter to the main sasview gui in MainWindow & GuiMan…
Funkmich008 Sep 17, 2023
ca14f1d
next update of the UI of MuMag adding buttons and text edit fields, c…
Funkmich008 Sep 18, 2023
dca1714
Added python scripts including functionalities for perpendicular and …
Funkmich008 Sep 18, 2023
28559db
added selector in UI for selction of the perpendicular or parallel sc…
Funkmich008 Sep 18, 2023
f78d9ff
added functionality to the simple fit button
Funkmich008 Sep 18, 2023
a66411f
change of the global variable coding style to class coding style, so …
Funkmich008 Sep 18, 2023
315bf07
added panel for doing the plots inside of the MuMagTool MainWindow, s…
Funkmich008 Sep 18, 2023
9b82c1a
update test
Funkmich008 Sep 18, 2023
cfc2536
test update
Funkmich008 Sep 18, 2023
3f6b4eb
solved import problem with folder
Funkmich008 Sep 18, 2023
ae50218
test commit
Funkmich008 Sep 20, 2023
99bcb5b
added TEST data
Funkmich008 Sep 20, 2023
4730392
Put plot in window
lucas-wilkins Sep 20, 2023
eb6887a
new update of the mumag tool
Funkmich008 Jan 18, 2024
c9d017f
Update: Plot in the UI window
Funkmich008 Jan 19, 2024
f1a5d81
Update: Functionality of the compare button and save button
Funkmich008 Jan 22, 2024
17a6b33
Merge branch 'main' into 2531-add-mumag-to-tools
Funkmich008 Mar 15, 2024
82857fd
Fixed latex problem, some variable renaming
lucas-wilkins May 21, 2024
820dbf4
Cleaning up
lucas-wilkins May 21, 2024
09c12fe
Dataclass for loading operation
lucas-wilkins May 21, 2024
e99133d
Dataclass for results
lucas-wilkins May 21, 2024
c33809d
Directory selection
lucas-wilkins May 21, 2024
f5bf60c
Refactored first few methods of MuMagLib
lucas-wilkins May 21, 2024
88300ae
Bugfixes
lucas-wilkins May 21, 2024
84e91df
More changes
lucas-wilkins May 21, 2024
8ccfd98
Updates to GUI
lucas-wilkins May 23, 2024
9c53242
Minor changes to GUI
lucas-wilkins May 23, 2024
f58ece2
Enum for experiment geometry
lucas-wilkins May 24, 2024
7c420f7
Lots of refractoring
lucas-wilkins Jun 4, 2024
717a419
Debugging
lucas-wilkins Jun 6, 2024
7259833
Debugged, starting on parallel case
lucas-wilkins Jun 7, 2024
3068a81
Calculations now working
lucas-wilkins Jun 7, 2024
80a8351
Merge branch 'main' into 2531-add-mumag-to-tools
lucas-wilkins Jun 7, 2024
384a5da
Some refactoring
lucas-wilkins Jun 10, 2024
a9fc7a3
Much moving
lucas-wilkins Jun 10, 2024
e264f10
GUI work
lucas-wilkins Jun 10, 2024
28fb43e
Almost done, just need to adjust plots
lucas-wilkins Jun 10, 2024
c29f5c5
Done!!!!!
lucas-wilkins Jun 10, 2024
6cb5020
Merge branch '2531-add-mumag-to-tools' of https://github.com/SasView/…
lucas-wilkins Jun 10, 2024
cd7db0e
Tidying up
lucas-wilkins Jun 10, 2024
b0f11ae
Merge branch 'main' into 2531-add-mumag-to-tools
lucas-wilkins Jul 2, 2024
91f8f4a
Merge branch 'main' into 2531-add-mumag-to-tools
lucas-wilkins Jul 2, 2024
9957800
Merge branch 'main' into 2531-add-mumag-to-tools
lucas-wilkins Jul 2, 2024
e22e59c
Initial docs
lucas-wilkins Jul 10, 2024
47a2b05
Help button
lucas-wilkins Jul 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/sphinx-docs/source/user/tools.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@ Tools & Utilities
Image Viewer <qtgui/Calculators/image_viewer_help>

File Converter <qtgui/Calculators/file_converter_help>

MuMag Tool <qtgui/Utilities/MuMag/mumag_help>

9 changes: 9 additions & 0 deletions src/sas/qtgui/MainWindow/GuiManager.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
from sas.qtgui.Utilities.ResultPanel import ResultPanel
from sas.qtgui.Utilities.OrientationViewer.OrientationViewer import show_orientation_viewer
from sas.qtgui.Utilities.HidableDialog import hidable_dialog

from sas.qtgui.Utilities.MuMag.MuMag import MuMag
from sas.qtgui.Utilities.DocViewWidget import DocViewWindow
from sas.qtgui.Utilities.DocRegenInProgess import DocRegenProgress

Expand Down Expand Up @@ -206,6 +208,7 @@ def addWidgets(self):
self.SLDCalculator = SldPanel(self)
self.DVCalculator = DensityPanel(self)
self.KIESSIGCalculator = KiessigPanel(self)
self.MuMag_Fitter = MuMag(self)
self.SlitSizeCalculator = SlitSizeCalculator(self)
self.GENSASCalculator = GenericScatteringCalculator(self)
self.ResolutionCalculator = ResolutionCalculatorPanel(self)
Expand Down Expand Up @@ -737,6 +740,7 @@ def addTriggers(self):
self._workspace.actionSLD_Calculator.triggered.connect(self.actionSLD_Calculator)
self._workspace.actionDensity_Volume_Calculator.triggered.connect(self.actionDensity_Volume_Calculator)
self._workspace.actionKeissig_Calculator.triggered.connect(self.actionKiessig_Calculator)
self._workspace.actionMuMag_Fitter.triggered.connect(self.actionMuMag_Fitter)
#self._workspace.actionKIESSING_Calculator.triggered.connect(self.actionKIESSING_Calculator)
self._workspace.actionSlit_Size_Calculator.triggered.connect(self.actionSlit_Size_Calculator)
self._workspace.actionSAS_Resolution_Estimator.triggered.connect(self.actionSAS_Resolution_Estimator)
Expand Down Expand Up @@ -1023,6 +1027,11 @@ def actionKiessig_Calculator(self):
"""
self.KIESSIGCalculator.show()

def actionMuMag_Fitter(self):
"""
"""
self.MuMag_Fitter.show()

def actionSlit_Size_Calculator(self):
"""
"""
Expand Down
6 changes: 6 additions & 0 deletions src/sas/qtgui/MainWindow/UI/MainWindowUI.ui
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
<addaction name="actionSlit_Size_Calculator"/>
<addaction name="actionKeissig_Calculator"/>
<addaction name="actionSAS_Resolution_Estimator"/>
<addaction name="actionMuMag_Fitter"/>
<addaction name="actionGeneric_Scattering_Calculator"/>
<addaction name="separator"/>
<addaction name="actionImage_Viewer"/>
Expand Down Expand Up @@ -620,6 +621,11 @@
<string>Preferences...</string>
</property>
</action>
<action name="actionMuMag_Fitter">
<property name="text">
<string>MuMag Fitter</string>
</property>
</action>
<action name="actionWhat_s_New">
<property name="text">
<string>What's New</string>
Expand Down
Loading
Loading