Changeset 310

Timestamp:

02/28/08 16:02:53 (5 years ago)

Author:

grand

Message:

• A460: Added missed part for latest Fingalo's modifications.

Location:

trunk/core

Files:

• gui_menu.c (modified) (3 diffs)
• gui_osd.c (modified) (4 diffs)

trunk/core/gui_menu.c

@@ -92 +92 @@
 static char sbuf[7];
     switch (kbd_get_autoclicked_key()) {
-
+#if !defined (CAMERA_a460)
         case KEY_ERASE:
                 if (conf.user_menu_enable == 2) {
@@ -102 +102 @@
                 }
                 break;
-                
+#endif          
         case KEY_UP:
             do {
@@ -314 +314 @@
 #if defined (CAMERA_a460)
         case KEY_DISPLAY:
-            if (int_incr <= 1000){
-                int_incr *= 10;
+            if (conf.user_menu_enable == 2) {
+               if (curr_menu->title != LANG_MENU_USER_MENU)
+                  add_user_menu(curr_menu->menu[gui_menu_curr_item],&gui_menu_add_item, 0);
+               else
+                  add_user_menu(curr_menu->menu[gui_menu_curr_item],&gui_menu_add_item, 1);
+               gui_menu_redraw=1;
             }
             else {
-               int_incr = 1;
-            }
-            sprintf(sbuf, "±%d",int_incr);
-            if (int_incr == 1) {
-               draw_string(FONT_WIDTH*2,0,"    ", MAKE_COLOR(COLOR_TRANSPARENT, COLOR_TRANSPARENT));
-            }
-            draw_string(0,0,sbuf,MAKE_COLOR(COLOR_SELECTED_BG, COLOR_SELECTED_FG));
+               if (int_incr <= 1000){
+                   int_incr *= 10;
+               }
+               else {
+                  int_incr = 1;
+               }
+               sprintf(sbuf, "±%d",int_incr);
+               if (int_incr == 1) {
+                  draw_string(FONT_WIDTH*2,0,"    ", MAKE_COLOR(COLOR_TRANSPARENT, COLOR_TRANSPARENT));
+               }
+               draw_string(0,0,sbuf,MAKE_COLOR(COLOR_SELECTED_BG, COLOR_SELECTED_FG));
+            }
             break;
 

trunk/core/gui_osd.c

@@ -197 +197 @@
                 draw_set_draw_proc(draw_pixel_buffered);
                 if ((mode_get()&MODE_MASK) == MODE_REC) {
+                    if (conf.show_dof != DOF_DONT_SHOW) gui_osd_calc_dof();
                     if (conf.show_grid_lines) {
                         gui_grid_draw_osd(1);
                     }
-                    if (conf.show_dof) {
+                    if (conf.show_dof == DOF_SHOW_IN_DOF) {
                         gui_osd_draw_dof();
                     }
@@ -424 +425 @@
         }
     }
-
-    if ((histo_magnification) || (conf.show_overexp )) {
-        if ((conf.show_overexp ) && kbd_is_key_pressed(KEY_SHOOT_HALF) && (under_exposed || over_exposed))  
-                   draw_string(conf.histo_pos.x+HISTO_WIDTH-FONT_WIDTH*3, conf.histo_pos.y-FONT_HEIGHT, "EXP", conf.histo_color);
-        if (histo_magnification) {
-                   sprintf(osd_buf, " %d.%02dx ", histo_magnification/1000, histo_magnification/10%100);
-                   draw_string(conf.histo_pos.x, conf.histo_pos.y-FONT_HEIGHT, osd_buf, conf.histo_color);
-           }
-    } else {
+    if ((conf.show_overexp ) && kbd_is_key_pressed(KEY_SHOOT_HALF) && (under_exposed || over_exposed))
+      draw_string(conf.histo_pos.x+HISTO_WIDTH-FONT_WIDTH*3, conf.histo_pos.y-FONT_HEIGHT, "EXP", conf.histo_color);
+    if (conf.histo_auto_ajust){
+      if (histo_magnification) {
+        sprintf(osd_buf, " %d.%02dx ", histo_magnification/1000, histo_magnification/10%100);
+        draw_string(conf.histo_pos.x, conf.histo_pos.y-FONT_HEIGHT, osd_buf, conf.histo_color);
+      } else if (gui_get_mode()==GUI_MODE_OSD){
+        draw_string(conf.histo_pos.x, conf.histo_pos.y-FONT_HEIGHT, " 9.99x ", conf.histo_color);
+      } else {
         draw_filled_rect(conf.histo_pos.x, conf.histo_pos.y-FONT_HEIGHT, conf.histo_pos.x+8*FONT_WIDTH, conf.histo_pos.y-1, MAKE_COLOR(COLOR_TRANSPARENT, COLOR_TRANSPARENT));
+      }
     }
 }
@@ -694 +696 @@
     n=0;
 
-   if (((conf.tv_override_value) && (conf.tv_override_koef)) || gui_mode==GUI_MODE_OSD){
+    if (((conf.tv_override_value) && (conf.tv_override_koef)) || gui_mode==GUI_MODE_OSD){
         if(kbd_is_key_pressed(KEY_SHOOT_HALF)) 
                   { 
                   t=(int)(shooting_get_shutter_speed_from_tv96(shooting_get_tv96())*100000);    
-                  gui_print_osd_state_string_float("TV:", "%d.%05d ", 100000, t);
-                  }
+        gui_print_osd_state_string_float("TV:", "%d.%05d ", 100000, t);
+    }
         else 
                  {
@@ -790 +792 @@
       if (conf.values_show_luminance) gui_print_osd_misc_string_float("B  :", "%d.%02d ", 100, expo.b);
     }
+    
 }
 //-------------------------------------------------------------------