start with the intergration of musrWiz into musredit

doc/templates/asymDefault.msr

@@ -1,59 +0,0 @@
-TITLE
-###############################################################
-FITPARAMETER
-#      Nr. Name        Value     Step      Pos_Error  Boundaries
-         1 alpha       0.989765  1.0       none       0         none      
-         2 asy         0.26      0.1       none       0         0.33     
-         3 phase       8.5       1.0       none
-         4 field       100.0     0.1       none       0         none
-         5 rate        0.36      0.02      none       0         100
-
-###############################################################
-THEORY
-asymmetry     2
-TFieldCos     3  fun1                 (phase frequency)
-simplExpo     5
-
-###############################################################
-FUNCTIONS
-fun1 = par4 * gamma_mu
-
-###############################################################
-RUN lem07_his_0147 MUE4 PSI ROOT-NPP        (name beamline institute data-file-format)
-fittype         2               (asymmetry fit)
-alpha           1
-map             0    0    0    0    0    0    0    0    0    0
-forward         1
-backward        3
-background  65000  66500  65000  66500
-data         3413  63000   3413  63000
-t0           3413   3413
-fit          0.00   8.00          (fw bw)
-packing        75
-
-###############################################################
-COMMANDS
-SET BATCH
-MINIMIZE
-MINOS
-SAVE
-END RETURN
-
-###############################################################
-FOURIER
-units   Gauss  # fourier in field units
-fourier_power 12
-apodization NONE # NONE, WEAK, MEDIUM, STRONG
-plot power
-phase   8.5
-#range_for_phase_correction 50.0 70.0
-range   0.0  200.0
-
-###############################################################
-PLOT 2   (asymmetry plot)
-runs     1
-range    0.00    8.00   -0.30    0.30
-
-###############################################################
-STATISTIC --- 2008-04-04 07:44:31
-  chisq = 569.50931, NDF = 542, chisq/NDF = 1.05075518

doc/templates/singleHistoDefault.msr

@@ -1,60 +0,0 @@
-TITLE
-###############################################################
-FITPARAMETER
-#      Nr. Name       Value     Step      Pos_Error Boundaries   
-        1 Asy         0.26      0.01      none      0       0.33    
-        2 Rate        0.36      0.01      none
-        3 Field       100.0     1.0       none      0       200     
-        4 N0_L        150.0     0.01      none   
-        5 Bkg_L       4.9       0.01      none
-        6 Phase_L     7.0       1.5       none     -50     50      
-
-###############################################################
-THEORY
-asymmetry      1
-simplExpo      2                   (rate)
-TFieldCos   map1  fun1             (phase frequency)
-
-###############################################################
-FUNCTIONS
-fun1 = par3 * gamma_mu
-
-###############################################################
-RUN lem07_his_0111 MUE4 PSI ROOT-NPP   (name beamline institute data-file-format)
-fittype         0         (single histogram fit)
-norm            4
-backgr.fit      5
-lifetimecorrection
-map             6    0    0    0    0    0    0    0    0    0
-forward         1
-data            3413    65000   
-t0              3413    
-fit             0.20    8.2
-packing         50
-
-###############################################################
-COMMANDS
-SET BATCH
-MINIMIZE
-MINOS
-SAVE
-END RETURN
-
-###############################################################
-PLOT 0   (single histo plot)
-runs     1 
-range    0.00   7.00   -0.30   0.30
-
-###############################################################
-FOURIER
-units   Gauss  # fourier in field units
-fourier_power 12
-apodization NONE # NONE, WEAK, MEDIUM, STRONG
-plot power
-phase   8.5
-#range_for_phase_correction 50.0 70.0
-range   0.0  200.0
-
-###############################################################
-STATISTIC --- 2008-06-09 14:09:39
-  chisq = 1446.93547, NDF = 1377, chisq/NDF = 1.05078829

src/musredit_qt5/PAdmin.cpp

