From 460d35defa3d88b380e6ec23a00d8d9d59e3e913 Mon Sep 17 00:00:00 2001 From: Zaher Salman Date: Wed, 3 Feb 2016 08:55:20 +0100 Subject: [PATCH 1/8] Add HAL and move to MUSR-ROOT in MuSRFitGUI. Update msr template for libBNMR. --- src/external/MuSRFitGUI/MSR.pm | 139 ++++++++++++++++++++++------ src/external/libBNMR/ExpRlx-MUD.msr | 41 ++++---- src/external/libBNMR/ExpRlx.msr | 2 +- src/external/libBNMR/SExpRlx.msr | 2 +- 4 files changed, 133 insertions(+), 51 deletions(-) diff --git a/src/external/MuSRFitGUI/MSR.pm b/src/external/MuSRFitGUI/MSR.pm index b496f419a..a65856714 100755 --- a/src/external/MuSRFitGUI/MSR.pm +++ b/src/external/MuSRFitGUI/MSR.pm @@ -11,13 +11,14 @@ my %DATADIRS = ( "GPS", "/afs/psi.ch/project/bulkmusr/data/gps", "LTF", "/afs/psi.ch/project/bulkmusr/data/ltf", "Dolly", "/afs/psi.ch/project/bulkmusr/data/dolly", - "GPD", "/afs/psi.ch/project/bulkmusr/data/gpd" + "GPD", "/afs/psi.ch/project/bulkmusr/data/gpd", + "HAL", "/afs/psi.ch/project/bulkmusr/data/hifi" ); -my %BeamLines = ( "LEM", "MUE4", "LEM (PPC)", "MUE4", "GPS", "PIM3", "LTF", "PIM3", "Dolly", "PIE1", "GPD", "PIE1" ); +my %BeamLines = ( "LEM", "MUE4", "LEM (PPC)", "MUE4", "GPS", "PIM3", "LTF", "PIM3", "Dolly", "PIE1", "GPD", "PIE1" , "HAL", "PIE3"); my %Def_Format = - ( "LEM", "ROOT-NPP", "LEM (PPC)", "ROOT-PPC", "GPS", "PSI-BIN", "LTF", "PSI-BIN", "Dolly", "PSI-BIN" , "GPD", "PSI-BIN"); + ( "LEM", "MUSR-ROOT", "LEM (PPC)", "ROOT-PPC", "GPS", "PSI-BIN", "LTF", "PSI-BIN", "Dolly", "PSI-BIN" , "GPD", "PSI-BIN", "HAL", "PSI-MDU"); # Additional information to extract run properties from database # For LEM use summary files @@ -28,6 +29,7 @@ $SUMM_DIR="/afs/psi.ch/project/nemu/data/summ/"; "Dolly","/afs/psi.ch/project/bulkmusr/olddata/list/", "GPD","/afs/psi.ch/project/bulkmusr/olddata/list/", "ALC","/afs/psi.ch/project/bulkmusr/olddata/list/", + "HAL","/afs/psi.ch/project/bulkmusr/olddata/list/", "LTF","/afs/psi.ch/project/bulkmusr/olddata/list/"); # Information available since @@ -36,6 +38,7 @@ $SUMM_DIR="/afs/psi.ch/project/nemu/data/summ/"; "Dolly","1998", "GPD","1993", "ALC","1993", + "HAL","2012", "LTF","1995"); # And to deal with old names of bulk muons @@ -160,6 +163,9 @@ FUNCTIONS my $RUNSType = 0; my @RUNS=(); if ($All{"RunNumbers"} ne $EMPTY) { + # Remove spaces and other illegal characters + $All{"RunNumbers"} =~ s/ //g; + $All{"RunNumbers"} =~ s/[a-zA-Z]//g; @RUNS=split( /,/, $All{"RunNumbers"}); $RUNSType = 0; } @@ -415,13 +421,11 @@ SAVE # Check if a plot range is defined (i.e. different from fit) $PRANGE_Line = "use_fit_ranges"; if ( $All{"Xi"} != $All{"Xf"} ) { - - # if ($Yi != $Yf) { - $PRANGE_Line = "range ".$All{"Xi"}." ".$All{"Xf"}." ".$All{"Yi"}." ".$All{"Yf"}; - - # } else { - # $PRANGE_Line = "range $Xi $Xf"; - # } + if ($All{"Yi"} != $All{"Yf"}) { + $PRANGE_Line = "range ".$All{"Xi"}." ".$All{"Xf"}." ".$All{"Yi"}." ".$All{"Yf"}; + } else { + $PRANGE_Line = "range ".$All{"Xi"}." ".$All{"Xf"}; + } } $VIEWBIN_Line =""; @@ -441,7 +445,10 @@ $logxy"; if ($All{"FAPODIZATION"} eq $EMPTY) {$All{"FAPODIZATION"}="STRONG";} if ($All{"FPLOT"} eq $EMPTY) {$All{"FPLOT"}="POWER";} if ($All{"FPHASE"} eq $EMPTY) {$All{"FPHASE"}="8.5";} - + my $FrqRange = "#range ".$All{"FRQMIN"}." ".$All{"FRQMAX"}; + if ($All{"FRQMAX"} ne $EMPTY && $All{"FRQMIN"} ne $EMPTY) { + $FrqRange = "range ".$All{"FRQMIN"}." ".$All{"FRQMAX"}; + } $FOURIER_Block= "############################################################### @@ -451,12 +458,13 @@ fourier_power 12 apodization FAPODIZATION # NONE, WEAK, MEDIUM, STRONG plot FPLOT # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE phase FPHASE -#range FRQMIN FRQMAX"; +FRQRANGE"; $FOURIER_Block=~ s/FUNITS/$All{"FUNITS"}/g; $FOURIER_Block=~ s/FAPODIZATION/$All{"FAPODIZATION"}/g; $FOURIER_Block=~ s/FPLOT/$All{"FPLOT"}/g; $FOURIER_Block=~ s/FPHASE/$All{"FPHASE"}/g; + $FOURIER_Block=~ s/FRQRANGE/$FrqRange/g; # Don't know why but it is needed initially $STAT_Block = @@ -519,8 +527,6 @@ sub CreateMSRSingleHist { my ($Full_T_Block,$Paramcomp_ref)=MSR::CreateTheory(@FitTypes); my @Paramcomp = @$Paramcomp_ref; - print "Paramcomp= $Paramcomp[0]"; - # If we have a FUNCTIONS Block the Full_T_Block should be # replaced by Func_T_Block $FUNCTIONS_Block = $EMPTY; @@ -664,6 +670,7 @@ FUNCTIONS $NoBg_Line = $NoBg_Line . "backgr.fit $PCount\n"; } } + # End of No and NBg Lines # Now deal with physical parameters and phases elsif ( $Param_ORG ne "Phi" && $Param_ORG ne "No" && $Param_ORG ne "NBg") { @@ -817,13 +824,11 @@ SAVE # Check if a plot range is defined (i.e. different from fit) $PRANGE_Line = "use_fit_ranges"; if ( $All{"Xi"} != $All{"Xf"} ) { - - # if ($Yi != $Yf) { - $PRANGE_Line = "range ".$All{"Xi"}." ".$All{"Xf"}." ".$All{"Yi"}." ".$All{"Yf"}; - - # } else { - # $PRANGE_Line = "range $Xi $Xf"; - # } + if ($All{"Yi"} != $All{"Yf"}) { + $PRANGE_Line = "range ".$All{"Xi"}." ".$All{"Xf"}." ".$All{"Yi"}." ".$All{"Yf"}; + } else { + $PRANGE_Line = "range ".$All{"Xi"}." ".$All{"Xf"}; + } } my $RRFBlock=MSR::CreateRRFBlock(\%All); @@ -1057,11 +1062,18 @@ sub CreateTheory { $Parameters = join( $SPACE, $Parameters, $THEORY{'dynGssKTLF'} ); } + # Static Lorentzian or Gaussian KF ZF elsif ( $FitType eq "LGKT" ) { $T_Block = $T_Block . "\n" . "combiLGKT " . $THEORY{'combiLGKT'}; $Parameters = join( $SPACE, $Parameters, $THEORY{'combiLGKT'} ); } + # Static Stretched KF ZF + elsif ( $FitType eq "STRKT" ) { + $T_Block = $T_Block . "\n" . "strKT " . $THEORY{'strKT'}; + $Parameters = join( $SPACE, $Parameters, $THEORY{'strKT'} ); + } + # Now some more combined functions (multiplication). # Lorentzian KT LF multiplied by exponential @@ -1109,6 +1121,15 @@ sub CreateTheory { $Parameters = join( $SPACE, $Parameters, $THEORY{'combiLGKT'} ); } + # Stretched KT ZF multiplied by exponential + elsif ( $FitType eq "STRKTExp" ) { + $T_Block = $T_Block . "\n" . "simplExpo " . $THEORY{'simplExpo'}; + $Parameters = join( $SPACE, $Parameters, $THEORY{'simplExpo'} ); + $T_Block = + $T_Block . "\n" . "strKT " . $THEORY{'strKT'}; + $Parameters = join( $SPACE, $Parameters, $THEORY{'strKT'} ); + } + # Lorentzian or Gaussian KT ZF multiplied by stretched exponential elsif ( $FitType eq "LGKTSExp" ) { $T_Block = $T_Block . "\n" . "generExpo " . $THEORY{'generExpo'}; @@ -1118,6 +1139,15 @@ sub CreateTheory { $Parameters = join( $SPACE, $Parameters, $THEORY{'combiLGKT'} ); } + # Stretched KT ZF multiplied by stretched exponential + elsif ( $FitType eq "STRKTSExp" ) { + $T_Block = $T_Block . "\n" . "generExpo " . $THEORY{'generExpo'}; + $Parameters = join( $SPACE, $Parameters, $THEORY{'generExpo'} ); + $T_Block = + $T_Block . "\n" . "strKT " . $THEORY{'strKT'}; + $Parameters = join( $SPACE, $Parameters, $THEORY{'strKT'} ); + } + # Lorentzian or Gaussian KT LF multiplied by stretched exponential elsif ( $FitType eq "MolMag" ) { $T_Block = $T_Block . "\n" . "generExpo " . $THEORY{'generExpo'}; @@ -1717,7 +1747,7 @@ sub RUNFileNameAuto { my $RUN_Line=$EMPTY; # if BeamLine is empty assume manual name if ($BeamLine eq $EMPTY) { - my %EXTs = ("root","ROOT-NPP", + my %EXTs = ("root","MUSR-ROOT", "bin","PSI-BIN", "msr","MUD"); @@ -1764,6 +1794,11 @@ sub RUNFileNameAuto { elsif ( $BeamLine eq "GPD" ) { $RUN_File_Name = "deltat_tdc_gpd_" . $RUNtmp; $RUNFILE = "$DATADIR/d$YEAR/tdc/$RUN_File_Name"; + } + elsif ( $BeamLine eq "HAL" ) { + $RUNtmp=sprintf("%05d",$RUNtmp); + $RUN_File_Name = "tdc_hifi_" . $YEAR . "_" . $RUNtmp; + $RUNFILE = "$DATADIR/d$YEAR/tdc/$RUN_File_Name"; } $RUN_Line = join( $SPACE, "RUN", $RUNFILE, $BeamLines{$BeamLine}, "PSI", @@ -1792,6 +1827,52 @@ sub CreateRRFBlock { } +######################## +# ExtractInfo +######################## +# Used to extract information from data file header. The header (using +# "dump_header" is sent to this function from musrfit.cgi or MuSRFit +sub ExtractInfo { + my ($header,$Arg) = @_; + + my @lines = split(/\n/,$header); + + if ( $Arg eq "TITLE" ) { + $RTRN_Val = $lines[3]; + $RTRN_Val =~ s/\n//g; + } + elsif ( $Arg eq "Temp" ) { + foreach my $line (@lines) { + if ( $line =~ /Mean Sample_CF1/ ) { + ( my $tmp, my $T ) = split( /=/, $line ); + ( $T, $tmp ) = split( /\(/, $T ); + $RTRN_Val = $T; + } + } + + } + elsif ( $Arg eq "Field" ) { + foreach my $line (@lines) { + if ( $line =~ /Mean B field/ ) { + ( $tmp, my $B ) = split( /=/, $line ); + ( $B, $tmp ) = split( /\(/, $B ); + $RTRN_Val = $B; + } + } + } + elsif ( $Arg eq "Energy" ) { + foreach my $line (@lines) { + if ( $line =~ /implantation energy/ ) { + ( my $tmp1, my $tmp2, my $E ) = split( /=/, $line ); + ( $E, $tmp ) = split( /keV/, $E ); + $RTRN_Val = $E; + } + } + + } + # $RTRN_Val =~ s/[\.\~\/\&\*\[\;\>\<\^\$\(\)\`\|\]\'\@]//g; + return $RTRN_Val; +} ######################## @@ -2224,7 +2305,7 @@ FUNCTIONS FITPARAMETER ############################################################### # No Name Value Err Min Max "; - my %PTable=MSR::PrepParamTableSh(\%All); + my %PTable=MSR::PrepParamTable(\%All); my $NParam=scalar keys( %PTable ); # Fill the table with labels and values of parametr for (my $iP=0;$iP<$NParam;$iP++) { @@ -2266,13 +2347,11 @@ SAVE # Check if a plot range is defined (i.e. different from fit) $PRANGE_Line = "use_fit_ranges"; if ( $All{"Xi"} != $All{"Xf"} ) { - - # if ($Yi != $Yf) { - $PRANGE_Line = "range ".$All{"Xi"}." ".$All{"Xf"}." ".$All{"Yi"}." ".$All{"Yf"}; - - # } else { - # $PRANGE_Line = "range $Xi $Xf"; - # } + if ($All{"Yi"} != $All{"Yf"}) { + $PRANGE_Line = "range ".$All{"Xi"}." ".$All{"Xf"}." ".$All{"Yi"}." ".$All{"Yf"}; + } else { + $PRANGE_Line = "range ".$All{"Xi"}." ".$All{"Xf"}; + } } $VIEWBIN_Line =""; diff --git a/src/external/libBNMR/ExpRlx-MUD.msr b/src/external/libBNMR/ExpRlx-MUD.msr index ccbf0bb4d..ef4234919 100644 --- a/src/external/libBNMR/ExpRlx-MUD.msr +++ b/src/external/libBNMR/ExpRlx-MUD.msr @@ -4,23 +4,23 @@ FITPARAMETER ############################################################### # No Name Value Err Min Max - 1 Alphap 1.11662 0.00020 none - 2 Asyp 0 0.00038 none - 3 T 1e6 0 none - 4 Rlx 0.969e6 0.020 none - 5 Pos 1 0 none - 6 Neg -1 0 none + 1 Alpha 1.11587 0.00038 none + 2 Asy 0.0570 0.0011 none + 3 T 1 0 none + 4 Rlx 1.015 0.023 none + 5 One 1 0 none + 6 Bet -1.052 0.027 none ############################################################### THEORY ############################################################### asymmetry fun1 -userFcn libBNMR.so ExpRlx 3 4 +userFcn .libs/libBNMR.so ExpRlx 3 4 ############################################################### FUNCTIONS ############################################################### -fun1 = map1 * map2 +fun1 = 0.5 * map1 * map2 ############################################################### RUN 045674 BNMR TRIUMF MUD (name beamline institute data-file-format) @@ -28,11 +28,12 @@ fittype 2 (asymmetry fit) alpha 1 forward 3 backward 4 -data 11 799 11 799 -background 800 900 800 900 # estimated bkg: 416.9700 / 465.7600 -t0 0.0 0.0 +data 11 800 11 800 +#backgr.fix 0 +background 1 9 1 9 # estimated bkg: 8.0000 / 9.6250 +t0 10.0 10.0 map 2 5 0 0 0 0 0 0 0 0 -fit 5e5 8e6 +fit 0.5 8 packing 5 RUN 045674 BNMR TRIUMF MUD (name beamline institute data-file-format) @@ -40,11 +41,12 @@ fittype 2 (asymmetry fit) alpha 1 forward 5 backward 6 -data 11 799 11 799 -background 800 900 800 900 # estimated bkg: 430.9200 / 479.4500 -t0 0.0 0.0 +data 11 800 11 800 +#backgr.fix 0 +background 1 9 1 9 # estimated bkg: 11.6250 / 15.6250 +t0 10.0 10.0 map 2 6 0 0 0 0 0 0 0 0 -fit 5e5 8e6 +fit 0.5 8 packing 5 @@ -58,16 +60,17 @@ SAVE PLOT 2 (asymmetry plot) runs 1 2 use_fit_ranges +view_packing 10 ############################################################### FOURIER -units MHz # units either 'Gauss', 'MHz', or 'Mc/s' +units MHz # units either 'Gauss', 'Tesla', 'MHz', or 'Mc/s' fourier_power 12 apodization STRONG # NONE, WEAK, MEDIUM, STRONG plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE phase 8 #range FRQMIN FRQMAX ############################################################### -STATISTIC --- 2014-11-14 16:37:41 - chisq = 372.2, NDF = 295, chisq/NDF = 1.261744 +STATISTIC --- 2015-04-14 11:00:19 + chisq = 399.5, NDF = 290, chisq/NDF = 1.377736 diff --git a/src/external/libBNMR/ExpRlx.msr b/src/external/libBNMR/ExpRlx.msr index 8b0d79c9e..2b3f52ac2 100644 --- a/src/external/libBNMR/ExpRlx.msr +++ b/src/external/libBNMR/ExpRlx.msr @@ -9,7 +9,7 @@ FITPARAMETER ############################################################### THEORY asymmetry 1 -userFcn /home/l_salman/LEM/musrfit/src/external/libBNMR/libBNMR.so ExpRlx 2 3 +userFcn /usr/local/lib/libBNMR.so ExpRlx 2 3 ############################################################### RUN 45377 MUE4 PSI ASCII (name beamline institute data-file-format) diff --git a/src/external/libBNMR/SExpRlx.msr b/src/external/libBNMR/SExpRlx.msr index a296e4492..636583f81 100644 --- a/src/external/libBNMR/SExpRlx.msr +++ b/src/external/libBNMR/SExpRlx.msr @@ -10,7 +10,7 @@ FITPARAMETER ############################################################### THEORY asymmetry 1 -userFcn /home/l_salman/LEM/musrfit/src/external/libBNMR/libBNMR.so SExpRlx 2 3 4 +userFcn /usr/local/lib/libBNMR.so SExpRlx 2 3 4 ############################################################### RUN 45377 MUE4 PSI ASCII (name beamline institute data-file-format) From 1d98148d9d25571df5f94d2d65ced7dd917769e7 Mon Sep 17 00:00:00 2001 From: Suter Andreas Date: Tue, 16 Feb 2016 08:52:40 +0100 Subject: [PATCH 2/8] musredit_qt5 partially new icons (see ChangeLog) --- ChangeLog | 4 + src/musredit_qt5/PTextEdit.cpp | 51 ++- .../{images => icons}/MuonSpin-Avatar.gif | Bin .../{images => icons}/MuonSpin-Avatar.nb | 0 .../icons/inkscape/document-new.svg | 72 +++++ .../icons/inkscape/document-open.svg | 64 ++++ .../icons/inkscape/document-print.svg | 64 ++++ .../icons/inkscape/document-save.svg | 83 +++++ src/musredit_qt5/icons/inkscape/edit-copy.svg | 64 ++++ src/musredit_qt5/icons/inkscape/edit-cut.svg | 84 +++++ src/musredit_qt5/icons/inkscape/edit-find.svg | 77 +++++ .../icons/inkscape/edit-paste.svg | 64 ++++ src/musredit_qt5/icons/inkscape/edit-redo.svg | 66 ++++ src/musredit_qt5/icons/inkscape/edit-undo.svg | 66 ++++ .../icons/inkscape/go-next-use.svg | 64 ++++ .../icons/inkscape/go-previous-use.svg | 64 ++++ src/musredit_qt5/icons/inkscape/msr2data.svg | 256 ++++++++++++++++ src/musredit_qt5/icons/inkscape/musrchisq.svg | 170 ++++++++++ src/musredit_qt5/icons/inkscape/musrfit.svg | 186 +++++++++++ src/musredit_qt5/icons/inkscape/musrswap.svg | 201 ++++++++++++ src/musredit_qt5/icons/inkscape/musrview.svg | 196 ++++++++++++ .../icons/inkscape/view-refresh.svg | 79 +++++ src/musredit_qt5/{images => icons}/musrFT.xpm | 0 .../{images => icons}/musrasym.xpm | 0 .../{images => icons}/musrdump.xpm | 0 .../{images => icons}/musredit.icns | Bin .../{images => icons}/musredit.ico | Bin .../{images => icons}/musrfit-16x16.gif | Bin .../{images => icons}/musrfit-16x16.ico | Bin .../{images => icons}/musrfit-16x16.png | Bin .../{images => icons}/musrfit-16x16.xpm | 0 .../{images => icons}/musrfit.gif | Bin .../{images => icons}/musrmsr2data.xpm | 0 .../{images => icons}/musrprefs.xpm | 0 .../{images => icons}/musrsinglehisto.xpm | 0 src/musredit_qt5/{images => icons}/musrt0.xpm | 0 src/musredit_qt5/images/editcopy.xpm | 36 --- src/musredit_qt5/images/editcut.xpm | 32 -- src/musredit_qt5/images/editfind.xpm | 202 ------------ src/musredit_qt5/images/editnext.xpm | 49 --- src/musredit_qt5/images/editpaste.xpm | 36 --- src/musredit_qt5/images/editprevious.xpm | 45 --- src/musredit_qt5/images/editredo.xpm | 36 --- src/musredit_qt5/images/editundo.xpm | 36 --- src/musredit_qt5/images/filenew.xpm | 36 --- src/musredit_qt5/images/fileopen.xpm | 36 --- src/musredit_qt5/images/fileprint.xpm | 117 ------- src/musredit_qt5/images/filereload.xpm | 172 ----------- src/musredit_qt5/images/filesave.xpm | 36 --- src/musredit_qt5/images/musrcalcchisq.xpm | 28 -- src/musredit_qt5/images/musrfit.svg | 290 ------------------ src/musredit_qt5/images/musrfit.xpm | 28 -- src/musredit_qt5/images/musrswap.xpm | 28 -- src/musredit_qt5/images/musrview.xpm | 28 -- src/musredit_qt5/musredit.qrc | 48 +-- 55 files changed, 1973 insertions(+), 1321 deletions(-) rename src/musredit_qt5/{images => icons}/MuonSpin-Avatar.gif (100%) rename src/musredit_qt5/{images => icons}/MuonSpin-Avatar.nb (100%) create mode 100644 src/musredit_qt5/icons/inkscape/document-new.svg create mode 100644 src/musredit_qt5/icons/inkscape/document-open.svg create mode 100644 src/musredit_qt5/icons/inkscape/document-print.svg create mode 100644 src/musredit_qt5/icons/inkscape/document-save.svg create mode 100644 src/musredit_qt5/icons/inkscape/edit-copy.svg create mode 100644 src/musredit_qt5/icons/inkscape/edit-cut.svg create mode 100644 src/musredit_qt5/icons/inkscape/edit-find.svg create mode 100644 src/musredit_qt5/icons/inkscape/edit-paste.svg create mode 100644 src/musredit_qt5/icons/inkscape/edit-redo.svg create mode 100644 src/musredit_qt5/icons/inkscape/edit-undo.svg create mode 100644 src/musredit_qt5/icons/inkscape/go-next-use.svg create mode 100644 src/musredit_qt5/icons/inkscape/go-previous-use.svg create mode 100644 src/musredit_qt5/icons/inkscape/msr2data.svg create mode 100644 src/musredit_qt5/icons/inkscape/musrchisq.svg create mode 100644 src/musredit_qt5/icons/inkscape/musrfit.svg create mode 100644 src/musredit_qt5/icons/inkscape/musrswap.svg create mode 100644 src/musredit_qt5/icons/inkscape/musrview.svg create mode 100644 src/musredit_qt5/icons/inkscape/view-refresh.svg rename src/musredit_qt5/{images => icons}/musrFT.xpm (100%) rename src/musredit_qt5/{images => icons}/musrasym.xpm (100%) rename src/musredit_qt5/{images => icons}/musrdump.xpm (100%) rename src/musredit_qt5/{images => icons}/musredit.icns (100%) rename src/musredit_qt5/{images => icons}/musredit.ico (100%) rename src/musredit_qt5/{images => icons}/musrfit-16x16.gif (100%) rename src/musredit_qt5/{images => icons}/musrfit-16x16.ico (100%) rename src/musredit_qt5/{images => icons}/musrfit-16x16.png (100%) rename src/musredit_qt5/{images => icons}/musrfit-16x16.xpm (100%) rename src/musredit_qt5/{images => icons}/musrfit.gif (100%) rename src/musredit_qt5/{images => icons}/musrmsr2data.xpm (100%) rename src/musredit_qt5/{images => icons}/musrprefs.xpm (100%) rename src/musredit_qt5/{images => icons}/musrsinglehisto.xpm (100%) rename src/musredit_qt5/{images => icons}/musrt0.xpm (100%) delete mode 100644 src/musredit_qt5/images/editcopy.xpm delete mode 100644 src/musredit_qt5/images/editcut.xpm delete mode 100644 src/musredit_qt5/images/editfind.xpm delete mode 100644 src/musredit_qt5/images/editnext.xpm delete mode 100644 src/musredit_qt5/images/editpaste.xpm delete mode 100644 src/musredit_qt5/images/editprevious.xpm delete mode 100644 src/musredit_qt5/images/editredo.xpm delete mode 100644 src/musredit_qt5/images/editundo.xpm delete mode 100644 src/musredit_qt5/images/filenew.xpm delete mode 100644 src/musredit_qt5/images/fileopen.xpm delete mode 100644 src/musredit_qt5/images/fileprint.xpm delete mode 100644 src/musredit_qt5/images/filereload.xpm delete mode 100644 src/musredit_qt5/images/filesave.xpm delete mode 100644 src/musredit_qt5/images/musrcalcchisq.xpm delete mode 100644 src/musredit_qt5/images/musrfit.svg delete mode 100644 src/musredit_qt5/images/musrfit.xpm delete mode 100644 src/musredit_qt5/images/musrswap.xpm delete mode 100644 src/musredit_qt5/images/musrview.xpm diff --git a/ChangeLog b/ChangeLog index 1c2ed6158..8ecbf1389 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ changes since 0.16.0 =================================== NEW 2016-01-22 update of the docu which now describes the RRF option. +CHANGED 2016-02-16 start migrating the icons of musredit_qt5 to the breeze + icons (https://github.com/NitruxSA/breeze-icon-theme). + At the same time I start to redesign the musrfit specific + icons accordingly (not yet happy with it, but ...). changes since 0.15.0 =================================== diff --git a/src/musredit_qt5/PTextEdit.cpp b/src/musredit_qt5/PTextEdit.cpp index ede387e8b..0068cab35 100644 --- a/src/musredit_qt5/PTextEdit.cpp +++ b/src/musredit_qt5/PTextEdit.cpp @@ -117,8 +117,7 @@ PTextEdit::PTextEdit( QWidget *parent, Qt::WindowFlags f ) textSize(QString("%1").arg(fAdmin->getFontSize())); fFontChanging = false; - QPixmap image0(":/images/musrfit.xpm"); - setWindowIcon( image0 ); + setWindowIcon( QIcon( QPixmap( ":/icons/musrfit-plain.svg" ) ) ); // if arguments are give, try to load those files, otherwise create an empty new file if ( qApp->arguments().size() != 1 ) { @@ -173,14 +172,14 @@ void PTextEdit::setupFileActions() QAction *a; - a = new QAction( QIcon( QPixmap(":/images/filenew.xpm") ), tr( "&New..." ), this ); + a = new QAction( QIcon( QPixmap(":/icons/document-new-plain.svg") ), tr( "&New..." ), this ); a->setShortcut( tr("Ctrl+N") ); a->setStatusTip( tr("Create a new msr-file") ); connect( a, SIGNAL( triggered() ), this, SLOT( fileNew() ) ); tb->addAction(a); menu->addAction(a); - a = new QAction( QIcon( QPixmap(":/images/fileopen.xpm" ) ), tr( "&Open..." ), this ); + a = new QAction( QIcon( QPixmap(":/icons/document-open-plain.svg" ) ), tr( "&Open..." ), this ); a->setShortcut( tr("Ctrl+O") ); a->setStatusTip( tr("Opens a msr-file") ); connect( a, SIGNAL( triggered() ), this, SLOT( fileOpen() ) ); @@ -196,7 +195,7 @@ void PTextEdit::setupFileActions() } fillRecentFiles(); - a = new QAction( QIcon( QPixmap(":/images/filereload.xpm") ), tr( "Reload..." ), this ); + a = new QAction( QIcon( QPixmap(":/icons/view-refresh-plain.svg") ), tr( "Reload..." ), this ); a->setShortcut( tr("F5") ); a->setStatusTip( tr("Reload msr-file") ); connect( a, SIGNAL( triggered() ), this, SLOT( fileReload() ) ); @@ -209,7 +208,7 @@ void PTextEdit::setupFileActions() menu->addSeparator(); - a = new QAction( QIcon( QPixmap(":/images/filesave.xpm") ), tr( "&Save..." ), this ); + a = new QAction( QIcon( QPixmap(":/icons/document-save-plain.svg") ), tr( "&Save..." ), this ); a->setShortcut( tr("Ctrl+S") ); a->setStatusTip( tr("Save msr-file") ); connect( a, SIGNAL( triggered() ), this, SLOT( fileSave() ) ); @@ -227,7 +226,7 @@ void PTextEdit::setupFileActions() menu->addSeparator(); - a = new QAction( QIcon( QPixmap(":/images/fileprint.xpm") ), tr( "&Print..." ), this ); + a = new QAction( QIcon( QPixmap(":/icons/document-print-plain.svg") ), tr( "&Print..." ), this ); a->setShortcut( tr("Ctrl+P") ); a->setStatusTip( tr("Print msr-file") ); connect( a, SIGNAL( triggered() ), this, SLOT( filePrint() ) ); @@ -276,14 +275,14 @@ void PTextEdit::setupEditActions() QAction *a; - a = new QAction( QIcon( QPixmap( ":/images/editundo.xpm" ) ), tr( "&Undo" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/edit-undo-plain.svg" ) ), tr( "&Undo" ), this ); a->setShortcut( tr("Ctrl+Z") ); a->setStatusTip( tr("Edit Undo") ); connect( a, SIGNAL( triggered() ), this, SLOT( editUndo() ) ); tb->addAction(a); menu->addAction(a); - a = new QAction( QIcon( QPixmap( ":/images/editredo.xpm" ) ), tr( "&Redo" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/edit-redo-plain.svg" ) ), tr( "&Redo" ), this ); a->setShortcut( tr("Ctrl+Y") ); a->setStatusTip( tr("Edit Redo") ); connect( a, SIGNAL( triggered() ), this, SLOT( editRedo() ) ); @@ -300,21 +299,21 @@ void PTextEdit::setupEditActions() menu->addSeparator(); tb->addSeparator(); - a = new QAction( QIcon( QPixmap( ":/images/editcopy.xpm" ) ), tr( "&Copy" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/edit-copy-plain.svg" ) ), tr( "&Copy" ), this ); a->setShortcut( tr("Ctrl+C") ); a->setStatusTip( tr("Edit Copy") ); connect( a, SIGNAL( triggered() ), this, SLOT( editCopy() ) ); tb->addAction(a); menu->addAction(a); - a = new QAction( QIcon( QPixmap( ":/images/editcut.xpm" ) ), tr( "Cu&t" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/edit-cut-plain.svg" ) ), tr( "Cu&t" ), this ); a->setShortcut( tr("Ctrl+X") ); a->setStatusTip( tr("Edit Cut") ); connect( a, SIGNAL( triggered() ), this, SLOT( editCut() ) ); tb->addAction(a); menu->addAction(a); - a = new QAction( QIcon( QPixmap( ":/images/editpaste.xpm" ) ), tr( "&Paste" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/edit-paste-plain.svg" ) ), tr( "&Paste" ), this ); a->setShortcut( tr("Ctrl+V") ); a->setStatusTip( tr("Edit Paste") ); connect( a, SIGNAL( triggered() ), this, SLOT( editPaste() ) ); @@ -324,21 +323,21 @@ void PTextEdit::setupEditActions() menu->addSeparator(); tb->addSeparator(); - a = new QAction( QIcon( QPixmap( ":/images/editfind.xpm" ) ), tr( "&Find" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/edit-find-plain.svg" ) ), tr( "&Find" ), this ); a->setShortcut( tr("Ctrl+F") ); a->setStatusTip( tr("Edit Find") ); connect( a, SIGNAL( triggered() ), this, SLOT( editFind() ) ); tb->addAction(a); menu->addAction(a); - a = new QAction( QIcon( QPixmap( ":/images/editnext.xpm" ) ), tr( "Find &Next" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/go-next-use-plain.svg" ) ), tr( "Find &Next" ), this ); a->setShortcut( tr("F3") ); a->setStatusTip( tr("Edit Find Next") ); connect( a, SIGNAL( triggered() ), this, SLOT( editFindNext() ) ); tb->addAction(a); menu->addAction(a); - a = new QAction( QIcon( QPixmap( ":/images/editprevious.xpm" ) ) , tr( "Find Pre&vious" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/go-previous-use-plain.svg" ) ) , tr( "Find Pre&vious" ), this ); a->setShortcut( tr("Shift+F4") ); a->setStatusTip( tr("Edit Find Previous") ); connect( a, SIGNAL( triggered() ), this, SLOT( editFindPrevious() ) ); @@ -490,14 +489,14 @@ void PTextEdit::setupMusrActions() menuBar()->addMenu( menu ); QAction *a; - a = new QAction( QIcon( QPixmap( ":/images/musrasym.xpm" ) ), tr( "&Asymmetry Default" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/musrasym.xpm" ) ), tr( "&Asymmetry Default" ), this ); a->setShortcut( tr("Alt+A") ); a->setStatusTip( tr("Get Default Asymmetry msr-file") ); connect( a, SIGNAL( triggered() ), this, SLOT( musrGetAsymmetryDefault() ) ); tb->addAction(a); menu->addAction(a); - a = new QAction( QIcon( QPixmap( ":/images/musrsinglehisto.xpm" ) ), tr( "Single &Histogram Default" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/musrsinglehisto.xpm" ) ), tr( "Single &Histogram Default" ), this ); a->setShortcut( tr("Alt+H") ); a->setStatusTip( tr("Get Default Single Histogram msr-file") ); connect( a, SIGNAL( triggered() ), this, SLOT( musrGetSingleHistoDefault() ) ); @@ -507,28 +506,28 @@ void PTextEdit::setupMusrActions() menu->addSeparator(); tb->addSeparator(); - a = new QAction( QIcon( QPixmap( ":/images/musrcalcchisq.xpm" ) ), tr( "Calculate Chisq" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/musrchisq-plain.svg" ) ), tr( "Calculate Chisq" ), this ); a->setShortcut( tr("Alt+C") ); a->setStatusTip( tr("Calculate Chi Square (Log Max Likelihood)") ); connect( a, SIGNAL( triggered() ), this, SLOT( musrCalcChisq() ) ); tb->addAction(a); menu->addAction(a); - a = new QAction( QIcon( QPixmap( ":/images/musrfit.xpm" ) ), tr( "&Fit" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/musrfit-plain.svg" ) ), tr( "&Fit" ), this ); a->setShortcut( tr("Alt+F") ); a->setStatusTip( tr("Fit") ); connect( a, SIGNAL( triggered() ), this, SLOT( musrFit() ) ); tb->addAction(a); menu->addAction(a); - a = new QAction( QIcon( QPixmap( ":/images/musrswap.xpm" ) ), tr( "&Swap Msr <-> Mlog" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/musrswap-plain.svg" ) ), tr( "&Swap Msr <-> Mlog" ), this ); a->setShortcut( tr("Alt+S") ); a->setStatusTip( tr("Swap msr-file <-> mlog-file") ); connect( a, SIGNAL( triggered() ), this, SLOT( musrSwapMsrMlog() ) ); tb->addAction(a); menu->addAction(a); - a = new QAction( QIcon( QPixmap( ":/images/musrmsr2data.xpm" ) ), tr( "&Msr2Data" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/msr2data-plain.svg" ) ), tr( "&Msr2Data" ), this ); a->setShortcut( tr("Alt+M") ); a->setStatusTip( tr("Start msr2data interface") ); connect( a, SIGNAL( triggered() ), this, SLOT( musrMsr2Data() ) ); @@ -538,27 +537,27 @@ void PTextEdit::setupMusrActions() menu->addSeparator(); tb->addSeparator(); - a = new QAction( QIcon( QPixmap( ":/images/musrview.xpm" ) ), tr( "&View" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/musrview-plain.svg" ) ), tr( "&View" ), this ); a->setShortcut( tr("Alt+V") ); a->setStatusTip( tr("Start musrview") ); connect( a, SIGNAL( triggered() ), this, SLOT( musrView() ) ); tb->addAction(a); menu->addAction(a); - fMusrT0Action = new QAction( QIcon( QPixmap( ":/images/musrt0.xpm" ) ), tr( "&T0" ), this ); + fMusrT0Action = new QAction( QIcon( QPixmap( ":/icons/musrt0.xpm" ) ), tr( "&T0" ), this ); fMusrT0Action->setStatusTip( tr("Start musrt0") ); connect( fMusrT0Action, SIGNAL( triggered() ), this, SLOT( musrT0() ) ); tb->addAction(fMusrT0Action); menu->addAction(fMusrT0Action); fMusrT0Action->setEnabled(fAdmin->getEnableMusrT0Flag()); - a = new QAction( QIcon( QPixmap (":/images/musrFT.xpm") ), tr( "Raw Fourier" ), this ); + a = new QAction( QIcon( QPixmap (":/icons/musrFT.xpm") ), tr( "Raw Fourier" ), this ); a->setStatusTip( tr("Start musrFT") ); connect( a, SIGNAL( triggered() ), this, SLOT( musrFT() ) ); tb->addAction(a); menu->addAction(a); - a = new QAction( QIcon( QPixmap( ":/images/musrprefs.xpm" ) ), tr( "&Preferences" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/musrprefs.xpm" ) ), tr( "&Preferences" ), this ); a->setStatusTip( tr("Show Preferences") ); connect( a, SIGNAL( triggered() ), this, SLOT( musrPrefs() ) ); tb->addAction(a); @@ -567,7 +566,7 @@ void PTextEdit::setupMusrActions() menu->addSeparator(); tb->addSeparator(); - a = new QAction( QIcon( QPixmap(":/images/musrdump.xpm")), tr( "&Dump Header"), this); + a = new QAction( QIcon( QPixmap(":/icons/musrdump.xpm")), tr( "&Dump Header"), this); a->setStatusTip( tr("Dumps muSR File Header Information") ); connect( a, SIGNAL(triggered()), this, SLOT(musrDump())); tb->addAction(a); diff --git a/src/musredit_qt5/images/MuonSpin-Avatar.gif b/src/musredit_qt5/icons/MuonSpin-Avatar.gif similarity index 100% rename from src/musredit_qt5/images/MuonSpin-Avatar.gif rename to src/musredit_qt5/icons/MuonSpin-Avatar.gif diff --git a/src/musredit_qt5/images/MuonSpin-Avatar.nb b/src/musredit_qt5/icons/MuonSpin-Avatar.nb similarity index 100% rename from src/musredit_qt5/images/MuonSpin-Avatar.nb rename to src/musredit_qt5/icons/MuonSpin-Avatar.nb diff --git a/src/musredit_qt5/icons/inkscape/document-new.svg b/src/musredit_qt5/icons/inkscape/document-new.svg new file mode 100644 index 000000000..2a46e85e3 --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/document-new.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/document-open.svg b/src/musredit_qt5/icons/inkscape/document-open.svg new file mode 100644 index 000000000..58101a551 --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/document-open.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/document-print.svg b/src/musredit_qt5/icons/inkscape/document-print.svg new file mode 100644 index 000000000..de757e134 --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/document-print.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/document-save.svg b/src/musredit_qt5/icons/inkscape/document-save.svg new file mode 100644 index 000000000..a725304ac --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/document-save.svg @@ -0,0 +1,83 @@ + + + + I REALLY hate this icon + + + + + + + + + + + + + + + + + + image/svg+xml + + I REALLY hate this icon + Migh as well use Tango... for crying out loud. This damn icon has to die, but no because obviously we're still using floppies therefore it is still relevant in 2014. + English + + + + + + + + Uri Herrera + + + November 20th 2014 + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/edit-copy.svg b/src/musredit_qt5/icons/inkscape/edit-copy.svg new file mode 100644 index 000000000..6edb0571f --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/edit-copy.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/edit-cut.svg b/src/musredit_qt5/icons/inkscape/edit-cut.svg new file mode 100644 index 000000000..1f77c2687 --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/edit-cut.svg @@ -0,0 +1,84 @@ + + + + I hate this icon + + + + + + + + + + + + + + + + + + image/svg+xml + + I hate this icon + October 19th 2014 + + + Uri Herrera + + + + + + + + English + An icon I absolutely don't like, and that represents exactly the kind of things why I choose CC licenses. + + + Everyone + + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/edit-find.svg b/src/musredit_qt5/icons/inkscape/edit-find.svg new file mode 100644 index 000000000..7694d71dd --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/edit-find.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/edit-paste.svg b/src/musredit_qt5/icons/inkscape/edit-paste.svg new file mode 100644 index 000000000..49233e35a --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/edit-paste.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/edit-redo.svg b/src/musredit_qt5/icons/inkscape/edit-redo.svg new file mode 100644 index 000000000..8f221de08 --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/edit-redo.svg @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/edit-undo.svg b/src/musredit_qt5/icons/inkscape/edit-undo.svg new file mode 100644 index 000000000..67add4f49 --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/edit-undo.svg @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/go-next-use.svg b/src/musredit_qt5/icons/inkscape/go-next-use.svg new file mode 100644 index 000000000..04c85bd1d --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/go-next-use.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/go-previous-use.svg b/src/musredit_qt5/icons/inkscape/go-previous-use.svg new file mode 100644 index 000000000..15facb2f1 --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/go-previous-use.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/msr2data.svg b/src/musredit_qt5/icons/inkscape/msr2data.svg new file mode 100644 index 000000000..9f4cab357 --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/msr2data.svg @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/musrchisq.svg b/src/musredit_qt5/icons/inkscape/musrchisq.svg new file mode 100644 index 000000000..b0a982fc1 --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/musrchisq.svg @@ -0,0 +1,170 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + χ2 + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/musrfit.svg b/src/musredit_qt5/icons/inkscape/musrfit.svg new file mode 100644 index 000000000..05704d7ce --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/musrfit.svg @@ -0,0 +1,186 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/musrswap.svg b/src/musredit_qt5/icons/inkscape/musrswap.svg new file mode 100644 index 000000000..c92078f3e --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/musrswap.svg @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + MLOG + MSR + + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/musrview.svg b/src/musredit_qt5/icons/inkscape/musrview.svg new file mode 100644 index 000000000..dea64857c --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/musrview.svg @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/view-refresh.svg b/src/musredit_qt5/icons/inkscape/view-refresh.svg new file mode 100644 index 000000000..2e3d287ef --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/view-refresh.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/musredit_qt5/images/musrFT.xpm b/src/musredit_qt5/icons/musrFT.xpm similarity index 100% rename from src/musredit_qt5/images/musrFT.xpm rename to src/musredit_qt5/icons/musrFT.xpm diff --git a/src/musredit_qt5/images/musrasym.xpm b/src/musredit_qt5/icons/musrasym.xpm similarity index 100% rename from src/musredit_qt5/images/musrasym.xpm rename to src/musredit_qt5/icons/musrasym.xpm diff --git a/src/musredit_qt5/images/musrdump.xpm b/src/musredit_qt5/icons/musrdump.xpm similarity index 100% rename from src/musredit_qt5/images/musrdump.xpm rename to src/musredit_qt5/icons/musrdump.xpm diff --git a/src/musredit_qt5/images/musredit.icns b/src/musredit_qt5/icons/musredit.icns similarity index 100% rename from src/musredit_qt5/images/musredit.icns rename to src/musredit_qt5/icons/musredit.icns diff --git a/src/musredit_qt5/images/musredit.ico b/src/musredit_qt5/icons/musredit.ico similarity index 100% rename from src/musredit_qt5/images/musredit.ico rename to src/musredit_qt5/icons/musredit.ico diff --git a/src/musredit_qt5/images/musrfit-16x16.gif b/src/musredit_qt5/icons/musrfit-16x16.gif similarity index 100% rename from src/musredit_qt5/images/musrfit-16x16.gif rename to src/musredit_qt5/icons/musrfit-16x16.gif diff --git a/src/musredit_qt5/images/musrfit-16x16.ico b/src/musredit_qt5/icons/musrfit-16x16.ico similarity index 100% rename from src/musredit_qt5/images/musrfit-16x16.ico rename to src/musredit_qt5/icons/musrfit-16x16.ico diff --git a/src/musredit_qt5/images/musrfit-16x16.png b/src/musredit_qt5/icons/musrfit-16x16.png similarity index 100% rename from src/musredit_qt5/images/musrfit-16x16.png rename to src/musredit_qt5/icons/musrfit-16x16.png diff --git a/src/musredit_qt5/images/musrfit-16x16.xpm b/src/musredit_qt5/icons/musrfit-16x16.xpm similarity index 100% rename from src/musredit_qt5/images/musrfit-16x16.xpm rename to src/musredit_qt5/icons/musrfit-16x16.xpm diff --git a/src/musredit_qt5/images/musrfit.gif b/src/musredit_qt5/icons/musrfit.gif similarity index 100% rename from src/musredit_qt5/images/musrfit.gif rename to src/musredit_qt5/icons/musrfit.gif diff --git a/src/musredit_qt5/images/musrmsr2data.xpm b/src/musredit_qt5/icons/musrmsr2data.xpm similarity index 100% rename from src/musredit_qt5/images/musrmsr2data.xpm rename to src/musredit_qt5/icons/musrmsr2data.xpm diff --git a/src/musredit_qt5/images/musrprefs.xpm b/src/musredit_qt5/icons/musrprefs.xpm similarity index 100% rename from src/musredit_qt5/images/musrprefs.xpm rename to src/musredit_qt5/icons/musrprefs.xpm diff --git a/src/musredit_qt5/images/musrsinglehisto.xpm b/src/musredit_qt5/icons/musrsinglehisto.xpm similarity index 100% rename from src/musredit_qt5/images/musrsinglehisto.xpm rename to src/musredit_qt5/icons/musrsinglehisto.xpm diff --git a/src/musredit_qt5/images/musrt0.xpm b/src/musredit_qt5/icons/musrt0.xpm similarity index 100% rename from src/musredit_qt5/images/musrt0.xpm rename to src/musredit_qt5/icons/musrt0.xpm diff --git a/src/musredit_qt5/images/editcopy.xpm b/src/musredit_qt5/images/editcopy.xpm deleted file mode 100644 index cc6fb7a68..000000000 --- a/src/musredit_qt5/images/editcopy.xpm +++ /dev/null @@ -1,36 +0,0 @@ -/* XPM */ -static char *magick[] = { -/* columns rows colors chars-per-pixel */ -"22 22 8 1", -" c Gray100", -". c #8b8bfd", -"X c #3c3cfd", -"o c #000082", -"O c Gray0", -"+ c None", -"@ c Gray0", -"# c Gray0", -/* pixels */ -"++++++++++++++++++++++", -"++++++++++++++++++++++", -"OOOOOOOO++++++++++++++", -"O OO+++++++++++++", -"O OOOO O O++++++++++++", -"O O O+++++++++++", -"O OOOO Ooooooooo++++++", -"O Oo oo+++++", -"O OOOOO o OOOO oXo++++", -"O o o.Xo+++", -"O OOOOO o OOOO o .Xo++", -"O o oooooo+", -"O OOOOO o OOOO o+", -"O o o+", -"O OOOOO o OOOOOOOOO o+", -"O o o+", -"OOOOOOOOo OOOOOOOOO o+", -"++++++++o o+", -"++++++++o OOOOOOOOO o+", -"++++++++o o+", -"++++++++ooooooooooooo+", -"++++++++++++++++++++++" -}; diff --git a/src/musredit_qt5/images/editcut.xpm b/src/musredit_qt5/images/editcut.xpm deleted file mode 100644 index 2391adda5..000000000 --- a/src/musredit_qt5/images/editcut.xpm +++ /dev/null @@ -1,32 +0,0 @@ -/* XPM */ -static char *magick[] = { -/* columns rows colors chars-per-pixel */ -"22 22 4 1", -" c Gray100", -". c #000082", -"X c Gray0", -"o c None", -/* pixels */ -"oooooooooooooooooooooo", -"oooooooXoooooXoooooooo", -"oooooooXoooooXoooooooo", -"oooooooXoooooXoooooooo", -"oooooooXooooXXoooooooo", -"oooooooXXoooXooooooooo", -"ooooooooXoooXooooooooo", -"ooooooooXXoXXooooooooo", -"oooooooooXXXoooooooooo", -"oooooooooXXXoooooooooo", -"ooooooooooXooooooooooo", -"ooooooooo.X.oooooooooo", -"oooooooo..o...oooooooo", -"ooooooo.o.o.oo.ooooooo", -"oooooo.oo.o.ooo.oooooo", -"ooooo.ooo.o.oooo.ooooo", -"oooo.oooo.o.oooo.ooooo", -"oooo.oooo.oo.ooo.ooooo", -"oooo.oooo.oo.oo.oooooo", -"oooo.ooo.oooo..ooooooo", -"ooooo...oooooooooooooo", -"oooooooooooooooooooooo" -}; diff --git a/src/musredit_qt5/images/editfind.xpm b/src/musredit_qt5/images/editfind.xpm deleted file mode 100644 index f5790f34a..000000000 --- a/src/musredit_qt5/images/editfind.xpm +++ /dev/null @@ -1,202 +0,0 @@ -/* XPM */ -static char * editfind_xpm[] = { -"22 22 177 2", -" c None", -". c #59595A", -"+ c #3B3B3C", -"@ c #3E3E3F", -"# c #3C3C3D", -"$ c #404041", -"% c #585859", -"& c #979797", -"* c #5B5B5B", -"= c #FFFFFF", -"- c #5D5D5E", -"; c #49494A", -"> c #868787", -", c #AFB4B4", -"' c #BBC4C6", -") c #BBC5C6", -"! c #B2B7B7", -"~ c #7A7A7B", -"{ c #1D1D1D", -"] c #474747", -"^ c #3D3D3D", -"/ c #444445", -"( c #7B7879", -"_ c #CFDADA", -": c #E5F0F2", -"< c #DCF2F5", -"[ c #DDF4FA", -"} c #D7F3F8", -"| c #CCEFF7", -"1 c #DCE7E9", -"2 c #6F6F70", -"3 c #434343", -"4 c #E4E4E4", -"5 c #4C4C4D", -"6 c #7D7E7D", -"7 c #E9F8FA", -"8 c #C6EDF5", -"9 c #BDE7F0", -"0 c #A5DCEA", -"a c #9BD6E2", -"b c #BBE7EE", -"c c #444444", -"d c #8A8A8A", -"e c #767676", -"f c #C5CFD2", -"g c #B1E2EC", -"h c #9DD9E6", -"i c #8ACDD9", -"j c #81C9D6", -"k c #AFE1EC", -"l c #CED9D9", -"m c #29292A", -"n c #818181", -"o c #6C6C6C", -"p c #4A4A4A", -"q c #5C5C5C", -"r c #A2A7A7", -"s c #E5F4F8", -"t c #C3E9F0", -"u c #ACE0EB", -"v c #99D8E6", -"w c #87CDDC", -"x c #6CBACB", -"y c #7BC4D4", -"z c #9DA2A1", -"A c #626262", -"B c #727272", -"C c #535353", -"D c #494949", -"E c #BAC0C1", -"F c #E7F3F6", -"G c #CBE9F2", -"H c #86D1E1", -"I c #6CC3D9", -"J c #50A6B9", -"K c #6AB5C3", -"L c #B2C7CB", -"M c #454545", -"N c #4F4F4F", -"O c #4B4B4B", -"P c #373737", -"Q c #E3F2F4", -"R c #C5E7EC", -"S c #A8E1EB", -"T c #96D7E7", -"U c #74C8DD", -"V c #5BB1C4", -"W c #4399A8", -"X c #54ACB9", -"Y c #0C0C0C", -"Z c #D3D3D3", -"` c #464646", -" . c #434344", -".. c #A6ABAA", -"+. c #D8EDF1", -"@. c #B1DBE4", -"#. c #96D5E5", -"$. c #4DBACE", -"%. c #449AA9", -"&. c #3D8996", -"*. c #63B5C4", -"=. c #ABDFEA", -"-. c #232323", -";. c #FCFCFC", -">. c #78C3D3", -",. c #68BDCF", -"'. c #4CB7CB", -"). c #4298A7", -"!. c #398491", -"~. c #489EAD", -"{. c #404647", -"]. c #484848", -"^. c #797A79", -"/. c #D7F0F4", -"(. c #A4DBE9", -"_. c #79BFCC", -":. c #60B3C5", -"<. c #52A7B3", -"[. c #4496A5", -"}. c #50A3B5", -"|. c #8ACFE1", -"1. c #000000", -"2. c #8E8E8E", -"3. c #5C5D5C", -"4. c #BAE4EF", -"5. c #99D4E0", -"6. c #87CAD6", -"7. c #BDE6F0", -"8. c #414648", -"9. c #AC993F", -"0. c #6C6D6C", -"a. c #7B7C7B", -"b. c #79989C", -"c. c #A9C7CE", -"d. c #B3CAD0", -"e. c #88A8AD", -"f. c #6B7274", -"g. c #DECE9D", -"h. c #635920", -"i. c #4D4D4E", -"j. c #595959", -"k. c #737374", -"l. c #757576", -"m. c #717172", -"n. c #707071", -"o. c #424849", -"p. c #414748", -"q. c #BDA44C", -"r. c #717171", -"s. c #686868", -"t. c #928237", -"u. c #747475", -"v. c #767677", -"w. c #373738", -"x. c #939393", -"y. c #E3E3E3", -"z. c #363637", -"A. c #777778", -"B. c #E1E1E1", -"C. c #39393A", -"D. c #3B3B3B", -"E. c #DCDCDC", -"F. c #828282", -"G. c #CECECE", -"H. c #3A3F40", -"I. c #727273", -"J. c #313131", -"K. c #575757", -"L. c #393939", -"M. c #EEEEEE", -"N. c #3D3D3E", -"O. c #9D9D9D", -"P. c #FEFEFE", -"Q. c #323233", -"R. c #7F7F80", -"S. c #0B0B0B", -"T. c #4D4D4D", -" . + @ # $ % & * = ", -" - ; > , ' ) ! ~ { ] * ^ = & ", -" / ( _ : < [ } | [ 1 2 3 4 4 * ", -" 5 6 1 7 = 7 8 9 0 a b 1 6 c d e = ", -" ; f 7 = = = 7 g h i j k l m n o * p = ", -"q r 1 < s = 7 t u v w x y k z A B * C D = ", -"; E F G G 7 t k v H I J K g L M N O M P ", -"; ' Q R b g S T H U V W X S L Y Z ` P = ", -" ...+.@.a v #.H U $.%.&.*.=.r -. ;.= ", -"o 6 _ k i j >.,.'.).!.~.#._ {.] ", -" ].^./.(._.:.<.[.&.}.|.+.z 1. ", -" 2.3.6 +.4.5.6.>.w 7.+.6 8.1.9. ", -" * 0.a.b.c.R R d.e.f.8.1.= g.h. ", -" q i.j.k.l.m.n.o.p.1.q.g.= k.$ ", -" r.i.N p D s. h.t.o.u.= v.w. ", -" x.C y. h.z.o.A.B.~ C. ", -" * D.E.F.M G. z.z.H.I.G.2 J. ", -" = = K.L.M. 1.z.o.n.G.n.N.", -"O.d e P.y. Q.z.o.n.R.$ ", -"n o * ].4 & * = 1.z.o.S.$ ", -"e * C D 4 * ^ = 1.1.$ ", -"K.T.M P = = = "}; diff --git a/src/musredit_qt5/images/editnext.xpm b/src/musredit_qt5/images/editnext.xpm deleted file mode 100644 index 383761ec8..000000000 --- a/src/musredit_qt5/images/editnext.xpm +++ /dev/null @@ -1,49 +0,0 @@ -/* XPM */ -static char * editnext_xpm[] = { -"24 24 22 1", -" c None", -". c #000000", -"+ c #FFFFFF", -"@ c #E6E6E6", -"# c #FAFAFA", -"$ c #AEAEAE", -"% c #F6F6F6", -"& c #C9C9C9", -"* c #666666", -"= c #ACACAC", -"- c #F3F3F3", -"; c #FDFDFD", -"> c #676767", -", c #AAAAAA", -"' c #888888", -") c #A5A5A5", -"! c #F0F0F0", -"~ c #525252", -"{ c #5E5E5E", -"] c #696969", -"^ c #FCFCFC", -"/ c #F9F9F9", -" ", -" ", -" ........+ ", -" . ........+ ", -" .@. . #++++++++ ", -" .@$%. .. ..........+ ", -".&$*=%..@. -;+++++++++ ", -" .>$*=&@,. ....+ ", -" .>$*')>. !;+++ ", -" .~${{>. .......+ ", -" .@']]>. !^++++++ ", -" .@,>>>>. ", -" ......... ..........+ ", -" ..........+ ", -" /++++++++++ ", -" ....+ ", -" +++++ ", -" ......+ ", -" +++++++ ", -" ........+ ", -" +++++++++ ", -" ", -" ", -" "}; diff --git a/src/musredit_qt5/images/editpaste.xpm b/src/musredit_qt5/images/editpaste.xpm deleted file mode 100644 index 3f775920f..000000000 --- a/src/musredit_qt5/images/editpaste.xpm +++ /dev/null @@ -1,36 +0,0 @@ -/* XPM */ -static char *magick[] = { -/* columns rows colors chars-per-pixel */ -"22 22 8 1", -" c Gray100", -". c Yellow", -"X c #c6c3c6", -"o c #848284", -"O c #848200", -"+ c #000084", -"@ c Gray0", -"# c None", -/* pixels */ -"######################", -"#######@@@@@##########", -"##@@@@@@...@@@@@@#####", -"#@@@@@@.....@@@@@@####", -"@@oOo@@.@@@.@@oOo@@###", -"@oOo@XXXXXXXXX@oOo@###", -"@OoO@XXXXXXXXX@OoO@###", -"@oOo@@@@@@@@@@@oOo@###", -"@OoOoOoOoOoOoOoOoO@###", -"@oOoOoOoOoOoOoOoOo@###", -"@OoOoOoO++++++++++@###", -"@oOoOoOo+ + +###", -"@OoOoOoO+ +++++ + +##", -"@oOoOoOo+ + +#", -"@OoOoOoO+ +++++ + +", -"@oOoOoOo+ ++++++", -"@OoOoOoO+ +++++ +", -"@oOoOoOo+ +", -"@OoOoOoO+ ++++++++++ +", -"#@@@@@@@+ +", -"########++++++++++++++", -"######################" -}; diff --git a/src/musredit_qt5/images/editprevious.xpm b/src/musredit_qt5/images/editprevious.xpm deleted file mode 100644 index 6dba0c525..000000000 --- a/src/musredit_qt5/images/editprevious.xpm +++ /dev/null @@ -1,45 +0,0 @@ -/* XPM */ -static char * editprevious_xpm[] = { -"24 22 20 1", -" c None", -". c #000000", -"+ c #FFFFFF", -"@ c #D6D6D6", -"# c #F0F0F0", -"$ c #FDFDFD", -"% c #B1B1B1", -"& c #969696", -"* c #696969", -"= c #FEFEFE", -"- c #A8A8A8", -"; c #888888", -"> c #5E5E5E", -", c #F7F7F7", -"' c #666666", -") c #ACACAC", -"! c #A0A0A0", -"~ c #AEAEAE", -"{ c #3B3B3B", -"] c #4C4C4C", -" ", -" ", -"........+ ", -"........+ ......... ", -"+++++++++ .@@###@. ", -"..........$ .%&*&@. ", -"++++++++++= .-;>&,. ", -"....+ .-;;'),. ", -"+++++ .!~{~'),. ", -".......+ .~..{~'),. ", -"++++++++ .. .{~]. ", -" . .{. ", -"..........$ . ", -"..........+ ", -"+++++++++++ ", -"....+ ", -"+++++ ", -"......+ ", -"+++++++ ", -"........+ ", -"+++++++++ ", -" "}; diff --git a/src/musredit_qt5/images/editredo.xpm b/src/musredit_qt5/images/editredo.xpm deleted file mode 100644 index 46dc03319..000000000 --- a/src/musredit_qt5/images/editredo.xpm +++ /dev/null @@ -1,36 +0,0 @@ -/* XPM */ -static char *magick[] = { -/* columns rows colors chars-per-pixel */ -"22 22 8 1", -" c Gray100", -". c #848284", -"X c #000084", -"o c Gray0", -"O c None", -"+ c Gray0", -"@ c Gray0", -"# c Gray0", -/* pixels */ -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOO.XXXXXXOOOOOOOOOOO", -"OOOXXXXXXXXXXOOOOOOXOO", -"OO.XXOOOOOOXXXXOOOXXOO", -"OOXXOOOOOOOOOXXXOXXXOO", -"OOXXOOOOOOOOOOXXXXXXOO", -"OOXXOOOOOOOOOOOXXXXXOO", -"OOXXOOOOOOOOOOXXXXXXOO", -"OOXXOOOOOOOOOXXXXXXXOO", -"OO.XXOOOOOOOXXXXXXXXOO", -"OOOXXX.OOOOOOOOOOOOOOO", -"OOOOXXXOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO" -}; diff --git a/src/musredit_qt5/images/editundo.xpm b/src/musredit_qt5/images/editundo.xpm deleted file mode 100644 index 229c1636e..000000000 --- a/src/musredit_qt5/images/editundo.xpm +++ /dev/null @@ -1,36 +0,0 @@ -/* XPM */ -static char *magick[] = { -/* columns rows colors chars-per-pixel */ -"22 22 8 1", -" c Gray100", -". c #848284", -"X c #000084", -"o c Gray0", -"O c None", -"+ c Gray0", -"@ c Gray0", -"# c Gray0", -/* pixels */ -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOXXXXXX.OOOO", -"OOXOOOOOOXXXXXXXXXXOOO", -"OOXXOOOXXXXOOOOOOXX.OO", -"OOXXXOXXXOOOOOOOOOXXOO", -"OOXXXXXXOOOOOOOOOOXXOO", -"OOXXXXXOOOOOOOOOOOXXOO", -"OOXXXXXXOOOOOOOOOOXXOO", -"OOXXXXXXXOOOOOOOOOXXOO", -"OOXXXXXXXXOOOOOOOXX.OO", -"OOOOOOOOOOOOOOO.XXXOOO", -"OOOOOOOOOOOOOOOXXXOOOO", -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO" -}; diff --git a/src/musredit_qt5/images/filenew.xpm b/src/musredit_qt5/images/filenew.xpm deleted file mode 100644 index 884d7cbb1..000000000 --- a/src/musredit_qt5/images/filenew.xpm +++ /dev/null @@ -1,36 +0,0 @@ -/* XPM */ -static char *magick[] = { -/* columns rows colors chars-per-pixel */ -"22 22 8 1", -" c Gray100", -". c Gray76", -"X c Gray53", -"o c Gray36", -"O c Gray18", -"+ c Gray0", -"@ c None", -"# c Gray0", -/* pixels */ -"@@@@@@@@@@@@@@@@@@@@@@", -"@@@@++++++++++@@@@@@@@", -"@@@@+ +O+@@@@@@@", -"@@@@+ +oO+@@@@@@", -"@@@@+ +XoO+@@@@@", -"@@@@+ +.XoO+@@@@", -"@@@@+ + .XoO+@@@", -"@@@@+ +++++++@@@", -"@@@@+ +@@@", -"@@@@+ +@@@", -"@@@@+ +@@@", -"@@@@+ +@@@", -"@@@@+ +@@@", -"@@@@+ +@@@", -"@@@@+ +@@@", -"@@@@+ +@@@", -"@@@@+ +@@@", -"@@@@+ +@@@", -"@@@@+ +@@@", -"@@@@+++++++++++++++@@@", -"@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@" -}; diff --git a/src/musredit_qt5/images/fileopen.xpm b/src/musredit_qt5/images/fileopen.xpm deleted file mode 100644 index 82effcf7b..000000000 --- a/src/musredit_qt5/images/fileopen.xpm +++ /dev/null @@ -1,36 +0,0 @@ -/* XPM */ -static char *magick[] = { -/* columns rows colors chars-per-pixel */ -"22 22 8 1", -" c Gray100", -". c Yellow", -"X c #848200", -"o c Gray0", -"O c None", -"+ c Gray0", -"@ c Gray0", -"# c Gray0", -/* pixels */ -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOooooOOOOoO", -"OOOOOOOOOOOoOOOOooOooO", -"OOOOOOOOOOOOOOOOOOoooO", -"OOOOOOOOOOOOOOOOOooooO", -"OooooOOOOOOOOOOOoooooO", -"o. . ooooooooooOOOOOOO", -"o . . . . . . oOOOOOOO", -"o. . . . . . .oOOOOOOO", -"o . . . . . . oOOOOOOO", -"o. . . ooooooooooooooo", -"o . . ooXXXXXXXXXXXXoo", -"o. . ooXXXXXXXXXXXXooO", -"o . ooXXXXXXXXXXXXooOO", -"o. ooXXXXXXXXXXXXooOOO", -"o ooXXXXXXXXXXXXooOOOO", -"oooXXXXXXXXXXXXooOOOOO", -"ooXXXXXXXXXXXXooOOOOOO", -"oooooooooooooooOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOO" -}; diff --git a/src/musredit_qt5/images/fileprint.xpm b/src/musredit_qt5/images/fileprint.xpm deleted file mode 100644 index 8701d4609..000000000 --- a/src/musredit_qt5/images/fileprint.xpm +++ /dev/null @@ -1,117 +0,0 @@ -/* XPM */ -static char *magick[] = { -/* columns rows colors chars-per-pixel */ -"22 22 89 1", -" c Gray0", -". c #101008081010", -"X c #101010101010", -"o c #101010101818", -"O c #181810101818", -"+ c #181818181818", -"@ c #181818182121", -"# c #212118182121", -"$ c Gray13", -"% c #212121212929", -"& c #292921212929", -"* c Gray16", -"= c #292929293131", -"- c #313129293131", -"; c #313131313131", -": c #313131313939", -"> c #393931313939", -", c #393939393939", -"< c #393939394242", -"1 c #424239394242", -"2 c Gray26", -"3 c #4a4a4a4a5252", -"4 c #5a5a52525a5a", -"5 c #5a5a5a5a6363", -"6 c #6b6b63636b6b", -"7 c Gray42", -"8 c #6b6b6b6b7373", -"9 c #73736b6b7373", -"0 c #7b7b73737b7b", -"q c #7b7b73738484", -"w c #0808ffff0808", -"e c #2929ffff2929", -"r c #3131ffff3131", -"t c #5a5acece5a5a", -"y c #6b6bffff6363", -"u c #7b7bffff7b7b", -"i c #84847b7b8484", -"p c #84847b7b8c8c", -"a c #8c8c7b7b9494", -"s c #848484848c8c", -"d c #8c8c84848c8c", -"f c Gray55", -"g c #8c8c84849494", -"h c #8c8c8c8c9494", -"j c #94948c8c9494", -"k c #94948c8c9c9c", -"l c Gray58", -"z c #949494949c9c", -"x c #9c9c94949c9c", -"c c Gray61", -"v c #9c9c9494a5a5", -"b c #9c9c9c9ca5a5", -"n c #a5a59c9ca5a5", -"m c #a5a59c9cadad", -"M c #adad9c9cadad", -"N c #a5a5a5a5a5a5", -"B c #a5a5a5a5adad", -"V c #adada5a5adad", -"C c Gray68", -"Z c #adadadadb5b5", -"A c #b5b5adadb5b5", -"S c Gray71", -"D c Gray74", -"F c #9494c6c69494", -"G c #9c9ccecea5a5", -"H c #bdbdd6d6bdbd", -"J c #c0c0c0c0c0c0", -"K c #c6c6c6c6c6c6", -"L c #cecec6c6cece", -"P c #cececececece", -"I c #cecececed6d6", -"U c #d6d6ceced6d6", -"Y c #d6d6cecedede", -"T c Gray84", -"R c #d6d6d6d6dede", -"E c #deded6d6dede", -"W c Gray87", -"Q c #deded6d6e7e7", -"! c #dedededee7e7", -"~ c #d6d6ffffd6d6", -"^ c #e7e7dedee7e7", -"/ c #e7e7e7e7e7e7", -"( c #e7e7e7e7efef", -") c #efefe7e7efef", -"_ c #efefefefefef", -"` c #e7e7ffffe7e7", -"' c Gray97", -"] c Gray100", -"[ c None", -/* pixels */ -"[[[[[[SDPPPPKKDDCD[[[[", -"[[[[[[D_/////___WD[[[[", -"[[[[[[DKKKPPKKKKDK[[[[", -"[[[[[[SDDDDSDDSSCD[[[[", -"[[[[[KCKDKKKDDDKS[[[[[", -"[[[[[DDSDDDDDDKKS[[[[[", -"[[[[[DSKDDDDDKDKC[[[[[", -"[[[[[KDDDDDDDDDDS[[[[[", -"[[[[[CP/WWWWWWTWNNZ[[[", -"[[[Dc9STPTPTPTWWj427S[", -"[[Dziq0000000pag8<%@2N", -"[DcE(!ERRRRUYGtFn2##O<", -"Db)]]]]]]]]]~ewePa;@X#", -"V']]]]]]]]]]`yru]Q0@ #", -"BRILITRRW^!E!RHUILhO @", -"jAZVBmBnmmNmnmMvzh6o #", -"jZZmBnnnbnbbbbvxxg6o +", -"lmmnbnbbbvcvxxxvjs6O 3", -"jBnnvcvxvcvxvxzjhd8o+C", -"lsdgfgdhgdhhjhjkhg6+l[", -"S9%@$%&&&=--::>>:-:l[[", -"[[C511,:;;;**%++.2c[[[" -}; diff --git a/src/musredit_qt5/images/filereload.xpm b/src/musredit_qt5/images/filereload.xpm deleted file mode 100644 index 23bedb114..000000000 --- a/src/musredit_qt5/images/filereload.xpm +++ /dev/null @@ -1,172 +0,0 @@ -/* XPM */ -static char * editreload_xpm[] = { -"22 22 147 2", -" c None", -". c #215017", -"+ c #225118", -"@ c #1C3F10", -"# c #1C4110", -"$ c #213B14", -"% c #1A330D", -"& c #141400", -"* c #1D4613", -"= c #2A732F", -"- c #65C284", -"; c #D8F0D6", -"> c #B9E4BD", -", c #82CD91", -"' c #3D8F4B", -") c #477D40", -"! c #417036", -"~ c #1E4917", -"{ c #1B3E0F", -"] c #32A85D", -"^ c #FFFFFF", -"/ c #B8E2BE", -"( c #46B670", -"_ c #2F833C", -": c #112405", -"< c #121600", -"[ c #212106", -"} c #142B0A", -"| c #B2E0B8", -"1 c #47B671", -"2 c #50854A", -"3 c #686868", -"4 c #6E6E6E", -"5 c #101800", -"6 c #CBE9CB", -"7 c #63C284", -"8 c #337F3A", -"9 c #17320C", -"0 c #747474", -"a c #2A6F2B", -"b c #A3DAAE", -"c c #31843E", -"d c #676767", -"e c #7B7B7B", -"f c #296C27", -"g c #E0F3DD", -"h c #63C385", -"i c #46914F", -"j c #142908", -"k c #6D6D6D", -"l c #284919", -"m c #305020", -"n c #2FA057", -"o c #BEE5C1", -"p c #55BD7A", -"q c #32843F", -"r c #192C0B", -"s c #161600", -"t c #2C7F39", -"u c #B0E1B5", -"v c #DFF3DD", -"w c #D4F4D4", -"x c #6FC386", -"y c #419652", -"z c #378843", -"A c #7DCB8F", -"B c #CEECCE", -"C c #2C813A", -"D c #16310C", -"E c #000000", -"F c #171717", -"G c #366D2F", -"H c #32A65C", -"I c #34B464", -"J c #319E52", -"K c #3A924C", -"L c #64C280", -"M c #256022", -"N c #A0A0A0", -"O c #474747", -"P c #191919", -"Q c #2F8F46", -"R c #33B364", -"S c #6AC684", -"T c #5A5A5A", -"U c #B8B8B8", -"V c #848484", -"W c #454545", -"X c #151515", -"Y c #407438", -"Z c #2F8B40", -"` c #2D823B", -" . c #C3C3C3", -".. c #383838", -"+. c #484848", -"@. c #8D8D8D", -"#. c #4C4C4C", -"$. c #B5B5B5", -"%. c #6F6F6F", -"&. c #353535", -"*. c #222222", -"=. c #292929", -"-. c #4D4D4D", -";. c #464646", -">. c #282828", -",. c #9B9B9B", -"'. c #2A2A2A", -"). c #2F2F2F", -"!. c #2E2E2E", -"~. c #717171", -"{. c #2C2C2C", -"]. c #0A0A0A", -"^. c #030303", -"/. c #757575", -"(. c #3C3C3C", -"_. c #515151", -":. c #242424", -"<. c #010101", -"[. c #898989", -"}. c #414141", -"|. c #575757", -"1. c #252525", -"2. c #A3A3A3", -"3. c #3B3B3B", -"4. c #1A1A1A", -"5. c #AFAFAF", -"6. c #6A6A6A", -"7. c #434343", -"8. c #404040", -"9. c #070707", -"0. c #424242", -"a. c #141414", -"b. c #080808", -"c. c #0B0B0B", -"d. c #1C1C1C", -"e. c #797979", -"f. c #828282", -"g. c #505050", -"h. c #1F1F1F", -"i. c #4B4B4B", -"j. c #818181", -"k. c #A5A5A5", -"l. c #5E5E5E", -"m. c #0D0D0D", -"n. c #121212", -"o. c #212121", -"p. c #1D1D1D", -" . + @ # $ % & ", -" * = - ; > , ' ) ! ~ { ", -" * ] ^ / ( _ * : < [ & ~ } ", -" = ^ | 1 2 & & 3 4 & } 5 ", -" * - 6 7 8 9 3 0 } & ", -" a ^ b c & d e & ", -" f g h i j k ", -"& { l m n o p q r s & & ", -"& t u v w x y z A B C D E F ", -" & G H I J K L C M & E N O P ", -" & G Q R S C M & T E U k V W X ", -" & Y Z ` M & E .4 ..+.@.#.P ", -" & G M & E $.%.&.*.=.-.@.;.X ", -" & & >.,.3 W W '.).!.;.~.{.].", -" E E ^.E /.(._.:.<.E E E ", -" E [.}.|.1. ", -" E E 2.3._.4. ", -" E E E 5.6.7.8.9. ", -" E E E E E 5.V 0.+.a. ", -" b.*.c.d.E E e.5.f.g.g.{.9. ", -" E h.i.6.j.k.l.0.g.m.E ", -" ].n.P h.o.p.E "}; diff --git a/src/musredit_qt5/images/filesave.xpm b/src/musredit_qt5/images/filesave.xpm deleted file mode 100644 index 71cbd331a..000000000 --- a/src/musredit_qt5/images/filesave.xpm +++ /dev/null @@ -1,36 +0,0 @@ -/* XPM */ -static char *magick[] = { -/* columns rows colors chars-per-pixel */ -"22 22 8 1", -" c Gray100", -". c #cab5d1", -"X c #c1c1c1", -"o c #848200", -"O c Gray0", -"+ c None", -"@ c Gray0", -"# c Gray0", -/* pixels */ -"++++++++++++++++++++++", -"+OOOOOOOOOOOOOOOOOOOO+", -"+OooOXXXXXXXXXXXXOXXO+", -"+OooOXXXXXXXXXXXXOXXO+", -"+OooOXXXXXXXXX.XXOOOO+", -"+OooOXXX..XXXXXXXOooO+", -"+OooOXXX..XXXXXXXOooO+", -"+OooOXXXXXXXXXXXXOooO+", -"+OooOXXXXXXXXXXXXOooO+", -"+OooOXXXXXXXXXXXXOooO+", -"+OooOXXXXXXXXXXXXOooO+", -"+OoooOOOOOOOOOOOOoooO+", -"+OooooooooooooooooooO+", -"+OooooooooooooooooooO+", -"+OoooOOOOOOOOOOOOOooO+", -"+OoooOOOOOOOOOXXXOooO+", -"+OoooOOOOOOOOOXXXOooO+", -"+OoooOOOOOOOOOXXXOooO+", -"+OoooOOOOOOOOOXXXOooO+", -"+OoooOOOOOOOOOXXXOooO+", -"++OOOOOOOOOOOOOOOOOO++", -"++++++++++++++++++++++" -}; diff --git a/src/musredit_qt5/images/musrcalcchisq.xpm b/src/musredit_qt5/images/musrcalcchisq.xpm deleted file mode 100644 index 63088af1d..000000000 --- a/src/musredit_qt5/images/musrcalcchisq.xpm +++ /dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static char * musrcalcchisq_xpm[] = { -"22 22 3 1", -" c None", -". c #FF0000", -"+ c #000000", -" ... ", -" +... . ", -" .+ ...+. ", -" ... . ... ", -" ... ... ", -" ... ... ", -"+ . . ", -" . ", -" +++ ", -" ++..+ ", -" + ..+ . ", -" .+.+ . ", -"++ + +. + ... ", -"+++ ++ + ...++... ", -" ++ ++ +++++.. ... ", -" +++ ... .+ ", -" ++ . ", -" ++ ...", -" +++ ...", -" ++ + ...", -" ++ +++ . ", -"++ +++ "}; diff --git a/src/musredit_qt5/images/musrfit.svg b/src/musredit_qt5/images/musrfit.svg deleted file mode 100644 index 461d75dc9..000000000 --- a/src/musredit_qt5/images/musrfit.svg +++ /dev/null @@ -1,290 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - FIT - FIT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/musredit_qt5/images/musrfit.xpm b/src/musredit_qt5/images/musrfit.xpm deleted file mode 100644 index de1b652d8..000000000 --- a/src/musredit_qt5/images/musrfit.xpm +++ /dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static char * musrfit_xpm[] = { -"22 22 3 1", -" c None", -". c #FF0000", -"+ c #000000", -" ... ", -" +... . ", -" .+ ...+. ", -" ... . ... ", -" ... ... ", -" ... ... ", -"+ . .+ ", -" .+ ", -" . ", -" ... ", -" ... . ", -" ...+ . ", -" . + ... ", -" ...++... ", -"++++ + +++++... ... ", -"+ + + ... .+ ", -"+ + + . ", -"++++ + + ...", -"+ + + ...", -"+ + + ...", -"+ + + . ", -" "}; diff --git a/src/musredit_qt5/images/musrswap.xpm b/src/musredit_qt5/images/musrswap.xpm deleted file mode 100644 index b95e4e9fa..000000000 --- a/src/musredit_qt5/images/musrswap.xpm +++ /dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static char * musrswap_xpm[] = { -"22 22 3 1", -" c None", -". c #000000", -"+ c #FF0000", -".. .. .... .... ", -".. .. . . . . ", -". . . . . . . ", -". ... . ... . . ", -". . . .. .... ", -". . . . . ", -". . . . . . ", -". . .+.. . . ", -" +++ ", -" +++++ ", -" ++ + ++ ", -" + ", -" ++ + ++ ", -" +++++ ", -".. .. .+++... ... ", -".. .. . +.. .. .. ..", -". . . . . . . . .", -". ... . . . . . ", -". . . . . . . ...", -". . . . . . .", -". . . .. .. .. ..", -". . ....... ... "}; diff --git a/src/musredit_qt5/images/musrview.xpm b/src/musredit_qt5/images/musrview.xpm deleted file mode 100644 index fad71c57d..000000000 --- a/src/musredit_qt5/images/musrview.xpm +++ /dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static char * musrview_xpm[] = { -"22 22 3 1", -" c None", -". c #000000", -"+ c #FF0000", -" .. ... .. ", -" ", -"......................", -" . ", -" . . ... ", -" ++ . ", -" ++ . ..... ", -" + + . ", -" + ... . ..... ", -" + . + . . ", -" +. + . . . ....", -" +. + . . ", -" + . + . . ... . ", -" + . + . . ", -" +. + . . ", -" +. + ... ", -" ++ . ", -" . ", -"......................", -" ", -" ....... .... .... ", -" "}; diff --git a/src/musredit_qt5/musredit.qrc b/src/musredit_qt5/musredit.qrc index 808a7ea84..37915851e 100644 --- a/src/musredit_qt5/musredit.qrc +++ b/src/musredit_qt5/musredit.qrc @@ -1,29 +1,29 @@ - images/editcopy.xpm - images/editcut.xpm - images/editfind.xpm - images/editnext.xpm - images/editpaste.xpm - images/editprevious.xpm - images/editredo.xpm - images/editundo.xpm - images/filenew.xpm - images/fileopen.xpm - images/fileprint.xpm - images/filereload.xpm - images/filesave.xpm - images/musrasym.xpm - images/musrcalcchisq.xpm - images/musrfit.xpm - images/musrmsr2data.xpm - images/musrprefs.xpm - images/musrsinglehisto.xpm - images/musrswap.xpm - images/musrt0.xpm - images/musrview.xpm - images/musrFT.xpm - images/musrdump.xpm + icons/edit-copy-plain.svg + icons/edit-cut-plain.svg + icons/edit-find-plain.svg + icons/go-next-use-plain.svg + icons/edit-paste-plain.svg + icons/go-previous-use-plain.svg + icons/edit-redo-plain.svg + icons/edit-undo-plain.svg + icons/document-new-plain.svg + icons/document-open-plain.svg + icons/document-print-plain.svg + icons/view-refresh-plain.svg + icons/document-save-plain.svg + icons/musrasym.xpm + icons/musrchisq-plain.svg + icons/musrfit-plain.svg + icons/msr2data-plain.svg + icons/musrprefs.xpm + icons/musrsinglehisto.xpm + icons/musrswap-plain.svg + icons/musrt0.xpm + icons/musrview-plain.svg + icons/musrFT.xpm + icons/musrdump.xpm latex_images/abragam.png latex_images/asymmetry.png latex_images/bessel.png From f6cbb4d8067709544af19d9e5274f87ce88d31a3 Mon Sep 17 00:00:00 2001 From: Suter Andreas Date: Tue, 16 Feb 2016 13:29:45 +0100 Subject: [PATCH 3/8] replace data-file-format tag from ROOT-NPP/PPC to MUSR-ROOT whenever possible. --- ChangeLog | 4 ++++ src/classes/PRunDataHandler.cpp | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8ecbf1389..3899ebf3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ changes since 0.16.0 =================================== NEW 2016-01-22 update of the docu which now describes the RRF option. +CHANGED 2016-02-16 if the LEM file is created 2012 or later and the + data-file-format tag is still ROOT-NPP or ROOT-PPC, it + will automatically switched to MUSR-ROOT. This way red/green + issues should be prevented. (see MUSR-314). CHANGED 2016-02-16 start migrating the icons of musredit_qt5 to the breeze icons (https://github.com/NitruxSA/breeze-icon-theme). At the same time I start to redesign the musrfit specific diff --git a/src/classes/PRunDataHandler.cpp b/src/classes/PRunDataHandler.cpp index b95c46fb3..97171de92 100644 --- a/src/classes/PRunDataHandler.cpp +++ b/src/classes/PRunDataHandler.cpp @@ -365,6 +365,10 @@ Bool_t PRunDataHandler::ReadFilesMsr() return false; } + char str[1024], *p_str=0; + UInt_t year=0; + TString musrRoot("musr-root"); + for (UInt_t i=0; isize(); i++) { for (UInt_t j=0; jat(i).GetRunNameSize(); j++) { fRunName = *(runList->at(i).GetRunName(j)); @@ -372,8 +376,17 @@ Bool_t PRunDataHandler::ReadFilesMsr() if (!FileExistsCheck(runList->at(i), j)) return false; + // get year from string if LEM data file + strcpy(str, fRunName.Data()); + p_str = strstr(str, "lem"); + if (p_str != 0) + sscanf(p_str, "lem%d_his", &year); + // check special case for ROOT-NPP/ROOT-PPC (LEM) if (!runList->at(i).GetFileFormat(j)->CompareTo("root-npp")) { // not post pile up corrected histos + // if LEM file header is already TMusrRoot, change the data-file-format + if (year >= 12) + runList->at(i).SetFileFormat(musrRoot, j); // check if forward/backward histoNo are within proper bounds, i.e. < PRH_PPC_OFFSET for (UInt_t k=0; kat(i).GetForwardHistoNoSize(); k++) { if (runList->at(i).GetForwardHistoNo(k) > PRH_PPC_OFFSET) @@ -384,6 +397,9 @@ Bool_t PRunDataHandler::ReadFilesMsr() runList->at(i).SetBackwardHistoNo(runList->at(i).GetBackwardHistoNo(k)-PRH_PPC_OFFSET, k); } } else if (!runList->at(i).GetFileFormat(j)->CompareTo("root-ppc")) { // post pile up corrected histos + // if LEM file header is already TMusrRoot, change the data-file-format + if (year >= 12) + runList->at(i).SetFileFormat(musrRoot, j); // check if forward/backward histoNo are within proper bounds, i.e. > PRH_PPC_OFFSET for (UInt_t k=0; kat(i).GetForwardHistoNoSize(); k++) { if (runList->at(i).GetForwardHistoNo(k) < PRH_PPC_OFFSET) From d553dcbb6abc14a05d0a0dd5f172d145b4820264 Mon Sep 17 00:00:00 2001 From: Suter Andreas Date: Tue, 16 Feb 2016 17:51:32 +0100 Subject: [PATCH 4/8] added missing icon files --- src/musredit_qt5/icons/document-new-plain.svg | 75 +++++ .../icons/document-open-plain.svg | 75 +++++ .../icons/document-print-plain.svg | 74 +++++ .../icons/document-save-plain.svg | 95 +++++++ src/musredit_qt5/icons/edit-copy-plain.svg | 74 +++++ src/musredit_qt5/icons/edit-cut-plain.svg | 104 +++++++ src/musredit_qt5/icons/edit-find-plain.svg | 79 ++++++ src/musredit_qt5/icons/edit-paste-plain.svg | 74 +++++ src/musredit_qt5/icons/edit-redo-plain.svg | 75 +++++ src/musredit_qt5/icons/edit-undo-plain.svg | 75 +++++ src/musredit_qt5/icons/go-next-use-plain.svg | 74 +++++ .../icons/go-previous-use-plain.svg | 73 +++++ src/musredit_qt5/icons/msr2data-plain.svg | 256 ++++++++++++++++++ src/musredit_qt5/icons/musrchisq-plain.svg | 127 +++++++++ src/musredit_qt5/icons/musrfit-plain.svg | 186 +++++++++++++ src/musredit_qt5/icons/musrswap-plain.svg | 201 ++++++++++++++ src/musredit_qt5/icons/musrview-plain.svg | 136 ++++++++++ src/musredit_qt5/icons/view-refresh-plain.svg | 91 +++++++ 18 files changed, 1944 insertions(+) create mode 100644 src/musredit_qt5/icons/document-new-plain.svg create mode 100644 src/musredit_qt5/icons/document-open-plain.svg create mode 100644 src/musredit_qt5/icons/document-print-plain.svg create mode 100644 src/musredit_qt5/icons/document-save-plain.svg create mode 100644 src/musredit_qt5/icons/edit-copy-plain.svg create mode 100644 src/musredit_qt5/icons/edit-cut-plain.svg create mode 100644 src/musredit_qt5/icons/edit-find-plain.svg create mode 100644 src/musredit_qt5/icons/edit-paste-plain.svg create mode 100644 src/musredit_qt5/icons/edit-redo-plain.svg create mode 100644 src/musredit_qt5/icons/edit-undo-plain.svg create mode 100644 src/musredit_qt5/icons/go-next-use-plain.svg create mode 100644 src/musredit_qt5/icons/go-previous-use-plain.svg create mode 100644 src/musredit_qt5/icons/msr2data-plain.svg create mode 100644 src/musredit_qt5/icons/musrchisq-plain.svg create mode 100644 src/musredit_qt5/icons/musrfit-plain.svg create mode 100644 src/musredit_qt5/icons/musrswap-plain.svg create mode 100644 src/musredit_qt5/icons/musrview-plain.svg create mode 100644 src/musredit_qt5/icons/view-refresh-plain.svg diff --git a/src/musredit_qt5/icons/document-new-plain.svg b/src/musredit_qt5/icons/document-new-plain.svg new file mode 100644 index 000000000..1327e7fd8 --- /dev/null +++ b/src/musredit_qt5/icons/document-new-plain.svg @@ -0,0 +1,75 @@ + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/musredit_qt5/icons/document-open-plain.svg b/src/musredit_qt5/icons/document-open-plain.svg new file mode 100644 index 000000000..bcd7478da --- /dev/null +++ b/src/musredit_qt5/icons/document-open-plain.svg @@ -0,0 +1,75 @@ + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/musredit_qt5/icons/document-print-plain.svg b/src/musredit_qt5/icons/document-print-plain.svg new file mode 100644 index 000000000..41c4fcfff --- /dev/null +++ b/src/musredit_qt5/icons/document-print-plain.svg @@ -0,0 +1,74 @@ + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/musredit_qt5/icons/document-save-plain.svg b/src/musredit_qt5/icons/document-save-plain.svg new file mode 100644 index 000000000..01669b544 --- /dev/null +++ b/src/musredit_qt5/icons/document-save-plain.svg @@ -0,0 +1,95 @@ + + + I REALLY hate this icon + + + + + + + image/svg+xml + + I REALLY hate this icon + Migh as well use Tango... for crying out loud. This damn icon has to die, but no because obviously we're still using floppies therefore it is still relevant in 2014. + English + + + + + + + + Uri Herrera + + + November 20th 2014 + + + + + + + + + + diff --git a/src/musredit_qt5/icons/edit-copy-plain.svg b/src/musredit_qt5/icons/edit-copy-plain.svg new file mode 100644 index 000000000..af0fe5fc5 --- /dev/null +++ b/src/musredit_qt5/icons/edit-copy-plain.svg @@ -0,0 +1,74 @@ + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/musredit_qt5/icons/edit-cut-plain.svg b/src/musredit_qt5/icons/edit-cut-plain.svg new file mode 100644 index 000000000..1f9c50245 --- /dev/null +++ b/src/musredit_qt5/icons/edit-cut-plain.svg @@ -0,0 +1,104 @@ + + + I hate this icon + + + + + + + image/svg+xml + + I hate this icon + October 19th 2014 + + + Uri Herrera + + + + + + + + English + An icon I absolutely don't like, and that represents exactly the kind of things why I choose CC licenses. + + + Everyone + + + + + + + + + + diff --git a/src/musredit_qt5/icons/edit-find-plain.svg b/src/musredit_qt5/icons/edit-find-plain.svg new file mode 100644 index 000000000..7098f1c96 --- /dev/null +++ b/src/musredit_qt5/icons/edit-find-plain.svg @@ -0,0 +1,79 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/musredit_qt5/icons/edit-paste-plain.svg b/src/musredit_qt5/icons/edit-paste-plain.svg new file mode 100644 index 000000000..4f5e81dd3 --- /dev/null +++ b/src/musredit_qt5/icons/edit-paste-plain.svg @@ -0,0 +1,74 @@ + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/musredit_qt5/icons/edit-redo-plain.svg b/src/musredit_qt5/icons/edit-redo-plain.svg new file mode 100644 index 000000000..d2d70ab8d --- /dev/null +++ b/src/musredit_qt5/icons/edit-redo-plain.svg @@ -0,0 +1,75 @@ + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/musredit_qt5/icons/edit-undo-plain.svg b/src/musredit_qt5/icons/edit-undo-plain.svg new file mode 100644 index 000000000..4169593ca --- /dev/null +++ b/src/musredit_qt5/icons/edit-undo-plain.svg @@ -0,0 +1,75 @@ + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/musredit_qt5/icons/go-next-use-plain.svg b/src/musredit_qt5/icons/go-next-use-plain.svg new file mode 100644 index 000000000..4bbeff5cd --- /dev/null +++ b/src/musredit_qt5/icons/go-next-use-plain.svg @@ -0,0 +1,74 @@ + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/musredit_qt5/icons/go-previous-use-plain.svg b/src/musredit_qt5/icons/go-previous-use-plain.svg new file mode 100644 index 000000000..06c4b0c54 --- /dev/null +++ b/src/musredit_qt5/icons/go-previous-use-plain.svg @@ -0,0 +1,73 @@ + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/musredit_qt5/icons/msr2data-plain.svg b/src/musredit_qt5/icons/msr2data-plain.svg new file mode 100644 index 000000000..6efadaf62 --- /dev/null +++ b/src/musredit_qt5/icons/msr2data-plain.svg @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/musrchisq-plain.svg b/src/musredit_qt5/icons/musrchisq-plain.svg new file mode 100644 index 000000000..93f6576c1 --- /dev/null +++ b/src/musredit_qt5/icons/musrchisq-plain.svg @@ -0,0 +1,127 @@ + + + + + + + image/svg+xml + + + + + + + χ2 + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/musrfit-plain.svg b/src/musredit_qt5/icons/musrfit-plain.svg new file mode 100644 index 000000000..48931d3ff --- /dev/null +++ b/src/musredit_qt5/icons/musrfit-plain.svg @@ -0,0 +1,186 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/musrswap-plain.svg b/src/musredit_qt5/icons/musrswap-plain.svg new file mode 100644 index 000000000..31cd08e36 --- /dev/null +++ b/src/musredit_qt5/icons/musrswap-plain.svg @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + MLOG + MSR + + + + + + + + + + diff --git a/src/musredit_qt5/icons/musrview-plain.svg b/src/musredit_qt5/icons/musrview-plain.svg new file mode 100644 index 000000000..36edb07f1 --- /dev/null +++ b/src/musredit_qt5/icons/musrview-plain.svg @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/view-refresh-plain.svg b/src/musredit_qt5/icons/view-refresh-plain.svg new file mode 100644 index 000000000..c78579d9e --- /dev/null +++ b/src/musredit_qt5/icons/view-refresh-plain.svg @@ -0,0 +1,91 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + From 28dc4a5a415b33869aa176c00e46755b33d90ee6 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Tue, 16 Feb 2016 21:18:41 +0100 Subject: [PATCH 5/8] added more svg icons and remove the old xpm icons --- src/musredit_qt5/PTextEdit.cpp | 12 +- src/musredit_qt5/icons/inkscape/musrAsym.svg | 132 +++++++++++++ src/musredit_qt5/icons/inkscape/musrFT.svg | 159 ++++++++++++++++ .../icons/inkscape/musrSingleHisto.svg | 132 +++++++++++++ src/musredit_qt5/icons/inkscape/musrdump.svg | 176 ++++++++++++++++++ src/musredit_qt5/icons/inkscape/musrprefs.svg | 171 +++++++++++++++++ src/musredit_qt5/icons/inkscape/musrt0.svg | 128 +++++++++++++ src/musredit_qt5/icons/musrAsym-plain.svg | 86 +++++++++ src/musredit_qt5/icons/musrFT-plain.svg | 108 +++++++++++ src/musredit_qt5/icons/musrFT.xpm | 28 --- .../icons/musrSingleHisto-plain.svg | 132 +++++++++++++ src/musredit_qt5/icons/musrasym.xpm | 29 --- src/musredit_qt5/icons/musrdump-plain.svg | 176 ++++++++++++++++++ src/musredit_qt5/icons/musrdump.xpm | 28 --- src/musredit_qt5/icons/musrmsr2data.xpm | 28 --- src/musredit_qt5/icons/musrprefs-plain.svg | 171 +++++++++++++++++ src/musredit_qt5/icons/musrprefs.xpm | 28 --- src/musredit_qt5/icons/musrsinglehisto.xpm | 29 --- src/musredit_qt5/icons/musrt0-plain.svg | 84 +++++++++ src/musredit_qt5/icons/musrt0.xpm | 28 --- src/musredit_qt5/musredit.qrc | 12 +- 21 files changed, 1667 insertions(+), 210 deletions(-) create mode 100644 src/musredit_qt5/icons/inkscape/musrAsym.svg create mode 100644 src/musredit_qt5/icons/inkscape/musrFT.svg create mode 100644 src/musredit_qt5/icons/inkscape/musrSingleHisto.svg create mode 100644 src/musredit_qt5/icons/inkscape/musrdump.svg create mode 100644 src/musredit_qt5/icons/inkscape/musrprefs.svg create mode 100644 src/musredit_qt5/icons/inkscape/musrt0.svg create mode 100644 src/musredit_qt5/icons/musrAsym-plain.svg create mode 100644 src/musredit_qt5/icons/musrFT-plain.svg delete mode 100644 src/musredit_qt5/icons/musrFT.xpm create mode 100644 src/musredit_qt5/icons/musrSingleHisto-plain.svg delete mode 100644 src/musredit_qt5/icons/musrasym.xpm create mode 100644 src/musredit_qt5/icons/musrdump-plain.svg delete mode 100644 src/musredit_qt5/icons/musrdump.xpm delete mode 100644 src/musredit_qt5/icons/musrmsr2data.xpm create mode 100644 src/musredit_qt5/icons/musrprefs-plain.svg delete mode 100644 src/musredit_qt5/icons/musrprefs.xpm delete mode 100644 src/musredit_qt5/icons/musrsinglehisto.xpm create mode 100644 src/musredit_qt5/icons/musrt0-plain.svg delete mode 100644 src/musredit_qt5/icons/musrt0.xpm diff --git a/src/musredit_qt5/PTextEdit.cpp b/src/musredit_qt5/PTextEdit.cpp index 0068cab35..716a716e6 100644 --- a/src/musredit_qt5/PTextEdit.cpp +++ b/src/musredit_qt5/PTextEdit.cpp @@ -489,14 +489,14 @@ void PTextEdit::setupMusrActions() menuBar()->addMenu( menu ); QAction *a; - a = new QAction( QIcon( QPixmap( ":/icons/musrasym.xpm" ) ), tr( "&Asymmetry Default" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/musrAsym-plain.svg" ) ), tr( "&Asymmetry Default" ), this ); a->setShortcut( tr("Alt+A") ); a->setStatusTip( tr("Get Default Asymmetry msr-file") ); connect( a, SIGNAL( triggered() ), this, SLOT( musrGetAsymmetryDefault() ) ); tb->addAction(a); menu->addAction(a); - a = new QAction( QIcon( QPixmap( ":/icons/musrsinglehisto.xpm" ) ), tr( "Single &Histogram Default" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/musrSingleHisto-plain.svg" ) ), tr( "Single &Histogram Default" ), this ); a->setShortcut( tr("Alt+H") ); a->setStatusTip( tr("Get Default Single Histogram msr-file") ); connect( a, SIGNAL( triggered() ), this, SLOT( musrGetSingleHistoDefault() ) ); @@ -544,20 +544,20 @@ void PTextEdit::setupMusrActions() tb->addAction(a); menu->addAction(a); - fMusrT0Action = new QAction( QIcon( QPixmap( ":/icons/musrt0.xpm" ) ), tr( "&T0" ), this ); + fMusrT0Action = new QAction( QIcon( QPixmap( ":/icons/musrt0-plain.svg" ) ), tr( "&T0" ), this ); fMusrT0Action->setStatusTip( tr("Start musrt0") ); connect( fMusrT0Action, SIGNAL( triggered() ), this, SLOT( musrT0() ) ); tb->addAction(fMusrT0Action); menu->addAction(fMusrT0Action); fMusrT0Action->setEnabled(fAdmin->getEnableMusrT0Flag()); - a = new QAction( QIcon( QPixmap (":/icons/musrFT.xpm") ), tr( "Raw Fourier" ), this ); + a = new QAction( QIcon( QPixmap (":/icons/musrFT-plain.svg") ), tr( "Raw Fourier" ), this ); a->setStatusTip( tr("Start musrFT") ); connect( a, SIGNAL( triggered() ), this, SLOT( musrFT() ) ); tb->addAction(a); menu->addAction(a); - a = new QAction( QIcon( QPixmap( ":/icons/musrprefs.xpm" ) ), tr( "&Preferences" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/musrprefs-plain.svg" ) ), tr( "&Preferences" ), this ); a->setStatusTip( tr("Show Preferences") ); connect( a, SIGNAL( triggered() ), this, SLOT( musrPrefs() ) ); tb->addAction(a); @@ -566,7 +566,7 @@ void PTextEdit::setupMusrActions() menu->addSeparator(); tb->addSeparator(); - a = new QAction( QIcon( QPixmap(":/icons/musrdump.xpm")), tr( "&Dump Header"), this); + a = new QAction( QIcon( QPixmap(":/icons/musrdump-plain.svg")), tr( "&Dump Header"), this); a->setStatusTip( tr("Dumps muSR File Header Information") ); connect( a, SIGNAL(triggered()), this, SLOT(musrDump())); tb->addAction(a); diff --git a/src/musredit_qt5/icons/inkscape/musrAsym.svg b/src/musredit_qt5/icons/inkscape/musrAsym.svg new file mode 100644 index 000000000..dedda4757 --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/musrAsym.svg @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + ASYM + + + diff --git a/src/musredit_qt5/icons/inkscape/musrFT.svg b/src/musredit_qt5/icons/inkscape/musrFT.svg new file mode 100644 index 000000000..98515d4dd --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/musrFT.svg @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/musrSingleHisto.svg b/src/musredit_qt5/icons/inkscape/musrSingleHisto.svg new file mode 100644 index 000000000..9ea2dd3ad --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/musrSingleHisto.svg @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + HISTO + + + diff --git a/src/musredit_qt5/icons/inkscape/musrdump.svg b/src/musredit_qt5/icons/inkscape/musrdump.svg new file mode 100644 index 000000000..c13a8e1f6 --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/musrdump.svg @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + DUMP + + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/musrprefs.svg b/src/musredit_qt5/icons/inkscape/musrprefs.svg new file mode 100644 index 000000000..e4d7b3b25 --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/musrprefs.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + PREFS + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/musrt0.svg b/src/musredit_qt5/icons/inkscape/musrt0.svg new file mode 100644 index 000000000..83a2d02f1 --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/musrt0.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + T0 + + diff --git a/src/musredit_qt5/icons/musrAsym-plain.svg b/src/musredit_qt5/icons/musrAsym-plain.svg new file mode 100644 index 000000000..b723be474 --- /dev/null +++ b/src/musredit_qt5/icons/musrAsym-plain.svg @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + ASYM + + + diff --git a/src/musredit_qt5/icons/musrFT-plain.svg b/src/musredit_qt5/icons/musrFT-plain.svg new file mode 100644 index 000000000..e9289a3a3 --- /dev/null +++ b/src/musredit_qt5/icons/musrFT-plain.svg @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/musrFT.xpm b/src/musredit_qt5/icons/musrFT.xpm deleted file mode 100644 index 406c21dcc..000000000 --- a/src/musredit_qt5/icons/musrFT.xpm +++ /dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static char *dummy[]={ -"22 22 3 1", -". c None", -"# c #000000", -"a c #ff0000", -"..##....###...##......", -"......................", -"######################", -"......................", -".........a............", -".........a............", -".........a............", -".........a............", -".........aa...........", -"........aaa...........", -"........aaa...........", -"........a.a...........", -"........a.a...........", -".......aa.aa..........", -".......aa..aa.........", -"a.aaa..a....aaa...aa..", -"aa.aaa.a......aaa.aaaa", -"......a..........aa...", -"######################", -"......................", -".#######.####..####...", -"......................"}; diff --git a/src/musredit_qt5/icons/musrSingleHisto-plain.svg b/src/musredit_qt5/icons/musrSingleHisto-plain.svg new file mode 100644 index 000000000..86c2b153e --- /dev/null +++ b/src/musredit_qt5/icons/musrSingleHisto-plain.svg @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + HISTO + + + diff --git a/src/musredit_qt5/icons/musrasym.xpm b/src/musredit_qt5/icons/musrasym.xpm deleted file mode 100644 index 64bfb2f45..000000000 --- a/src/musredit_qt5/icons/musrasym.xpm +++ /dev/null @@ -1,29 +0,0 @@ -/* XPM */ -static char * musrasym_xpm[] = { -"22 22 4 1", -" c None", -". c #3D20CF", -"+ c #FF0000", -"@ c #000000", -" ", -" . .. . . . .", -" . . . . . . .. ..", -". . . . . . . .", -". . .. . . . .", -"..... . . . .", -". . . . . . .", -". . .. . . .", -" ", -" ++ ", -"+ + ", -" + ", -" + ", -" + ", -" + ++ ", -" + + + +", -"@@@@@@@+@@@@+@@@@+@@+ ", -" + + ++ ", -" ++ ", -" ", -" ", -" "}; diff --git a/src/musredit_qt5/icons/musrdump-plain.svg b/src/musredit_qt5/icons/musrdump-plain.svg new file mode 100644 index 000000000..f81adb2f2 --- /dev/null +++ b/src/musredit_qt5/icons/musrdump-plain.svg @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + DUMP + + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/musrdump.xpm b/src/musredit_qt5/icons/musrdump.xpm deleted file mode 100644 index f6d401f08..000000000 --- a/src/musredit_qt5/icons/musrdump.xpm +++ /dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static char * musrdump_xpm[] = { -"22 22 3 1", -" c None", -". c #0000FF", -"+ c #000000", -"... . . . . ... ", -". . . . .. .. . .", -". . . . . . . . .", -". . . . . . . . .", -". . . . . . ... ", -". . . . . . . ", -"... ... . . . ", -" ", -" ", -"+++ ", -" ++++ ", -" + ", -" ++++ ", -" + ", -" ++++ ", -" + + ", -" + +++++ ", -" + +++ ", -" ++++ + ", -" +++ +++ ", -" + ++++ ", -" +++ + "}; diff --git a/src/musredit_qt5/icons/musrmsr2data.xpm b/src/musredit_qt5/icons/musrmsr2data.xpm deleted file mode 100644 index 4aa1bd07c..000000000 --- a/src/musredit_qt5/icons/musrmsr2data.xpm +++ /dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static char * musrmlog2db_xpm[] = { -"22 22 3 1", -" c None", -". c #000000", -"+ c #FF0000", -" .... . ..... ", -".... . . . ", -" . . . ", -".... ... . . ", -" . . . ", -"....... . . . ", -" . . . ", -".... ", -" + ", -"... + ", -" + ", -"...... + + + ", -" +++ ", -".... + ", -" ", -".... +++ +++ ", -" + + + + ", -"..... + + + + ", -" + + +++ ", -"...... + + + + ", -" + + + + ", -".... +++ +++ "}; diff --git a/src/musredit_qt5/icons/musrprefs-plain.svg b/src/musredit_qt5/icons/musrprefs-plain.svg new file mode 100644 index 000000000..7230817be --- /dev/null +++ b/src/musredit_qt5/icons/musrprefs-plain.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + PREFS + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/musrprefs.xpm b/src/musredit_qt5/icons/musrprefs.xpm deleted file mode 100644 index f52e3e324..000000000 --- a/src/musredit_qt5/icons/musrprefs.xpm +++ /dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static char * musrprefs_xpm[] = { -"22 22 3 1", -" c None", -". c #3D20CF", -"+ c #000000", -"... ... ... ... ... ", -". . . . . . . ", -"... ... ... ... ... ", -". . . . . . ", -". . . ... . ... ", -" ", -" + + ", -" + + + ", -"+ ++++ ++ + ", -" + + + + ", -" + + ", -" ", -" + + ", -" + + + ++ ++ + ", -"+ + +++ + + + + + ", -" + + + + ", -" + + ", -" ", -" + + + ", -" + + + + + ", -"+ + +++++++++ + ++ +", -" + ++ ++ + + "}; diff --git a/src/musredit_qt5/icons/musrsinglehisto.xpm b/src/musredit_qt5/icons/musrsinglehisto.xpm deleted file mode 100644 index bc1e3ec29..000000000 --- a/src/musredit_qt5/icons/musrsinglehisto.xpm +++ /dev/null @@ -1,29 +0,0 @@ -/* XPM */ -static char * musrsinglehisto_xpm[] = { -"22 22 4 1", -" c None", -". c #3D20CF", -"+ c #FF0000", -"@ c #000000", -" ", -". . . .. ..... ... ", -".++ . . . . . . .", -". + . . . . . .", -"..... . .. . . .", -". +. . . . . .", -". . . . . . . .", -". .+. .. . ... ", -"@ + ", -"@ + ", -"@ + ", -"@ ++ ", -"@ + ", -"@ + ", -"@ + ", -"@ + ", -"@ ++ ", -"@ + ", -"@ ++ ", -"@ ++ ", -"@ ++ ", -"@@@@@@@@@@@@@@@@@@@+++"}; diff --git a/src/musredit_qt5/icons/musrt0-plain.svg b/src/musredit_qt5/icons/musrt0-plain.svg new file mode 100644 index 000000000..28da08301 --- /dev/null +++ b/src/musredit_qt5/icons/musrt0-plain.svg @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + T0 + + diff --git a/src/musredit_qt5/icons/musrt0.xpm b/src/musredit_qt5/icons/musrt0.xpm deleted file mode 100644 index 6a14ac0e5..000000000 --- a/src/musredit_qt5/icons/musrt0.xpm +++ /dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static char * musrt0_xpm[] = { -"22 22 3 1", -" c None", -". c #3D20CF", -"+ c #000000", -"..... .. ", -" . . . ", -" . . . ", -" . . . ", -" . + . . ++ ", -" . + . .+ ++ ", -" . + .. + + ", -" + + +++ ", -" + + + ", -" + + ++ ", -" + + + ", -" + + + ", -" + + ++ ", -" + + ++++ ", -" + + + ", -" + + ++", -" + + ", -" + + ", -" + + ", -" + ++ + ", -"++ + + ", -" "}; diff --git a/src/musredit_qt5/musredit.qrc b/src/musredit_qt5/musredit.qrc index 37915851e..688830513 100644 --- a/src/musredit_qt5/musredit.qrc +++ b/src/musredit_qt5/musredit.qrc @@ -13,17 +13,17 @@ icons/document-print-plain.svg icons/view-refresh-plain.svg icons/document-save-plain.svg - icons/musrasym.xpm + icons/musrAsym-plain.svg icons/musrchisq-plain.svg icons/musrfit-plain.svg icons/msr2data-plain.svg - icons/musrprefs.xpm - icons/musrsinglehisto.xpm + icons/musrprefs-plain.svg + icons/musrSingleHisto-plain.svg icons/musrswap-plain.svg - icons/musrt0.xpm + icons/musrt0-plain.svg icons/musrview-plain.svg - icons/musrFT.xpm - icons/musrdump.xpm + icons/musrFT-plain.svg + icons/musrdump-plain.svg latex_images/abragam.png latex_images/asymmetry.png latex_images/bessel.png From 4fec25e423493c58fa21cedec161430f90ffc10d Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Tue, 16 Feb 2016 21:29:31 +0100 Subject: [PATCH 6/8] corrected wrong path to musredit icon under MacOSX --- src/musredit_qt5/musredit.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/musredit_qt5/musredit.pro b/src/musredit_qt5/musredit.pro index 26e42fd90..82eec492c 100644 --- a/src/musredit_qt5/musredit.pro +++ b/src/musredit_qt5/musredit.pro @@ -73,6 +73,7 @@ QT += xml QT += webkitwidgets QT += network QT += printsupport +QT += svg HEADERS = musredit.h \ PHelp.h \ @@ -144,5 +145,5 @@ FORMS = forms/PFindDialog.ui \ RESOURCES = musredit.qrc -macx:ICON = images/musredit.icns +macx:ICON = icons/musredit.icns From bd05f57523e790045095f82562c9ddea0cb1a083 Mon Sep 17 00:00:00 2001 From: Suter Andreas Date: Wed, 17 Feb 2016 10:47:18 +0100 Subject: [PATCH 7/8] start moving startup XML-files to /home/nemu/.musrfit --- ChangeLog | 2 + src/musredit/PAdmin.cpp | 95 ++++++++++------------- src/musredit/PAdmin.h | 2 + src/musredit/PTextEdit.cpp | 54 +++++++++++-- src/musredit/PTextEdit.h | 2 +- src/musredit/musredit.pro | 4 +- src/musredit/musredit_startup.xml.in | 1 + src/musredit_qt5/PAdmin.cpp | 96 +++++++++++------------- src/musredit_qt5/PAdmin.h | 4 +- src/musredit_qt5/PTextEdit.cpp | 54 +++++++++++-- src/musredit_qt5/PTextEdit.h | 2 +- src/musredit_qt5/musredit.pro | 6 +- src/musredit_qt5/musredit_startup.xml.in | 1 + 13 files changed, 191 insertions(+), 132 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3899ebf3e..0e66dac34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ changes since 0.16.0 =================================== NEW 2016-01-22 update of the docu which now describes the RRF option. +CHANGED 2016-02-17 start to move the startup XML-files to $HOME/.musrfit + rather than having it within $prefix/bin. CHANGED 2016-02-16 if the LEM file is created 2012 or later and the data-file-format tag is still ROOT-NPP or ROOT-PPC, it will automatically switched to MUSR-ROOT. This way red/green diff --git a/src/musredit/PAdmin.cpp b/src/musredit/PAdmin.cpp index ac360c58f..0d6af6dac 100644 --- a/src/musredit/PAdmin.cpp +++ b/src/musredit/PAdmin.cpp @@ -603,6 +603,7 @@ PAdmin::PAdmin() : QObject() fFontName = QString("Courier"); // default font fFontSize = 11; // default font size + fPrefPathName = QString(""); fExecPath = QString(""); fDefaultSavePath = QString(""); fMsrDefaultFilePath = QString(""); @@ -641,25 +642,28 @@ PAdmin::PAdmin() : QObject() fMsr2DataParam.globalPlus = false; // XML Parser part - QString fln = "musredit_startup.xml"; - // check if it is a MacOSX -#ifdef Q_WS_MAC - fln = "./musredit_startup.xml"; - if (!QFile::exists(fln)) { - fln = "/Applications/musredit.app/Contents/Resources/musredit_startup.xml"; + // 1st: check local directory + QString path = QString("./"); + QString fln = QString("musredit_startup.xml"); + QString pathFln = path + fln; + if (!QFile::exists(pathFln)) { + // 2nd: check $HOME/.musrfit/musredit/musredit_startup.xml + path = std::getenv("HOME"); + pathFln = path + "/.musrfit/musredit/" + fln; + if (!QFile::exists(pathFln)) { + // 3rd: check $MUSRFITPATH/musredit_startup.xml + path = std::getenv("MUSRFITPATH"); + pathFln = path + "/" + fln; + if (!QFile::exists(pathFln)) { + // 4th: check $ROOTSYS/bin/musredit_startup.xml + path = std::getenv("ROOTSYS"); + pathFln = path + "/bin/" + fln; + } + } } -#else - fln = "./musredit_startup.xml"; - if (!QFile::exists(fln)) { - QString path = std::getenv("MUSRFITPATH"); - QString rootsys = std::getenv("ROOTSYS"); - if (path.isEmpty()) - path = rootsys + "/bin"; - fln = path + "/musredit_startup.xml"; - } -#endif + fPrefPathName = pathFln; - loadPrefs(fln); + loadPrefs(fPrefPathName); } //-------------------------------------------------------------------------- @@ -769,25 +773,10 @@ int PAdmin::savePrefs(QString pref_fln) { // check if musredit_startup.xml is present in the current directory, and if yes, use this file to // save the recent file names otherwise use the "master" musredit_startup.xml + QString fln = QString("./musredit_startup.xml"); + if (!QFile::exists(fln)) + fln = fPrefPathName; - QString str; - QString fln = "musredit_startup.xml"; - // check if it is a MacOSX -#ifdef Q_WS_MAC - fln = "./musredit_startup.xml"; - if (!QFile::exists(fln)) { - fln = "/Applications/musredit.app/Contents/Resources/musredit_startup.xml"; - } -#else - fln = "./musredit_startup.xml"; - if (!QFile::exists(fln)) { - QString path = std::getenv("MUSRFITPATH"); - QString rootsys = std::getenv("ROOTSYS"); - if (path.isEmpty()) - path = rootsys + "/bin"; - fln = path + "/musredit_startup.xml"; - } -#endif if (QFile::exists(fln)) { // administration file present QVector data; QFile file(fln); @@ -842,6 +831,12 @@ int PAdmin::savePrefs(QString pref_fln) else data[i] = " n"; } + if (data[i].contains("") && data[i].contains("")) { + if (fMusrviewShowFourier) + data[i] = " y"; + else + data[i] = " n"; + } if (data[i].contains("") && data[i].contains("")) { if (fEnableMusrT0) data[i] = " y"; @@ -853,13 +848,16 @@ int PAdmin::savePrefs(QString pref_fln) // write prefs file.setFileName(pref_fln); if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - cerr << endl << ">> PAdmin::savePrefs: **ERROR** Cannot open " << fln.toLatin1().data() << " for writing." << endl; + cerr << endl << ">> PAdmin::savePrefs: **ERROR** Cannot open " << pref_fln.toLatin1().data() << " for writing." << endl; return 0; } fin.setDevice(&file); for (int i=0; i data; QFile file(fln); @@ -959,6 +943,9 @@ void PAdmin::saveRecentFiles() for (int i=0; igetDefaultSavePath(); } @@ -903,12 +903,31 @@ void PTextEdit::fileReload() */ void PTextEdit::fileOpenPrefs() { - QString fln = QFileDialog::getOpenFileName( this, tr("Open Prefs"), + QString fln(""); + QString msg(""); + QMessageBox msgBox; + msgBox.setText("Which Preferences do you want to open?"); + msgBox.addButton("Default", QMessageBox::AcceptRole); + msgBox.addButton("Custom", QMessageBox::AcceptRole); + msgBox.setStandardButtons(QMessageBox::Cancel); + int result = msgBox.exec(); + if (result == QMessageBox::Cancel) { + return; + } else if (result == 0) { // default dir + fln = fAdmin->getDefaultPrefPathName(); + msg = QString("Current Default Preferences Path-Name:\n") + fln; + if (QMessageBox::information(this, "Info", msg, QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Cancel) + return; + } else if (result == 1) { // custom dir + fln = QFileDialog::getOpenFileName( this, tr("Open Prefs"), fLastDirInUse, tr( "xml-Files (*.xml);; All Files (*)" )); + } - if (fAdmin->loadPrefs(fln)) - QMessageBox::information(0, "Prefs", "Prefs Loaded."); + if (fAdmin->loadPrefs(fln)) { + msg = QString("Prefs from '") + fln + QString("' loaded."); + QMessageBox::information(0, "Info", msg); + } } //---------------------------------------------------------------------------------------------------- @@ -970,12 +989,31 @@ void PTextEdit::fileSaveAs() */ void PTextEdit::fileSavePrefs() { - QString fn = QFileDialog::getSaveFileName( this, + QString fln(""); + QString msg(""); + QMessageBox msgBox; + msgBox.setText("Which Preferences do you want to open?"); + msgBox.addButton("Default", QMessageBox::AcceptRole); + msgBox.addButton("Custom", QMessageBox::AcceptRole); + msgBox.setStandardButtons(QMessageBox::Cancel); + int result = msgBox.exec(); + if (result == QMessageBox::Cancel) { + return; + } else if (result == 0) { // default dir + fln = fAdmin->getDefaultPrefPathName(); + msg = QString("Current Default Preferences Path-Name:\n") + fln; + if (QMessageBox::information(this, "Info", msg, QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Cancel) + return; + } else if (result == 1) { // custom dir + fln = QFileDialog::getSaveFileName( this, tr( "Save Prefs As" ), "musredit_startup.xml", tr( "xml-Files (*.xml);;All Files (*)" ) ); + } - if ( !fn.isEmpty() ) { - fAdmin->savePrefs(fn); + if ( !fln.isEmpty() ) { + fAdmin->savePrefs(fln); + msg = QString("Prefs to '") + fln + QString("' saved."); + QMessageBox::information(0, "Info", msg); } } @@ -2508,7 +2546,7 @@ void PTextEdit::replaceAll() /** *

