Menu
▾
▴
[Qcell-commitlogs] SF.net SVN: qcell: [187] trunk/qcell
|
From: <le...@us...> - 2007-01-17 18:33:53
|
Revision: 187
http://svn.sourceforge.net/qcell/?rev=187&view=rev
Author: lessm
Date: 2007-01-17 10:33:40 -0800 (Wed, 17 Jan 2007)
Log Message:
-----------
-some GUI changes
Modified Paths:
--------------
trunk/qcell/baseheaders/basetools.ui
trunk/qcell/baseheaders/simulationwindow.ui
trunk/qcell/baseheaders/view1dtexttools.ui
trunk/qcell/baseheaders/view2dtexttools.ui
trunk/qcell/baseheaders/view3dtools.ui
trunk/qcell/basesources/simulationwindow.cpp
trunk/qcell/doc/licenciate_thesis/thesis.tex
Added Paths:
-----------
trunk/qcell/doc/licenciate_thesis/1d.png
trunk/qcell/doc/licenciate_thesis/2d.png
trunk/qcell/doc/licenciate_thesis/3d.png
trunk/qcell/doc/licenciate_thesis/mainwindow.png
Modified: trunk/qcell/baseheaders/basetools.ui
===================================================================
--- trunk/qcell/baseheaders/basetools.ui 2007-01-17 18:24:56 UTC (rev 186)
+++ trunk/qcell/baseheaders/basetools.ui 2007-01-17 18:33:40 UTC (rev 187)
@@ -5,7 +5,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>102</width>
+ <width>115</width>
<height>375</height>
</rect>
</property>
@@ -17,37 +17,37 @@
<rect>
<x>1</x>
<y>140</y>
- <width>100</width>
+ <width>113</width>
<height>91</height>
</rect>
</property>
<property name="title" >
<string>Edit Tools</string>
</property>
- <widget class="QToolButton" name="FillButton" >
+ <widget class="QToolButton" name="PasteButton" >
<property name="geometry" >
<rect>
<x>10</x>
- <y>60</y>
- <width>81</width>
+ <y>40</y>
+ <width>91</width>
<height>20</height>
</rect>
</property>
<property name="text" >
- <string>Fill</string>
+ <string>Paste</string>
</property>
</widget>
- <widget class="QToolButton" name="PasteButton" >
+ <widget class="QToolButton" name="FillButton" >
<property name="geometry" >
<rect>
<x>10</x>
- <y>40</y>
- <width>81</width>
+ <y>60</y>
+ <width>91</width>
<height>20</height>
</rect>
</property>
<property name="text" >
- <string>Paste</string>
+ <string>Fill</string>
</property>
</widget>
<widget class="QToolButton" name="CopyButton" >
@@ -55,7 +55,7 @@
<rect>
<x>10</x>
<y>20</y>
- <width>81</width>
+ <width>91</width>
<height>20</height>
</rect>
</property>
@@ -64,68 +64,45 @@
</property>
</widget>
</widget>
- <widget class="QGroupBox" name="ValuesGroup" >
+ <widget class="QGroupBox" name="EditModeGroup" >
<property name="geometry" >
<rect>
<x>1</x>
- <y>240</y>
- <width>100</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>90</width>
- <height>101</height>
- </rect>
- </property>
- </widget>
- </widget>
- <widget class="QGroupBox" name="ViewModeGroup" >
- <property name="geometry" >
- <rect>
- <x>1</x>
- <y>0</y>
- <width>100</width>
+ <y>70</y>
+ <width>113</width>
<height>71</height>
</rect>
</property>
<property name="title" >
- <string>View Mode</string>
+ <string>Edit Mode</string>
</property>
- <widget class="QToolButton" name="LocalViewButton" >
+ <widget class="QToolButton" name="ModeEditButton" >
<property name="geometry" >
<rect>
<x>10</x>
<y>40</y>
- <width>81</width>
+ <width>91</width>
<height>20</height>
</rect>
</property>
<property name="text" >
- <string>Local</string>
+ <string>Edit</string>
</property>
<property name="checkable" >
<bool>true</bool>
</property>
</widget>
- <widget class="QToolButton" name="GlobalVievButton" >
+ <widget class="QToolButton" name="ModeSelectButton" >
<property name="geometry" >
<rect>
<x>10</x>
<y>20</y>
- <width>81</width>
+ <width>91</width>
<height>20</height>
</rect>
</property>
<property name="text" >
- <string>Global</string>
+ <string>Select</string>
</property>
<property name="checkable" >
<bool>true</bool>
@@ -135,45 +112,45 @@
</property>
</widget>
</widget>
- <widget class="QGroupBox" name="EditModeGroup" >
+ <widget class="QGroupBox" name="ViewModeGroup" >
<property name="geometry" >
<rect>
<x>1</x>
- <y>70</y>
- <width>100</width>
+ <y>0</y>
+ <width>113</width>
<height>71</height>
</rect>
</property>
<property name="title" >
- <string>Edit Mode</string>
+ <string>View Mode</string>
</property>
- <widget class="QToolButton" name="ModeEditButton" >
+ <widget class="QToolButton" name="LocalViewButton" >
<property name="geometry" >
<rect>
<x>10</x>
<y>40</y>
- <width>81</width>
+ <width>91</width>
<height>20</height>
</rect>
</property>
<property name="text" >
- <string>Edit</string>
+ <string>Local</string>
</property>
<property name="checkable" >
<bool>true</bool>
</property>
</widget>
- <widget class="QToolButton" name="ModeSelectButton" >
+ <widget class="QToolButton" name="GlobalVievButton" >
<property name="geometry" >
<rect>
<x>10</x>
<y>20</y>
- <width>81</width>
+ <width>91</width>
<height>20</height>
</rect>
</property>
<property name="text" >
- <string>Select</string>
+ <string>Global</string>
</property>
<property name="checkable" >
<bool>true</bool>
@@ -183,6 +160,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>
<layoutdefault spacing="6" margin="11" />
<resources/>
Modified: trunk/qcell/baseheaders/simulationwindow.ui
===================================================================
--- trunk/qcell/baseheaders/simulationwindow.ui 2007-01-17 18:24:56 UTC (rev 186)
+++ trunk/qcell/baseheaders/simulationwindow.ui 2007-01-17 18:33:40 UTC (rev 187)
@@ -36,7 +36,7 @@
<enum>QTabWidget::Rounded</enum>
</property>
<property name="currentIndex" >
- <number>4</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="view3D" >
<attribute name="title" >
Modified: trunk/qcell/baseheaders/view1dtexttools.ui
===================================================================
--- trunk/qcell/baseheaders/view1dtexttools.ui 2007-01-17 18:24:56 UTC (rev 186)
+++ trunk/qcell/baseheaders/view1dtexttools.ui 2007-01-17 18:33:40 UTC (rev 187)
@@ -5,62 +5,36 @@
<rect>
<x>0</x>
<y>0</y>
- <width>102</width>
+ <width>115</width>
<height>145</height>
</rect>
</property>
<property name="windowTitle" >
<string>View1DTextTools</string>
</property>
- <widget class="QGroupBox" name="groupBox_2" >
- <property name="geometry" >
- <rect>
- <x>1</x>
- <y>90</y>
- <width>100</width>
- <height>51</height>
- </rect>
- </property>
- <property name="title" >
- <string>Memory</string>
- </property>
- <widget class="QToolButton" name="MemoryClearButton" >
- <property name="geometry" >
- <rect>
- <x>10</x>
- <y>20</y>
- <width>81</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text" >
- <string>Clear</string>
- </property>
- </widget>
- </widget>
<widget class="QGroupBox" name="groupBox" >
<property name="geometry" >
<rect>
<x>1</x>
<y>1</y>
- <width>100</width>
+ <width>113</width>
<height>91</height>
</rect>
</property>
<property name="title" >
<string>View 1D Text</string>
</property>
- <widget class="QToolButton" name="ColorsButton" >
+ <widget class="QToolButton" name="SymbolsButton" >
<property name="geometry" >
<rect>
<x>10</x>
- <y>20</y>
- <width>81</width>
+ <y>60</y>
+ <width>91</width>
<height>20</height>
</rect>
</property>
<property name="text" >
- <string>Colors</string>
+ <string>Symbols</string>
</property>
<property name="checkable" >
<bool>true</bool>
@@ -71,7 +45,7 @@
<rect>
<x>10</x>
<y>40</y>
- <width>81</width>
+ <width>91</width>
<height>20</height>
</rect>
</property>
@@ -85,23 +59,49 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QToolButton" name="SymbolsButton" >
+ <widget class="QToolButton" name="ColorsButton" >
<property name="geometry" >
<rect>
<x>10</x>
- <y>60</y>
- <width>81</width>
+ <y>20</y>
+ <width>91</width>
<height>20</height>
</rect>
</property>
<property name="text" >
- <string>Symbols</string>
+ <string>Colors</string>
</property>
<property name="checkable" >
<bool>true</bool>
</property>
</widget>
</widget>
+ <widget class="QGroupBox" name="groupBox_2" >
+ <property name="geometry" >
+ <rect>
+ <x>1</x>
+ <y>90</y>
+ <width>113</width>
+ <height>51</height>
+ </rect>
+ </property>
+ <property name="title" >
+ <string>Memory</string>
+ </property>
+ <widget class="QToolButton" name="MemoryClearButton" >
+ <property name="geometry" >
+ <rect>
+ <x>10</x>
+ <y>20</y>
+ <width>91</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text" >
+ <string>Clear</string>
+ </property>
+ </widget>
+ </widget>
</widget>
<layoutdefault spacing="6" margin="11" />
<resources/>
Modified: trunk/qcell/baseheaders/view2dtexttools.ui
===================================================================
--- trunk/qcell/baseheaders/view2dtexttools.ui 2007-01-17 18:24:56 UTC (rev 186)
+++ trunk/qcell/baseheaders/view2dtexttools.ui 2007-01-17 18:33:40 UTC (rev 187)
@@ -5,7 +5,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>102</width>
+ <width>115</width>
<height>157</height>
</rect>
</property>
@@ -17,7 +17,7 @@
<rect>
<x>1</x>
<y>100</y>
- <width>100</width>
+ <width>113</width>
<height>51</height>
</rect>
</property>
@@ -29,7 +29,7 @@
<rect>
<x>10</x>
<y>20</y>
- <width>71</width>
+ <width>91</width>
<height>22</height>
</rect>
</property>
@@ -40,54 +40,54 @@
<rect>
<x>1</x>
<y>1</y>
- <width>100</width>
+ <width>113</width>
<height>91</height>
</rect>
</property>
<property name="title" >
<string>View 2D Text</string>
</property>
- <widget class="QToolButton" name="ValuesButton" >
+ <widget class="QToolButton" name="ColorsButton" >
<property name="geometry" >
<rect>
<x>10</x>
- <y>40</y>
- <width>81</width>
+ <y>20</y>
+ <width>91</width>
<height>20</height>
</rect>
</property>
<property name="text" >
- <string>Values</string>
+ <string>Colors</string>
</property>
<property name="checkable" >
<bool>true</bool>
</property>
- <property name="checked" >
- <bool>true</bool>
- </property>
</widget>
- <widget class="QToolButton" name="ColorsButton" >
+ <widget class="QToolButton" name="ValuesButton" >
<property name="geometry" >
<rect>
<x>10</x>
- <y>20</y>
- <width>81</width>
+ <y>40</y>
+ <width>91</width>
<height>20</height>
</rect>
</property>
<property name="text" >
- <string>Colors</string>
+ <string>Values</string>
</property>
<property name="checkable" >
<bool>true</bool>
</property>
+ <property name="checked" >
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QToolButton" name="SymbolsButton" >
<property name="geometry" >
<rect>
<x>10</x>
<y>60</y>
- <width>81</width>
+ <width>91</width>
<height>20</height>
</rect>
</property>
Modified: trunk/qcell/baseheaders/view3dtools.ui
===================================================================
--- trunk/qcell/baseheaders/view3dtools.ui 2007-01-17 18:24:56 UTC (rev 186)
+++ trunk/qcell/baseheaders/view3dtools.ui 2007-01-17 18:33:40 UTC (rev 187)
@@ -5,7 +5,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>102</width>
+ <width>115</width>
<height>205</height>
</rect>
</property>
@@ -17,7 +17,7 @@
<rect>
<x>1</x>
<y>1</y>
- <width>100</width>
+ <width>113</width>
<height>71</height>
</rect>
</property>
@@ -29,7 +29,7 @@
<rect>
<x>10</x>
<y>20</y>
- <width>81</width>
+ <width>91</width>
<height>20</height>
</rect>
</property>
@@ -48,7 +48,7 @@
<rect>
<x>10</x>
<y>40</y>
- <width>81</width>
+ <width>91</width>
<height>20</height>
</rect>
</property>
@@ -65,29 +65,19 @@
<rect>
<x>1</x>
<y>70</y>
- <width>100</width>
+ <width>113</width>
<height>131</height>
</rect>
</property>
<property name="title" >
<string>Section</string>
</property>
- <widget class="QSpinBox" name="maskValue" >
- <property name="geometry" >
- <rect>
- <x>10</x>
- <y>100</y>
- <width>81</width>
- <height>22</height>
- </rect>
- </property>
- </widget>
<widget class="QToolButton" name="EnableButton" >
<property name="geometry" >
<rect>
<x>10</x>
<y>20</y>
- <width>81</width>
+ <width>91</width>
<height>20</height>
</rect>
</property>
@@ -103,7 +93,7 @@
<rect>
<x>10</x>
<y>40</y>
- <width>81</width>
+ <width>91</width>
<height>20</height>
</rect>
</property>
@@ -122,7 +112,7 @@
<rect>
<x>10</x>
<y>60</y>
- <width>81</width>
+ <width>91</width>
<height>20</height>
</rect>
</property>
@@ -138,7 +128,7 @@
<rect>
<x>10</x>
<y>80</y>
- <width>81</width>
+ <width>91</width>
<height>20</height>
</rect>
</property>
@@ -149,6 +139,16 @@
<bool>true</bool>
</property>
</widget>
+ <widget class="QSpinBox" name="maskValue" >
+ <property name="geometry" >
+ <rect>
+ <x>10</x>
+ <y>100</y>
+ <width>91</width>
+ <height>22</height>
+ </rect>
+ </property>
+ </widget>
</widget>
</widget>
<layoutdefault spacing="6" margin="11" />
Modified: trunk/qcell/basesources/simulationwindow.cpp
===================================================================
--- trunk/qcell/basesources/simulationwindow.cpp 2007-01-17 18:24:56 UTC (rev 186)
+++ trunk/qcell/basesources/simulationwindow.cpp 2007-01-17 18:33:40 UTC (rev 187)
@@ -99,10 +99,10 @@
symbolTable->move(0, 35);
symbolTable->resize(ui.symbolConfig->width() - 7, ui.symbolConfig->height() -42);
- basetools->move(width() - 101, 0);
- view3DTools->move(width() - 101, basetools->height() + 1);
- view2DTextTools->move(width() - 101, basetools->height() + 1);
- view1DTextTools->move(width() - 101, basetools->height() + 1);
+ basetools->move(width() - 116, 0);
+ view3DTools->move(width() - 116, basetools->height() + 1);
+ view2DTextTools->move(width() - 116, basetools->height() + 1);
+ view1DTextTools->move(width() - 116, basetools->height() + 1);
@@ -661,6 +661,10 @@
connect(view3DTools, SIGNAL(maskSet(int, int, int)), SLOT(maskChange(int, int, int)));
+ ui.tabWidget->setTabEnabled(0, 0);
+ ui.tabWidget->setTabEnabled(1, 0);
+ ui.tabWidget->setTabEnabled(2, 0);
+ ui.tabWidget->setTabEnabled(3, 0);
}
simulationWindow::~simulationWindow()
@@ -1063,7 +1067,7 @@
{
if(mode==3)
{
- //loclaViewMemory[cycleTable] = *getStorage();
+ loclaViewMemory[cycleTable] = *getStorage();
//localViewFlag = 1;
storeCurentTable = getStorage()->getDataPointer();
renderer->modeEdit();
Added: trunk/qcell/doc/licenciate_thesis/1d.png
===================================================================
(Binary files differ)
Property changes on: trunk/qcell/doc/licenciate_thesis/1d.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/qcell/doc/licenciate_thesis/2d.png
===================================================================
(Binary files differ)
Property changes on: trunk/qcell/doc/licenciate_thesis/2d.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/qcell/doc/licenciate_thesis/3d.png
===================================================================
(Binary files differ)
Property changes on: trunk/qcell/doc/licenciate_thesis/3d.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/qcell/doc/licenciate_thesis/mainwindow.png
===================================================================
(Binary files differ)
Property changes on: trunk/qcell/doc/licenciate_thesis/mainwindow.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/qcell/doc/licenciate_thesis/thesis.tex
===================================================================
--- trunk/qcell/doc/licenciate_thesis/thesis.tex 2007-01-17 18:24:56 UTC (rev 186)
+++ trunk/qcell/doc/licenciate_thesis/thesis.tex 2007-01-17 18:33:40 UTC (rev 187)
@@ -26,6 +26,10 @@
% Korzystamy z bajer\xF3w pdf'a, jak kolorowe linki
\pdfcompresslevel=9
+
+%grafika
+\usepackage{graphicx}
+
% Na razie wy\xB3\xB1czam, dop\xF3ki nie wymy\xB6l\xEA, jak poradzi\xE6 sobie ze stron\xB1 tytu\xB3ow\xB1
\usepackage[colorlinks,hyperindex,plainpages=false]{hyperref}
@@ -248,10 +252,51 @@
\chapter{Instrukcja obs\xB3ugi pakietu}
IMHO nie ma sensu tworzenia rozdzia\xB3u ,,Pokaz mo\xBFliwo\xB6ci pakietu'', gdy\xBF 'mo\xBFliwo\xB6ci programu' zostan\xB1 zademonstrowane (zrzutami ekranu) w~tym rozdziale - ka\xBFda funkcjonalno\xB6\xE6 z~osobna.
+
\section{Typowy przebieg eksperymentu [Quickstart? Jak to nazwa\xE6?]}
-\chapter{Zako\xF1czenie}
+\begin{enumerate}
+ \item Menu g\xB3\xF3wne
+ \item Opcje symulacji
+ \item Zak\xB3adki tryb\xF3w wizualizacji
+ \item Panel narz\xEAdzi
+ \item Widok g\xB3\xF3wny
+\end{enumerate}
+\subsection{Menu g\xB3owne}
+\label{sec:}
+Zawiera podstawowe komendy umo\xBFliwiajace wczytanie konfiguracji eksperymentu, funkcj lokalnej, pliku sasiedztwa oraz konfiguracji inicjalnej eksperymentu.
+\subsection{Opcje symulacji}
+\label{sec:}
+Umo\xBFliwia sterowanie symulacja, prace krokow\xB9 oraz ciag\xB3a.
+
+\subsection{Zak\xB3adki tryb\xF3w wizualizacji }
+\label{sec:}
+Zak\xB3adki przypisane s\xB9 do poszczeg\xF3lnych tryb\xF3w wizualizaji. Umo\xBFliwiaj\xB9 prze\xB3aczanie powi\xEAdzy trybami 1D, 2D, 3D. Nie wszystkie wizualizacje dost\xEApne s\xB9 dla wszystkich konfiguracji.
+
+\subsection{Panel narz\xEAdzi}
+\label{sec:}
+Panel ten zawiera narzedzia przypisane do poszczeg\xF3lnych widok\xF3w eksperyment oraz podstawowe narzedzia edycji i trybu obserwatora. W trybie obserwatora lokalnego narz\xEAdzia edycji s\xB9 niedost\xEApne.
+
+\subsection{Widok g\xB3\xF3wny}
+\label{sec:}
+
+\section{Konfiguracja Symboli}
+\label{sec:}
+W celu dokonania konfiguracji symboli przechodzimy do zakladki "Konfiguracja Symboli" przedstawiaj\xB9cej aktualne ustawienia. Widoczna tabela zawiera:
+
+\begin{enumerate}
+ \item przycisk nowy dodajacy symbol
+ \item przycisk usuwajacy ostatni symbol z tabeli(minimalna liczba symboli 2)
+ \item wartos\xE6
+ \item symbol tekstowy przypisany do wartosci
+ \item kolor w trybie graficznym
+ \item model w trybie 3D
+ \item flaga ukrycia(zaznaczenie oznacza ukryci wartosci w trybie 3D);
+\end{enumerate}
+
+Zmiany dokonyujemy klikaj\xB9c 2xLPM
+
% Bibliografia w zewn\xEAtrznym pliku w/g standardu natbib
\bibliographystyle{plain}
\bibliography{thesis}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
