Menu
▾
▴
[Qcell-commitlogs] SF.net SVN: qcell: [122] trunk/qcell
|
From: <dhu...@us...> - 2007-01-07 22:36:02
|
Revision: 122
http://svn.sourceforge.net/qcell/?rev=122&view=rev
Author: dhubleizh
Date: 2007-01-07 14:35:59 -0800 (Sun, 07 Jan 2007)
Log Message:
-----------
- include case in Render.h
- out with Class::Enum::Value from CalculationData AGAIN!
Modified Paths:
--------------
trunk/qcell/baseheaders/Renderer.h
trunk/qcell/basesources/CalculationData.cpp
Modified: trunk/qcell/baseheaders/Renderer.h
===================================================================
--- trunk/qcell/baseheaders/Renderer.h 2007-01-07 21:30:21 UTC (rev 121)
+++ trunk/qcell/baseheaders/Renderer.h 2007-01-07 22:35:59 UTC (rev 122)
@@ -10,7 +10,7 @@
#include <QImage>
#include <QPainter>
#include <QObject>
-#include <QtOpengl>
+#include <QtOpenGL>
#include <QPixmap>
#include <QChar>
Modified: trunk/qcell/basesources/CalculationData.cpp
===================================================================
--- trunk/qcell/basesources/CalculationData.cpp 2007-01-07 21:30:21 UTC (rev 121)
+++ trunk/qcell/basesources/CalculationData.cpp 2007-01-07 22:35:59 UTC (rev 122)
@@ -39,14 +39,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::CHAR;
+ dataType = baseDataTypes::CHAR;
sizeX = sizeY = sizeZ = sizeT = 0;
dimension = -1;
dataSize = sizeof(char);
@@ -56,7 +56,7 @@
CalculationData::~CalculationData()
{
- dataType = baseDataTypes::DATA_TYPES::NONE;
+ dataType = baseDataTypes::NONE;
sizeX = sizeY = sizeZ = sizeT = 0;
dimension = -1;
dataSize = 0;
@@ -67,7 +67,7 @@
{
switch(dataType)
{
- case baseDataTypes::DATA_TYPES::BOOL:
+ case baseDataTypes::BOOL:
break;
case baseDataTypes::CHAR:
@@ -92,16 +92,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))));
@@ -116,16 +116,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:
@@ -141,16 +141,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:
@@ -183,18 +183,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;
}
@@ -204,18 +204,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;
}
@@ -225,18 +225,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;
}
@@ -246,18 +246,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;
}
@@ -267,22 +267,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;
@@ -292,22 +292,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;
@@ -317,22 +317,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;
@@ -342,22 +342,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;
@@ -383,11 +383,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;
}
@@ -397,11 +397,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;
}
@@ -411,11 +411,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;
}
@@ -425,11 +425,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;
}
@@ -576,10 +576,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:
@@ -592,7 +592,7 @@
return sizeX * sizeY * sizeZ * sizeT * sizeof(char);
}
- case baseDataTypes::DATA_TYPES::DOUBLE:
+ case baseDataTypes::DOUBLE:
switch(dimension)
{
case 1:
@@ -605,7 +605,7 @@
return sizeX * sizeY * sizeZ * sizeT * sizeof(double);
}
- case baseDataTypes::DATA_TYPES::FLOAT:
+ case baseDataTypes::FLOAT:
switch(dimension)
{
case 1:
@@ -618,7 +618,7 @@
return sizeX * sizeY * sizeZ * sizeT * sizeof(float);
}
- case baseDataTypes::DATA_TYPES::INT:
+ case baseDataTypes::INT:
switch(dimension)
{
case 1:
@@ -631,7 +631,7 @@
return sizeX * sizeY * sizeZ * sizeT * sizeof(int);
}
- case baseDataTypes::DATA_TYPES::SHORT:
+ case baseDataTypes::SHORT:
switch(dimension)
{
case 1:
@@ -713,4 +713,4 @@
fillData(cData.getDataPointer());
return *this;
-}
\ No newline at end of file
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
