From f12b4a552009b8c9ba4db4a0f0af791b73a8696f Mon Sep 17 00:00:00 2001
From: Andreas Suter <andreas.suter@psi.ch>
Date: Mon, 28 Jun 2010 17:26:18 +0000
Subject: [PATCH] msr2data global option handling completed.

---
 src/musrgui/PMsr2DataDialog.cpp          |  11 --
 src/musrgui/PMsr2DataDialog.h            |   1 -
 src/musrgui/PTextEdit.cpp                | 138 +++++++++++++++--------
 src/musrgui/forms/PMsr2DataDialogBase.ui |   7 --
 4 files changed, 90 insertions(+), 67 deletions(-)

diff --git a/src/musrgui/PMsr2DataDialog.cpp b/src/musrgui/PMsr2DataDialog.cpp
index 67f3224d..a88073d0 100644
--- a/src/musrgui/PMsr2DataDialog.cpp
+++ b/src/musrgui/PMsr2DataDialog.cpp
@@ -245,17 +245,6 @@ void PMsr2DataDialog::fitOnlyChanged(int buttonState)
   }
 }
 
-//----------------------------------------------------------------------------------------------------
-/**
- * <p>
- */
-void PMsr2DataDialog::globalChanged(int buttonState)
-{
-  if (buttonState == QButton::On) {
-    fFitOnly_checkBox->setChecked(false);
-  }
-}
-
 //----------------------------------------------------------------------------------------------------
 // END
 //----------------------------------------------------------------------------------------------------
diff --git a/src/musrgui/PMsr2DataDialog.h b/src/musrgui/PMsr2DataDialog.h
index e95a4874..24aad2f9 100644
--- a/src/musrgui/PMsr2DataDialog.h
+++ b/src/musrgui/PMsr2DataDialog.h
@@ -51,7 +51,6 @@ class PMsr2DataDialog : public PMsr2DataDialogBase
     void templateRunEntered(const QString&);
     void createMsrFileOnlyChanged(int);
     void fitOnlyChanged(int);
-    void globalChanged(int);
 
   private:
     int fRunTag; // -1 = not valid, 0 = first last, 1 = run list, 2 = run list file name
diff --git a/src/musrgui/PTextEdit.cpp b/src/musrgui/PTextEdit.cpp
index 1ecfce8c..6c97c090 100644
--- a/src/musrgui/PTextEdit.cpp
+++ b/src/musrgui/PTextEdit.cpp
@@ -1639,48 +1639,27 @@ void PTextEdit::musrMsr2Data()
       QFile *file;
       QTextStream *stream;
 
