exposurses: Check-in [4cc8e33f3c]

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

Overview

Comment:	Ignore selection of OVER/UNDER in shutter/aperture menus Since this seems easier than trying to prevent selection.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| origin/master \| trunk
Files:	files \| file ages \| folders
SHA3-256:	4cc8e33f3c9fdaff2714a8b807bf794125b0c15368eb2ac98f7c2eacd70fe3cc
User & Date:	base@atomicules.co.uk 2013-09-18 12:49:36
Original User & Date:	base@atomicules.co.uk 2013-09-18 12:49:37

Context

2013-09-18
12:49		Split out ITEM creation into separate func so can clean on exit I still hadn't got things quite right from when I'd split out the menu and window creation functions. The segfault on exit was due to the item pointers I thought existed not actually existing. Need to make sure they exist as expected as otherwise I can't free up the memory, etc. Yay, pretty much done. check-in: d39151ac51 user: base@atomicules.co.uk tags: origin/master, trunk
12:49		Ignore selection of OVER/UNDER in shutter/aperture menus Since this seems easier than trying to prevent selection. check-in: 4cc8e33f3c user: base@atomicules.co.uk tags: origin/master, trunk
12:48		Add under/over exposure indication in to the shutter/aperture menus Keeping the NULLs in makes array indices very confusing, but this seems to be the right thing to do. check-in: 7312ab2b6f user: base@atomicules.co.uk tags: origin/master, trunk

Changes

Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to exposurses.c.

				void (*p)(char *);

				cur = current_item(*menu);
				p = item_userptr(cur);
				/* Learning notes - Don't understand this bit */
				/* Is this a function pointer? */
				p((char *)item_name(cur));
				





				switch (selection_counter) {
					case 1: { /* Exposure selected */
						selection_counter += 1;
						menu_counter += 1;
						move(LINES - 2, 0);
						clrtoeol();
						mvprintw(LINES - 2, 0, "Select ISO");
						refresh();
						menu = &iso_menu;
						win = &iso_win;
					}
					break;
					case 2: { /* ISO Selected */
						selection_counter += 1;
						menu_counter += 1;
						move(LINES - 2, 0);
						clrtoeol();
						mvprintw(LINES - 2, 0, "Select Shutter or Aperture");
						refresh();
						menu = &shutter_menu;
						win = &shutter_win;
					}
					break;
					case 3: { /* Shutter or Aperture selected */
						if (strcmp("", shutter_sel) == 0) {
							char aperture_sel_[4] = "";
							strncpy(aperture_sel_, aperture_sel+2, 3);
							/* Using menu_driver to go up/down to force refresh and correct highlighting */
							menu_driver(shutter_menu, REQ_SCR_UPAGE);
							menu_driver(shutter_menu, REQ_SCR_DPAGE);
							/* There is probably a nicer way to format the below */
							set_menu_pattern(
								shutter_menu,
								shutter_array[nearest_match(
									shutter(exposure(atoi(iso_sel)), strtod(aperture_sel_, NULL)),
									3,
									n_shutter
								)]
							);
							menu_driver(shutter_menu, REQ_DOWN_ITEM);
							menu_driver(shutter_menu, REQ_UP_ITEM);
							wrefresh(shutter_win);
						}
						if (strcmp("", aperture_sel) == 0) {
							menu_driver(aperture_menu, REQ_SCR_UPAGE);
							menu_driver(aperture_menu, REQ_SCR_DPAGE);
							set_menu_pattern(
								aperture_menu,
								aperture_array[nearest_match(
									aperture(exposure(atoi(iso_sel)), fraction_to_double(shutter_sel)),
									4,
									n_aperture
								)]
							);
							menu_driver(aperture_menu, REQ_DOWN_ITEM);
							menu_driver(aperture_menu, REQ_UP_ITEM);
							wrefresh(aperture_win);
						}
						/* clear the selections for next time */
						strcpy(iso_sel, "");
						strcpy(shutter_sel, "");
						strcpy(aperture_sel, "");
						/* And set defaults back to start */
						selection_counter = 1;
						menu_counter = 1;
						menu = &exposure_menu;
						win = &exposure_win;
						move(LINES - 2, 0);
						clrtoeol();
						mvprintw(LINES - 2, 0, "Select EV");
						refresh();
					}
					break;









				}
			}
			break;
		}
		wrefresh(*win);
	}	
	/* Unpost and free all the memory taken up */