@@ -114,8 +114,6 @@ bool PAdminXMLParser::startElement( const QString&, const QString&,
     fKeyWord = eFileFormat;
   } else if (qName == "lifetime_correction") {
     fKeyWord = eLifetimeCorrection;
-  } else if (qName == "msr_default_file_path") {
-    fKeyWord = eMsrDefaultFilePath;
   } else if (qName == "musr_web_main") {
     fKeyWord = eHelpMain;
   } else if (qName == "musr_web_title") {
@@ -327,9 +325,6 @@ bool PAdminXMLParser::characters(const QString& str)
         flag = false;
       fAdmin->setLifetimeCorrectionFlag(flag);
       break;
-    case eMsrDefaultFilePath:
-      fAdmin->setMsrDefaultFilePath(QString(str.toLatin1()).trimmed());
-      break;
     case eHelpMain:
       fAdmin->setHelpUrl("main", str);
       break;
@@ -493,12 +488,6 @@ bool PAdminXMLParser::endDocument()
       fAdmin->setDefaultSavePath(str);
  }
 
-  if (fAdmin->getMsrDefaultFilePath().indexOf('$') >= 0) {
-    str = expandPath(fAdmin->getMsrDefaultFilePath());
-    if (!str.isEmpty())
-      fAdmin->setMsrDefaultFilePath(str);
-  }
-
   if (fAdmin->getTheoFuncPixmapPath().indexOf('$') >=0) {
     str = expandPath(fAdmin->getTheoFuncPixmapPath());
     if (!str.isEmpty())
@@ -628,7 +617,6 @@ PAdmin::PAdmin() : QObject()
   fPrefPathName = QString("");
   fExecPath = QString("");
   fDefaultSavePath = QString("");
-  fMsrDefaultFilePath = QString("");
   fTheoFuncPixmapPath = QString("");
 
   fBeamline   = QString("");

src/musredit_qt5/PAdmin.h

@@ -72,7 +72,7 @@ class PAdminXMLParser : public QXmlDefaultHandler
                          eTitleFromDataFile, eChisqPreRunBlock, eEstimateN0,
                          eMusrviewShowFourier, eMusrviewShowAvg, eEnableMusrT0,
                          eFontName, eFontSize, eExecPath, eDefaultSavePath,
-                         eRecentFile, eBeamline, eInstitute, eFileFormat, eLifetimeCorrection, eMsrDefaultFilePath,
+                         eRecentFile, eBeamline, eInstitute, eFileFormat, eLifetimeCorrection,
                          eTheoFuncPixmapPath, eFunc, eFuncName, eFuncComment, eFuncLabel,
                          eFuncPixmap, eFuncParams, eHelpMain, eHelpTitle, eHelpParameters, eHelpTheory, eHelpFunctions,
                          eHelpRun, eHelpCommand, eHelpFourier, eHelpPlot, eHelpStatistic, eHelpMsr2Data, eHelpMusrFT,
@@ -131,7 +131,6 @@ class PAdmin : public QObject
     QString getInstitute() { return fInstitute; }
     QString getFileFormat() { return fFileFormat; }
     bool    getLifetimeCorrectionFlag() { return fLifetimeCorrection; }
-    QString getMsrDefaultFilePath() { return fMsrDefaultFilePath; }
     QString getHelpUrl(QString tag);
     QString getTheoFuncPixmapPath() { return fTheoFuncPixmapPath; }
     unsigned int getTheoryCounts() { return fTheory.size(); }
@@ -166,7 +165,6 @@ class PAdmin : public QObject
     void setInstitute(const QString str) { fInstitute = str; }
     void setFileFormat(const QString str) { fFileFormat = str; }
     void setLifetimeCorrectionFlag(const bool flag) { fLifetimeCorrection = flag; }
-    void setMsrDefaultFilePath(const QString str) { fMsrDefaultFilePath = str; }
     void setHelpUrl(const QString tag, const QString url);
     void setTheoFuncPixmapPath (const QString str) { fTheoFuncPixmapPath = str; }
     void addTheoryItem(const PTheory theo) { fTheory.push_back(theo); }
@@ -182,7 +180,6 @@ class PAdmin : public QObject
     QString fPrefPathName;       ///< path-name of the musredit_startup.xml
     QString fExecPath;           ///< system path to the musrfit executables
     QString fDefaultSavePath;    ///< default path where the msr-file should be saved
-    QString fMsrDefaultFilePath; ///< path where to find musredit source
     QString fTheoFuncPixmapPath; ///< path where the default pixmaps can be found
 
     QVector<QString> fRecentFile; ///< keep vector of recent path-file names

src/musredit_qt5/PTextEdit.cpp

@@ -72,7 +72,7 @@ using namespace std;
 #include "PDumpOutputHandler.h"
 #include "PPrefsDialog.h"
 #include "PGetMusrFTOptionsDialog.h"
-#include "PGetDefaultDialog.h"
+//#include "PGetDefaultDialog.h"
 #include "PMusrEditAbout.h"
 #include "PMsr2DataDialog.h"
 
@@ -491,17 +491,10 @@ void PTextEdit::setupMusrActions()
   menuBar()->addMenu( menu );
 
   QAction *a;
-  a = new QAction( QIcon( QPixmap( ":/icons/musrAsym-plain.svg" ) ), tr( "&Asymmetry Default" ), this );
+  a = new QAction( QIcon( QPixmap( ":/icons/musrWiz-32x32.svg" ) ), tr( "musr&Wiz" ), this );
-  a->setShortcut( tr("Alt+A") );
+  a->setShortcut( tr("Alt+W") );
-  a->setStatusTip( tr("Get Default Asymmetry msr-file") );
+  a->setStatusTip( tr("Call musrWiz which helps to create msr-files") );
-  connect( a, SIGNAL( triggered() ), this, SLOT( musrGetAsymmetryDefault() ) );
+  connect( a, SIGNAL( triggered() ), this, SLOT( musrWiz() ) );
-  tb->addAction(a);
-  menu->addAction(a);
-
-  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() ) );
   tb->addAction(a);
   menu->addAction(a);
 
