Showing 1 changed files with 6 additions and 29 deletions
+6 -29
Nasal/MFD.pages.nas
... ...
@@ -31,12 +31,7 @@ displayClass.MFD = {
31 31
                 }
32 32
             }
33 33
             var windowId = 'SYSTEM SETUP';
34
-            var obj_s = size(obj_infos);
35
-            me.device.windows.draw(
36
-                windowId,
37
-                {autogeom: 1},
38
-                obj_infos
39
-            );
34
+            me.device.windows.draw( windowId, obj_infos );
40 35
             me.device.buttons.CLR = func {
41 36
                 me.device.windows.del(windowId);
42 37
                 me.device.buttons.ENT = func;
... ...
@@ -79,12 +74,7 @@ displayClass.MFD = {
79 74
             }
80 75
             append(obj_infos, {type: 'separator'});
81 76
             var windowId = 'NEAREST AIRPORTS';
82
-            me.device.windows.draw(
83
-                windowId,
84
-                {autogeom: 1},
85
-                obj_infos,
86
-                {lines: 4, columns: 1}
87
-            );
77
+            me.device.windows.draw( windowId, obj_infos, {lines: 4, columns: 1} );
88 78
             me.device.buttons.CLR = func {
89 79
                 me.device.windows.del(windowId);
90 80
                 me.device.buttons.ENT = func;
... ...
@@ -139,12 +129,7 @@ displayClass.MFD = {
139 129
         }
140 130
         append(obj_infos, {type: 'separator'});
141 131
         var windowId = obj_infos[0].text;
142
-        me.device.windows.draw(
143
-            windowId,
144
-            {autogeom: 1},
145
-            obj_infos,
146
-            {lines: 4, columns: 1}
147
-        );
132
+        me.device.windows.draw( windowId, obj_infos, {lines: 4, columns: 1} );
148 133
         me.device.buttons.CLR = func {
149 134
             me.device.windows.del(windowId);
150 135
             me.device.buttons.ENT = func;
... ...
@@ -189,11 +174,7 @@ displayClass.MFD = {
189 174
             append(obj_infos, {text: sprintf('FREQ  %.2f kHz', info[0].frequency / 100), type: 'normal|end-of-line'});
190 175
         var lines = size(obj_infos);
191 176
         var windowId = 'NAVAID INFORMATIONS';
192
-        me.device.windows.draw(
193
-            windowId,
194
-            {autogeom: 1},
195
-            obj_infos
196
-        );
177
+        me.device.windows.draw( windowId, obj_infos );
197 178
         me.device.buttons.CLR = func {
198 179
             me.device.windows.del(windowId);
199 180
             me.device.buttons.ENT = func;
... ...
@@ -230,7 +211,7 @@ displayClass.MFD = {
230 211
         if (size(info.comms()) > 0) {
231 212
 # TODO: find nearby freqs if none found for airport
232 213
             append(obj_infos, {type: 'separator'}); sep += 1;
233
-            append(obj_infos, {text: 'COMMS FREQUENCIES', type: 'title|end-of-line'});
214
+            append(obj_infos, {text: 'COMMS FREQUENCIES', type: 'title'});
234 215
             var freqs = {};
235 216
             var comms = info.comms();
236 217
             foreach (var c; comms)
... ...
@@ -241,11 +222,7 @@ displayClass.MFD = {
241 222
         }
242 223
         var lines = size(obj_infos) - sep; # minus the separators
243 224
         var windowId = 'AIRPORT INFORMATIONS';
244
-        me.device.windows.draw(
245
-            windowId,
246
-            {autogeom: 1},
247
-            obj_infos
248
-        );
225
+        me.device.windows.draw( windowId, obj_infos );
249 226
         me.device.buttons.CLR = func {
250 227
             me.device.windows.del(windowId);
251 228
             me.device.buttons.ENT = func;