Menu
▾
▴
[Qcell-commitlogs] SF.net SVN: qcell: [345] trunk/qcell
|
From: <le...@us...> - 2007-02-17 03:22:37
|
Revision: 345
http://svn.sourceforge.net/qcell/?rev=345&view=rev
Author: lessm
Date: 2007-02-16 19:22:36 -0800 (Fri, 16 Feb 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/qcell/baseheaders/Renderer.h
trunk/qcell/baseheaders/simulationwindow.h
trunk/qcell/basesources/Renderer.cpp
trunk/qcell/basesources/simulationwindow.cpp
trunk/qcell/bin/examples/dynamicmodelexample.FQT
trunk/qcell/bin/observer.png
trunk/qcell/doc/licenciate_thesis/chap2/Thumbs.db
trunk/qcell/doc/licenciate_thesis/chap6/NTools.png
trunk/qcell/doc/licenciate_thesis/chap6/iter1.png
trunk/qcell/doc/licenciate_thesis/chap6/iter2.png
trunk/qcell/doc/licenciate_thesis/chap6/iter3.png
trunk/qcell/doc/licenciate_thesis/chap6/iter4.png
trunk/qcell/doc/licenciate_thesis/chap6/mainwindow.png
trunk/qcell/doc/licenciate_thesis/chap6/observer.png
trunk/qcell/doc/licenciate_thesis/chap6/step.png
trunk/qcell/parsers/N/NParserPlugin.cpp
trunk/qcell/visgui/MainWindow.cpp
Modified: trunk/qcell/baseheaders/Renderer.h
===================================================================
--- trunk/qcell/baseheaders/Renderer.h 2007-02-17 03:19:21 UTC (rev 344)
+++ trunk/qcell/baseheaders/Renderer.h 2007-02-17 03:22:36 UTC (rev 345)
@@ -69,7 +69,9 @@
QVector<int> maskValue;
bool showValues;
- const char** texture;
+ //QString texture;
+ //const char** texture;
+ QPixmap texture;
bool force2D;
Modified: trunk/qcell/baseheaders/simulationwindow.h
===================================================================
--- trunk/qcell/baseheaders/simulationwindow.h 2007-02-17 03:19:21 UTC (rev 344)
+++ trunk/qcell/baseheaders/simulationwindow.h 2007-02-17 03:22:36 UTC (rev 345)
@@ -170,6 +170,8 @@
void clearView();
int getLocalObserversHistoryCount();
CalculationData* getLocalObserversCD(int iteration);
+ void setLocalObserverMem(QList<CalculationData *> cdList);
+ void forceLOdataReset(void);
public slots:
void NViewModeChange(int mode);
Modified: trunk/qcell/basesources/Renderer.cpp
===================================================================
--- trunk/qcell/basesources/Renderer.cpp 2007-02-17 03:19:21 UTC (rev 344)
+++ trunk/qcell/basesources/Renderer.cpp 2007-02-17 03:22:36 UTC (rev 345)
@@ -138,7 +138,10 @@
{
glEnable(GL_TEXTURE_2D);
observerTexture = bindTexture(texture, GL_TEXTURE_2D);
- glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+// glGenTextures(1, &observerTexture);
+// glBindTexture(GL_TEXTURE_2D, observerTexture);
+// gluBuild2DMipmaps(GL_TEXTURE_2D, 3, 256, 256, GL_RGB, GL_BYTE, texture);
+// glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -655,13 +658,14 @@
glDisable(GL_DEPTH_TEST);
glBlendFunc(GL_ONE, GL_ONE);
- glEnable(GL_BLEND);
+ //glEnable(GL_BLEND);
glDisable(GL_LIGHTING);
glEnable(GL_TEXTURE_2D);
+ glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
glCallList(observer);
glDisable(GL_TEXTURE_2D);
glEnable(GL_LIGHTING);
- glDisable(GL_BLEND);
+ //glDisable(GL_BLEND);
glEnable(GL_DEPTH_TEST);
glPopMatrix();
}
@@ -865,8 +869,8 @@
void Renderer::setTexture(const char *xpm[])
{
-// texture = QPixmap(xpm);
- texture = xpm;
+ texture = QPixmap(xpm);
+// texture = xpm;
}
void Renderer::setOrtoPerspective(bool noClear)
Modified: trunk/qcell/basesources/simulationwindow.cpp
===================================================================
--- trunk/qcell/basesources/simulationwindow.cpp 2007-02-17 03:19:21 UTC (rev 344)
+++ trunk/qcell/basesources/simulationwindow.cpp 2007-02-17 03:22:36 UTC (rev 345)
@@ -662,7 +662,7 @@
ui.view3D->setLayout(new QVBoxLayout(ui.view3D));
renderer = new Renderer(ui.view3D);
- renderer->setTexture((const char**)observer_xpm);
+ renderer->setTexture((const char **)observer_xpm);
ui.view3D->layout()->addWidget(renderer);
// Not needed anymore
// renderer->resize(ui.view3D->width(), ui.view3D->height());
@@ -1707,4 +1707,25 @@
return &loclaViewMemory[iteration];
}
+void simulationWindow::setLocalObserverMem(QList<CalculationData *> cdList)
+{
+ if(cdList.size()>loclaViewMemory.size())
+ {
+ for(int i=0;i<loclaViewMemory.size();++i)
+ loclaViewMemory[loclaViewMemory.size() - 1 - i] = *(cdList[cdList.size()-1 - i]);
+ usedSpace = loclaViewMemory.size();
+ cycleTable = loclaViewMemory.size()-1;
+ }
+ else
+ {
+
+ }
+}
+
+void simulationWindow::forceLOdataReset(void)
+{
+ usedSpace = 0;
+ localView = *getStorage();
+ cycleTable = 0;
+}
Modified: trunk/qcell/bin/examples/dynamicmodelexample.FQT
===================================================================
--- trunk/qcell/bin/examples/dynamicmodelexample.FQT 2007-02-17 03:19:21 UTC (rev 344)
+++ trunk/qcell/bin/examples/dynamicmodelexample.FQT 2007-02-17 03:22:36 UTC (rev 345)
@@ -1,4 +1,4 @@
FQT
3 4 4
1
-
+0: ----------------
Modified: trunk/qcell/bin/observer.png
===================================================================
(Binary files differ)
Modified: trunk/qcell/doc/licenciate_thesis/chap2/Thumbs.db
===================================================================
(Binary files differ)
Modified: trunk/qcell/doc/licenciate_thesis/chap6/NTools.png
===================================================================
(Binary files differ)
Modified: trunk/qcell/doc/licenciate_thesis/chap6/iter1.png
===================================================================
(Binary files differ)
Modified: trunk/qcell/doc/licenciate_thesis/chap6/iter2.png
===================================================================
(Binary files differ)
Modified: trunk/qcell/doc/licenciate_thesis/chap6/iter3.png
===================================================================
(Binary files differ)
Modified: trunk/qcell/doc/licenciate_thesis/chap6/iter4.png
===================================================================
(Binary files differ)
Modified: trunk/qcell/doc/licenciate_thesis/chap6/mainwindow.png
===================================================================
(Binary files differ)
Modified: trunk/qcell/doc/licenciate_thesis/chap6/observer.png
===================================================================
(Binary files differ)
Modified: trunk/qcell/doc/licenciate_thesis/chap6/step.png
===================================================================
(Binary files differ)
Modified: trunk/qcell/parsers/N/NParserPlugin.cpp
===================================================================
--- trunk/qcell/parsers/N/NParserPlugin.cpp 2007-02-17 03:19:21 UTC (rev 344)
+++ trunk/qcell/parsers/N/NParserPlugin.cpp 2007-02-17 03:22:36 UTC (rev 345)
@@ -15,8 +15,6 @@
QString NParserPlugin::realParser(const QByteArray content, const QString type, const QString subtype)
{
- QString costam(content);
- qDebug() << content;
QStringList result;
// Used to doublecheck the format of a line in file
QRegExp format;
Modified: trunk/qcell/visgui/MainWindow.cpp
===================================================================
--- trunk/qcell/visgui/MainWindow.cpp 2007-02-17 03:19:21 UTC (rev 344)
+++ trunk/qcell/visgui/MainWindow.cpp 2007-02-17 03:22:36 UTC (rev 345)
@@ -448,6 +448,7 @@
if(!fd.selectedFiles().isEmpty())
{
callParser(fd.selectedFiles().first(), "World");
+ sw->forceLOdataReset();
}
}
@@ -828,6 +829,7 @@
iteration--;
calc = *(data[iteration]);
data.removeLast();
+ // sw->setLocalObserverMem(data);
sw->back1DTable();
}
@@ -1216,6 +1218,7 @@
// Do the actual serializing
deserialize(file.readAll());
+ sw->forceLOdataReset();
file.close();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
