acc251ffbe
Merged muonspin/musrfit:root6 into master
2019-05-02 17:05:39 +02:00
2065904bec
some minor ubuntu tweak concerning themes.
2019-05-02 15:04:55 +02:00
f320230b30
make sure that the icon theme is properly loaded when the prefs are reloaded.
2019-05-02 11:02:06 +02:00
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
1ef1e6f42e
updated default musredit_startup.xml file info.
2019-05-01 10:57:50 +02:00
20153c6ffc
more work for dark theme under macOS.
2019-05-01 09:01:27 +02:00
bd3ade3136
improved icon scaling.
2019-04-30 14:20:38 +02:00
f51f3e2038
make toolbar icons switchable plain/dark.
2019-04-30 09:40:36 +02:00
08ee7991a5
Merged muonspin/musrfit:root6 into master
2019-04-29 09:29:15 +02:00
a5526d7f76
Merge branch 'root6' of https://git.psi.ch/nemu/musrfit into root6
2019-04-26 20:35:32 +02:00
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
a2d8acb16d
Merged muonspin/musrfit:root6 into master
2019-04-26 16:03:36 +02:00
34872e043d
added MusrRoot docu. Added 'Proposal Number' and 'Main Proposer' to the RunInfo.
2019-04-26 11:46:15 +02:00
a1bc47c39e
Merged muonspin/musrfit:root6 into master
2019-04-26 08:54:54 +02:00
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
074d8c77e4
some minor cleanup and update of the copyright info.
2019-04-25 20:30:44 +02:00
96d9ba5f88
added some more specifc error codes.
2019-04-25 20:23:40 +02:00
9d12700f39
added some additional error tags.
2019-04-25 20:22:43 +02:00
02d233b412
Merged muonspin/musrfit:root6 into master
2019-04-25 17:27:56 +02:00
35612c25ca
Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit
2019-04-25 17:27:26 +02:00
904471b664
Resolve conflicts manually.
2019-04-25 17:27:03 +02:00
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
8247b19b84
Merged muonspin/musrfit:root6 into master
2019-04-05 09:00:38 +02:00
e6d424e900
removed outdated 'register' from code.
2019-04-04 15:52:21 +02:00
aa6579af41
Merged muonspin/musrfit:root6 into master
2019-04-03 08:46:24 +02:00
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
15692b89e7
Fix crash when trying to close empty tab
2019-04-01 09:03:29 +02:00
fa446460af
Merged muonspin/musrfit:root6 into master
2019-03-13 10:55:52 +01:00
05a62506d8
Resolving conflict.
2019-03-13 10:55:36 +01:00
ffae09354e
Resolving conflict.
2019-03-13 10:54:33 +01:00
a00b93f6cd
Resolving conflict.
2019-03-13 10:53:13 +01:00
95ea5b6f68
Resolving conflict.
2019-03-13 10:52:05 +01:00
d66b132a0b
Resolving conflict.
2019-03-13 10:50:28 +01:00
33d0e51a05
Resolving conflict.
2019-03-13 10:46:53 +01:00
fec5017fc2
added log info for the cpack part.
2019-03-11 13:33:42 +01:00
9cd35d1373
added missing include directory.
2019-03-08 16:24:45 +01:00
86d03d7132
Docu updated
...
Removed the automake tool chain description (hopefully) everywhere.
2019-03-08 13:07:47 +01:00
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
414165bc90
Merged muonspin/musrfit:root6 into master
2019-02-19 08:42:19 +01:00
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
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
29d35579a7
added the current source code path to root_generate_dictionary.
2019-02-04 19:43:31 +01:00
c64a8146b7
added the necessary header-, pcm-, and rootmap-files. This is needed when distrbuted as package.
2019-02-04 10:54:52 +01:00
d48615650e
adopted for yum update which calls at the end the uninstall script.
2019-02-04 10:53:35 +01:00
a7806f7e02
added necessary CPack tag for redhat flavor.
2019-02-04 10:52:37 +01:00
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
faffd5bcd6
CPack post (un)install
...
add post (un)install scripts to musrfit cpack. Currently for rpm only. Furthermore a minimal required root version is added. Will need to see if this is sufficient or if more detailed work needs to be added.
2019-01-31 10:45:05 +01:00
467a799056
Merged muonspin/musrfit:root6 into master
2019-01-22 15:22:59 +01:00
98057629e6
adopted musredit.pro such that the deprecated automake get things compiled.
2019-01-22 14:51:52 +01:00
8485914b89
make msr-file comment consistent with the docu (for ifll and ifgk).
2019-01-22 14:15:43 +01:00
