Commit Graph

1629 Commits

Author SHA1 Message Date
Zaher Salman acc251ffbe Merged muonspin/musrfit:root6 into master 2019-05-02 17:05:39 +02:00
suter_a 2065904bec some minor ubuntu tweak concerning themes. 2019-05-02 15:04:55 +02:00
suter_a f320230b30 make sure that the icon theme is properly loaded when the prefs are reloaded. 2019-05-02 11:02:06 +02:00
suter_a 3256dde54e More flexible dark scheme handling
It works now as follows:
1) try to get theme information from the system, and if present us it.
2) if no theme information of the system is present, take the one from
   the musredit_startup.xml.

Now it is possible to switch the icon theme for the menu and toolbar
separately.
2019-05-02 10:44:04 +02:00
suter_a 1ef1e6f42e updated default musredit_startup.xml file info. 2019-05-01 10:57:50 +02:00
suter_a 20153c6ffc more work for dark theme under macOS. 2019-05-01 09:01:27 +02:00
suter_a bd3ade3136 improved icon scaling. 2019-04-30 14:20:38 +02:00
suter_a f51f3e2038 make toolbar icons switchable plain/dark. 2019-04-30 09:40:36 +02:00
Zaher Salman 08ee7991a5 Merged muonspin/musrfit:root6 into master 2019-04-29 09:29:15 +02:00
suter_a a5526d7f76 Merge branch 'root6' of https://git.psi.ch/nemu/musrfit into root6 2019-04-26 20:35:32 +02:00
suter_a 67421b2114 Allow switching icon theme in musredit
Added the needed facility in the preferences which allows to switch
the icon scheme between plain and dark. This is needed for some OS
where qt doesn't provide the necessary information.
2019-04-26 19:29:24 +02:00
Zaher Salman a2d8acb16d Merged muonspin/musrfit:root6 into master 2019-04-26 16:03:36 +02:00
suter_a 34872e043d added MusrRoot docu. Added 'Proposal Number' and 'Main Proposer' to the RunInfo. 2019-04-26 11:46:15 +02:00
Zaher Salman a1bc47c39e Merged muonspin/musrfit:root6 into master 2019-04-26 08:54:54 +02:00
suter_a dae9ef0ffb some minor improvement concerning the start of musrview for cases where the msr-file is corrupted, the data file cannot be read, etc. 2019-04-25 20:33:43 +02:00
suter_a 074d8c77e4 some minor cleanup and update of the copyright info. 2019-04-25 20:30:44 +02:00
suter_a 96d9ba5f88 added some more specifc error codes. 2019-04-25 20:23:40 +02:00
suter_a 9d12700f39 added some additional error tags. 2019-04-25 20:22:43 +02:00
Zaher Salman 02d233b412 Merged muonspin/musrfit:root6 into master 2019-04-25 17:27:56 +02:00
salman 35612c25ca Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit 2019-04-25 17:27:26 +02:00
salman 904471b664 Resolve conflicts manually. 2019-04-25 17:27:03 +02:00
suter_a 795cd75b1e modernized code to C++11 and newer.
This allows to analyze the code by external code analyzers. Since a lot is adopted,
the version is changed to 1.4.3
2019-04-16 15:34:49 +02:00
Zaher Salman 8247b19b84 Merged muonspin/musrfit:root6 into master 2019-04-05 09:00:38 +02:00
suter_a e6d424e900 removed outdated 'register' from code. 2019-04-04 15:52:21 +02:00
Zaher Salman aa6579af41 Merged muonspin/musrfit:root6 into master 2019-04-03 08:46:24 +02:00
suter_a 36cc3444a2 improve msr2data handling
It is now checked if a msr-file is already open so that the corresponding
tab is reloaded after msr2data is carried out with a file open request.
2019-04-01 10:32:24 +02:00
suter_a 15692b89e7 Fix crash when trying to close empty tab 2019-04-01 09:03:29 +02:00
Zaher Salman fa446460af Merged muonspin/musrfit:root6 into master 2019-03-13 10:55:52 +01:00
suter_a 9cd35d1373 added missing include directory. 2019-03-08 16:24:45 +01:00
suter_a dbfeeddf3f Remove automake support
Since the cmake tool chain is now stable, the automake tool chain is removed from musrfit.
This makes documentation and code less cluttered.
2019-03-08 12:50:41 +01:00
Zaher Salman 414165bc90 Merged muonspin/musrfit:root6 into master 2019-02-19 08:42:19 +01:00
suter_a 64f73ffb11 find theme in case default channel fail. This is ugly and eventually needs a better solution. 2019-02-14 09:35:32 +01:00
suter_a 97beb80c4b Dynamic Search Path for ROOT Dictionary
Added by default the dynamic search path '/usr/local/lib' to ROOT.
This is needed to find the necessary dictionaries for musrfit,
musrview, musrt0. Furthermore, added an option '--show-dynamic-path'
to these programs which allow the user to dump the currently used
dynamic search paths. This is potentially handy for diagnostics.
2019-02-05 09:51:30 +01:00
suter_a 29d35579a7 added the current source code path to root_generate_dictionary. 2019-02-04 19:43:31 +01:00
suter_a c64a8146b7 added the necessary header-, pcm-, and rootmap-files. This is needed when distrbuted as package. 2019-02-04 10:54:52 +01:00
suter_a 3cb950277f cmake/cpack root dictionary issue fixed.
In order that package assembly works, the code needs to be relocatble
and any hints linking it to the original source need to be absent.
The changes here do exactely this. For rootcling the '-inlineInputHeader'
option is needed, otherwise the dictionary wants to load the header
file from the source destination which of course will fail when installing
the package on a machine without the source.
2019-02-01 16:05:24 +01:00
Zaher Salman 467a799056 Merged muonspin/musrfit:root6 into master 2019-01-22 15:22:59 +01:00
suter_a 98057629e6 adopted musredit.pro such that the deprecated automake get things compiled. 2019-01-22 14:51:52 +01:00
suter_a 8485914b89 make msr-file comment consistent with the docu (for ifll and ifgk). 2019-01-22 14:15:43 +01:00
Zaher Salman 592b0cfc42 Merged muonspin/musrfit:root6 into master 2019-01-22 09:26:02 +01:00
suter_a c7e35dfdff Make so far undocumented functions ifgk and ifll public and at the same time properly normalize them. 2019-01-18 10:35:26 +01:00
Zaher Salman 91e2eca915 Merged muonspin/musrfit:root6 into master 2018-12-18 10:00:45 +01:00
suter_a 1831b8bf3e Add Default Search Paths via musredit preferences if previously no search paths were present
So far it was not possible to add Default Search Paths to musrfit via musredit if somebody delete all the predefined search paths. This bug is now fixed.
2018-12-17 17:30:58 +01:00
Zaher Salman e0eaa3efb5 Merged muonspin/musrfit:root6 into master 2018-12-12 17:26:44 +01:00
suter_a c6766864d9 AddT0 offset bug
Up to now there has been an addT0 offset bug which resulted to the following situation.
Since the offset was wrong by '1', for the first addt0 the t0 of the file was used
instead of the one given in the msr-file. If these t0's are substantially different, the
adding of the runs was quite off, resulting in strong distortions at very early times.
Pant Amba Datt pointed towards this bug which is fixed now.
2018-12-11 13:59:58 +01:00
Zaher Salman 8a7e96a8f7 Merged muonspin/musrfit:root6 into master 2018-11-30 08:51:19 +01:00
suter_a 7361dc6f70 Fourier relative phase: bug fix
The reference phase for real Fourier was accidentely counted twice.
2018-11-29 10:56:37 +01:00
suter_a 2d3ec33aa1 musredit help system if neither QWebEngine nor QWebKit is found.
If neither QWebEngine nor QWebKit is found, do not generate an build
error anymore. Instead just show a default window stating that
the help system is not available due to missing Qt web libs.
2018-11-28 20:14:16 +01:00
Zaher Salman 813bad88ab Merged muonspin/musrfit:root6 into master 2018-11-27 14:32:03 +01:00
suter_a c5c5b16c46 BNMR lib installation problems
Adopted the build system for the BNMR libs such that the generated files are found and can be installed. The BNMR lib mantainers (ZS, JK) are responsible for the functionality though.
2018-11-27 12:25:18 +01:00