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

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

Revision: 249
          http://svn.sourceforge.net/qcell/?rev=249&view=rev
Author:   lessm
Date:     2007-01-24 07:52:32 -0800 (Wed, 24 Jan 2007)

Log Message:
-----------
- Neighbourhood tab show window properly

Modified Paths:
--------------
    trunk/qcell/baseheaders/simulationwindow.ui
    trunk/qcell/basesources/Renderer.cpp
    trunk/qcell/visgui/MainWindow.cpp

Modified: trunk/qcell/baseheaders/simulationwindow.ui
===================================================================
--- trunk/qcell/baseheaders/simulationwindow.ui	2007-01-24 15:35:25 UTC (rev 248)
+++ trunk/qcell/baseheaders/simulationwindow.ui	2007-01-24 15:52:32 UTC (rev 249)
@@ -36,7 +36,7 @@
       <enum>QTabWidget::Rounded</enum>
      </property>
      <property name="currentIndex" >
-      <number>6</number>
+      <number>4</number>
      </property>
      <widget class="QWidget" name="view3D" >
       <attribute name="title" >

Modified: trunk/qcell/basesources/Renderer.cpp
===================================================================
--- trunk/qcell/basesources/Renderer.cpp	2007-01-24 15:35:25 UTC (rev 248)
+++ trunk/qcell/basesources/Renderer.cpp	2007-01-24 15:52:32 UTC (rev 249)
@@ -263,6 +263,7 @@
 
 	 primitives<<generateBox();
 	 generateObserver();
+	 renderText(0.0f , 0.0f, 0.0f, "init");
  }
 
  void Renderer::paintGL()
@@ -811,10 +812,9 @@
 		}
 		if(showValues)
 		{
+			counter = 0;
 			glDisable(GL_LIGHTING);
 			glDisable(GL_DEPTH_TEST);
-			QFont font("Curier New");
-			font.setStyleHint(QFont::AnyStyle, QFont::PreferBitmap);
 
 			for(int z=0;z<sz;++z)
 			{
@@ -822,7 +822,12 @@
 				{
 					for(int x=0;x<sx;++x)
 					{
-						renderText(mx + (float)x * 2.0f , my + (float)y * 2.0f, mz + (float)z * 2.0f, tr("%1").arg(storage.getValueAt_i(x, y-1, z)), font);
+						if(selectetObjects.contains(counter))
+							glColor3f(1.0f, 0.0f, 0.0f);
+						else
+							glColor3f(1.0f, 1.0f, 1.0f);
+						renderText(mx + (float)x * 2.0f , my + (float)y * 2.0f, mz + (float)z * 2.0f, tr("%1").arg(storage.getValueAt_i(x, y-1, z)));
+						counter++;
 					}
 				}
 			}

Modified: trunk/qcell/visgui/MainWindow.cpp
===================================================================
--- trunk/qcell/visgui/MainWindow.cpp	2007-01-24 15:35:25 UTC (rev 248)
+++ trunk/qcell/visgui/MainWindow.cpp	2007-01-24 15:52:32 UTC (rev 249)
@@ -438,7 +438,7 @@
 	}
 
 	//***************************************************
-//	*sw->getNeighbourhoodEditor()->getStorage() = neighbourhood->toCalculationData();
+	*sw->getNeighbourhoodEditor()->getStorage() = neighbourhood->toCalculationData();
 	sw->getNeighbourhoodEditor()->setTranslation(0.0f, 0.0f, -10.0f);
 	sw->getNeighbourhoodEditor()->setSymbolColor(1, QColor(128, 128, 128));
 	//***************************************************


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