Mercurial > public > hwos_code
comparison src/divemode.inc @ 309:efb53af0d62a new_screen_layout
VSIbar #1: layout position changes
author | janos_kovacs <kovjanos@gmail.com> |
---|---|
date | Sun, 07 Jun 2015 22:07:55 +0200 (2015-06-07) |
parents | 5ad479f2a868 |
children | 453a3d13570f |
comparison
equal
deleted
inserted
replaced
307:14719662fb95 | 309:efb53af0d62a |
---|---|
43 #DEFINE dm_offset .14 ; 14 | 43 #DEFINE dm_offset .14 ; 14 |
44 ; Depth | 44 ; Depth |
45 #DEFINE dm_depth_row dm_offset ; TOP - 14 - start position of the detph numbers | 45 #DEFINE dm_depth_row dm_offset ; TOP - 14 - start position of the detph numbers |
46 #DEFINE dm_depth_column .0 ; LEFT - 0 | 46 #DEFINE dm_depth_column .0 ; LEFT - 0 |
47 #DEFINE dm_depth_bot dm_depth_row+.61 ; 75 | 47 #DEFINE dm_depth_bot dm_depth_row+.61 ; 75 |
48 #DEFINE dm_depth_rgt dm_depth_column+.61 ; 61 | 48 #DEFINE dm_depth_rgt dm_depth_column+.59 ; 59 |
49 #DEFINE dm_depth_dm_row dm_depth_row+.25 ; 39 - if metric and d<100, decimeter shown as: ".5" | 49 #DEFINE dm_depth_dm_row dm_depth_row+.25 ; 39 - if metric and d<100, decimeter shown as: ".5" |
50 #DEFINE dm_depth_dm_column dm_depth_column+.40 ; 40 - bottom aligned so it has its own position (2nd content line only) | 50 #DEFINE dm_depth_dm_column dm_depth_column+.40 ; 40 - bottom aligned so it has its own position (2nd content line only) |
51 ; Ascend rate | 51 ; Ascend rate |
52 #DEFINE dm_velocity_text_row dm_depth_row+.62 ; 76 | 52 #DEFINE dm_velocity_text_row dm_depth_row+.62 ; 76 |
53 #DEFINE dm_velocity_text_column dm_depth_column ; 0 | 53 #DEFINE dm_velocity_text_column dm_depth_column ; 0 |
54 #DEFINE dm_velocity_text_bot dm_velocity_text_row+.23 ; 99 | 54 #DEFINE dm_velocity_text_bot dm_velocity_text_row+.23 ; 99 |
55 #DEFINE dm_velocity_text_rgt dm_depth_rgt ; 61 | 55 #DEFINE dm_velocity_text_rgt dm_depth_rgt ; 61 |
56 ; Ascend/Descend bar | |
57 #DEFINE dm_velobar_top dm_offset ; 14 | |
58 #DEFINE dm_velobar_lft dm_depth_rgt+.1 ; 62 | |
59 #DEFINE dm_velobar_bot dm_offset+.85 ; 99 | |
60 #DEFINE dm_velobar_rgt .73 ; 73 | |
56 | 61 |
57 ;******* Upper content / content row / 2nd col ******* | 62 ;******* Upper content / content row / 2nd col ******* |
63 #DEFINE dm_upcnt_2ndcol .74 ; 74 | |
58 ; Max depth | 64 ; Max depth |
59 #DEFINE dm_max_depth_row dm_offset ; 14 | 65 #DEFINE dm_max_depth_row dm_offset ; 14 |
60 #DEFINE dm_max_depth_column .64 ; 64 | 66 #DEFINE dm_max_depth_column dm_upcnt_2ndcol ; 74 |
61 #DEFINE dm_max_depth_bot dm_max_depth_row+.34 ; 48 | 67 #DEFINE dm_max_depth_bot dm_max_depth_row+.34 ; 48 |
62 #DEFINE dm_max_depth_rgt dm_max_depth_column+.36 ; 100 | 68 #DEFINE dm_max_depth_rgt dm_max_depth_column+.36 ; 100 |
63 #DEFINE dm_max_depth_dm_row dm_max_depth_row+.11 ; 25 | 69 #DEFINE dm_max_depth_dm_row dm_max_depth_row+.11 ; 25 |
64 #DEFINE dm_max_depth_dm_column dm_max_depth_column+.23 ; 87 | 70 #DEFINE dm_max_depth_dm_column dm_max_depth_column+.23 ; 87 |
65 ; Warning area (combined) | 71 ; Warning area (combined) |
66 #DEFINE dm_warning_row dm_offset+.36 ; 50 | 72 #DEFINE dm_warning_row dm_offset+.36 ; 50 |
67 #DEFINE dm_warning_column .64 ; 64 | 73 #DEFINE dm_warning_column dm_upcnt_2ndcol ; 74 |
68 #DEFINE dm_warning_bot dm_warning_row+.49 ; 99 | 74 #DEFINE dm_warning_bot dm_warning_row+.49 ; 99 |
69 #DEFINE dm_warning_rgt dm_warning_column+.68 ; 130 | 75 #DEFINE dm_warning_rgt dm_warning_column+.62 ; 136 |
70 #DEFINE dm_warning_length .9 ; total string length | 76 #DEFINE dm_warning_length .9 ; total string length |
71 ; Warning row #1 | 77 ; Warning row #1 |
72 #DEFINE dm_warning1_row dm_warning_row ; 36/50 | 78 #DEFINE dm_warning1_row dm_warning_row ; 36/50 |
73 #DEFINE dm_warning1_column dm_warning_column ; 64 | 79 #DEFINE dm_warning1_column dm_warning_column ; 64 |
74 #DEFINE dm_warning1_bot dm_warning1_row+.23 ; 59/73 | 80 #DEFINE dm_warning1_bot dm_warning1_row+.23 ; 59/73 |
75 #DEFINE dm_warning1_rgt dm_warning1_column+.68 ; 130 | 81 #DEFINE dm_warning1_rgt dm_warning_rgt ; 136 |
76 ; Warning row #2 | 82 ; Warning row #2 |
77 #DEFINE dm_warning2_row dm_warning_row+.24 ; 60/74 | 83 #DEFINE dm_warning2_row dm_warning_row+.24 ; 60/74 |
78 #DEFINE dm_warning2_column dm_warning_column ; 64 | 84 #DEFINE dm_warning2_column dm_warning_column ; 64 |
79 #DEFINE dm_warning2_bot dm_warning2_row+.23 ; 83/97 | 85 #DEFINE dm_warning2_bot dm_warning2_row+.23 ; 83/97 |
80 #DEFINE dm_warning2_rgt dm_warning2_column+.68 ; 130 | 86 #DEFINE dm_warning2_rgt dm_warning_rgt ; 136 |
81 | 87 |
82 ;******* Upper content / content row / 3rd col ******* | 88 ;******* Upper content / content row / 3rd col ******* |
83 ; Dive time | 89 ; Dive time |
84 #DEFINE dm_divetime_row dm_offset ; 14 | 90 #DEFINE dm_divetime_row dm_offset ; 14 |
85 #DEFINE dm_divetime_column .115 ; 115 | 91 #DEFINE dm_divetime_column .115 ; 115 |
88 #DEFINE dm_divetime_rgt .159 ; 159 | 94 #DEFINE dm_divetime_rgt .159 ; 159 |
89 #DEFINE dm_divetime_secs_row dm_divetime_row+.11 ; 25 | 95 #DEFINE dm_divetime_secs_row dm_divetime_row+.11 ; 25 |
90 #DEFINE dm_divetime_secs_column dm_divetime_column+.24 ; 139 | 96 #DEFINE dm_divetime_secs_column dm_divetime_column+.24 ; 139 |
91 ; Warning icon | 97 ; Warning icon |
92 #DEFINE dm_warning_icon_row dm_offset+.41 ; 55 | 98 #DEFINE dm_warning_icon_row dm_offset+.41 ; 55 |
93 #DEFINE dm_warning_icon_column .135 ; 135 | 99 #DEFINE dm_warning_icon_column .137 ; 137 |
94 #DEFINE dm_warning_icon_bot dm_warning_icon_row+.38 ; 93 | 100 #DEFINE dm_warning_icon_bot dm_warning_icon_row+.38 ; 93 |
95 #DEFINE dm_warning_icon_rgt dm_warning_icon_column+.21 ; 156 | 101 #DEFINE dm_warning_icon_rgt dm_warning_icon_column+.21 ; 156 |
96 ; Apnea dive time | 102 ; Apnea dive time |
97 #DEFINE dm_divetime_apnoe_row dm_offset ; 14 | 103 #DEFINE dm_divetime_apnoe_row dm_offset ; 14 |
98 #DEFINE dm_divetime_apnoe_column .103 ; 103 | 104 #DEFINE dm_divetime_apnoe_column .103 ; 103 |