From df7f36de2fe784a805f3754e7083ff88f1807b62 Mon Sep 17 00:00:00 2001
From: nemu <nemu>
Date: Wed, 25 Mar 2009 09:49:32 +0000
Subject: [PATCH] fixed a bug which was leading to wrong file format settings
 when loading default msr files.

---
 src/musrgui/PAdmin.cpp                     |   6 +-
 src/musrgui/PGetDefaultDialog.cpp          |  37 -----
 src/musrgui/PGetDefaultDialog.h            |  22 +--
 src/musrgui/forms/PGetDefaultDialogBase.ui | 160 +++++++++------------
 4 files changed, 76 insertions(+), 149 deletions(-)

diff --git a/src/musrgui/PAdmin.cpp b/src/musrgui/PAdmin.cpp
index 8970a3ac..dcb41df7 100644
--- a/src/musrgui/PAdmin.cpp
+++ b/src/musrgui/PAdmin.cpp
@@ -239,13 +239,17 @@ PAdmin::PAdmin()
   if (path.isEmpty())
     path = "/home/nemu/analysis/bin";
   QString fln = path + "/musrgui_startup.xml";
-  if (QFile::exists(fln)) { // administrations file present
+  if (QFile::exists(fln)) { // administration file present
     PAdminXMLParser handler(this);
     QFile xmlFile(fln);
     QXmlInputSource source( &xmlFile );
     QXmlSimpleReader reader;
     reader.setContentHandler( &handler );
     reader.parse( source );
+  } else {
+    QMessageBox::critical(0, "ERROR",
+                          "Couldn't find the musrgui_startup.xml settings file.\nProbably a few things will not work porperly.\nPlease fix this first.",
+                          QMessageBox::Ok, QMessageBox::NoButton);
   }
 }
 
diff --git a/src/musrgui/PGetDefaultDialog.cpp b/src/musrgui/PGetDefaultDialog.cpp
index 18c77128..ac1d8096 100644
--- a/src/musrgui/PGetDefaultDialog.cpp
+++ b/src/musrgui/PGetDefaultDialog.cpp
@@ -57,45 +57,8 @@ PGetDefaultDialog::PGetDefaultDialog(QWidget *parent, const char *name,
                       bool modal, WFlags f) :
                       PGetDefaultDialogBase(parent, name, modal, f)
 {
-  fInstitute  = fInstitute_comboBox->currentText();
-  fFileFormat = fFileFormat_comboBox->currentText();
 }
 
-//---------------------------------------------------------------------------
-/**
- * <p>
- */
-void PGetDefaultDialog::runFileNameChanged(const QString &text)
-{
-  fRunFileName = text;
-}
-
-//---------------------------------------------------------------------------
-/**
- * <p>
- */
-void PGetDefaultDialog::beamlineChanged(const QString &text)
-{
-  fBeamline = text;
-}
-
-//---------------------------------------------------------------------------
-/**
- * <p>
- */
-void PGetDefaultDialog::instituteChanged(const QString &text)
-{
- fInstitute = text;
-}
-
-//---------------------------------------------------------------------------
-/**
- * <p>
- */
-void PGetDefaultDialog::fileFormatChanged(const QString &text)
-{
-  fFileFormat = text;
-}
 //---------------------------------------------------------------------------
 // END
 //---------------------------------------------------------------------------
diff --git a/src/musrgui/PGetDefaultDialog.h b/src/musrgui/PGetDefaultDialog.h
index 35374fe3..c89a2fc5 100644
--- a/src/musrgui/PGetDefaultDialog.h
+++ b/src/musrgui/PGetDefaultDialog.h
@@ -34,6 +34,8 @@
 
 #include <qstring.h>
 #include <qwidget.h>
+#include <qlineedit.h>
+#include <qcombobox.h>
 
 #include "forms/PGetDefaultDialogBase.h"
 
@@ -46,22 +48,10 @@ class PGetDefaultDialog : public PGetDefaultDialogBase
                       bool modal = TRUE, WFlags f = 0);
     virtual ~PGetDefaultDialog() {}
 
-    virtual const QString getRunFileName() const { return fRunFileName; }
-    virtual const QString getBeamline() const { return fBeamline; }
-    virtual const QString getInstitute() const { return fInstitute; }
-    virtual const QString getFileFormat() const { return fFileFormat; }
-
-  private:
-    QString fRunFileName;
-    QString fBeamline;
-    QString fInstitute;
-    QString fFileFormat;
-
-  private slots:
-    void runFileNameChanged(const QString&);
-    void beamlineChanged(const QString&);
-    void instituteChanged(const QString&);
-    void fileFormatChanged(const QString&);
+    virtual const QString getRunFileName() const { return fRunFileName_lineEdit->text(); }
+    virtual const QString getBeamline() const { return fBeamline_lineEdit->text(); }
+    virtual const QString getInstitute() const { return fInstitute_comboBox->currentText(); }
+    virtual const QString getFileFormat() const { return fFileFormat_comboBox->currentText(); }
 };
 
 #endif // _PGETDEFAULTDIALOG_H_
