[Debichem-commits] [SCM] massXpert mass spectrometry suite: debian packaging branch, debian, updated. upstream/3.2.0-1-g5564507

[Filippo Rusconi (Debian Maintainer)]

The following commit has been merged in the debian branch:
commit 6a34b4dab3a4d5a36f7ac34d3f0023045263753f
Author: Filippo Rusconi (Debian Maintainer) <rusconi-debian at laposte.net>
Date:   Fri Oct 30 23:39:31 2009 +0100

    Each PolChemDef now has its settings with respect to calculator window position...
    The list of formulas that are being stored during a session are now serialized polchemdef-specifically and are reloaded
    during next session.

diff --git a/gui/calculatorWnd.cpp b/gui/calculatorWnd.cpp
index 881d2da..62a1140 100644
--- a/gui/calculatorWnd.cpp
+++ b/gui/calculatorWnd.cpp
@@ -93,14 +93,45 @@ namespace massXpert
       (static_cast<Application *>(qApp)->configSettingsFilePath(), 
        QSettings::IniFormat);
     
-    settings.beginGroup("calculator_wnd");
+    QString section = QString ("calculator_wnd/%2")
+      .arg(m_polChemDef.name());
+    
+    settings.beginGroup(section);
     
     restoreGeometry(settings.value("geometry").toByteArray());
     
     m_ui.hSplitter->
       restoreState(settings.value("hSplitterSize").toByteArray());
     
+    int count = settings.beginReadArray("formulas");
+
+    for (int iter = 0; iter < count; ++iter) 
+      {
+	settings.setArrayIndex(iter);
+	
+	QString index;
+	index.setNum(iter);
+
+	QString value = settings.value(index).toString();
+	
+	m_ui.formulaComboBox->insertItem(iter, value);
+
+// 	qDebug () << __FILE__ << __LINE__
+// 		  << "Read line:" << value << "and" 
+// 		  << m_ui.formulaComboBox->itemText(iter);
+
+      }
+    
+    settings.endArray();
+
     settings.endGroup();
+
+    // But we want that the formulaComboBox line edit widget be empty
+    // even when formulas have been loaded. So clear the line edit
+    // widget of the combo box.
+
+    m_ui.formulaComboBox->lineEdit()->clear();
+
     
     show();
   }
@@ -119,12 +150,34 @@ namespace massXpert
       (static_cast<Application *>(qApp)->configSettingsFilePath(), 
        QSettings::IniFormat);
     
-    settings.beginGroup("calculator_wnd");
+    QString section = QString ("calculator_wnd/%2")
+      .arg(m_polChemDef.name());
+
+    settings.beginGroup(section);
     
     settings.setValue("geometry", saveGeometry());
     
     settings.setValue("hSplitterSize", m_ui.hSplitter->saveState());
     
+    settings.beginWriteArray("formulas");
+
+    int count = m_ui.formulaComboBox->count();
+    
+    for (int iter = 0; iter < count; ++iter)
+      {
+	settings.setArrayIndex(iter);
+
+	QString index;
+	index.setNum(iter);
+     
+	settings.setValue(index, m_ui.formulaComboBox->itemText(iter));
+
+// 	qDebug () << __FILE__ << __LINE__
+// 		  << "Set line:" << m_ui.formulaComboBox->itemText(iter);
+      }
+    
+    settings.endArray();
+    
     settings.endGroup();
     
     // Force the writing of the geometry settings of the chemical pad

-- 
massXpert mass spectrometry suite: debian packaging