<
>
>
>
>
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
>
>
>
>
>
>
>
>
>

				void (*p)(char *);

				cur = current_item(*menu);
				p = item_userptr(cur);
				/* Learning notes - Don't understand this bit */
				/* Is this a function pointer? */
				p((char *)item_name(cur));

				/* need to igore over/under if selected, probably easier than try to prevent selection */
				if (!((strcmp("OVER", shutter_sel) == 0)
						|| (strcmp("UNDER", shutter_sel) == 0) 
						|| (strcmp("OVER", aperture_sel) == 0) 
						|| (strcmp("UNDER", aperture_sel) == 0))) {
					switch (selection_counter) {
						case 1: { /* Exposure selected */
							selection_counter += 1;
							menu_counter += 1;
							move(LINES - 2, 0);
							clrtoeol();
							mvprintw(LINES - 2, 0, "Select ISO");
							refresh();
							menu = &iso_menu;
							win = &iso_win;
						}
						break;
						case 2: { /* ISO Selected */
							selection_counter += 1;
							menu_counter += 1;
							move(LINES - 2, 0);
							clrtoeol();
							mvprintw(LINES - 2, 0, "Select Shutter or Aperture");
							refresh();
							menu = &shutter_menu;
							win = &shutter_win;
						}
						break;
						case 3: { /* Shutter or Aperture selected */
							if (strcmp("", shutter_sel) == 0) {
								char aperture_sel_[4] = "";
								strncpy(aperture_sel_, aperture_sel+2, 3);
								/* Using menu_driver to go up/down to force refresh and correct highlighting */
								menu_driver(shutter_menu, REQ_SCR_UPAGE);
								menu_driver(shutter_menu, REQ_SCR_DPAGE);
								/* There is probably a nicer way to format the below */
								set_menu_pattern(
									shutter_menu,
									shutter_array[nearest_match(
										shutter(exposure(atoi(iso_sel)), strtod(aperture_sel_, NULL)),
										3,
										n_shutter
									)]
								);
								menu_driver(shutter_menu, REQ_DOWN_ITEM);
								menu_driver(shutter_menu, REQ_UP_ITEM);
								wrefresh(shutter_win);
							}
							if (strcmp("", aperture_sel) == 0) {
								menu_driver(aperture_menu, REQ_SCR_UPAGE);
								menu_driver(aperture_menu, REQ_SCR_DPAGE);
								set_menu_pattern(
									aperture_menu,
									aperture_array[nearest_match(
										aperture(exposure(atoi(iso_sel)), fraction_to_double(shutter_sel)),
										4,
										n_aperture
									)]
								);
								menu_driver(aperture_menu, REQ_DOWN_ITEM);
								menu_driver(aperture_menu, REQ_UP_ITEM);
								wrefresh(aperture_win);
							}
							/* clear the selections for next time */
							strcpy(iso_sel, "");
							strcpy(shutter_sel, "");
							strcpy(aperture_sel, "");
							/* And set defaults back to start */
							selection_counter = 1;
							menu_counter = 1;
							menu = &exposure_menu;
							win = &exposure_win;
							move(LINES - 2, 0);
							clrtoeol();
							mvprintw(LINES - 2, 0, "Select EV");
							refresh();
						}
						break;
					}
				}
				/* If over/under need to clear selection so know which is blank
				 * when a proper selection is made */
				if ((strcmp("OVER", shutter_sel) == 0) || (strcmp("UNDER", shutter_sel) == 0)) {
					strcpy(shutter_sel, "");
				}
				if ((strcmp("OVER", aperture_sel) == 0) || (strcmp("UNDER", aperture_sel) == 0)) {
					strcpy(aperture_sel, "");
				}
			}
			break;
		}
		wrefresh(*win);
	}	
	/* Unpost and free all the memory taken up */