author | cniehaus <cniehaus> | 2002-09-19 13:54:25 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2002-09-19 13:54:25 (UTC) |
commit | 477a620e5745bd30222fe72d9c9b842785c285ab (patch) (unidiff) | |
tree | d458aefeacb29d2d863db693349328a0a29e8bb4 /noncore/apps | |
parent | 71af43c57ea311efbd1cc9b9b18996718a48b3a1 (diff) | |
download | opie-477a620e5745bd30222fe72d9c9b842785c285ab.zip opie-477a620e5745bd30222fe72d9c9b842785c285ab.tar.gz opie-477a620e5745bd30222fe72d9c9b842785c285ab.tar.bz2 |
will continue in some hours... The new class Element should work now. Data
storage is still lacking
-rw-r--r-- | noncore/apps/oxygen/dataTable.h | 9 | ||||
-rw-r--r-- | noncore/apps/oxygen/psewidget.cpp | 10 | ||||
-rw-r--r-- | noncore/apps/oxygen/psewidget.h | 47 |
3 files changed, 66 insertions, 0 deletions
diff --git a/noncore/apps/oxygen/dataTable.h b/noncore/apps/oxygen/dataTable.h index 624e8bd..bdcaa99 100644 --- a/noncore/apps/oxygen/dataTable.h +++ b/noncore/apps/oxygen/dataTable.h | |||
@@ -17,6 +17,15 @@ | |||
17 | class QLabel; | 17 | class QLabel; |
18 | class OxydataTable; | 18 | class OxydataTable; |
19 | 19 | ||
20 | /* | ||
21 | * A OxydataWidget shows all known data of an element. It can | ||
22 | * be used for both the PSE and the pure Data-Dialog. It is | ||
23 | * a simple QHBox with 2 QStrings in it plus a OxydataTable | ||
24 | * which contains the rest of the data. | ||
25 | * | ||
26 | * Author: Carsten Niehaus <cniehaus@handhelds.org> | ||
27 | */ | ||
28 | |||
20 | class OxydataWidget : public QWidget | 29 | class OxydataWidget : public QWidget |
21 | { | 30 | { |
22 | Q_OBJECT | 31 | Q_OBJECT |
diff --git a/noncore/apps/oxygen/psewidget.cpp b/noncore/apps/oxygen/psewidget.cpp index cf55635..4e002d1 100644 --- a/noncore/apps/oxygen/psewidget.cpp +++ b/noncore/apps/oxygen/psewidget.cpp | |||
@@ -9,11 +9,21 @@ | |||
9 | 9 | ||
10 | #include <qpe/config.h> | 10 | #include <qpe/config.h> |
11 | #include <qlayout.h> | 11 | #include <qlayout.h> |
12 | #include <qlist.h> | ||
12 | #include "psewidget.h" | 13 | #include "psewidget.h" |
13 | #include "oxyframe.h" | 14 | #include "oxyframe.h" |
14 | 15 | ||
16 | |||
17 | Element::Element( const QString &name ) | ||
18 | { | ||
19 | } | ||
20 | |||
15 | PSEWidget::PSEWidget() : QWidget() | 21 | PSEWidget::PSEWidget() : QWidget() |
16 | { | 22 | { |
23 | QList<Element> elements; | ||
24 | elements.setAutoDelete( TRUE ); | ||
25 | elements.append( new Element( "1" ) ); | ||
26 | |||
17 | maingrid = new QGridLayout( 18 , 10 , -1 , "maingridlayout" ); | 27 | maingrid = new QGridLayout( 18 , 10 , -1 , "maingridlayout" ); |
18 | OxyFrame *configobj = new OxyFrame(this); | 28 | OxyFrame *configobj = new OxyFrame(this); |
19 | } | 29 | } |
diff --git a/noncore/apps/oxygen/psewidget.h b/noncore/apps/oxygen/psewidget.h index a0ab701..9f574ce 100644 --- a/noncore/apps/oxygen/psewidget.h +++ b/noncore/apps/oxygen/psewidget.h | |||
@@ -14,6 +14,53 @@ | |||
14 | 14 | ||
15 | class QGridLayout; | 15 | class QGridLayout; |
16 | 16 | ||
17 | class Element | ||
18 | { | ||
19 | public: | ||
20 | Element(const QString &elnum); | ||
21 | ~Element(); | ||
22 | |||
23 | void setName( QString c){ name = c;}; | ||
24 | void setWeight( QString c){ weight = c;}; | ||
25 | void setDensityName( QString c){density = c;}; | ||
26 | void setGroup( QString c){group = c;}; | ||
27 | void setIE( QString c){ie = c;}; | ||
28 | void setNum( QString c){num = c;}; | ||
29 | void setAZ( QString c){az = c;}; | ||
30 | void setDate( QString c){date = c;}; | ||
31 | void setEN( QString c){en = c;}; | ||
32 | void setMP( QString c){mp = c;}; | ||
33 | void setBP( QString c){bp = c;}; | ||
34 | void setAR( QString c){ar = c;}; | ||
35 | |||
36 | QString elname() const{ return name; }; | ||
37 | QString elweight() const{ return weight; }; | ||
38 | QString eldensity() const{ return density; }; | ||
39 | QString elgroup() const{ return group; }; | ||
40 | QString elie() const{ return ie; }; | ||
41 | QString elnum() const{ return num; }; | ||
42 | QString elaz() const{ return az; }; | ||
43 | QString eldate() const{ return date; }; | ||
44 | QString elen() const{ return en; }; | ||
45 | QString elmp() const{ return mp; }; | ||
46 | QString elbp() const{ return bp; }; | ||
47 | QString elar() const{ return ar; }; | ||
48 | |||
49 | private: | ||
50 | QString name, // The name of the element | ||
51 | weight, // weight | ||
52 | density, // density | ||
53 | group, // group | ||
54 | ie, // ionisationenergie | ||
55 | num, // number ( e.g. Carbon is 6 ) | ||
56 | az, // state of aggregation | ||
57 | date, // date of discovery | ||
58 | en, // electronegativity | ||
59 | mp, // meltingpoint | ||
60 | bp, // boilingpoint | ||
61 | ar; // atomic radius | ||
62 | }; | ||
63 | |||
17 | class PSEWidget : public QWidget | 64 | class PSEWidget : public QWidget |
18 | { | 65 | { |
19 | Q_OBJECT | 66 | Q_OBJECT |