summaryrefslogtreecommitdiff
authorcniehaus <cniehaus>2003-01-03 16:07:22 (UTC)
committer cniehaus <cniehaus>2003-01-03 16:07:22 (UTC)
commit83acc7920179fba4b278bad9ba383ca8564b7278 (patch) (side-by-side diff)
treeedaf0e609a000cdb799981354cdb2bae13b6cc2a
parentdfd02afc1f3b3f0da39194d2224f56c5b7c1b12e (diff)
downloadopie-83acc7920179fba4b278bad9ba383ca8564b7278.zip
opie-83acc7920179fba4b278bad9ba383ca8564b7278.tar.gz
opie-83acc7920179fba4b278bad9ba383ca8564b7278.tar.bz2
fixing "content-bug"
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/oxygen/psewidget.cpp168
1 files changed, 84 insertions, 84 deletions
diff --git a/noncore/apps/oxygen/psewidget.cpp b/noncore/apps/oxygen/psewidget.cpp
index 4f990b0..be5185b 100644
--- a/noncore/apps/oxygen/psewidget.cpp
+++ b/noncore/apps/oxygen/psewidget.cpp
@@ -4,3 +4,3 @@
begin : September 2002
- copyright : ( C ) 2002 by Carsten Niehaus
+ copyright : ( C ) 2002, 2003 by Carsten Niehaus
email : cniehaus@handhelds.org
@@ -96,41 +96,20 @@ void PSEWidget::position(int n, int& h, int& v)
{
- //Hydrogen
- if (n == 1)
- {
- h=0; v=0;
- }
-
-
- //Helium
- if (n == 2)
- {
- h=680; v=0;
- }
-
-
- //Lithium
- if (n == 3)
- {
- h=0; v=40;
- }
+ //Hydrogen
+ if (n == 1)
+ {
+ h=0; v=0;
+ }
- //Beryllium
- if (n == 4)
- {
- h=40; v=40;
- }
+ //Helium
+ if (n == 2)
+ {
+ h=680; v=0;
+ }
- //Boron-->Neon or Aluminum --> Argon
- if ((n >= 5 && n <= 10) || (n >= 13 && n <= 18))
- for (int i = 1; i <= (6-(10-n)); i++)
+ //Lithium
+ if (n == 3)
{
- h=((i*40)+440);
- v = 40;
- if (n >= 13)
- {
- v=80;
- h=(h-320);
- }
+ h=0; v=40;
}
@@ -138,43 +117,27 @@ void PSEWidget::position(int n, int& h, int& v)
- //Sodium
- if (n == 11)
- {
- h=0; v=80;
- }
+ //Beryllium
+ if (n == 4)
+ {
+ h=40; v=40;
+ }
- //Magnesium
- if (n == 12)
- {
- h=40; v=80;
- }
+ //Boron-->Neon or Aluminum --> Argon
+ if ((n >= 5 && n <= 10) || (n >= 13 && n <= 18))
+ for (int i = 1; i <= (6-(10-n)); i++)
+ {
+ h=((i*40)+440);
+ v = 40;
+ if (n >= 13)
+ {
+ v=80;
+ h=(h-320);
+ }
+ }
- //Potassium --> Uuo without La and Ac
- if ((n >= 19 && n <= 56) || (n >= 72 && n <= 88) || n >= 104)
- for (int i = 1; i <= 18; i++)
+ //Sodium
+ if (n == 11)
{
- int f = n;
- if (n > 18)
- f = n-18;
- if (n > 36)
- f = n-36;
- if (n > 54)
- f = n-54;
- if (n > 71)
- f = n-68;
- if (n > 86)
- f = n-86;
- if (n > 103)
- f = n-100;
-
- h=((f*40)-40);
-
- v = 120;
- if (n >= 37)
- v=160;
- if (n >= 55)
- v=200;
- if (n >= 87)
- v=240;
+ h=0; v=80;
}
@@ -182,17 +145,54 @@ void PSEWidget::position(int n, int& h, int& v)
- //Lanthanum --> Lutetium and Actinum --> Lawrencium
- if ((n >= 57 && n <= 71) || (n >= 89 && n <= 103))
- for (int i = 1; i <= 14; i++)
+ //Magnesium
+ if (n == 12)
{
- int f = n;
- if (n > 56)
- f = n-55;
- if (n > 88)
- f = n-87;
- h=(f*40);
- v = 290;
- if (n >= 89)
- v=330;
+ h=40; v=80;
}
- v += 10;
+
+
+ //Potassium --> Uuo without La and Ac
+ if ((n >= 19 && n <= 57) || (n >= 72 && n <= 89) || n >= 104)
+ for (int i = 1; i <= 18; i++)
+ {
+ int f = n;
+ if (n > 18)
+ f = n-18;
+ if (n > 36)
+ f = n-36;
+ if (n > 54)
+ f = n-54;
+ if (n > 71)
+ f = n-68;
+ if (n > 86)
+ f = n-86;
+ if (n > 103)
+ f = n-100;
+
+ h=((f*40)-40);
+
+ v = 120;
+ if (n >= 37)
+ v=160;
+ if (n >= 55)
+ v=200;
+ if (n >= 87)
+ v=240;
+ }
+
+
+ //Lanthanum --> Lutetium and Actinum --> Lawrencium
+ if ((n >= 58 && n <= 71) || (n >= 90 && n <= 103))
+ for (int i = 1; i <= 14; i++)
+ {
+ int f = n;
+ if (n > 57)
+ f = n-55;
+ if (n > 88)
+ f = n-87;
+ h=(f*40);
+ v = 290;
+ if (n >= 90)
+ v=330;
+ }
+ v += 10;
}