diff --git a/src/musrgui/forms/PGetDefaultDialogBase.ui b/src/musrgui/forms/PGetDefaultDialogBase.ui
index 44869f83..9c401260 100644
--- a/src/musrgui/forms/PGetDefaultDialogBase.ui
+++ b/src/musrgui/forms/PGetDefaultDialogBase.ui
@@ -174,6 +174,71 @@
             </widget>
         </hbox>
     </widget>
+    <widget class="QLineEdit">
+        <property name="name">
+            <cstring>fRunFileName_lineEdit</cstring>
+        </property>
+        <property name="geometry">
+            <rect>
+                <x>130</x>
+                <y>20</y>
+                <width>360</width>
+                <height>24</height>
+            </rect>
+        </property>
+        <property name="toolTip" stdset="0">
+            <string>e.g. 2007/lem07_his_0147</string>
+        </property>
+    </widget>
+    <widget class="QLineEdit">
+        <property name="name">
+            <cstring>fBeamline_lineEdit</cstring>
+        </property>
+        <property name="geometry">
+            <rect>
+                <x>130</x>
+                <y>60</y>
+                <width>360</width>
+                <height>24</height>
+            </rect>
+        </property>
+        <property name="toolTip" stdset="0">
+            <string>e.g. mue4</string>
+        </property>
+    </widget>
+    <widget class="QComboBox">
+        <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>
+        <property name="name">
+            <cstring>fInstitute_comboBox</cstring>
+        </property>
+        <property name="geometry">
+            <rect>
+                <x>130</x>
+                <y>100</y>
+                <width>99</width>
+                <height>24</height>
+            </rect>
+        </property>
+    </widget>
     <widget class="QComboBox">
         <item>
             <property name="text">
@@ -227,71 +292,6 @@
             </rect>
         </property>
     </widget>
-    <widget class="QComboBox">
-        <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>
-        <property name="name">
-            <cstring>fInstitute_comboBox</cstring>
-        </property>
-        <property name="geometry">
-            <rect>
-                <x>130</x>
-                <y>100</y>
-                <width>99</width>
-                <height>24</height>
-            </rect>
-        </property>
-    </widget>
-    <widget class="QLineEdit">
-        <property name="name">
-            <cstring>fRunFileName_lineEdit</cstring>
-        </property>
-        <property name="geometry">
-            <rect>
-                <x>130</x>
-                <y>20</y>
-                <width>360</width>
-                <height>24</height>
-            </rect>
-        </property>
-        <property name="toolTip" stdset="0">
-            <string>e.g. 2007/lem07_his_0147</string>
-        </property>
-    </widget>
-    <widget class="QLineEdit">
-        <property name="name">
-            <cstring>fBeamline_lineEdit</cstring>
-        </property>
-        <property name="geometry">
-            <rect>
-                <x>130</x>
-                <y>60</y>
-                <width>360</width>
-                <height>24</height>
-            </rect>
-        </property>
-        <property name="toolTip" stdset="0">
-            <string>e.g. mue4</string>
-        </property>
-    </widget>
 </widget>
 <images>
     <image name="image0">
@@ -311,30 +311,6 @@
         <receiver>PGetDefaultDialogBase</receiver>
         <slot>reject()</slot>
     </connection>
-    <connection>
-        <sender>fRunFileName_lineEdit</sender>
-        <signal>textChanged(const QString&amp;)</signal>
-        <receiver>PGetDefaultDialogBase</receiver>
-        <slot>runFileNameChanged(const QString&amp;)</slot>
-    </connection>
-    <connection>
-        <sender>fBeamline_lineEdit</sender>
-        <signal>textChanged(const QString&amp;)</signal>
-        <receiver>PGetDefaultDialogBase</receiver>
-        <slot>beamlineChanged(const QString&amp;)</slot>
-    </connection>
-    <connection>
-        <sender>fInstitute_comboBox</sender>
-        <signal>activated(const QString&amp;)</signal>
-        <receiver>PGetDefaultDialogBase</receiver>
-        <slot>instituteChanged(const QString&amp;)</slot>
-    </connection>
-    <connection>
-        <sender>fFileFormat_comboBox</sender>
-        <signal>activated(const QString&amp;)</signal>
-        <receiver>PGetDefaultDialogBase</receiver>
-        <slot>fileFormatChanged(const QString&amp;)</slot>
-    </connection>
 </connections>
 <tabstops>
     <tabstop>fRunFileName_lineEdit</tabstop>
@@ -345,11 +321,5 @@
     <tabstop>buttonCancel</tabstop>
     <tabstop>buttonHelp</tabstop>
 </tabstops>
-<slots>
-    <slot>runFileNameChanged(const QString&amp;)</slot>
-    <slot>beamlineChanged(const QString&amp;)</slot>
-    <slot>instituteChanged(const QString&amp;)</slot>
-    <slot>fileFormatChanged(const QString&amp;)</slot>
-</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>