Changeset 135

Timestamp:

04/21/07 11:27:54 (6 years ago)

Author:

GrAnd

Message:

+ OSD/histogram drawing over zebra
+ Clock in TextReader?
+ Focus distance in cm/m
+ Quick on/off Zebra mode by pressing [left] button while [shoot] button is half pressed ([up] for histogram toggle; [right] for OSD)

Location:

branches/grand

Files:

• core/conf.c (modified) (1 diff)
• core/gui.c (modified) (8 diffs)
• core/gui_osd.c (modified) (4 diffs)
• core/gui_osd.h (modified) (1 diff)
• core/gui_read.c (modified) (2 diffs)
• core/main.c (modified) (1 diff)
• include/conf.h (modified) (1 diff)
• platform/s3is/main.c (modified) (1 diff)

branches/grand/core/conf.c

@@ -113 +113 @@
     CONF_INFO( 54, conf.zebra_under,            CONF_DEF_VALUE, i:0, NULL),
     CONF_INFO( 55, conf.zebra_color,            CONF_DEF_VALUE, cl:MAKE_COLOR(COLOR_RED, COLOR_RED), NULL),
-    CONF_INFO( 56, conf.zebra_draw_histo,       CONF_DEF_VALUE, i:0, NULL),
+    CONF_INFO( 56, conf.zebra_draw_osd,         CONF_DEF_VALUE, i:ZEBRA_DRAW_HISTO, NULL),
 };
 #define CONF_NUM (sizeof(conf_info)/sizeof(conf_info[0]))

branches/grand/core/gui.c

@@ -57 +57 @@
 static const char* gui_histo_layout_enum(int change, int arg);
 static const char* gui_zebra_mode_enum(int change, int arg);
+static const char* gui_zebra_draw_osd_enum(int change, int arg);
 static const char* gui_font_enum(int change, int arg);
 static const char* gui_raw_prefix_enum(int change, int arg);
@@ -221 +222 @@
 
 static CMenuItem zebra_submenu_items[] = {
-    {"Draw Zebra instead of histo", MENUITEM_BOOL,                            &conf.zebra_draw },
+    {"Draw Zebra",                  MENUITEM_BOOL,                            &conf.zebra_draw },
     {"Zebra mode",                  MENUITEM_ENUM,                            (int*)gui_zebra_mode_enum },
     {"Draw UnderExplosure",         MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,  &conf.zebra_under,   MENU_MINMAX(0, 32)},
@@ -227 +228 @@
     {"Restore original screen",     MENUITEM_BOOL|MENUITEM_ARG_CALLBACK,      &conf.zebra_restore_screen,     (int)cb_zebra_restore_screen },
     {"Restore OSD",                 MENUITEM_BOOL|MENUITEM_ARG_CALLBACK,      &conf.zebra_restore_osd,        (int)cb_zebra_restore_osd },
-    {"Draw histogram over zebra",   MENUITEM_BOOL,                            &conf.zebra_draw_histo },
+    {"Draw over zebra",             MENUITEM_ENUM,                            (int*)gui_zebra_draw_osd_enum },
     {"<- Back",                     MENUITEM_UP },
     {0}
@@ -390 +391 @@
 
     return modes[conf.zebra_mode];
+}
+
+//-------------------------------------------------------------------
+const char* gui_zebra_draw_osd_enum(int change, int arg) {
+    static const char* modes[]={ "Nothing", "Histo", "OSD" };
+
+    conf.zebra_draw_osd+=change;
+    if (conf.zebra_draw_osd<0)
+        conf.zebra_draw_osd=(sizeof(modes)/sizeof(modes[0]))-1;
+    else if (conf.zebra_draw_osd>=(sizeof(modes)/sizeof(modes[0])))
+        conf.zebra_draw_osd=0;
+
+    return modes[conf.zebra_draw_osd];
 }
 
