diff --git a/src/musrgui/PTextEdit.cpp b/src/musrgui/PTextEdit.cpp index 48ffc388..a5c1ecae 100644 --- a/src/musrgui/PTextEdit.cpp +++ b/src/musrgui/PTextEdit.cpp @@ -55,6 +55,7 @@ #include "PAdmin.h" #include "PFitOutputHandler.h" #include "PGetDefaultDialog.h" +#include "forms/PMusrGuiAbout.h" //---------------------------------------------------------------------------------------------------- /** @@ -65,7 +66,7 @@ PTextEdit::PTextEdit( QWidget *parent, const char *name ) { fAdmin = new PAdmin(); - fShowMlog = true; + fShowMlog = fAdmin->getShowMlog(); setupFileActions(); setupEditActions(); @@ -701,6 +702,16 @@ void PTextEdit::musrCalcChisq() if ( !currentEditor() ) return; + QString tabLabel = fTabWidget->label(fTabWidget->currentPageIndex()); + if (tabLabel == "noname") { + QMessageBox::critical(this, "**ERROR**", "For a fit a real msr-file is needed."); + return; + } else if (tabLabel == "noname*") { + fileSaveAs(); + } else if (tabLabel.find("*") > 0) { + fileSave(); + } + QValueVector cmd; QString str; str = fAdmin->getExecPath() + "/musrfit"; @@ -722,6 +733,16 @@ void PTextEdit::musrFit() if ( !currentEditor() ) return; + QString tabLabel = fTabWidget->label(fTabWidget->currentPageIndex()); + if (tabLabel == "noname") { + QMessageBox::critical(this, "**ERROR**", "For a fit a real msr-file is needed."); + return; + } else if (tabLabel == "noname*") { + fileSaveAs(); + } else if (tabLabel.find("*") > 0) { + fileSave(); + } + QValueVector cmd; QString str; str = fAdmin->getExecPath() + "/musrfit"; @@ -742,9 +763,29 @@ void PTextEdit::musrView() if ( !currentEditor() ) return; - QMessageBox::information( this, "musrView", - "Will call musrview.\n" - "NOT IMPLEMENTED YET :-(" ); + QString tabLabel = fTabWidget->label(fTabWidget->currentPageIndex()); + if (tabLabel == "noname") { + QMessageBox::critical(this, "**ERROR**", "For a view a real mlog/msr-file is needed."); + return; + } else if (tabLabel == "noname*") { + fileSaveAs(); + } else if (tabLabel.find("*") > 0) { + fileSave(); + } + + QString cmd; + QString str; + + str = fAdmin->getExecPath() + "/musrview"; + cmd = str + " "; + + str = *fFilenames.find( currentEditor()); + if (fShowMlog) { + str.replace(str.find(".msr"), 4, ".mlog"); + } + cmd += str + " &"; + + system(cmd.latin1()); } //---------------------------------------------------------------------------------------------------- @@ -789,8 +830,8 @@ void PTextEdit::helpContents() */ void PTextEdit::helpAbout() { - QMessageBox::about(this, "MuSR-GUI", - "andreas.suter@psi.ch"); + PMusrGuiAbout *about = new PMusrGuiAbout(); + about->show(); } //---------------------------------------------------------------------------------------------------- diff --git a/src/musrgui/forms/PMusrGuiAbout.ui b/src/musrgui/forms/PMusrGuiAbout.ui new file mode 100644 index 00000000..cdcf9747 --- /dev/null +++ b/src/musrgui/forms/PMusrGuiAbout.ui @@ -0,0 +1,103 @@ + +PMusrGuiAbout + + + PMusrGuiAbout + + + + 0 + 0 + 428 + 192 + + + + musrgui About + + + image0 + + + + fMusrGui_textLabel + + + + 130 + 0 + 199 + 45 + + + + <b><i><font size="+4">musrgui...</font></i></b> + + + + + fSVN_textLabel + + + + 10 + 130 + 400 + 20 + + + + <i>SVN $Id$</i> + + + + + fAbout_textLabel + + + + 150 + 50 + 140 + 70 + + + + <p align="center">by Andreas Suter<br> +andreas.suter@psi.ch<br> +Paul Scherrer Institut<br> +Switzerland</p> + + + + + fOk_pushButton + + + + 183 + 160 + 70 + 26 + + + + OK + + + + + + 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000016249444154388d95544dae86200c9c1a169e471217707e5890d4f3b830e95b687d15e51349889982fd19a6252e0c6c001cb06e2b4637629abde0584b61aacf7bf0b06eebc5e88d5360b74fc18b9ed7f75bd82908210a01e0c204e33c8628029c99e8fd373ca853009023c3a530290d1a619abdf464aa7818dd682b3f232f8569ddd6cb594fa6578eab9f2f0f5105ede57888214ace692f3d33d591951602be719c72a2d18dc839512b93737de0989e74dcc2d3eca557d7371db7b0364daf3a865eceded41142949b8e7b38b32b86288fe7371d77bcb66d1ace4ceadcce9669f6a2f79dcdf0edbb1426752200c874ec8da6c37e6e2e0cfbadb798cd99c18571b11546ca090ed807cf85db23b2da6388a27ab7034a39d54a08403afc383c7514dab8a5e3a530a5431d4b667200e0c37f16e968efa70adede40a7e414bc3875663b4833d44a6adc548f59832dd3ce865fb8a9fbdaf1178e7f656ea724a59cba75fce5fb0774073f42f0dd40cc0000000049454e44ae426082 + + + + + fOk_pushButton + clicked() + PMusrGuiAbout + accept() + + + + diff --git a/src/musrgui/editcopy.xpm b/src/musrgui/images/editcopy.xpm similarity index 100% rename from src/musrgui/editcopy.xpm rename to src/musrgui/images/editcopy.xpm diff --git a/src/musrgui/editcut.xpm b/src/musrgui/images/editcut.xpm similarity index 100% rename from src/musrgui/editcut.xpm rename to src/musrgui/images/editcut.xpm diff --git a/src/musrgui/editpaste.xpm b/src/musrgui/images/editpaste.xpm similarity index 100% rename from src/musrgui/editpaste.xpm rename to src/musrgui/images/editpaste.xpm diff --git a/src/musrgui/editredo.xpm b/src/musrgui/images/editredo.xpm similarity index 100% rename from src/musrgui/editredo.xpm rename to src/musrgui/images/editredo.xpm diff --git a/src/musrgui/editundo.xpm b/src/musrgui/images/editundo.xpm similarity index 100% rename from src/musrgui/editundo.xpm rename to src/musrgui/images/editundo.xpm diff --git a/src/musrgui/filenew.xpm b/src/musrgui/images/filenew.xpm similarity index 100% rename from src/musrgui/filenew.xpm rename to src/musrgui/images/filenew.xpm diff --git a/src/musrgui/fileopen.xpm b/src/musrgui/images/fileopen.xpm similarity index 100% rename from src/musrgui/fileopen.xpm rename to src/musrgui/images/fileopen.xpm diff --git a/src/musrgui/fileprint.xpm b/src/musrgui/images/fileprint.xpm similarity index 100% rename from src/musrgui/fileprint.xpm rename to src/musrgui/images/fileprint.xpm diff --git a/src/musrgui/filesave.xpm b/src/musrgui/images/filesave.xpm similarity index 100% rename from src/musrgui/filesave.xpm rename to src/musrgui/images/filesave.xpm diff --git a/src/musrgui/musrasym.xpm b/src/musrgui/images/musrasym.xpm similarity index 100% rename from src/musrgui/musrasym.xpm rename to src/musrgui/images/musrasym.xpm diff --git a/src/musrgui/musrcalcchisq.xpm b/src/musrgui/images/musrcalcchisq.xpm similarity index 100% rename from src/musrgui/musrcalcchisq.xpm rename to src/musrgui/images/musrcalcchisq.xpm diff --git a/src/musrgui/musrfit.xpm b/src/musrgui/images/musrfit.xpm similarity index 100% rename from src/musrgui/musrfit.xpm rename to src/musrgui/images/musrfit.xpm diff --git a/src/musrgui/musrprefs.xpm b/src/musrgui/images/musrprefs.xpm similarity index 100% rename from src/musrgui/musrprefs.xpm rename to src/musrgui/images/musrprefs.xpm diff --git a/src/musrgui/musrsinglehisto.xpm b/src/musrgui/images/musrsinglehisto.xpm similarity index 100% rename from src/musrgui/musrsinglehisto.xpm rename to src/musrgui/images/musrsinglehisto.xpm diff --git a/src/musrgui/musrt0.xpm b/src/musrgui/images/musrt0.xpm similarity index 100% rename from src/musrgui/musrt0.xpm rename to src/musrgui/images/musrt0.xpm diff --git a/src/musrgui/musrview.xpm b/src/musrgui/images/musrview.xpm similarity index 100% rename from src/musrgui/musrview.xpm rename to src/musrgui/images/musrview.xpm diff --git a/src/musrgui/musrgui.pro b/src/musrgui/musrgui.pro index 05cd4959..5a7a8aae 100644 --- a/src/musrgui/musrgui.pro +++ b/src/musrgui/musrgui.pro @@ -25,22 +25,23 @@ SOURCES = PTextEdit.cpp \ PGetDefaultDialog.cpp \ main.cpp -FORMS = forms/PGetDefaultDialogBase.ui +FORMS = forms/PGetDefaultDialogBase.ui \ + forms/PMusrGuiAbout.ui -IMAGES = editcopy.xpm \ - editcut.xpm \ - editpaste.xpm \ - editredo.xpm \ - editundo.xpm \ - filenew.xpm \ - fileopen.xpm \ - fileprint.xpm \ - filesave.xpm \ - musrasym.xpm \ - musrsinglehisto.xpm \ - musrcalcchisq.xpm \ - musrfit.xpm \ - musrview.xpm \ - musrt0.xpm \ - musrprefs.xpm +IMAGES = images/editcopy.xpm \ + images/editcut.xpm \ + images/editpaste.xpm \ + images/editredo.xpm \ + images/editundo.xpm \ + images/filenew.xpm \ + images/fileopen.xpm \ + images/fileprint.xpm \ + images/filesave.xpm \ + images/musrasym.xpm \ + images/musrsinglehisto.xpm \ + images/musrcalcchisq.xpm \ + images/musrfit.xpm \ + images/musrview.xpm \ + images/musrt0.xpm \ + images/musrprefs.xpm