LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

added musrStep dummy menu. First step towards a full integration of musrStep into musredit.

Browse Source
This commit is contained in:
suter_a 2017-02-22 08:03:12 +01:00
parent d52b0b70a4
commit cc1679144c
4 changed files with 162 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/musredit_qt5/PTextEdit.cpp
View File

@ -501,7 +501,7 @@ void PTextEdit::setupMusrActions()
menu->addSeparator();
tb->addSeparator();
a = new QAction( QIcon( QPixmap( ":/icons/musrchisq-plain.svg" ) ), 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() ) );
@ -522,6 +522,13 @@ void PTextEdit::setupMusrActions()
tb->addAction(a);
menu->addAction(a);
a = new QAction( QIcon( QPixmap( ":/icons/musrStep-32x32.svg" ) ), tr( "Set Ste&ps" ), this );
a->setShortcut( tr("Alt+P") );
a->setStatusTip( tr("Set Steps") );
connect( a, SIGNAL( triggered() ), this, SLOT( musrSetSteps() ) );
tb->addAction(a);
menu->addAction(a);
a = new QAction( QIcon( QPixmap( ":/icons/msr2data-plain.svg" ) ), tr( "&Msr2Data" ), this );
a->setShortcut( tr("Alt+M") );
a->setStatusTip( tr("Start msr2data interface") );
@ -1594,6 +1601,9 @@ void PTextEdit::textSize( const QString &p )
*/
void PTextEdit::musrWiz()
{
if ( !currentEditor() )
return;
QMessageBox::information(this, "**INFO**", "Will eventually call musrWiz");
}
@ -2251,6 +2261,15 @@ void PTextEdit::musrPrefs()
dlg = 0;
}
//----------------------------------------------------------------------------------------------------
void PTextEdit::musrSetSteps()
{
if ( !currentEditor() )
return;
QMessageBox::information(this, "**INFO**", "Eventually this will allow to set the\nstep values of the current msr-file.");
}
//----------------------------------------------------------------------------------------------------
/**
* <p>Swaps the currently open msr-file with its mlog-file (if present) and updates musredit accordingly.

1
src/musredit_qt5/PTextEdit.h
View File

@ -134,6 +134,7 @@ private slots:
void musrFT();
void musrPrefs();
void musrSwapMsrMlog();
void musrSetSteps();
void musrDump();
void helpContents();

140
src/musredit_qt5/icons/musrStep-32x32.svg Normal file
View File

@ -0,0 +1,140 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="32"
height="32"
id="svg2"
version="1.1"
inkscape:version="0.47 r22583"
sodipodi:docname="musrStep-32x32.png">
<defs
id="defs4">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
id="perspective10" />
<inkscape:perspective
id="perspective3600"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 0.5 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
id="perspective3770"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 0.5 : 1"
sodipodi:type="inkscape:persp3d" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="29.227273"
inkscape:cx="15.349722"
inkscape:cy="17.294896"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="2050"
inkscape:window-height="1312"
inkscape:window-x="112"
inkscape:window-y="99"
inkscape:window-maximized="0">
<inkscape:grid
type="xygrid"
id="grid2816"
empspacing="5"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" />
</sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1020.3622)">
<path
sodipodi:type="arc"
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="path2818"
sodipodi:cx="3.5"
sodipodi:cy="10.5"
sodipodi:rx="1.5"
sodipodi:ry="1.5"
d="m 5,10.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
transform="matrix(2,0,0,2,-2.0000001,1015.3622)" />
<path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 5,2 0,28 0,0"
id="path3756"
transform="translate(0,1020.3622)" />
<path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 2,2 8,2"
id="path3758"
transform="translate(0,1020.3622)" />
<path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 2,30 6,0"
id="path3760"
transform="translate(0,1020.3622)" />
<path
sodipodi:type="arc"
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="path2818-7"
sodipodi:cx="3.5"
sodipodi:cy="10.5"
sodipodi:rx="1.5"
sodipodi:ry="1.5"
d="m 5,10.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
transform="matrix(2,0,0,2,20,1015.3622)" />
<path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 27,11 0,10"
id="path3784"
transform="translate(0,1020.3622)" />
<path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 24,21 6,0"
id="path3786"
transform="translate(0,1020.3622)" />
<path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 24,11 6,0"
id="path3788"
transform="translate(0,1020.3622)" />
<path
style="fill:#da4453;fill-opacity:1;stroke:#da4453;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 22.5,1033.3622 -5,-5 0,-4 -8,12 8,12 0,-4 5,-5 -2,-3 2,-3"
id="path3790" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

1
src/musredit_qt5/musredit.qrc
View File

@ -19,6 +19,7 @@
<file>icons/msr2data-plain.svg</file>
<file>icons/musrprefs-plain.svg</file>
<file>icons/musrswap-plain.svg</file>
<file>icons/musrStep-32x32.svg</file>
<file>icons/musrt0-plain.svg</file>
<file>icons/musrview-plain.svg</file>
<file>icons/musrFT-plain.svg</file>