exposurses: Check-in [a88f7285c1]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	For ref: Try wrapping menu and window creation in single function Got this so it drew everything ok, but segfaults as soon as a key is pressed. I obviously don't understand pointers, etc properly yet. As although it's drawn the menus it hasn't "attached" them the the objects/pointers I was expecting.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| origin/master \| trunk
Files:	files \| file ages \| folders
SHA3-256:	a88f7285c1b85e569cca145436d9d3691a3842a3fe625dda41b01fb470d8a541
User & Date:	base@atomicules.co.uk 2013-09-18 10:33:49

Context

2013-09-18
10:44		Add debug options to Makefile Not as simple as adding `-g` option as also need to ensure not calling the `-s` option which strips the debug info. Decided to change so have a `make` and a `make debug` check-in: 86fd753f70 user: base@atomicules.co.uk tags: origin/master, trunk
10:33		For ref: Try wrapping menu and window creation in single function Got this so it drew everything ok, but segfaults as soon as a key is pressed. I obviously don't understand pointers, etc properly yet. As although it's drawn the menus it hasn't "attached" them the the objects/pointers I was expecting. check-in: a88f7285c1 user: base@atomicules.co.uk tags: origin/master, trunk
2013-09-10
08:51		Make exposure menu functional - Make it function so that user is constrained to exposure menu initially and must select value there. - Once selected, the ISO menu becomes active and user must select value there - Finally make both shutter and aperture menus actives (switch between them with left/right arrow keys). Whichever is selected, the other will be calculated. This is not very pretty: - I don't like having both the selection_counter and menu_counter. Seems almost redundant. Made sense before I constrained selections and stepped through the menu's etc (and therefore you could re-select), but now seems annoying to have to keep it only for how last two menus work. - I don't like the repetitive menu creation stuff. That should be DRY-ed up. check-in: 580afe6ab4 user: base@atomicules.co.uk tags: origin/master, trunk

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to exposurses.c.

     84     85     86     87     88     89       90     91     92     93     94     95     96 ......    118    119    120    121    122    123    124     125    126    127    128    129    130    131    132    133    134    135    136    137    138    139    140    141    142    143    144    145    146    147    148    149    150    151    152    153    154    155    156    157    158    159    160    161    162    163    164    165    166    167    168    169    170    171    172    173    174    175    176    177    178    179    180    181    182    183    184    185    186    187    188    189    190    191    192    193    194    195    196    197    198    199    200    201    202    203    204    205    206    207    208    209    210    211    212    213    214    215    216        217    218    219    220    221    222    223 ......    252    253    254    255    256    257     258    259    260    261    262    263    264 ......    332    333    334    335    336    337    338    339    340    341    342    343    344    345    346    347    348    349    350    351    352    353        354    355                                     356    357    358    359    360    361    362