SLOT: updates the fonts if the textedit tab has changed. */ -void PTextEdit::applyFontSettings(QWidget*) +void PTextEdit::applyFontSettings(int) { QFont font(fAdmin->getFontName(), fAdmin->getFontSize()); fontChanged(font); diff --git a/src/musredit/PTextEdit.h b/src/musredit/PTextEdit.h index 46a6e2826..a4e3a4e56 100644 --- a/src/musredit/PTextEdit.h +++ b/src/musredit/PTextEdit.h @@ -147,7 +147,7 @@ private slots: void replaceAndClose(); void replaceAll(); - void applyFontSettings(QWidget*); + void applyFontSettings(int); void fileChanged(const QString &fileName); void setFileSystemWatcherActive(); diff --git a/src/musredit/musredit.pro b/src/musredit/musredit.pro index 9c846bb09..7f400819e 100644 --- a/src/musredit/musredit.pro +++ b/src/musredit/musredit.pro @@ -58,8 +58,8 @@ QMAKE_CXX = $${CXX} QMAKE_LINK = $${CXX} # install path for the XML configuration file -unix:xml.path = $${MUSREDIT_INSTALL_PATH} -macx:xml.path = /Applications/musredit.app/Contents/Resources +unix:xml.path = $$(HOME)/.musrfit/musredit +macx:xml.path = $$(HOME)/.musrfit/musredit win32:xml.path = c:/musrfit/bin xml.files = musredit_startup.xml INSTALLS += xml diff --git a/src/musredit/musredit_startup.xml.in b/src/musredit/musredit_startup.xml.in index bdcf0b4ed..4493befed 100644 --- a/src/musredit/musredit_startup.xml.in +++ b/src/musredit/musredit_startup.xml.in @@ -14,6 +14,7 @@ y n y + n y diff --git a/src/musredit_qt5/PAdmin.cpp b/src/musredit_qt5/PAdmin.cpp index d4d67ae74..581b0757d 100644 --- a/src/musredit_qt5/PAdmin.cpp +++ b/src/musredit_qt5/PAdmin.cpp @@ -603,6 +603,7 @@ PAdmin::PAdmin() : QObject() fFontName = QString("Courier"); // default font fFontSize = 11; // default font size + fPrefPathName = QString(""); fExecPath = QString(""); fDefaultSavePath = QString(""); fMsrDefaultFilePath = QString(""); @@ -641,25 +642,28 @@ PAdmin::PAdmin() : QObject() fMsr2DataParam.globalPlus = false; // XML Parser part - QString fln = "musredit_startup.xml"; - // check if it is a MacOSX -#ifdef Q_OS_OSX - fln = "./musredit_startup.xml"; - if (!QFile::exists(fln)) { - fln = "/Applications/musredit.app/Contents/Resources/musredit_startup.xml"; + // 1st: check local directory + QString path = QString("./"); + QString fln = QString("musredit_startup.xml"); + QString pathFln = path + fln; + if (!QFile::exists(pathFln)) { + // 2nd: check $HOME/.musrfit/musredit/musredit_startup.xml + path = std::getenv("HOME"); + pathFln = path + "/.musrfit/musredit/" + fln; + if (!QFile::exists(pathFln)) { + // 3rd: check $MUSRFITPATH/musredit_startup.xml + path = std::getenv("MUSRFITPATH"); + pathFln = path + "/" + fln; + if (!QFile::exists(pathFln)) { + // 4th: check $ROOTSYS/bin/musredit_startup.xml + path = std::getenv("ROOTSYS"); + pathFln = path + "/bin/" + fln; + } + } } -#else - fln = "./musredit_startup.xml"; - if (!QFile::exists(fln)) { - QString path = std::getenv("MUSRFITPATH"); - QString rootsys = std::getenv("ROOTSYS"); - if (path.isEmpty()) - path = rootsys + "/bin"; - fln = path + "/musredit_startup.xml"; - } -#endif + fPrefPathName = pathFln; - loadPrefs(fln); + loadPrefs(fPrefPathName); } //-------------------------------------------------------------------------- @@ -769,25 +773,10 @@ int PAdmin::savePrefs(QString pref_fln) { // check if musredit_startup.xml is present in the current directory, and if yes, use this file to // save the recent file names otherwise use the "master" musredit_startup.xml + QString fln = QString("./musredit_startup.xml"); + if (!QFile::exists(fln)) + fln = fPrefPathName; - QString str; - QString fln = "musredit_startup.xml"; - // check if it is a MacOSX -#ifdef Q_OS_OSX - fln = "./musredit_startup.xml"; - if (!QFile::exists(fln)) { - fln = "/Applications/musredit.app/Contents/Resources/musredit_startup.xml"; - } -#else - fln = "./musredit_startup.xml"; - if (!QFile::exists(fln)) { - QString path = std::getenv("MUSRFITPATH"); - QString rootsys = std::getenv("ROOTSYS"); - if (path.isEmpty()) - path = rootsys + "/bin"; - fln = path + "/musredit_startup.xml"; - } -#endif if (QFile::exists(fln)) { // administration file present QVector data; QFile file(fln); @@ -842,6 +831,12 @@ int PAdmin::savePrefs(QString pref_fln) else data[i] = " n"; } + if (data[i].contains("") && data[i].contains("")) { + if (fMusrviewShowFourier) + data[i] = " y"; + else + data[i] = " n"; + } if (data[i].contains("") && data[i].contains("")) { if (fEnableMusrT0) data[i] = " y"; @@ -853,13 +848,16 @@ int PAdmin::savePrefs(QString pref_fln) // write prefs file.setFileName(pref_fln); if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - cerr << endl << ">> PAdmin::savePrefs: **ERROR** Cannot open " << fln.toLatin1().data() << " for writing." << endl; + cerr << endl << ">> PAdmin::savePrefs: **ERROR** Cannot open " << pref_fln.toLatin1().data() << " for writing." << endl; return 0; } fin.setDevice(&file); for (int i=0; i data; QFile file(fln); @@ -959,6 +944,9 @@ void PAdmin::saveRecentFiles() for (int i=0; igetDefaultSavePath(); } @@ -901,12 +901,31 @@ void PTextEdit::fileReload() */ void PTextEdit::fileOpenPrefs() { - QString fln = QFileDialog::getOpenFileName( this, tr("Open Prefs"), + QString fln(""); + QString msg(""); + QMessageBox msgBox; + msgBox.setText("Which Preferences do you want to open?"); + msgBox.addButton("Default", QMessageBox::AcceptRole); + msgBox.addButton("Custom", QMessageBox::AcceptRole); + msgBox.setStandardButtons(QMessageBox::Cancel); + int result = msgBox.exec(); + if (result == QMessageBox::Cancel) { + return; + } else if (result == 0) { // default dir + fln = fAdmin->getDefaultPrefPathName(); + msg = QString("Current Default Preferences Path-Name:\n") + fln; + if (QMessageBox::information(this, "Info", msg, QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Cancel) + return; + } else if (result == 1) { // custom dir + fln = QFileDialog::getOpenFileName( this, tr("Open Prefs"), fLastDirInUse, tr( "xml-Files (*.xml);; All Files (*)" )); + } - if (fAdmin->loadPrefs(fln)) - QMessageBox::information(0, "Prefs", "Prefs Loaded."); + if (fAdmin->loadPrefs(fln)) { + msg = QString("Prefs from '") + fln + QString("' loaded."); + QMessageBox::information(0, "Info", msg); + } } //---------------------------------------------------------------------------------------------------- @@ -968,12 +987,31 @@ void PTextEdit::fileSaveAs() */ void PTextEdit::fileSavePrefs() { - QString fn = QFileDialog::getSaveFileName( this, + QString fln(""); + QString msg(""); + QMessageBox msgBox; + msgBox.setText("Which Preferences do you want to open?"); + msgBox.addButton("Default", QMessageBox::AcceptRole); + msgBox.addButton("Custom", QMessageBox::AcceptRole); + msgBox.setStandardButtons(QMessageBox::Cancel); + int result = msgBox.exec(); + if (result == QMessageBox::Cancel) { + return; + } else if (result == 0) { // default dir + fln = fAdmin->getDefaultPrefPathName(); + msg = QString("Current Default Preferences Path-Name:\n") + fln; + if (QMessageBox::information(this, "Info", msg, QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Cancel) + return; + } else if (result == 1) { // custom dir + fln = QFileDialog::getSaveFileName( this, tr( "Save Prefs As" ), "musredit_startup.xml", tr( "xml-Files (*.xml);;All Files (*)" ) ); + } - if ( !fn.isEmpty() ) { - fAdmin->savePrefs(fn); + if ( !fln.isEmpty() ) { + fAdmin->savePrefs(fln); + msg = QString("Prefs to '") + fln + QString("' saved."); + QMessageBox::information(0, "Info", msg); } } @@ -2506,7 +2544,7 @@ void PTextEdit::replaceAll() /** *

SLOT: updates the fonts if the textedit tab has changed. */ -void PTextEdit::applyFontSettings(QWidget*) +void PTextEdit::applyFontSettings(int) { QFont font(fAdmin->getFontName(), fAdmin->getFontSize()); fontChanged(font); diff --git a/src/musredit_qt5/PTextEdit.h b/src/musredit_qt5/PTextEdit.h index 46a6e2826..a4e3a4e56 100644 --- a/src/musredit_qt5/PTextEdit.h +++ b/src/musredit_qt5/PTextEdit.h @@ -147,7 +147,7 @@ private slots: void replaceAndClose(); void replaceAll(); - void applyFontSettings(QWidget*); + void applyFontSettings(int); void fileChanged(const QString &fileName); void setFileSystemWatcherActive(); diff --git a/src/musredit_qt5/musredit.pro b/src/musredit_qt5/musredit.pro index 82eec492c..a236dc25e 100644 --- a/src/musredit_qt5/musredit.pro +++ b/src/musredit_qt5/musredit.pro @@ -31,8 +31,8 @@ unix { unix:target.path = $${MUSREDIT_INSTALL_PATH} macx:target.path = /Applications - win32:target.path = c:/musrfit/bin + INSTALLS += target # This is only needed for SL5.1 @@ -58,8 +58,8 @@ QMAKE_CXX = $${CXX} QMAKE_LINK = $${CXX} # install path for the XML configuration file -unix:xml.path = $${MUSREDIT_INSTALL_PATH} -macx:xml.path = /Applications/musredit.app/Contents/Resources +unix:xml.path = $$(HOME)/.musrfit/musredit +macx:xml.path = $$(HOME)/.musrfit/musredit win32:xml.path = c:/musrfit/bin xml.files = musredit_startup.xml INSTALLS += xml diff --git a/src/musredit_qt5/musredit_startup.xml.in b/src/musredit_qt5/musredit_startup.xml.in index 34374e56d..d51cc3d5c 100644 --- a/src/musredit_qt5/musredit_startup.xml.in +++ b/src/musredit_qt5/musredit_startup.xml.in @@ -14,6 +14,7 @@ y n y + n y From 352ac5db21d9d23b520942128164cc254cba6256 Mon Sep 17 00:00:00 2001 From: Suter Andreas Date: Wed, 17 Feb 2016 12:59:03 +0100 Subject: [PATCH 8/8] install default XML startup files under /home/nemu/.musrfit rather than /bin. Since this is a substantial indentation, the version number has been incremented. --- ChangeLog | 9 ++++++-- README.md | 3 ++- configure.ac | 9 ++++---- src/Makefile.am | 6 ++--- src/classes/PStartupHandler.cpp | 29 ++++++++++++++++-------- src/musredit/musredit_startup.xml.in | 2 +- src/musredit_qt5/musredit_startup.xml.in | 2 +- src/musrfit_startup.xml | 2 +- 8 files changed, 39 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0e66dac34..dd3ab1279 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,11 +2,16 @@ # ChangeLog #--------------------------------------------------------------------- +changes since 0.17.0 +=================================== + + changes since 0.16.0 =================================== NEW 2016-01-22 update of the docu which now describes the RRF option. -CHANGED 2016-02-17 start to move the startup XML-files to $HOME/.musrfit - rather than having it within $prefix/bin. +CHANGED 2016-02-17 move the startup XML-files to $HOME/.musrfit + rather than having it within $prefix/bin. Increase + therefore the version number to 0.17.0 CHANGED 2016-02-16 if the LEM file is created 2012 or later and the data-file-format tag is still ROOT-NPP or ROOT-PPC, it will automatically switched to MUSR-ROOT. This way red/green diff --git a/README.md b/README.md index fd52af9cf..84454b3e6 100644 --- a/README.md +++ b/README.md @@ -29,4 +29,5 @@ For a more exhaustive user documentation see: ### Contact ### - \ No newline at end of file + + diff --git a/configure.ac b/configure.ac index fa00d12e4..4931abfc0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_REVISION([m4_esyscmd_s([git describe --always])]) AC_PREREQ(2.63) -AC_INIT([musrfit],[0.16.0],[andreas.suter@psi.ch]) +AC_INIT([musrfit],[0.17.0],[andreas.suter@psi.ch]) AC_CONFIG_AUX_DIR(admin) AC_CANONICAL_HOST #AC_MSG_RESULT([${host} ${host_cpu} ${host_vendor} ${host_os}]) @@ -35,7 +35,7 @@ dnl ----------------------------------------------- #release versioning MUSR_MAJOR_VERSION=0 -MUSR_MINOR_VERSION=16 +MUSR_MINOR_VERSION=17 MUSR_MICRO_VERSION=0 #release versioning @@ -1401,6 +1401,7 @@ echo "" echo " Installation directories:" echo " -------------------------" echo "" -echo " Programs and XML configuration files: ${INSTALLDIR}/bin" -echo " Documentation: ${DOCDIR}" +echo " Programs: ${INSTALLDIR}/bin" +echo " XML configuration files: ${HOME}/.musrfit" +echo " Documentation: ${DOCDIR}" echo "" diff --git a/src/Makefile.am b/src/Makefile.am index 069d6d17f..5a1540a87 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -60,7 +60,7 @@ write_musrRoot_runHeader_SOURCES = write_musrRoot_runHeader.cpp musrRootValidation_SOURCES = musrRootValidation.cpp dump_header_SOURCES = dump_header.cpp -xmldir = $(bindir) +xmldir = $(HOME)/.musrfit xml_DATA = musrfit_startup.xml LIBADD = $(PMUSR_LIBS) $(MUSR_ROOT_LIBS) $(LEM_LIBS) $(PSIBIN_LIBS) $(MUD_LIBS) $(PNEXUS_LIBS) @@ -82,7 +82,7 @@ install-xmlDATA: $(xml_DATA) DIFF="$$(diff "$(DESTDIR)$(xmldir)/$(xml_DATA)" "$(xml_DATA)" 2>&1)"; \ if test "x$$DIFF" != "x"; then \ echo " " && \ - echo " musrfit_startup.xml in $(bindir)" && \ + echo " musrfit_startup.xml in $(xmldir)" && \ echo " is different from the distribution's version." && \ echo " Do you want to overwrite it? [y/N]" && \ read OVERWRITE && \ @@ -101,7 +101,7 @@ uninstall-xmlDATA: DIFF="$$(diff "$(DESTDIR)$(xmldir)/$(xml_DATA)" "$(xml_DATA)" 2>&1)"; \ if test "x$$DIFF" != "x"; then \ echo " " && \ - echo " musrfit_startup.xml in $(bindir)" && \ + echo " musrfit_startup.xml in $(xmldir)" && \ echo " is different from the distribution's version." && \ echo " Do you want to remove it? [y/N]" && \ read REMOVE && \ diff --git a/src/classes/PStartupHandler.cpp b/src/classes/PStartupHandler.cpp index 47414ed32..9077629e3 100644 --- a/src/classes/PStartupHandler.cpp +++ b/src/classes/PStartupHandler.cpp @@ -93,11 +93,13 @@ PStartupHandler::PStartupHandler() fStartupFilePath = ""; // get default path (for the moment only linux like) - Char_t *pmusrpath; - Char_t *home; + Char_t *pmusrpath=0; + Char_t *home=0; Char_t musrpath[128]; Char_t startup_path_name[128]; - Bool_t pmusrpathfound = false; + Bool_t found = false; + + strncpy(musrpath, "", sizeof(musrpath)); // check if the startup file is found in the current directory strcpy(startup_path_name, "./musrfit_startup.xml"); @@ -105,20 +107,27 @@ PStartupHandler::PStartupHandler() fStartupFileFound = true; fStartupFilePath = TString(startup_path_name); } else { // startup file is not found in the current directory - // check if the MUSRFITPATH system variable is set + // check if the startup file is found under $HOME/.musrfit + home = getenv("HOME"); + if (home != 0) { + sprintf(musrpath, "%s/.musrfit", home); + found = true; + } pmusrpath = getenv("MUSRFITPATH"); - if (pmusrpath != 0) { - if (strcmp(pmusrpath, "")) { // MUSRFITPATH variable set but empty - pmusrpathfound = true; + if (!found) { + // check if the MUSRFITPATH system variable is set + if (pmusrpath != 0) { + if (strcmp(pmusrpath, "")) { // MUSRFITPATH variable set but empty + found = true; + } } } - if (!pmusrpathfound) { // MUSRFITPATH not set or empty, will try default one + if (!found) { // MUSRFITPATH not set or empty, will try default one home = getenv("ROOTSYS"); sprintf(musrpath, "%s/bin", home); cerr << endl << "**WARNING** MUSRFITPATH environment variable not set will try " << musrpath << endl; - } else { - strncpy(musrpath, pmusrpath, sizeof(musrpath)); } + sprintf(startup_path_name, "%s/musrfit_startup.xml", musrpath); fStartupFilePath = TString(startup_path_name); if (StartupFileExists(startup_path_name)) { diff --git a/src/musredit/musredit_startup.xml.in b/src/musredit/musredit_startup.xml.in index 4493befed..07c1d4d30 100644 --- a/src/musredit/musredit_startup.xml.in +++ b/src/musredit/musredit_startup.xml.in @@ -1,5 +1,5 @@ - + This is handling default setting parameters for the musredit. diff --git a/src/musredit_qt5/musredit_startup.xml.in b/src/musredit_qt5/musredit_startup.xml.in index d51cc3d5c..2493a7131 100644 --- a/src/musredit_qt5/musredit_startup.xml.in +++ b/src/musredit_qt5/musredit_startup.xml.in @@ -1,5 +1,5 @@ - + This is handling default setting parameters for the musredit. diff --git a/src/musrfit_startup.xml b/src/musrfit_startup.xml index e35450e91..daf13703f 100644 --- a/src/musrfit_startup.xml +++ b/src/musrfit_startup.xml @@ -1,5 +1,5 @@ - + Defines default settings for the musrfit package