@@ -1597,124 +1590,11 @@ void PTextEdit::textSize( const QString &p )
 
 //----------------------------------------------------------------------------------------------------
 /**
- * <p>Loads a default asymmetry msr-file.
+ * @brief PTextEdit::musrWiz
  */
-void PTextEdit::musrGetAsymmetryDefault()
+void PTextEdit::musrWiz()
 {
-  QString runFileName, beamline, institute, fileFormat;
+  QMessageBox::information(this, "**INFO**", "Will eventually call musrWiz");
-
-  PGetDefaultDialog *dlg = new PGetDefaultDialog(fAdmin->getHelpUrl("main"));
-
-  if (dlg == 0) {
-    QMessageBox::critical(this, "**ERROR**", "Couldn't invoke get default dialog, sorry :-(", QMessageBox::Ok, QMessageBox::NoButton);
-    return;
-  }
-
-  // set defaults
-  dlg->setBeamline(fAdmin->getBeamline());
-  dlg->setInstitute(fAdmin->getInstitute());
-  dlg->setFileFormat(fAdmin->getFileFormat());
-
-  dlg->exec();
-
-  if (dlg->result() != QDialog::Accepted) {
-    delete dlg;
-    dlg = 0;
-    return;
-  }
-
-  runFileName = dlg->getRunFileName();
-  beamline    = dlg->getBeamline();
-  institute   = dlg->getInstitute();
-  fileFormat  = dlg->getFileFormat();
-  delete dlg;
-  dlg = 0;
-
-  QFile file(fAdmin->getMsrDefaultFilePath()+"/asymDefault.msr");
-  if (file.open(QIODevice::ReadOnly)) {
-    // make a new file tab
-    fileNew();
-    QTextStream ts( &file );
-    QString line;
-    while ( !ts.atEnd() ) {
-      line = ts.readLine(); // line of text excluding '\n'
-      if (line.startsWith("RUN")) {
-        QString runHeader = "RUN " + runFileName + " " + beamline.toUpper() + " " + institute + " " + fileFormat.toUpper() + " (name beamline institute data-file-format)\n";
-        currentEditor()->insertPlainText(runHeader);
-      } else { // just copy the text
-        currentEditor()->insertPlainText(line+"\n");
-      }
-    }
-    currentEditor()->textCursor().setPosition(0);
-
-    file.close();
-  } else {
-    QMessageBox::critical(this, "**ERROR**",
-       "Couldn't find default asymmetry file template :-(",
-       QMessageBox::Ok, QMessageBox::NoButton);
-  }
-
-}
-
-//----------------------------------------------------------------------------------------------------
-/**
- * <p>Loads a default single histogram msr-file.
- */
-void PTextEdit::musrGetSingleHistoDefault()
-{
-  QString runFileName, beamline, institute, fileFormat;
-
-  PGetDefaultDialog *dlg = new PGetDefaultDialog();
-
-  if (dlg == 0) {
-    QMessageBox::critical(this, "**ERROR**", "Couldn't invoke get default dialog, sorry :-(", QMessageBox::Ok, QMessageBox::NoButton);
-    return;
-  }
-
-  // set defaults
-  dlg->setBeamline(fAdmin->getBeamline());
-  dlg->setInstitute(fAdmin->getInstitute().toLower());
-  dlg->setFileFormat(fAdmin->getFileFormat().toLower());
-
-  dlg->exec();
-
-  if (dlg->result() != QDialog::Accepted) {
-    delete dlg;
-    dlg = 0;
-    return;
-  }
-
-  runFileName = dlg->getRunFileName();
-  beamline    = dlg->getBeamline();
-  institute   = dlg->getInstitute();
-  fileFormat  = dlg->getFileFormat();
-  delete dlg;
-  dlg = 0;
-
-  QFile file(fAdmin->getMsrDefaultFilePath()+"/singleHistoDefault.msr");
-  if (file.open(QIODevice::ReadOnly)) {
-    // make a new file tab
-    fileNew();
-    QTextStream ts( &file );
-    QString line;
-    while ( !ts.atEnd() ) {
-      line = ts.readLine(); // line of text excluding '\n'
-      if (line.startsWith("RUN")) {
-        QString runHeader = "RUN " + runFileName + " " + beamline.toUpper() + " " + institute + " " + fileFormat.toUpper() + " (name beamline institute data-file-format)\n";
-        currentEditor()->insertPlainText(runHeader);
-      } else { // just copy the text
-        currentEditor()->insertPlainText(line+"\n");
-      }
-    }
-    currentEditor()->textCursor().setPosition(0);
-
-    file.close();
-  } else {
-    QMessageBox::critical(this, "**ERROR**",
-       "Couldn't find default single histogram file template :-(",
-       QMessageBox::Ok, QMessageBox::NoButton);
-  }
-
 }
 
 //----------------------------------------------------------------------------------------------------