class="diffln"> 83 83 MENU *aperture_menu; 84 WINDOW *exposure_win; 85 WINDOW *iso_win; 86 WINDOW *shutter_win; 87 WINDOW *aperture_win; 88 89 void selection(char *name); 90 +void add_menu(char **array, ITEM **items, MENU *men, WINDOW *win, int n, int xpos, char *title); 91 +void remove_menu(ITEM **items, MENU *men, int n); 92 void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color); 93 int exposure(int iso); 94 double shutter(int exposure, double aperture); 95 double aperture(int exposure, double shutter); 96 int nearest_match(double x, int menu); 97 double fraction_to_double(char *fraction); 98 /* No one will ever need more than 9 bytes! */ .......................................................................... class="diffln"> 117 119 cbreak(); 120 noecho(); 121 keypad(stdscr, TRUE); 122 init_pair(1, COLOR_RED, COLOR_BLACK); 123 init_pair(2, COLOR_CYAN, COLOR_BLACK); 124 125 /* Create items */ - /* Lot's of repitition here. Surely can be wrapped in a function */ 126 + /* Can't really avoid finding array sizes here */ 127 n_exposure = ARRAY_SIZE(exposure_array); 128 n_iso = ARRAY_SIZE(iso_array); 129 n_shutter = ARRAY_SIZE(shutter_array); 130 n_aperture = ARRAY_SIZE(aperture_array); - exposure_items = (ITEM **)calloc(n_exposure, sizeof(ITEM *)); - for(i = 0; i < n_exposure; ++i) { - exposure_items[i] = new_item(exposure_array[i], exposure_array[i]); - set_item_userptr(exposure_items[i], selection); - } - iso_items = (ITEM **)calloc(n_iso, sizeof(ITEM *)); - for(i = 0; i < n_iso; ++i) { - iso_items[i] = new_item(iso_array[i], iso_array[i]); - set_item_userptr(iso_items[i], selection); - } - shutter_items = (ITEM **)calloc(n_shutter, sizeof(ITEM *)); - for(i = 0; i < n_shutter; ++i) { - shutter_items[i] = new_item(shutter_array[i], shutter_array[i]); - set_item_userptr(shutter_items[i], selection); - } - aperture_items = (ITEM **)calloc(n_aperture, sizeof(ITEM *)); - for(i = 0; i < n_aperture; ++i) { - aperture_items[i] = new_item(aperture_array[i], aperture_array[i]); - set_item_userptr(aperture_items[i], selection); - } - - /* Create menu */ - exposure_menu = new_menu((ITEM **)exposure_items); - iso_menu = new_menu((ITEM **)iso_items); - shutter_menu = new_menu((ITEM **)shutter_items); - aperture_menu = new_menu((ITEM **)aperture_items); - - /* Create the window to be associated with the menu */ - exposure_win = newwin(10, 40, 4, 4); - keypad(exposure_win, TRUE); - iso_win = newwin(10, 40, 4, 45); - keypad(iso_win, TRUE); - shutter_win = newwin(10, 40, 4, 86); - keypad(shutter_win, TRUE); - aperture_win = newwin(10, 40, 4, 127); - keypad(aperture_win, TRUE); - - /* Set main window and sub window */ - set_menu_win(exposure_menu, exposure_win); - set_menu_sub(exposure_menu, derwin(exposure_win, 6, 38, 3, 1)); - set_menu_win(iso_menu, iso_win); - set_menu_sub(iso_menu, derwin(iso_win, 6, 38, 3, 1)); - set_menu_win(shutter_menu, shutter_win); - set_menu_sub(shutter_menu, derwin(shutter_win, 6, 38, 3, 1)); - set_menu_win(aperture_menu, aperture_win); - set_menu_sub(aperture_menu, derwin(aperture_win, 6, 38, 3, 1)); - set_menu_format(exposure_menu, 5, 1); - set_menu_format(iso_menu, 5, 1); - set_menu_format(shutter_menu, 5, 1); - set_menu_format(aperture_menu, 5, 1); - - /* Set menu mark to the string " * " */ - set_menu_mark(exposure_menu, " * "); - set_menu_mark(iso_menu, " * "); - set_menu_mark(shutter_menu, " * "); - set_menu_mark(aperture_menu, " * "); - - /* Print a border around the main window and print a title */ - box(exposure_win, 0, 0); - box(iso_win, 0, 0); - box(shutter_win, 0, 0); - box(aperture_win, 0, 0); - print_in_middle(exposure_win, 1, 0, 40, "EV", COLOR_PAIR(1)); - print_in_middle(iso_win, 1, 0, 40, "ISO", COLOR_PAIR(1)); - print_in_middle(shutter_win, 1, 0, 40, "Shutter", COLOR_PAIR(1)); - print_in_middle(aperture_win, 1, 0, 40, "Aperture", COLOR_PAIR(1)); - mvwaddch(exposure_win, 2, 0, ACS_LTEE); - mvwaddch(iso_win, 2, 0, ACS_LTEE); - mvwaddch(shutter_win, 2, 0, ACS_LTEE); - mvwaddch(aperture_win, 2, 0, ACS_LTEE); - mvwhline(exposure_win, 2, 1, ACS_HLINE, 38); - mvwhline(iso_win, 2, 1, ACS_HLINE, 38); - mvwhline(shutter_win, 2, 1, ACS_HLINE, 38); - mvwhline(aperture_win, 2, 1, ACS_HLINE, 38); - mvwaddch(exposure_win, 2, 39, ACS_RTEE); - mvwaddch(iso_win, 2, 39, ACS_RTEE); - mvwaddch(shutter_win, 2, 39, ACS_RTEE); - mvwaddch(aperture_win, 2, 39, ACS_RTEE); - - /* Post the menu */ - post_menu(exposure_menu); - post_menu(iso_menu); - post_menu(shutter_menu); - post_menu(aperture_menu); - wrefresh(exposure_win); - wrefresh(iso_win); - wrefresh(shutter_win); - wrefresh(aperture_win); 131 + add_menu(exposure_array, exposure_items, exposure_menu, exposure_win, n_exposure, 4, "EV"); 132 + add_menu(iso_array, iso_items, iso_menu, iso_win, n_iso, 45, "ISO"); 133 + add_menu(shutter_array, shutter_items, shutter_menu, shutter_win, n_shutter, 86, "Shutter"); 134 + add_menu(aperture_array, aperture_items, aperture_menu, aperture_win, n_aperture, 127, "Aperture"); 135 136 attron(COLOR_PAIR(2)); 137 mvprintw(LINES - 2, 0, "Select EV"); 138 /*mvprintw(LINES - 2, 0, "Select ISO and then one of Shutter/Aperture to calculate other of Shutter/Aperture");*/ 139 mvprintw(LINES - 1, 0, "Arrow keys to navigate, Enter to select, Q to exit"); 140 attroff(COLOR_PAIR(2)); 141 refresh(); .......................................................................... class="diffln"> 251 169 case 10: { /* ENTER */ 170 ITEM *cur; 171 void (*p)(char *); 172 173 cur = current_item(*menu); 174 p = item_userptr(cur); 175 /* Learning notes - Don't understand this bit */ 176 + /* Is this a function pointer? */ 177 p((char *)item_name(cur)); 178 179 switch (selection_counter) { 180 case 1: { /* Exposure selected */ 181 selection_counter += 1; 182 menu_counter += 1; 183 move(LINES - 2, 0); .......................................................................... class="diffln"> 331 250 } 251 } 252 break; 253 } 254 wrefresh(*win); 255 } 256 /* Unpost and free all the memory taken up */ - unpost_menu(exposure_menu); - unpost_menu(iso_menu); - unpost_menu(shutter_menu); - unpost_menu(aperture_menu); - free_menu(exposure_menu); - free_menu(iso_menu); - free_menu(shutter_menu); - free_menu(aperture_menu); - for(i = 0; i < n_exposure; ++i) - free_item(iso_items[i]); - for(i = 0; i < n_iso; ++i) - free_item(iso_items[i]); - for(i = 0; i < n_shutter; ++i) - free_item(shutter_items[i]); - for(i = 0; i < n_aperture; ++i) - free_item(aperture_items[i]); 257 + remove_menu(exposure_items, exposure_menu, n_exposure); 258 + remove_menu(iso_items, iso_menu, n_iso); 259 + remove_menu(shutter_items, shutter_menu, n_shutter); 260 + remove_menu(aperture_items, aperture_menu, n_aperture); 261 endwin(); 262 } 263 + 264 +void add_menu(char **array, ITEM **items, MENU *men, WINDOW *win, int n, int xpos, char *title) { 265 + int i; 266 + 267 + items = (ITEM **)calloc(n, sizeof(ITEM *)); 268 + for(i = 0; i<n; ++i) { 269 + items[i] = new_item(array[i], array[i]); 270 + set_item_userptr(items[i], selection); 271 + } 272 + men = new_menu((ITEM **)items); 273 + win = newwin(10, 40, 4, xpos); 274 + keypad(win, TRUE); 275 + set_menu_win(men, win); 276 + set_menu_sub(men, derwin(win, 6, 38, 3, 1)); 277 + set_menu_format(men, 5, 1); 278 + set_menu_mark(men, " * "); 279 + box(win, 0, 0); 280 + print_in_middle(win, 1, 0, 40, title, COLOR_PAIR(1)); 281 + mvwaddch(win, 2, 0, ACS_LTEE); 282 + mvwhline(win, 2, 1, ACS_HLINE, 38); 283 + mvwaddch(win, 2, 39, ACS_RTEE); 284 + post_menu(men); 285 + wrefresh(win); 286 +} 287 + 288 +void remove_menu(ITEM **items, MENU *men, int n) { 289 + int i; 290 + 291 + unpost_menu(men); 292 + free_menu(men); 293 + for(i = 0; i < n; ++i) 294 + free_item(items[i]); 295 +} 296 297 void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color) { 298 int length, x, y; 299 float temp; 300 301 if(win == NULL) 302 win = stdscr;