@@ -663 +677 @@
     unsigned int m, n = 0, mode_photo;
     coord x;
-    static int flashlight = 0, zebra = 0, zebra_init = 0;
+    static int flashlight = 0, zebra = 0, zebra_init = 0, pressed = 0;
     
     m = mode_get();
@@ -679 +693 @@
     }
 
+    if (kbd_is_key_pressed(KEY_SHOOT_HALF)) {
+        if (kbd_is_key_pressed(KEY_LEFT)) {
+            if (!pressed) {
+                conf.zebra_draw = !conf.zebra_draw;
+                if (zebra && !conf.zebra_draw) {
+                    zebra = 0;
+                    draw_restore();
+                }
+                pressed = 1;
+            }
+        } else if (kbd_is_key_pressed(KEY_UP)) {
+            if (!pressed) {
+                conf.show_histo = !conf.show_histo;
+                if (!conf.show_histo) {
+                    draw_restore();
+                }
+                pressed = 1;
+            }
+        } else if (kbd_is_key_pressed(KEY_RIGHT)) {
+            if (!pressed) {
+                conf.show_osd = !conf.show_osd;
+                if (!conf.show_osd) {
+                    draw_restore();
+                }
+                pressed = 1;
+            }
+        } else {
+            pressed = 0;
+        }
+    } else {
+        pressed = 0;
+    }
+    
     mode_photo = (m&MODE_MASK) == MODE_PLAY || 
                  !((m&MODE_SHOOTING_MASK)==MODE_VIDEO_STD || (m&MODE_SHOOTING_MASK)==MODE_VIDEO_SPEED || (m&MODE_SHOOTING_MASK)==MODE_VIDEO_COMPACT ||
@@ -733 +780 @@
 
     if (debug_vals_show) {
-//        long v=get_file_counter();
+        long v=get_file_counter();
 //      sprintf(osd_buf, "1:%03d-%04d  ", (v>>18)&0x3FF, (v>>4)&0x3FFF);
 //      sprintf(osd_buf, "1:%d, %08X  ", xxxx, eeee);
@@ -744 +791 @@
         sprintf(osd_buf, "3:%8x  ", physw_status[2]);
         draw_txt_string(28, 12, osd_buf, conf.osd_color);
+
+        sprintf(osd_buf, "4:%8x  ", v);
+        draw_txt_string(28, 13, osd_buf, conf.osd_color);
     }
 

branches/grand/core/gui_osd.c

@@ -168 +168 @@
 
 //-------------------------------------------------------------------
+static void gui_osd_draw_zebra_osd() {
+    switch (conf.zebra_draw_osd) {
+        case ZEBRA_DRAW_NONE:
+            break;
+        case ZEBRA_DRAW_OSD:
+            if (conf.show_osd) {
+                draw_set_draw_proc(draw_pixel_buffered);
+                if ((mode_get()&MODE_MASK) == MODE_REC) {
+                    if (conf.show_dof) {
+                        gui_osd_draw_dof();
+                    }
+                    if (conf.show_state) {
+                        gui_osd_draw_state();
+                    }
+                    if (conf.show_values) {
+                        gui_osd_draw_values();
+                    }
+                }
+                gui_batt_draw_osd();
+                if (conf.show_clock) {
+                    gui_osd_draw_clock();
+                }
+                draw_set_draw_proc(NULL);
+            }
+            /* no break here */
+        case ZEBRA_DRAW_HISTO:
+        default:
+            if (conf.show_histo) {
+                draw_set_draw_proc(draw_pixel_buffered);
+                gui_osd_draw_histo();
+                draw_set_draw_proc(NULL);
+            }
+            break;
+    }
+}
+
+//-------------------------------------------------------------------
 int gui_osd_draw_zebra() {
     unsigned int v, s, x, y, f, over;
@@ -207 +244 @@
                     draw_restore();
                 } else {
-                    memset(scr_buf, COLOR_TRANSPARENT, screen_size*2-1);
+                    memset(buf, COLOR_TRANSPARENT, screen_size);
+                    gui_osd_draw_zebra_osd();
+                    memcpy(scr_buf, buf, screen_size);
+                    memcpy(scr_buf+screen_size, buf, screen_size);
                 }
                 need_restore=0;
@@ -233 +273 @@
             }
             
