[Qcell-commitlogs] SF.net SVN: qcell: [135] trunk/qcell

[<dhu...@us...>]

Revision: 135
          http://svn.sourceforge.net/qcell/?rev=135&view=rev
Author:   dhubleizh
Date:     2007-01-09 11:30:22 -0800 (Tue, 09 Jan 2007)

Log Message:
-----------
- found bug in FQTParserPlugin
- some minor changes in MainWindow in search of proper use of CalculationData and derriviates

Modified Paths:
--------------
    trunk/qcell/parsers/FQT/FQTParserPlugin.cpp
    trunk/qcell/visgui/MainWindow.cpp

Modified: trunk/qcell/parsers/FQT/FQTParserPlugin.cpp
===================================================================
--- trunk/qcell/parsers/FQT/FQTParserPlugin.cpp	2007-01-09 09:50:35 UTC (rev 134)
+++ trunk/qcell/parsers/FQT/FQTParserPlugin.cpp	2007-01-09 19:30:22 UTC (rev 135)
@@ -7,7 +7,6 @@
  */
 #include "FQTParserPlugin.h"
 
-
 FQTParserPlugin::FQTParserPlugin()
 {
     supported_parser_types << "LocalFunction";
@@ -245,7 +244,7 @@
 
 
 	// Finally adding the parsed values
-	results[tmp_sum] == QVector<int>(tmp_values);
+	results[tmp_sum] = QVector<int>(tmp_values);
 
 	// To keep count of current line nr
 	line_nr++;
@@ -271,7 +270,7 @@
 		foreach(int sum, results.keys())
 		{
 			for(int i=0;i<results.value(sum).size();++i)
-				lf.setFunctionValue((results.value(sum))[i], sum, i);
+			    lf.setFunctionValue((results.value(sum))[i], sum, i);
 		}
 	}
     return lf.toXmlString();

Modified: trunk/qcell/visgui/MainWindow.cpp
===================================================================
--- trunk/qcell/visgui/MainWindow.cpp	2007-01-09 09:50:35 UTC (rev 134)
+++ trunk/qcell/visgui/MainWindow.cpp	2007-01-09 19:30:22 UTC (rev 135)
@@ -279,7 +279,12 @@
 	/// @todo Fix that!
 	data.clear();
 	data.append((CalculationData*)world_parsers[subtype]->parse(file_content, type, subtype).toInt());
-	*sw->getStorage() = *data.last();
+	CalculationData* cd = new CalculationData();
+	cd->setDataType(data.last()->getDataType());
+	cd->fillData(data.last()->getDataPointer());
+	qDebug() << "D\xB3ugo\xB6c :" << cd->getDimension();
+	*sw->getStorage() = *cd;
+	calc.setForeignDataPointer((char*)data.first()->getDataPointer());
 	QVector<int> end_coord;
 	end_coord << data.last()->getSizeX()
 	    << data.last()->getSizeY()
@@ -371,11 +376,8 @@
     {
 	case Forward:
 	    {
-		if(iteration >= data.count())
+		if((iteration + 1) >= data.count())
 		{
-		    CalculationData* cd = new CalculationData();
-		    *cd = *data[iteration];
-		    calc.setForeignDataPointer((char*)cd->getDataPointer());
 		    calc.calculate();
 		}
 		else 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.