src/musredit_qt5/PTextEdit.h

@@ -125,8 +125,7 @@ private slots:
   void textFamily( const QString &f );
   void textSize( const QString &p );
 
-  void musrGetAsymmetryDefault();
+  void musrWiz();
-  void musrGetSingleHistoDefault();
   void musrCalcChisq();
   void musrFit();
   void musrMsr2Data();

src/musredit_qt5/forms/PGetDefaultDialog.ui

@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>PGetDefaultDialog</class>
- <widget class="QDialog" name="PGetDefaultDialog">
-  <property name="windowModality">
-   <enum>Qt::WindowModal</enum>
-  </property>
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>168</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Run</string>
-  </property>
-  <property name="windowIcon">
-   <iconset resource="../musredit.qrc">
-    <normaloff>:/images/musrfit.xpm</normaloff>:/images/musrfit.xpm</iconset>
-  </property>
-  <widget class="QWidget" name="layoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>130</y>
-     <width>381</width>
-     <height>27</height>
-    </rect>
-   </property>
-   <layout class="QHBoxLayout" name="horizontalLayout">
-    <item>
-     <widget class="QPushButton" name="fHelp_pushButton">
-      <property name="text">
-       <string>&amp;Help</string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <spacer name="horizontalSpacer">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>118</width>
-        <height>20</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
-    <item>
-     <widget class="QPushButton" name="fOk_pushButton">
-      <property name="text">
-       <string>&amp;OK</string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QPushButton" name="fCancel_pushButton">
-      <property name="text">
-       <string>&amp;Cancel</string>
-      </property>
-     </widget>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QWidget" name="layoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>12</x>
-     <y>12</y>
-     <width>84</width>
-     <height>111</height>
-    </rect>
-   </property>
-   <layout class="QVBoxLayout" name="verticalLayout">
-    <item>
-     <widget class="QLabel" name="fRunFileName_label">
-      <property name="text">
-       <string>Run File Name</string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QLabel" name="fBeamline_label">
-      <property name="minimumSize">
-       <size>
-        <width>68</width>
-        <height>0</height>
-       </size>
-      </property>
-      <property name="text">
-       <string>Beamline</string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QLabel" name="fInstitute_label">
-      <property name="minimumSize">
-       <size>
-        <width>68</width>
-        <height>0</height>
-       </size>
-      </property>
-      <property name="text">
-       <string>Institute</string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QLabel" name="fFileFormat_label">
-      <property name="minimumSize">
-       <size>
-        <width>68</width>
-        <height>0</height>
-       </size>
-      </property>
-      <property name="text">
-       <string>File Format</string>
-      </property>
-     </widget>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QWidget" name="layoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>99</x>
-     <y>12</y>
-     <width>291</width>
-     <height>111</height>
-    </rect>
-   </property>
-   <layout class="QVBoxLayout" name="verticalLayout_2">
-    <item>
-     <widget class="QLineEdit" name="fRunFileName_lineEdit"/>
-    </item>
-    <item>
-     <widget class="QLineEdit" name="fBeamline_lineEdit"/>
-    </item>
-    <item>
-     <widget class="QComboBox" name="fInstitute_comboBox">
-      <property name="minimumSize">
-       <size>
-        <width>80</width>
-        <height>0</height>
-       </size>
-      </property>
-      <item>
-       <property name="text">
-        <string>PSI</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>RAL</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>TRIUMF</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>JPARC</string>
-       </property>
-      </item>
-     </widget>
-    </item>
-    <item>
-     <widget class="QComboBox" name="fFileFormat_comboBox">
-      <item>
-       <property name="text">
-        <string>NeXuS</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>ROOT-NPP</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>ROOT-PPC</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>PSI-BIN</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>MDU</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>MDU-ASCII</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>MUD</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>WKM</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>ASCII</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>DB</string>
-       </property>
-      </item>
-     </widget>
-    </item>
-   </layout>
-  </widget>
- </widget>
- <tabstops>
-  <tabstop>fOk_pushButton</tabstop>
-  <tabstop>fCancel_pushButton</tabstop>
-  <tabstop>fHelp_pushButton</tabstop>
- </tabstops>
- <resources>
-  <include location="../musredit.qrc"/>
- </resources>
- <connections>
-  <connection>
-   <sender>fCancel_pushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>PGetDefaultDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>337</x>
-     <y>272</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>355</x>
-     <y>225</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>fOk_pushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>PGetDefaultDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>286</x>
-     <y>265</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>243</x>
-     <y>227</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>fHelp_pushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>PGetDefaultDialog</receiver>
-   <slot>helpContent()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>50</x>
-     <y>273</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>115</x>
-     <y>221</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
- <slots>
-  <slot>helpContent()</slot>
- </slots>
-</ui>