-      switch(dlg->getRunTag()) {
-        case 0: // first run / last run list
-          if (fMsr2DataParam->firstRun != -1) {
-            for (int i=fMsr2DataParam->firstRun; i<=fMsr2DataParam->lastRun; i++) {
-              if (fMsr2DataParam->msrFileExtension.isEmpty())
-                fln = QString("%1").arg(i) + ".msr";
-              else
-                fln = QString("%1").arg(i) + fMsr2DataParam->msrFileExtension + ".msr";
+      if (!fMsr2DataParam->global) { // standard fits
+        switch(dlg->getRunTag()) {
+          case 0: // first run / last run list
+            if (fMsr2DataParam->firstRun != -1) {
+              for (int i=fMsr2DataParam->firstRun; i<=fMsr2DataParam->lastRun; i++) {
+                if (fMsr2DataParam->msrFileExtension.isEmpty())
+                  fln = QString("%1").arg(i) + ".msr";
+                else
+                  fln = QString("%1").arg(i) + fMsr2DataParam->msrFileExtension + ".msr";
 
-              load(fln);
+                load(fln);
+              }
             }
-          }
-          break;
-        case 1: // run list
-          end = 0;
-          while (!runList.section(' ', end, end).isEmpty()) {
-            end++;
-          }
-          for (int i=0; i<end; i++) {
-            fln = runList.section(' ', i, i);
-            if (fMsr2DataParam->msrFileExtension.isEmpty())
-              fln += ".msr";
-            else
-              fln += fMsr2DataParam->msrFileExtension + ".msr";
-
-            load(fln);
-          }
-          break;
-        case 2: // run list file
-          file = new QFile(fMsr2DataParam->runListFileName);
-          if (!file->open(IO_ReadOnly)) {
-            str = QString("Couldn't open run list file %1, sorry.").arg(fMsr2DataParam->runListFileName);
-            QMessageBox::critical(this, "**ERROR**", str.latin1(), QMessageBox::Ok, QMessageBox::NoButton);
-            return;
-          }
-
-          stream = new QTextStream(file);
-          while ( !stream->atEnd() ) {
-            str = stream->readLine(); // line of text excluding '\n'
-            str.stripWhiteSpace();
-            if (!str.isEmpty() && !str.startsWith("#")) {
-              fln = str.section(' ', 0, 0);
+            break;
+          case 1: // run list
+            end = 0;
+            while (!runList.section(' ', end, end).isEmpty()) {
+              end++;
+            }
+            for (int i=0; i<end; i++) {
+              fln = runList.section(' ', i, i);
               if (fMsr2DataParam->msrFileExtension.isEmpty())
                 fln += ".msr";
               else
@@ -1688,16 +1667,79 @@ void PTextEdit::musrMsr2Data()
 
               load(fln);
             }
-          }
+            break;
+          case 2: // run list file
+            file = new QFile(fMsr2DataParam->runListFileName);
+            if (!file->open(IO_ReadOnly)) {
+              str = QString("Couldn't open run list file %1, sorry.").arg(fMsr2DataParam->runListFileName);
+              QMessageBox::critical(this, "**ERROR**", str.latin1(), QMessageBox::Ok, QMessageBox::NoButton);
+              return;
+            }
 
-          file->close();
+            stream = new QTextStream(file);
+            while ( !stream->atEnd() ) {
+              str = stream->readLine(); // line of text excluding '\n'
+              str.stripWhiteSpace();
+              if (!str.isEmpty() && !str.startsWith("#") && !str.startsWith("run", false)) {
+                fln = str.section(' ', 0, 0);
+                if (fMsr2DataParam->msrFileExtension.isEmpty())
+                  fln += ".msr";
+                else
+                  fln += fMsr2DataParam->msrFileExtension + ".msr";
 
-          // clean up
-          delete stream;
-          delete file;
-          break;
-        default:
-          break;
+                load(fln);
+              }
+            }
+
+            file->close();
+
+            // clean up
+            delete stream;
+            delete file;
+            break;
+          default:
+            break;
+        }
+      } else { // global tag set
+        fln = QString("");
+        switch(dlg->getRunTag()) {
+          case 0: // first/last run
+            fln = QString("%1").arg(fMsr2DataParam->firstRun) + QString("+global") + fMsr2DataParam->msrFileExtension + QString(".msr");
+            break;
+          case 1: // run list
+            fln = runList.section(" ", 0, 0) + QString("+global") + fMsr2DataParam->msrFileExtension + QString(".msr");
+            break;
+          case 2: // run list file name
+            file = new QFile(fMsr2DataParam->runListFileName);
+            if (!file->open(IO_ReadOnly)) {
+              str = QString("Couldn't open run list file %1, sorry.").arg(fMsr2DataParam->runListFileName);
+              QMessageBox::critical(this, "**ERROR**", str.latin1(), QMessageBox::Ok, QMessageBox::NoButton);
+              return;
+            }
+
+            stream = new QTextStream(file);
+            while ( !stream->atEnd() ) {
+              str = stream->readLine(); // line of text excluding '\n'
+              str.stripWhiteSpace();
+              if (!str.isEmpty() && !str.startsWith("#") && !str.startsWith("run", false)) {
+                fln = str.section(' ', 0, 0);
+                break;
+              }
+            }
+
+            file->close();
+
+            fln += QString("+global") + fMsr2DataParam->msrFileExtension + QString(".msr");
+
+            // clean up
+            delete stream;
+            delete file;
+            break;
+          default:
+            break;
+        }
+
+        load(fln);
       }
     }
   }
diff --git a/src/musrgui/forms/PMsr2DataDialogBase.ui b/src/musrgui/forms/PMsr2DataDialogBase.ui
index 81d5e1a1..2572e3cc 100644
--- a/src/musrgui/forms/PMsr2DataDialogBase.ui
+++ b/src/musrgui/forms/PMsr2DataDialogBase.ui
@@ -701,12 +701,6 @@
         <receiver>PMsr2DataDialogBase</receiver>
         <slot>templateRunEntered(const QString&amp;)</slot>
     </connection>
-    <connection>
-        <sender>fGlobal_checkBox</sender>
-        <signal>stateChanged(int)</signal>
-        <receiver>PMsr2DataDialogBase</receiver>
-        <slot>globalChanged(int)</slot>
-    </connection>
 </connections>
 <tabstops>
     <tabstop>fFirst_lineEdit</tabstop>
@@ -738,7 +732,6 @@
     <slot>createMsrFileOnlyChanged(int)</slot>
     <slot>fitOnlyChanged(int)</slot>
     <slot>templateRunEntered(const QString&amp;)</slot>
-    <slot>globalChanged(int)</slot>
 </slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>