Menu
▾
▴
[Qcell-commitlogs] SF.net SVN: qcell: [93] trunk/qcell
|
From: <dhu...@us...> - 2007-01-05 10:41:17
|
Revision: 93
http://svn.sourceforge.net/qcell/?rev=93&view=rev
Author: dhubleizh
Date: 2007-01-05 02:41:09 -0800 (Fri, 05 Jan 2007)
Log Message:
-----------
- no Cass::Enum::value !!!!!!!
Modified Paths:
--------------
trunk/qcell/baseheaders/Renderer.h
trunk/qcell/basesources/CalculationData.cpp
trunk/qcell/basesources/LocalFunction.cpp
trunk/qcell/basesources/Neighbourhood.cpp
Modified: trunk/qcell/baseheaders/Renderer.h
===================================================================
--- trunk/qcell/baseheaders/Renderer.h 2007-01-04 09:32:52 UTC (rev 92)
+++ trunk/qcell/baseheaders/Renderer.h 2007-01-05 10:41:09 UTC (rev 93)
@@ -10,7 +10,7 @@
#include <QImage>
#include <QPainter>
#include <QObject>
-#include <QtOpengl>
+#include <QtOpenGL>
struct SYMBOL
{
Modified: trunk/qcell/basesources/CalculationData.cpp
===================================================================
--- trunk/qcell/basesources/CalculationData.cpp 2007-01-04 09:32:52 UTC (rev 92)
+++ trunk/qcell/basesources/CalculationData.cpp 2007-01-05 10:41:09 UTC (rev 93)
@@ -33,14 +33,14 @@
void * CalculationData::getAddressAt(int x, int y, int z, int t)
{
int dSize;
- if(dataType==baseDataTypes::DATA_TYPES::NONE)
+ if(dataType==baseDataTypes::NONE)
return NULL;
return data + dataSize * (x + y * sizeX + z * sizeX * sizeY + t * sizeX * sizeY * sizeZ);
}
CalculationData::CalculationData()
{
- dataType = baseDataTypes::DATA_TYPES::NONE;
+ dataType = baseDataTypes::NONE;
sizeX = sizeY = sizeZ = sizeT = 0;
dimension = -1;
dataSize = 0;
@@ -50,7 +50,7 @@
CalculationData::~CalculationData()
{
- dataType = baseDataTypes::DATA_TYPES::NONE;
+ dataType = baseDataTypes::NONE;
sizeX = sizeY = sizeZ = sizeT = 0;
dimension = -1;
dataSize = 0;
@@ -61,7 +61,7 @@
{
switch(dataType)
{
- case baseDataTypes::DATA_TYPES::BOOL:
+ case baseDataTypes::BOOL:
break;
case baseDataTypes::CHAR:
@@ -86,16 +86,16 @@
{
switch(dataType)
{
- case baseDataTypes::DATA_TYPES::BOOL:
+ case baseDataTypes::BOOL:
break;
- case baseDataTypes::DATA_TYPES::CHAR:
+ case baseDataTypes::CHAR:
return *((char *)getAddressAt(x, y, 0, 0));
- case baseDataTypes::DATA_TYPES::INT:
+ case baseDataTypes::INT:
return *((int *)(getAddressAt(x, y, 0, 0)));
- case baseDataTypes::DATA_TYPES::SHORT:
+ case baseDataTypes::SHORT:
return *((short *)(getAddressAt(x, y, 0, 0)));
case baseDataTypes::FLOAT:
return (int)(*((float *)(getAddressAt(x, y, 0, 0))));
@@ -110,16 +110,16 @@
{
switch(dataType)
{
- case baseDataTypes::DATA_TYPES::BOOL:
+ case baseDataTypes::BOOL:
break;
- case baseDataTypes::DATA_TYPES::CHAR:
+ case baseDataTypes::CHAR:
return *((char *)getAddressAt(x, y, z, 0));
- case baseDataTypes::DATA_TYPES::INT:
+ case baseDataTypes::INT:
return *((int *)(getAddressAt(x, y, z, 0)));
- case baseDataTypes::DATA_TYPES::SHORT:
+ case baseDataTypes::SHORT:
return *((short *)(getAddressAt(x, y, z, 0)));
case baseDataTypes::FLOAT:
@@ -135,16 +135,16 @@
{
switch(dataType)
{
- case baseDataTypes::DATA_TYPES::BOOL:
+ case baseDataTypes::BOOL:
break;
- case baseDataTypes::DATA_TYPES::CHAR:
+ case baseDataTypes::CHAR:
return *((char *)getAddressAt(x, y, z, t));
- case baseDataTypes::DATA_TYPES::INT:
+ case baseDataTypes::INT:
return *((int *)(getAddressAt(x, y, z, t)));
- case baseDataTypes::DATA_TYPES::SHORT:
+ case baseDataTypes::SHORT:
return *((short *)(getAddressAt(x, y, z, t)));
case baseDataTypes::FLOAT:
@@ -177,18 +177,18 @@
{
switch(dataType)
{
- case baseDataTypes::DATA_TYPES::BOOL:
+ case baseDataTypes::BOOL:
break;
- case baseDataTypes::DATA_TYPES::CHAR:
+ case baseDataTypes::CHAR:
*((char *)getAddressAt(x, 0, 0, 0)) = (char)val;
break;
- case baseDataTypes::DATA_TYPES::INT:
+ case baseDataTypes::INT:
*((int *)(getAddressAt(x, 0, 0, 0))) = val;
break;
- case baseDataTypes::DATA_TYPES::SHORT:
+ case baseDataTypes::SHORT:
*((short *)(getAddressAt(x, 0, 0, 0))) = (short)val;
break;
}
@@ -198,18 +198,18 @@
{
switch(dataType)
{
- case baseDataTypes::DATA_TYPES::BOOL:
+ case baseDataTypes::BOOL:
break;
- case baseDataTypes::DATA_TYPES::CHAR:
+ case baseDataTypes::CHAR:
*((char *)getAddressAt(x, y, 0, 0)) = (char)val;
break;
- case baseDataTypes::DATA_TYPES::INT:
+ case baseDataTypes::INT:
*((int *)(getAddressAt(x, y, 0, 0))) = val;
break;
- case baseDataTypes::DATA_TYPES::SHORT:
+ case baseDataTypes::SHORT:
*((short *)(getAddressAt(x, y, 0, 0))) = (short)val;
break;
}
@@ -219,18 +219,18 @@
{
switch(dataType)
{
- case baseDataTypes::DATA_TYPES::BOOL:
+ case baseDataTypes::BOOL:
break;
- case baseDataTypes::DATA_TYPES::CHAR:
+ case baseDataTypes::CHAR:
*((char *)getAddressAt(x, y, z, 0)) = (char)val;
break;
- case baseDataTypes::DATA_TYPES::INT:
+ case baseDataTypes::INT:
*((int *)(getAddressAt(x, y, z, 0))) = val;
break;
- case baseDataTypes::DATA_TYPES::SHORT:
+ case baseDataTypes::SHORT:
*((short *)(getAddressAt(x, y, z, 0))) = (short)val;
break;
}
@@ -240,18 +240,18 @@
{
switch(dataType)
{
- case baseDataTypes::DATA_TYPES::BOOL:
+ case baseDataTypes::BOOL:
break;
- case baseDataTypes::DATA_TYPES::CHAR:
+ case baseDataTypes::CHAR:
*((char *)getAddressAt(x, y, z, t)) = (char)val;
break;
- case baseDataTypes::DATA_TYPES::INT:
+ case baseDataTypes::INT:
*((int *)(getAddressAt(x, y, z, t))) = val;
break;
- case baseDataTypes::DATA_TYPES::SHORT:
+ case baseDataTypes::SHORT:
*((short *)(getAddressAt(x, y, z, t))) = (short)val;
break;
}
@@ -261,22 +261,22 @@
{
switch(dataType)
{
- case baseDataTypes::DATA_TYPES::BOOL:
+ case baseDataTypes::BOOL:
break;
- case baseDataTypes::DATA_TYPES::CHAR:
+ case baseDataTypes::CHAR:
return (double)*((char *)getAddressAt(x, 0, 0, 0));
- case baseDataTypes::DATA_TYPES::INT:
+ case baseDataTypes::INT:
return (double)*((int *)(getAddressAt(x, 0, 0, 0)));
- case baseDataTypes::DATA_TYPES::SHORT:
+ case baseDataTypes::SHORT:
return (double)*((short *)(getAddressAt(x, 0, 0, 0)));
- case baseDataTypes::DATA_TYPES::DOUBLE:
+ case baseDataTypes::DOUBLE:
return *((double *)(getAddressAt(x, 0, 0, 0)));
- case baseDataTypes::DATA_TYPES::FLOAT:
+ case baseDataTypes::FLOAT:
return *((float *)(getAddressAt(x, 0, 0, 0)));
}
return 0.0;
@@ -286,22 +286,22 @@
{
switch(dataType)
{
- case baseDataTypes::DATA_TYPES::BOOL:
+ case baseDataTypes::BOOL:
break;
- case baseDataTypes::DATA_TYPES::CHAR:
+ case baseDataTypes::CHAR:
return (double)*((char *)getAddressAt(x, y, 0, 0));
- case baseDataTypes::DATA_TYPES::INT:
+ case baseDataTypes::INT:
return (double)*((int *)(getAddressAt(x, y, 0, 0)));
- case baseDataTypes::DATA_TYPES::SHORT:
+ case baseDataTypes::SHORT:
return (double)*((short *)(getAddressAt(x, y, 0, 0)));
- case baseDataTypes::DATA_TYPES::DOUBLE:
+ case baseDataTypes::DOUBLE:
return *((double *)(getAddressAt(x, y, 0, 0)));
- case baseDataTypes::DATA_TYPES::FLOAT:
+ case baseDataTypes::FLOAT:
return *((float *)(getAddressAt(x, y, 0, 0)));
}
return 0.0;
@@ -311,22 +311,22 @@
{
switch(dataType)
{
- case baseDataTypes::DATA_TYPES::BOOL:
+ case baseDataTypes::BOOL:
break;
- case baseDataTypes::DATA_TYPES::CHAR:
+ case baseDataTypes::CHAR:
return (double)*((char *)getAddressAt(x, y, z, 0));
- case baseDataTypes::DATA_TYPES::INT:
+ case baseDataTypes::INT:
return (double)*((int *)(getAddressAt(x, y, z, 0)));
- case baseDataTypes::DATA_TYPES::SHORT:
+ case baseDataTypes::SHORT:
return (double)*((short *)(getAddressAt(x, y, z, 0)));
- case baseDataTypes::DATA_TYPES::DOUBLE:
+ case baseDataTypes::DOUBLE:
return *((double *)(getAddressAt(x, y, z, 0)));
- case baseDataTypes::DATA_TYPES::FLOAT:
+ case baseDataTypes::FLOAT:
return *((float *)(getAddressAt(x, y, z, 0)));
}
return 0.0;
@@ -336,22 +336,22 @@
{
switch(dataType)
{
- case baseDataTypes::DATA_TYPES::BOOL:
+ case baseDataTypes::BOOL:
break;
- case baseDataTypes::DATA_TYPES::CHAR:
+ case baseDataTypes::CHAR:
return (double)*((char *)getAddressAt(x, y, z, t));
- case baseDataTypes::DATA_TYPES::INT:
+ case baseDataTypes::INT:
return (double)*((int *)(getAddressAt(x, y, z, t)));
- case baseDataTypes::DATA_TYPES::SHORT:
+ case baseDataTypes::SHORT:
return (double)*((short *)(getAddressAt(x, y, z, t)));
- case baseDataTypes::DATA_TYPES::DOUBLE:
+ case baseDataTypes::DOUBLE:
return *((double *)(getAddressAt(x, y, z, t)));
- case baseDataTypes::DATA_TYPES::FLOAT:
+ case baseDataTypes::FLOAT:
return *((float *)(getAddressAt(x, y, z, t)));
}
return 0.0;
@@ -377,11 +377,11 @@
{
switch(dataType)
{
- case baseDataTypes::DATA_TYPES::DOUBLE:
+ case baseDataTypes::DOUBLE:
*((double *)(getAddressAt(x, 0, 0, 0))) = val;
break;
- case baseDataTypes::DATA_TYPES::FLOAT:
+ case baseDataTypes::FLOAT:
*((float *)(getAddressAt(x, 0, 0, 0))) = (float)val;
break;
}
@@ -391,11 +391,11 @@
{
switch(dataType)
{
- case baseDataTypes::DATA_TYPES::DOUBLE:
+ case baseDataTypes::DOUBLE:
*((double *)(getAddressAt(x, y, 0, 0))) = val;
break;
- case baseDataTypes::DATA_TYPES::FLOAT:
+ case baseDataTypes::FLOAT:
*((float *)(getAddressAt(x, y, 0, 0))) = (float)val;
break;
}
@@ -405,11 +405,11 @@
{
switch(dataType)
{
- case baseDataTypes::DATA_TYPES::DOUBLE:
+ case baseDataTypes::DOUBLE:
*((double *)(getAddressAt(x, y, z, 0))) = val;
break;
- case baseDataTypes::DATA_TYPES::FLOAT:
+ case baseDataTypes::FLOAT:
*((float *)(getAddressAt(x, y, z, 0))) = (float)val;
break;
}
@@ -419,11 +419,11 @@
{
switch(dataType)
{
- case baseDataTypes::DATA_TYPES::DOUBLE:
+ case baseDataTypes::DOUBLE:
*((double *)(getAddressAt(x, y, z, t))) = val;
break;
- case baseDataTypes::DATA_TYPES::FLOAT:
+ case baseDataTypes::FLOAT:
*((float *)(getAddressAt(x, y, z, t))) = (float)val;
break;
}
@@ -550,10 +550,10 @@
{
switch(dataType)
{
- case baseDataTypes::DATA_TYPES::BOOL:
+ case baseDataTypes::BOOL:
return (sizeX * sizeY * sizeZ * sizeT)/8 + 1;
- case baseDataTypes::DATA_TYPES::CHAR:
+ case baseDataTypes::CHAR:
switch(dimension)
{
case 1:
@@ -566,7 +566,7 @@
return sizeX * sizeY * sizeZ * sizeT * sizeof(char);
}
- case baseDataTypes::DATA_TYPES::DOUBLE:
+ case baseDataTypes::DOUBLE:
switch(dimension)
{
case 1:
@@ -579,7 +579,7 @@
return sizeX * sizeY * sizeZ * sizeT * sizeof(double);
}
- case baseDataTypes::DATA_TYPES::FLOAT:
+ case baseDataTypes::FLOAT:
switch(dimension)
{
case 1:
@@ -592,7 +592,7 @@
return sizeX * sizeY * sizeZ * sizeT * sizeof(float);
}
- case baseDataTypes::DATA_TYPES::INT:
+ case baseDataTypes::INT:
switch(dimension)
{
case 1:
@@ -605,7 +605,7 @@
return sizeX * sizeY * sizeZ * sizeT * sizeof(int);
}
- case baseDataTypes::DATA_TYPES::SHORT:
+ case baseDataTypes::SHORT:
switch(dimension)
{
case 1:
Modified: trunk/qcell/basesources/LocalFunction.cpp
===================================================================
--- trunk/qcell/basesources/LocalFunction.cpp 2007-01-04 09:32:52 UTC (rev 92)
+++ trunk/qcell/basesources/LocalFunction.cpp 2007-01-05 10:41:09 UTC (rev 93)
@@ -5,20 +5,20 @@
switch(functionMode)
{
- case LocalFunction::FUNCTION_TYPE::SUM:
+ case LocalFunction::SUM:
numElements = 1;
for(int i=0;i<sumArguments.size();++i)
numElements *= sumArguments[i].size() * (maxArgVal - 1) + 1;
break;
- case LocalFunction::FUNCTION_TYPE::SUM_AND_SWITCH:
+ case LocalFunction::SUM_AND_SWITCH:
numElements = 1;
for(int i=0;i<sumArguments.size();++i)
numElements *= sumArguments[i].size() * (maxArgVal - 1) + 1;
numElements *= freeArguments.size() * maxArgVal;
break;
- case LocalFunction::FUNCTION_TYPE::SWITCH:
+ case LocalFunction::SWITCH:
numElements = numArg * maxArgVal;
break;
}
@@ -32,7 +32,7 @@
int i, t, out;
QVector<int> temp;
- if(functionMode==LocalFunction::FUNCTION_TYPE::SCRIPT)
+ if(functionMode==LocalFunction::SCRIPT)
return -1;
temp.resize(maxArgVal);
@@ -130,12 +130,12 @@
LocalFunction::LocalFunction()
{
- functionMode = LocalFunction::FUNCTION_TYPE::SWITCH;
+ functionMode = LocalFunction::SWITCH;
}
LocalFunction::~LocalFunction()
{
- functionMode = LocalFunction::FUNCTION_TYPE::SWITCH;
+ functionMode = LocalFunction::SWITCH;
}
void LocalFunction::init(int numberOfArguments, int alphabetSize)
@@ -145,7 +145,7 @@
valueTable.clear();
sumArguments.clear();
freeArguments.clear();
- functionMode = LocalFunction::FUNCTION_TYPE::SWITCH;
+ functionMode = LocalFunction::SWITCH;
}
void LocalFunction::addSumArguments(QVector<int> args)
@@ -162,12 +162,12 @@
}
if(freeArguments.size()==0)
- functionMode = LocalFunction::FUNCTION_TYPE::SUM;
+ functionMode = LocalFunction::SUM;
else
if(freeArguments.size()==numArg)
- functionMode = LocalFunction::FUNCTION_TYPE::SWITCH;
+ functionMode = LocalFunction::SWITCH;
else
- functionMode = LocalFunction::FUNCTION_TYPE::SUM_AND_SWITCH;
+ functionMode = LocalFunction::SUM_AND_SWITCH;
}
}
@@ -184,12 +184,12 @@
freeArguments<<i;
if(freeArguments.size()==0)
- functionMode = LocalFunction::FUNCTION_TYPE::SUM;
+ functionMode = LocalFunction::SUM;
else
if(freeArguments.size()==numArg)
- functionMode = LocalFunction::FUNCTION_TYPE::SWITCH;
+ functionMode = LocalFunction::SWITCH;
else
- functionMode = LocalFunction::FUNCTION_TYPE::SUM_AND_SWITCH;
+ functionMode = LocalFunction::SUM_AND_SWITCH;
}
}
@@ -198,13 +198,13 @@
sumArguments.clear();
freeArguments.clear();
valueTable.clear();
- functionMode = LocalFunction::FUNCTION_TYPE::SWITCH;
+ functionMode = LocalFunction::SWITCH;
}
void LocalFunction::setScript(QString scriptData)
{
script = scriptData;
- functionMode = LocalFunction::FUNCTION_TYPE::SCRIPT;
+ functionMode = LocalFunction::SCRIPT;
}
void LocalFunction::setFunctonType(LocalFunction::FUNCTION_TYPE type)
@@ -221,13 +221,13 @@
{
switch(functionMode)
{
- case LocalFunction::FUNCTION_TYPE::SUM:
+ case LocalFunction::SUM:
return 1;
- case LocalFunction::FUNCTION_TYPE::SUM_AND_SWITCH:
+ case LocalFunction::SUM_AND_SWITCH:
return freeArguments.size() + 1;
- case LocalFunction::FUNCTION_TYPE::SWITCH:
+ case LocalFunction::SWITCH:
return freeArguments.size();
}
@@ -256,11 +256,11 @@
resizeValueTable();
switch(functionMode)
{
- case LocalFunction::FUNCTION_TYPE::SUM:
+ case LocalFunction::SUM:
valueTable[sum] = value;
break;
- case LocalFunction::FUNCTION_TYPE::SUM_AND_SWITCH:
+ case LocalFunction::SUM_AND_SWITCH:
offset = sum * freeArguments.size() * maxArgVal;
for(int i=offset;i<freeArguments.size() * maxArgVal + offset;++i)
valueTable[i] = value;
@@ -333,7 +333,7 @@
int i, index = 0, temp;
if(valueTable.empty())
resizeValueTable();
- if(functionMode==LocalFunction::FUNCTION_TYPE::SCRIPT)
+ if(functionMode==LocalFunction::SCRIPT)
return -1;
QVector<int> sums, freeArgs;
@@ -342,7 +342,7 @@
switch(functionMode)
{
- case LocalFunction::FUNCTION_TYPE::SCRIPT:
+ case LocalFunction::SCRIPT:
break;
default:
index = calculateSumsIndex(sums) + calculateSwitchIndex(freeArgs);
@@ -357,12 +357,12 @@
double out = 0.0;
switch(functionMode)
{
- case LocalFunction::FUNCTION_TYPE::SUM:
+ case LocalFunction::SUM:
for (i=0;i<args.size();++i)
out += args[i];
break;
- case LocalFunction::FUNCTION_TYPE::SCRIPT:
+ case LocalFunction::SCRIPT:
break;
}
Modified: trunk/qcell/basesources/Neighbourhood.cpp
===================================================================
--- trunk/qcell/basesources/Neighbourhood.cpp 2007-01-04 09:32:52 UTC (rev 92)
+++ trunk/qcell/basesources/Neighbourhood.cpp 2007-01-05 10:41:09 UTC (rev 93)
@@ -282,22 +282,22 @@
dType = type;
switch(dType)
{
- case baseDataTypes::DATA_TYPES::BOOL:
+ case baseDataTypes::BOOL:
break;
- case baseDataTypes::DATA_TYPES::CHAR:
+ case baseDataTypes::CHAR:
dataSize = sizeof(char);
break;
- case baseDataTypes::DATA_TYPES::DOUBLE:
+ case baseDataTypes::DOUBLE:
dataSize = sizeof(double);
break;
- case baseDataTypes::DATA_TYPES::FLOAT:
+ case baseDataTypes::FLOAT:
dataSize = sizeof(float);
break;
- case baseDataTypes::DATA_TYPES::INT:
+ case baseDataTypes::INT:
dataSize = sizeof(int);
break;
- case baseDataTypes::DATA_TYPES::SHORT:
+ case baseDataTypes::SHORT:
dataSize = sizeof(short);
break;
}
@@ -311,38 +311,38 @@
int i;
switch(dType)
{
- case baseDataTypes::DATA_TYPES::BOOL:
+ case baseDataTypes::BOOL:
break;
- case baseDataTypes::DATA_TYPES::CHAR:
+ case baseDataTypes::CHAR:
for(i=0;i<neighbourVector.size();++i)
{
neighbourVector[i].value.iValue = *((char *)(address + neighbourVector[i].offset));
}
break;
- case baseDataTypes::DATA_TYPES::DOUBLE:
+ case baseDataTypes::DOUBLE:
for(i=0;i<neighbourVector.size();++i)
{
neighbourVector[i].value.dValue = *((double *)(address + neighbourVector[i].offset));
}
break;
- case baseDataTypes::DATA_TYPES::FLOAT:
+ case baseDataTypes::FLOAT:
for(i=0;i<neighbourVector.size();++i)
{
neighbourVector[i].value.dValue = *((float *)(address + neighbourVector[i].offset));
}
break;
- case baseDataTypes::DATA_TYPES::INT:
+ case baseDataTypes::INT:
for(i=0;i<neighbourVector.size();++i)
{
neighbourVector[i].value.iValue = *((int *)(address + neighbourVector[i].offset));
}
break;
- case baseDataTypes::DATA_TYPES::SHORT:
+ case baseDataTypes::SHORT:
for(i=0;i<neighbourVector.size();++i)
{
neighbourVector[i].value.iValue = *((short *)(address + neighbourVector[i].offset));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