src/musredit_qt5/icons/musrWiz-32x32.svg

@@ -0,0 +1,160 @@
+<?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"
+   viewBox="0 0 32.000001 32"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="musrWiz-32x32.svg">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 11 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="22 : 11 : 1"
+       inkscape:persp3d-origin="11 : 7.3333333 : 1"
+       id="perspective3013" />
+    <inkscape:perspective
+       id="perspective3023"
+       inkscape:persp3d-origin="0.49999999 : 0.33333333 : 1"
+       inkscape:vp_z="0.99999999 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3066"
+       inkscape:persp3d-origin="0.49999999 : 0.33333333 : 1"
+       inkscape:vp_z="0.99999999 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3088"
+       inkscape:persp3d-origin="0.49999999 : 0.33333333 : 1"
+       inkscape:vp_z="0.99999999 : 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="26.6875"
+     inkscape:cx="9.4051522"
+     inkscape:cy="16.897709"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="pt"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:snap-grids="true"
+     showguides="true"
+     borderlayer="true"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5486" />
+  </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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <path
+       sodipodi:type="star"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="path3056"
+       sodipodi:sides="4"
+       sodipodi:cx="6"
+       sodipodi:cy="1029.3622"
+       sodipodi:r1="4"
+       sodipodi:r2="2"
+       sodipodi:arg1="0"
+       sodipodi:arg2="0.78539816"
+       inkscape:flatsided="false"
+       inkscape:rounded="0.1"
+       inkscape:randomized="0"
+       d="m 10,1029.3622 c 0,0.2947 -2.3773843,1.2058 -2.5857864,1.4142 -0.2084022,0.2084 -1.1194884,2.5858 -1.4142136,2.5858 -0.2947252,0 -1.2058114,-2.3774 -1.4142136,-2.5858 C 4.3773843,1030.568 2,1029.6569 2,1029.3622 c 0,-0.2947 2.3773843,-1.2058 2.5857864,-1.4142 0.2084022,-0.2084 1.1194884,-2.5858 1.4142136,-2.5858 0.2947252,0 1.2058114,2.3774 1.4142136,2.5858 C 7.6226157,1028.1564 10,1029.0675 10,1029.3622 Z" />
+    <path
+       sodipodi:type="star"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="path3056-3"
+       sodipodi:sides="4"
+       sodipodi:cx="15"
+       sodipodi:cy="1024.3622"
+       sodipodi:r1="3"
+       sodipodi:r2="1.5"
+       sodipodi:arg1="0"
+       sodipodi:arg2="0.78539816"
+       inkscape:flatsided="false"
+       inkscape:rounded="0.1"
+       inkscape:randomized="0"
+       d="m 18,1024.3622 c 0,0.221 -1.783038,0.9043 -1.93934,1.0606 -0.156301,0.1563 -0.839616,1.9394 -1.06066,1.9394 -0.221044,0 -0.904359,-1.7831 -1.06066,-1.9394 C 13.783038,1025.2665 12,1024.5832 12,1024.3622 c 0,-0.2211 1.783038,-0.9044 1.93934,-1.0607 0.156301,-0.1563 0.839616,-1.9393 1.06066,-1.9393 0.221044,0 0.904359,1.783 1.06066,1.9393 0.156302,0.1563 1.93934,0.8396 1.93934,1.0607 z" />
+    <path
+       sodipodi:type="star"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="path3056-3-4"
+       sodipodi:sides="4"
+       sodipodi:cx="25"
+       sodipodi:cy="1042.3622"
+       sodipodi:r1="3"
+       sodipodi:r2="1.5"
+       sodipodi:arg1="0"
+       sodipodi:arg2="0.78539816"
+       inkscape:flatsided="false"
+       inkscape:rounded="0.1"
+       inkscape:randomized="0"
+       d="m 28,1042.3622 c 0,0.221 -1.783038,0.9043 -1.93934,1.0606 -0.156301,0.1563 -0.839616,1.9394 -1.06066,1.9394 -0.221044,0 -0.904359,-1.7831 -1.06066,-1.9394 C 23.783038,1043.2665 22,1042.5832 22,1042.3622 c 0,-0.2211 1.783038,-0.9044 1.93934,-1.0607 0.156301,-0.1563 0.839616,-1.9393 1.06066,-1.9393 0.221044,0 0.904359,1.783 1.06066,1.9393 0.156302,0.1563 1.93934,0.8396 1.93934,1.0607 z" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4712"
+       width="28"
+       height="4"
+       x="-738.83655"
+       y="742.13245"
+       rx="0.40000001"
+       ry="0.40000001"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4714"
+       width="4"
+       height="4"
+       x="-708.16895"
+       y="742.12415"
+       rx="0.40000001"
+       ry="0.40000001"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
+  </g>
+</svg>

