|
From: <le...@us...> - 2007-01-11 10:28:21
|
Revision: 147
http://svn.sourceforge.net/qcell/?rev=147&view=rev
Author: lessm
Date: 2007-01-11 02:28:19 -0800 (Thu, 11 Jan 2007)
Log Message:
-----------
- some problems with Calculator and CalculationData classes resolve
Modified Paths:
--------------
trunk/qcell/baseheaders/CalculationData.h
trunk/qcell/basesources/CalculationData.cpp
trunk/qcell/visgui/MainWindow.cpp
Modified: trunk/qcell/baseheaders/CalculationData.h
===================================================================
--- trunk/qcell/baseheaders/CalculationData.h 2007-01-11 09:00:21 UTC (rev 146)
+++ trunk/qcell/baseheaders/CalculationData.h 2007-01-11 10:28:19 UTC (rev 147)
@@ -72,7 +72,7 @@
int getDimension(void);
/*const*/ char *getDataPointer(void);
- void fillData(const char *dataPointer);
+ void fillData(char *dataPointer);
void setForeignDataPointer(char *dataPointer);
QString createXmlHeader(void);
Modified: trunk/qcell/basesources/CalculationData.cpp
===================================================================
--- trunk/qcell/basesources/CalculationData.cpp 2007-01-11 09:00:21 UTC (rev 146)
+++ trunk/qcell/basesources/CalculationData.cpp 2007-01-11 10:28:19 UTC (rev 147)
@@ -658,11 +658,15 @@
return data;
}
-void CalculationData::fillData(const char *dataPointer)
+void CalculationData::fillData(char *dataPointer)
{
if(!haveForeignDataPointer)
{
- if(data!=NULL)
+ if(data==NULL)
+ {
+ resizeData(0, dataPointer);
+ }
+ else
memcpy(data, dataPointer, getSizeInByte());
emit dataUpdated();
}
@@ -693,7 +697,6 @@
CalculationData & CalculationData::operator = (CalculationData &cData)
{
- clearData();
setDataType(cData.getDataType());
switch(cData.getDimension())
Modified: trunk/qcell/visgui/MainWindow.cpp
===================================================================
--- trunk/qcell/visgui/MainWindow.cpp 2007-01-11 09:00:21 UTC (rev 146)
+++ trunk/qcell/visgui/MainWindow.cpp 2007-01-11 10:28:19 UTC (rev 147)
@@ -491,6 +491,9 @@
/// @todo Use the updated API of Calculator
/// @todo Pass the calculated CalculationData to the data list
calc.calculate();
+ CalculationData *temp = new CalculationData;
+ *temp = calc;
+ data<<temp;
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|