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

[<dhu...@us...>]

Revision: 320
          http://svn.sourceforge.net/qcell/?rev=320&view=rev
Author:   dhubleizh
Date:     2007-02-14 06:45:46 -0800 (Wed, 14 Feb 2007)

Log Message:
-----------
- ui names corrections
- proper rows tagging

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

Modified: trunk/qcell/baseheaders/view1dtexttools.ui
===================================================================
--- trunk/qcell/baseheaders/view1dtexttools.ui	2007-02-14 11:19:15 UTC (rev 319)
+++ trunk/qcell/baseheaders/view1dtexttools.ui	2007-02-14 14:45:46 UTC (rev 320)
@@ -78,7 +78,7 @@
          </size>
         </property>
         <property name="text" >
-         <string>Values</string>
+         <string>Symbols</string>
         </property>
         <property name="checkable" >
          <bool>true</bool>
@@ -105,7 +105,7 @@
          </size>
         </property>
         <property name="text" >
-         <string>Symbols</string>
+         <string>Chars</string>
         </property>
         <property name="checkable" >
          <bool>true</bool>

Modified: trunk/qcell/baseheaders/view2dtexttools.ui
===================================================================
--- trunk/qcell/baseheaders/view2dtexttools.ui	2007-02-14 11:19:15 UTC (rev 319)
+++ trunk/qcell/baseheaders/view2dtexttools.ui	2007-02-14 14:45:46 UTC (rev 320)
@@ -84,7 +84,7 @@
          </size>
         </property>
         <property name="text" >
-         <string>Values</string>
+         <string>Symbols</string>
         </property>
         <property name="checkable" >
          <bool>true</bool>
@@ -111,7 +111,7 @@
          </size>
         </property>
         <property name="text" >
-         <string>Symbols</string>
+         <string>Chars</string>
         </property>
         <property name="checkable" >
          <bool>true</bool>

Modified: trunk/qcell/basesources/simulationwindow.cpp
===================================================================
--- trunk/qcell/basesources/simulationwindow.cpp	2007-02-14 11:19:15 UTC (rev 319)
+++ trunk/qcell/basesources/simulationwindow.cpp	2007-02-14 14:45:46 UTC (rev 320)
@@ -526,19 +526,24 @@
 void simulationWindow::update1DTableMem(void)
 {
 	QTableWidgetItem *item, *memItem;
-	table1DMem->blockSignals(1);
-	table1DMem->insertRow(0); 
-	for(int x=0;x<renderer->getStorage()->getSizeX();++x)
+//	table1DMem->blockSignals(1);
+	table1DMem->insertRow(table1DMem->rowCount()); 
+	QStringList labels;
+	for(int x=0; x < renderer->getStorage()->getSizeX(); x++)
 	{
-		item = table1D->item(0, x);
-		memItem = new QTableWidgetItem(*item);
-		table1DMem->setItem(0, x, memItem);
+//		item = table1D->item(0, x);
+//		memItem = new QTableWidgetItem(*item);
+		memItem = new QTableWidgetItem(*table1D->item(0,x));
+		table1DMem->setItem(table1DMem->rowCount()-1, x, memItem);
+		labels << QString::number(x);
 	}
-	table1DMem->blockSignals(0);
-	if(table1DMem->rowCount()>30)
-	{
-		table1DMem->removeRow(table1DMem->rowCount()-1);
-	}
+	table1DMem->setVerticalHeaderLabels(labels);
+	table1DMem->scrollToBottom();
+//	table1DMem->blockSignals(0);
+//	if(table1DMem->rowCount()>30)
+//	{
+//		table1DMem->removeRow(table1DMem->rowCount()-1);
+//	}
 }
 
 void simulationWindow::updateSymbolTable(void)

Modified: trunk/qcell/visgui/MainWindow.cpp
===================================================================
--- trunk/qcell/visgui/MainWindow.cpp	2007-02-14 11:19:15 UTC (rev 319)
+++ trunk/qcell/visgui/MainWindow.cpp	2007-02-14 14:45:46 UTC (rev 320)
@@ -815,7 +815,7 @@
 
 		iteration--;
 		calc = *(data[iteration]);
-		data.removeLast();
+//		data.removeLast();
 	    }
 
     }
@@ -901,7 +901,7 @@
 
 void MainWindow::on_action_Back_activated()
 {
-    oneStep( Back);
+    oneStep(Back);
 }
 
 void MainWindow::on_action_Start_activated()
@@ -944,6 +944,20 @@
     CalculationData* backup = data.first();
     data.clear();
     data.append(backup);
+
+    // Pass data to Calculator
+    *(CalculationData*)&calc = *data.last();	
+
+    // Creating elemental rules according to DATA_TYPE
+    elemental_rules->resetList();
+    elemental_rules->setCDSize(
+	data.last()->getSizeX(),
+	data.last()->getSizeY(),
+	data.last()->getSizeZ()
+    );
+
+    // visualization update
+    update();
 }
 
 void MainWindow::on_action_World_save_activated()

Modified: trunk/qcell/visgui/MainWindow.ui
===================================================================
--- trunk/qcell/visgui/MainWindow.ui	2007-02-14 11:19:15 UTC (rev 319)
+++ trunk/qcell/visgui/MainWindow.ui	2007-02-14 14:45:46 UTC (rev 320)
@@ -42,13 +42,6 @@
      <string>&amp;View</string>
     </property>
    </widget>
-   <widget class="QMenu" name="menu_Help" >
-    <property name="title" >
-     <string>&amp;Help</string>
-    </property>
-    <addaction name="separator" />
-    <addaction name="action_About" />
-   </widget>
    <widget class="QMenu" name="menu_Experiment" >
     <property name="enabled" >
      <bool>false</bool>
@@ -111,7 +104,6 @@
    <addaction name="menu_File" />
    <addaction name="menu_View" />
    <addaction name="menu_Experiment" />
-   <addaction name="menu_Help" />
   </widget>
   <widget class="QStatusBar" name="statusbar" />
   <widget class="QToolBar" name="toolBar" >


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