src/musredit_qt5/musredit.pro

@@ -90,7 +90,6 @@ HEADERS = musredit.h \
     PDumpOutputHandler.h \
     PPrefsDialog.h \
     PGetMusrFTOptionsDialog.h \
-    PGetDefaultDialog.h \
     PGetTitleBlockDialog.h \ 
     PGetParameterBlockDialog.h \
     PGetTheoryBlockDialog.h \
@@ -116,7 +115,6 @@ SOURCES = PHelp.cpp \
     PDumpOutputHandler.cpp \
     PPrefsDialog.cpp \
     PGetMusrFTOptionsDialog.cpp \
-    PGetDefaultDialog.cpp \
     PGetTitleBlockDialog.cpp \ 
     PGetParameterBlockDialog.cpp \
     PGetTheoryBlockDialog.cpp \
@@ -134,7 +132,6 @@ SOURCES = PHelp.cpp \
 FORMS = forms/PFindDialog.ui \
     forms/PReplaceDialog.ui \
     forms/PReplaceConfirmationDialog.ui \
-    forms/PGetDefaultDialog.ui \
     forms/PMusrEditAbout.ui \
     forms/PPrefsDialog.ui \
     forms/PGetMusrFTOptionsDialog.ui \

src/musredit_qt5/musredit.qrc

@@ -13,12 +13,11 @@
         <file>icons/document-print-plain.svg</file>
         <file>icons/view-refresh-plain.svg</file>
         <file>icons/document-save-plain.svg</file>
-        <file>icons/musrAsym-plain.svg</file>
+        <file>icons/musrWiz-32x32.svg</file>
         <file>icons/musrchisq-plain.svg</file>
         <file>icons/musrfit-plain.svg</file>
         <file>icons/msr2data-plain.svg</file>
         <file>icons/musrprefs-plain.svg</file>
-        <file>icons/musrSingleHisto-plain.svg</file>
         <file>icons/musrswap-plain.svg</file>
         <file>icons/musrt0-plain.svg</file>
         <file>icons/musrview-plain.svg</file>