Menu
▾
▴
[Qcell-commitlogs] SF.net SVN: qcell: [240] trunk/qcell
|
From: <dhu...@us...> - 2007-01-23 21:07:26
|
Revision: 240
http://svn.sourceforge.net/qcell/?rev=240&view=rev
Author: dhubleizh
Date: 2007-01-23 13:07:21 -0800 (Tue, 23 Jan 2007)
Log Message:
-----------
- disable all nonessential GUI-s at the begining
- GUI enabling on full experiment loading
Modified Paths:
--------------
trunk/qcell/baseheaders/basetools.h
trunk/qcell/baseheaders/basetools.ui
trunk/qcell/baseheaders/functiontable.h
trunk/qcell/baseheaders/simulationwindow.h
trunk/qcell/baseheaders/simulationwindow.ui
trunk/qcell/basesources/basetools.cpp
trunk/qcell/basesources/functiontable.cpp
trunk/qcell/basesources/simulationwindow.cpp
trunk/qcell/visgui/MainWindow.cpp
trunk/qcell/visgui/MainWindow.h
Modified: trunk/qcell/baseheaders/basetools.h
===================================================================
--- trunk/qcell/baseheaders/basetools.h 2007-01-23 20:23:28 UTC (rev 239)
+++ trunk/qcell/baseheaders/basetools.h 2007-01-23 21:07:21 UTC (rev 240)
@@ -19,6 +19,9 @@
Ui::BaseToolsClass ui;
int editMode;
+public slots:
+ void unlockGUI();
+
protected slots:
void modeChangeSelect(void);
void modeChangeEdit(void);
Modified: trunk/qcell/baseheaders/basetools.ui
===================================================================
--- trunk/qcell/baseheaders/basetools.ui 2007-01-23 20:23:28 UTC (rev 239)
+++ trunk/qcell/baseheaders/basetools.ui 2007-01-23 21:07:21 UTC (rev 240)
@@ -1,6 +1,9 @@
<ui version="4.0" >
<class>BaseToolsClass</class>
<widget class="QWidget" name="BaseToolsClass" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
<property name="geometry" >
<rect>
<x>0</x>
@@ -112,6 +115,29 @@
</property>
</widget>
</widget>
+ <widget class="QGroupBox" name="ValuesGroup" >
+ <property name="geometry" >
+ <rect>
+ <x>1</x>
+ <y>240</y>
+ <width>113</width>
+ <height>131</height>
+ </rect>
+ </property>
+ <property name="title" >
+ <string>Values</string>
+ </property>
+ <widget class="QTableWidget" name="valueTable" >
+ <property name="geometry" >
+ <rect>
+ <x>5</x>
+ <y>20</y>
+ <width>101</width>
+ <height>101</height>
+ </rect>
+ </property>
+ </widget>
+ </widget>
<widget class="QGroupBox" name="ViewModeGroup" >
<property name="geometry" >
<rect>
@@ -160,29 +186,6 @@
</property>
</widget>
</widget>
- <widget class="QGroupBox" name="ValuesGroup" >
- <property name="geometry" >
- <rect>
- <x>1</x>
- <y>240</y>
- <width>113</width>
- <height>131</height>
- </rect>
- </property>
- <property name="title" >
- <string>Values</string>
- </property>
- <widget class="QTableWidget" name="valueTable" >
- <property name="geometry" >
- <rect>
- <x>5</x>
- <y>20</y>
- <width>101</width>
- <height>101</height>
- </rect>
- </property>
- </widget>
- </widget>
</widget>
<layoutdefault spacing="6" margin="11" />
<resources/>
Modified: trunk/qcell/baseheaders/functiontable.h
===================================================================
--- trunk/qcell/baseheaders/functiontable.h 2007-01-23 20:23:28 UTC (rev 239)
+++ trunk/qcell/baseheaders/functiontable.h 2007-01-23 21:07:21 UTC (rev 240)
@@ -13,7 +13,8 @@
{
Q_OBJECT
-
+public slots:
+ void unlockGUI();
private:
Ui::FunctionTableClass ui;
Modified: trunk/qcell/baseheaders/simulationwindow.h
===================================================================
--- trunk/qcell/baseheaders/simulationwindow.h 2007-01-23 20:23:28 UTC (rev 239)
+++ trunk/qcell/baseheaders/simulationwindow.h 2007-01-23 21:07:21 UTC (rev 240)
@@ -131,6 +131,8 @@
void maskChange(int x, int y, int z);
+ void unlockGUI();
+
public:
void storeSelectedData(void);
void pasteStoredData(void);
Modified: trunk/qcell/baseheaders/simulationwindow.ui
===================================================================
--- trunk/qcell/baseheaders/simulationwindow.ui 2007-01-23 20:23:28 UTC (rev 239)
+++ trunk/qcell/baseheaders/simulationwindow.ui 2007-01-23 21:07:21 UTC (rev 240)
@@ -36,7 +36,7 @@
<enum>QTabWidget::Rounded</enum>
</property>
<property name="currentIndex" >
- <number>4</number>
+ <number>5</number>
</property>
<widget class="QWidget" name="view3D" >
<attribute name="title" >
@@ -109,6 +109,9 @@
</layout>
</widget>
<widget class="QWidget" name="functionTab" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
<attribute name="title" >
<string>Function</string>
</attribute>
Modified: trunk/qcell/basesources/basetools.cpp
===================================================================
--- trunk/qcell/basesources/basetools.cpp 2007-01-23 20:23:28 UTC (rev 239)
+++ trunk/qcell/basesources/basetools.cpp 2007-01-23 21:07:21 UTC (rev 240)
@@ -107,4 +107,10 @@
void BaseTools::updateSelectedSymbol(int row, int column)
{
emit symbolSelected(row);
-}
\ No newline at end of file
+}
+
+void BaseTools::unlockGUI()
+{
+ setEnabled(true);
+}
+
Modified: trunk/qcell/basesources/functiontable.cpp
===================================================================
--- trunk/qcell/basesources/functiontable.cpp 2007-01-23 20:23:28 UTC (rev 239)
+++ trunk/qcell/basesources/functiontable.cpp 2007-01-23 21:07:21 UTC (rev 240)
@@ -94,3 +94,9 @@
}
}
}
+
+void FunctionTable::unlockGUI()
+{
+ setEnabled(true);
+}
+
Modified: trunk/qcell/basesources/simulationwindow.cpp
===================================================================
--- trunk/qcell/basesources/simulationwindow.cpp 2007-01-23 20:23:28 UTC (rev 239)
+++ trunk/qcell/basesources/simulationwindow.cpp 2007-01-23 21:07:21 UTC (rev 240)
@@ -671,6 +671,7 @@
ui.tabWidget->setTabEnabled(1, 0);
ui.tabWidget->setTabEnabled(2, 0);
ui.tabWidget->setTabEnabled(3, 0);
+ ui.tabWidget->setTabEnabled(5, 0);
// for test only
ft = new FunctionTable(ui.functionTab);
@@ -1373,3 +1374,12 @@
ft->selectCell(index);
ui.tabWidget->setCurrentIndex(5);
}
+
+void simulationWindow::unlockGUI()
+{
+ basetools->unlockGUI();
+ ui.tabWidget->setTabEnabled(5, true);
+ ui.functionTab->setEnabled(true);
+ ft->unlockGUI();
+}
+
Modified: trunk/qcell/visgui/MainWindow.cpp
===================================================================
--- trunk/qcell/visgui/MainWindow.cpp 2007-01-23 20:23:28 UTC (rev 239)
+++ trunk/qcell/visgui/MainWindow.cpp 2007-01-23 21:07:21 UTC (rev 240)
@@ -16,6 +16,9 @@
sw = new simulationWindow(this);
centralWidget()->layout()->addWidget(sw);
+ connect(this, SIGNAL(unlockGUI()),
+ sw, SLOT(unlockGUI())
+ );
// Adding delay setup
// An interlinked pair of QDoubleSpinBox and a QSlider
@@ -530,6 +533,8 @@
// Whole experiment saving
action_Save_experiment->setEnabled(true);
+
+ emit unlockGUI();
}
}
Modified: trunk/qcell/visgui/MainWindow.h
===================================================================
--- trunk/qcell/visgui/MainWindow.h 2007-01-23 20:23:28 UTC (rev 239)
+++ trunk/qcell/visgui/MainWindow.h 2007-01-23 21:07:21 UTC (rev 240)
@@ -37,7 +37,8 @@
class MainWindow : public QMainWindow, private Ui::MainWindow
{
Q_OBJECT
-
+signals:
+ void unlockGUI();
public:
MainWindow(QWidget* parent = 0);
@@ -81,7 +82,6 @@
QMap<QString, ParserInterface*> function_parsers;
QMap<QString, ParserInterface*> world_parsers;
-
void callParser(QString filename, QString type);
void callSaver(const QString filename, const QString type);
void unlockExperiment();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
