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

[<le...@us...>]

Revision: 230
          http://svn.sourceforge.net/qcell/?rev=230&view=rev
Author:   lessm
Date:     2007-01-22 09:38:02 -0800 (Mon, 22 Jan 2007)

Log Message:
-----------
- resume bug resolved

Modified Paths:
--------------
    trunk/qcell/basesources/Calculator.cpp
    trunk/qcell/basesources/simulationwindow.cpp
    trunk/qcell/visgui/MainWindow.cpp

Modified: trunk/qcell/basesources/Calculator.cpp
===================================================================
--- trunk/qcell/basesources/Calculator.cpp	2007-01-22 15:01:07 UTC (rev 229)
+++ trunk/qcell/basesources/Calculator.cpp	2007-01-22 17:38:02 UTC (rev 230)
@@ -255,25 +255,25 @@
 	if(!wasFreezed)
 		copyData();
 
-	for(int t=startT;t<st;++t)
+	for(int t=startT;t<st;t++)
 	{
 		if (dimension == 4) 
 		{
 		    coordinates[3] = t;
 		}
-		for(int z=startZ;z<sz;++z)
+		for(int z=startZ;z<sz;z++)
 		{
 			if (dimension >= 3) 
 			{
 			    coordinates[2] = z;
 			}
-			for(int y=startY;y<sy;++y)
+			for(int y=startY;y<sy;y++)
 			{
 				if (dimension >= 2) 
 				{
 				    coordinates[1] = y;
 				}
-				for(int x=startX;x<sx;++x)
+				for(int x=startX;x<sx;x++)
 				{
 					coordinates[0] = x;
 				   	neighbourhood->resolveValues(tempData + (x - minBorder[0]) + ((y - minBorder[1]) * tempDataSize[0]) + (z - minBorder[2]) * (tempDataSize[0] * tempDataSize[1]) + (t - minBorder[3]) * (tempDataSize[0] * tempDataSize[1] * tempDataSize[2]) * dataSize);
@@ -295,12 +295,12 @@
 					if(*((int *)temp)<0)
 					{
 						/// @todo k\xD3Zka
-						startX = x;
-						startY = y;
-						startZ = z;
-						startT = t;
+						//startX = x;
+						//startY = y;
+						//startZ = z;
+						//startT = t;
 						wasFreezed = 1;
-						storedCounter = counter;
+						//storedCounter = counter;
 						functionIndex = localfunction->lastUnknownValueIndex();
 						return 0;
 					}

Modified: trunk/qcell/basesources/simulationwindow.cpp
===================================================================
--- trunk/qcell/basesources/simulationwindow.cpp	2007-01-22 15:01:07 UTC (rev 229)
+++ trunk/qcell/basesources/simulationwindow.cpp	2007-01-22 17:38:02 UTC (rev 230)
@@ -1350,6 +1350,7 @@
 		break;
 	case 3:
 		renderer->selectCell(coord[0], coord[1], coord[2]);
+		z_plane = coord[2];
 	case 2:
 		for(int i=0;i<table2D->rowCount();++i)
 		{

Modified: trunk/qcell/visgui/MainWindow.cpp
===================================================================
--- trunk/qcell/visgui/MainWindow.cpp	2007-01-22 15:01:07 UTC (rev 229)
+++ trunk/qcell/visgui/MainWindow.cpp	2007-01-22 17:38:02 UTC (rev 230)
@@ -560,6 +560,7 @@
 			{
 				sw->setSelectedCell(calc.freezedCoords());
 				sw->setSelectedFunctionRule(calc.getUnknowFunctionRuleIndex());
+				//iteration--;
 			}
 		}
 		else 


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