Changeset 531 for trunk/core/gui.c

Timestamp:

10/09/08 17:09:04 (5 years ago)

Author:

phyrephox

Message:

• increased version number to reflect for latest changes from previous revisions

+ added zoom override. first installment allows you to set a specific zoom value (on s3is for example between 0 and 128, on a620 between 0 and 8) that will be set upon starting the cam in record mode. Extra Photo Operations -> Zoom Override. You can disable and enable it there (default: off), also you can set the startup behaviour (there isnt much working right now :D). In the future: Not only set the zoom steps (in accurate int) but maybe set it using mm & factor (much like the shutter override menu stuff to allow for easing setting using "mnemonics"). Also will implement ZOOM BRACKETING. could be done via script, but then again everything could be done via script ;) Also i am wondering if i should focus after zooming. Also the zoom override should work like this, that no matter what value of zoom you set using the zoom lever, before each pic is taken the zoom will be set to the value you specified in the menu (much like shutter & aperture override). Also maybe implement the feature so that it remembers the actual zoom value you set (via lever/button) before shutting off the cam - and restore it when you power it on again!?
This feature works a) as somehow a "C" (custom mode in which you can save a few settings that will be remembered even when you shut off the cam) mode for cameras that dont have it and b) for studio photogs or other situations where you need the zoom in a fixed value over a long period of time. Noticed a bug: when you use this feature to zet zoom upon startup, you cant zoom out using the zoomlever, unless you zoom out before - i guess it is because the camera thinks you are still in wide (zoom 0). i guess one can fix that, dunno how though (yet).

• added security - now most "dangerous" functions (can also be called via ubasic or lua) are executed in record mode only (see ​http://chdk.setepontos.com/index.php/topic,2335.0.html & ​http://chdk.kernreaktor.org/mantis/view.php?id=30)
• added srpenneys documentation from ​http://chdk.kernreaktor.org/mantis/view.php?id=24
• fixed eol style in readme & version files so that the autobuilds will have readmes that can be read on windoze without problems
• fixed bug that was responsible for disabled OSD (see ​http://chdk.kernreaktor.org/mantis/view.php?id=31) - workaround up to now was to disable splashscreen. i fixed it by uncommenting my own code that disabled the OSD while the splashscreen is shown. this means that from this revision the CHDK osd icons/items will be shown on startup at the same time as the bootlogo - this is ugly, but not a critical bug, plus i guess it will be fixed sooner or later!

+ added czech language file

• fixed russian lang file - pethead updated it in the wiki (there are a lot of outdated lang files in the wiki, come on people!)

File:

• trunk/core/gui.c (modified) (5 diffs)

trunk/core/gui.c

@@ -168 +168 @@
 static const char* gui_bracket_type_enum(int change, int arg);
 static const char* gui_av_override_enum(int change, int arg);
+static const char* gui_zoom_override_enum(int change, int arg);
 static const char* gui_iso_override_koef_enum(int change, int arg);
 static const char* gui_tv_override_koef_enum(int change, int arg);
@@ -502 +503 @@
           {0x74,LANG_MENU_OVERRIDE_ISO_VALUE,      MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,  &conf.iso_override_value, MENU_MINMAX(0, 800)}, 
           {0x5f,LANG_MENU_OVERRIDE_ISO_KOEF,        MENUITEM_ENUM,    (int*)gui_iso_override_koef_enum},
+    {0x5c,LANG_MENU_OVERRIDE_ZOOM,         MENUITEM_BOOL,    &conf.zoom_override},
+    {0x5f,LANG_MENU_OVERRIDE_ZOOM_VALUE,          MENUITEM_ENUM,    (int*)gui_zoom_override_enum },   
+          
+          {0x5c,LANG_MENU_CLEAR_ZOOM_OVERRIDE_VALUES,    MENUITEM_BOOL,    (int*)&conf.clear_zoom_override},
+
           {0x2c,LANG_MENU_BRACKET_IN_CONTINUOUS,           MENUITEM_SUBMENU, (int*)&bracketing_in_continuous_submenu }, 
           {0x2d,LANG_MENU_AUTOISO,                  MENUITEM_SUBMENU, (int*)&autoiso_submenu },
       //{LANG_MENU_EXPOSURE,               MENUITEM_SUBMENU, (int*)&exposure_submenu },
           {0x5b,LANG_MENU_CLEAR_OVERRIDE_VALUES,    MENUITEM_BOOL,    (int*)&conf.clear_override},
+ 
       {0x5c,LANG_MENU_MISC_FAST_EV,         MENUITEM_BOOL,    &conf.fast_ev },
       {0x5f,LANG_MENU_MISC_FAST_EV_STEP,    MENUITEM_ENUM,    (int*)gui_fast_ev_step },
@@ -1549 +1556 @@
 }
 
+const char* gui_zoom_override_enum(int change, int arg) {
+    static char buf[3];
+    conf.zoom_override_value+=change;
+    if (conf.zoom_override_value<0) conf.zoom_override_value=zoom_points-1;
+    else if (conf.zoom_override_value>zoom_points-1) conf.zoom_override_value=0;
+                sprintf(buf,"%i",conf.zoom_override_value);
+                return buf; 
+}
+
 const char* gui_user_menu_show_enum(int change, int arg) {
     static const char* modes[]={ "Off", "On","On Direct", "Edit" };
@@ -1776 +1792 @@
     curve_load(conf.curve_file); // load curve upon init 
     drcurve_load("A/CHDK/SYSCURVES.CVF"); // load system L curves
+                shooting_set_zoom(conf.zoom_override_value);
 }
 
@@ -1823 +1840 @@
         if (gui_splash>(SPLASH_TIME-4)) {
             gui_draw_splash();
-                conf.show_osd = 0;
+           //   conf.show_osd = 0;
         } else if (gui_splash==1 && (mode_get()&MODE_MASK) == gui_splash_mode && (gui_mode==GUI_MODE_NONE || gui_mode==GUI_MODE_ALT)) {
             draw_restore();
-            conf.show_osd = 1;
+           // conf.show_osd = 1; //had to uncomment in order to fix a bug with disappearing osd...
         }
         --gui_splash;