-            if (conf.zebra_draw_histo && conf.show_histo) {
-                draw_set_draw_proc(draw_pixel_buffered);
-                gui_osd_draw_histo();
-                draw_set_draw_proc(NULL);
-            }
-
+            gui_osd_draw_zebra_osd();
             memcpy(scr_buf, buf, screen_size);
             memcpy(scr_buf+screen_size, buf, screen_size);
@@ -425 +460 @@
 
     lfp = lens_get_target_distance();
-    if (lfp == 0xFFFF) {
-        sprintf(osd_buf, "F:inf%8s", "");
-    } else {
-        sprintf(osd_buf, "F:%ld%8s", lfp, "");
-    }
+    strcpy(osd_buf, "F:");
+    sprintf_dist(osd_buf+2, lfp);
+    sprintf(osd_buf+strlen(osd_buf), "%8s", "");
     osd_buf[8]=0;
     draw_string(conf.values_pos.x, conf.values_pos.y+FONT_HEIGHT, osd_buf, conf.osd_color);

branches/grand/core/gui_osd.h

@@ -11 +11 @@
 #define OSD_HISTO_LAYOUT_Y_argb         5
 #define OSD_HISTO_LAYOUT_BLEND          6
+
+#define ZEBRA_DRAW_NONE                 0
+#define ZEBRA_DRAW_HISTO                1
+#define ZEBRA_DRAW_OSD                  2
 
 //-------------------------------------------------------------------

branches/grand/core/gui_read.c

@@ -26 +26 @@
 static void gui_read_draw_batt() {
     sprintf(buffer, "Batt:%3d%%", get_batt_perc());
-    draw_txt_string(screen_width/FONT_WIDTH-2-1-3-9, 0, buffer, MAKE_COLOR(COLOR_BLACK, COLOR_WHITE));
+    draw_txt_string(screen_width/FONT_WIDTH-2-1-1-9, 0, buffer, MAKE_COLOR(COLOR_BLACK, COLOR_WHITE));
+}
+
+//-------------------------------------------------------------------
+static void gui_read_draw_clock() {
+    unsigned long t;
+    static struct tm *ttm;
+
+    t = time(NULL);
+    ttm = localtime(&t);
+    sprintf(buffer, "%2u:%02u", ttm->tm_hour, ttm->tm_min);
+    draw_txt_string(screen_width/FONT_WIDTH-2-1-1-9-2-5, 0, buffer, MAKE_COLOR(COLOR_BLACK, COLOR_WHITE));
 }
 
@@ -148 +159 @@
     }
     gui_read_draw_batt();
+    gui_read_draw_clock();
 }
 

branches/grand/core/main.c

@@ -72 +72 @@
 void core_spytask()
 {
-    int cnt = 0;
+    int cnt = 1;
 
     raw_need_postprocess = 0;

branches/grand/include/conf.h

@@ -45 +45 @@
     int zebra_over;
     int zebra_under;
-    int zebra_draw_histo;
+    int zebra_draw_osd;
 
     OSD_pos histo_pos;

branches/grand/platform/s3is/main.c

@@ -44 +44 @@
 
     _GetPropertyCase(204, &t, 4);
-    mode  = (t==4)?MODE_REC:MODE_PLAY;
+    mode  = (t!=0)?MODE_REC:MODE_PLAY;
     mode |= (physw_status[1] & 0x00000001)?0:MODE_SCREEN_OPENED;
     mode |= (physw_status[1] & 0x00000002)?0:MODE_SCREEN_ROTATED;