Changeset 13289

Timestamp:

2012-10-10T11:38:17+02:00 (12 years ago)

Author:

hubert.thieriot

Message:

• corrected variableResult scan vector

Location:

trunk/OMOptimBasis

Files:

• FileData/CSVBase.cpp (modified) (1 diff)
• Variable.cpp (modified) (6 diffs)

trunk/OMOptimBasis/FileData/CSVBase.cpp

@@ -203 +203 @@
 
     QStringList lineList = lines.split("\n",QString::SkipEmptyParts);
+    if(lineList.isEmpty())
+        return;
+
     QStringList varNames;
     QStringList curScanValues;

trunk/OMOptimBasis/Variable.cpp

@@ -451 +451 @@
     if(iScan<finalValues.size())
     {
-        _finalValues.replace(iScan,QVector<double>(finalValues.size()));
-        _computedPoints.replace(iScan,QVector<bool>(finalValues.size()));
-        _finalValues.push_back(finalValues);
-
-        for(int i=0;i<finalValues.size();i++)
-        {
-            _computedPoints[iScan].push_back(true);
-        }
+        _finalValues.replace(iScan,finalValues);
+        _computedPoints.replace(iScan,QVector<bool>(finalValues.size(),true));
     }
     else
@@ -475 +469 @@
     QVector<bool> defaultComputed(nbPoints(),false);
 
-    while(values.size()>=nbScans())
+    while(values.size()>_finalValues.size())
     {
         _finalValues.push_back(defaultValues);
@@ -483 +477 @@
     for(int i=0;i<_finalValues.size();i++)
     {
-        while(iPoint>=nbPoints())
+        while(iPoint>=_finalValues.at(i).size())
         {
             _finalValues[i].push_back(0);
@@ -511 +505 @@
     QVector<bool> defaultComputed(nbPoints(),false);
 
-    while(iScan>=nbScans())
+    while(iScan>=_finalValues.size())
     {
         _finalValues.push_back(defaultValues);
@@ -520 +514 @@
     for(int i=0;i<_finalValues.size();i++)
     {
-        while(iPoint>=nbPoints())
+        while(iPoint>=_finalValues[i].size())
         {
             _finalValues[i].push_back(0);
@@ -527 +521 @@
     }
 
+    try{
     _finalValues[iScan][iPoint] = value;
     _computedPoints[iScan][iPoint] = computed;
+    }
+    catch(std::exception &e)
+    {
+        int a=2;
+    }
 }