Changeset 486

Timestamp:

08/16/08 21:54:21 (2 years ago)

Author:

Jucifer

Message:

+ added LjL's cropped zebra -mod (http://chdk.setepontos.com/index.php/topic,1849.msg17467.html#msg17467)
+ added get_time("unit") for Lua, where unit can be Y[ear], M[onth], D[ay], h[our], m[inute] or s[econd] ([]=optional/example)

Files:

• branches/juciphox/core/gui_draw.c (modified) (2 diffs)
• branches/juciphox/core/gui_osd.c (modified) (9 diffs)
• branches/juciphox/core/luascript.c (modified) (3 diffs)
• branches/juciphox/doc/version.txt (modified) (1 diff)
• branches/juciphox/version.inc (modified) (1 diff)

branches/juciphox/core/gui_draw.c

@@ -41 +41 @@
-//-------------------------------------------------------------------
-void draw_pixel(coord x, coord y, color cl) {
-
+< 0 || y < 0 || x 
-    else {
-        register unsigned int offset = y * screen_buffer_width + x;
@@ -196 +196 @@
-    // XXX optimize. probably use 4bit -> 32bit lookup table
-    // so 4(8) pixels were drawn at a time
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }

branches/juciphox/core/gui_osd.c

@@ -47 +47 @@
-static char osd_buf2[64];
-static int step;
-
+, *cur_buf
-static int timer = 0;
-static char *buf = NULL;
@@ -195 +195 @@
-}
-
+int draw_guard_pixel() {
+    unsigned char* buffer1 = vid_get_bitmap_fb()+screen_buffer_size/2;
+    unsigned char* buffer2 = buffer1+screen_buffer_size;
+    int has_disappeared=0;
+
+    if(*buffer1!=COLOR_GREEN) has_disappeared=1;
+    if(*buffer2!=COLOR_GREEN) has_disappeared=2;
+    *buffer1 = *buffer2 = COLOR_GREEN;
+    return has_disappeared;
+}
+
+
-//-------------------------------------------------------------------
-static void gui_osd_draw_zebra_osd() {
+    color old_osd_color=conf.osd_color;
+    conf.osd_color=MAKE_COLOR(COLOR_TRANSPARENT, conf.osd_color);
-    switch (conf.zebra_draw_osd) {
-        case ZEBRA_DRAW_NONE:
@@ -241 +255 @@
-            break;
-    }
+    conf.osd_color=old_osd_color;
-}
-
@@ -267 +282 @@
-        buf = malloc(screen_buffer_size);
-        scr_buf = vid_get_bitmap_fb();
+        cur_buf = malloc(screen_buffer_size);
-    }
-
-    if (buf) {
+        if(timer==0) {
+            draw_guard_pixel();
+            timer=1;
+            return 0;
+        }
+        if(timer==1) {
+            short ready;
+            static int n=0;
+            get_property_case(PROPCASE_SHOOTING, &ready, 4);
+            n=draw_guard_pixel();
+            if(!ready || n==0) return 0;
+            if(n==1) memcpy(cur_buf, scr_buf, screen_buffer_size);
+            else memcpy(cur_buf, scr_buf+screen_buffer_size, screen_buffer_size);
+        }
-        ++timer;
-        img_buf=((mode_get()&MODE_MASK) == MODE_PLAY)?vid_get_viewport_fb_d():vid_get_viewport_fb();
@@ -284 +314 @@
-                break;
-            case ZEBRA_MODE_BLINKED_1:
-2
+1
-                break;
-            case ZEBRA_MODE_BLINKED_3:
-8
+4
-                break;
-            case ZEBRA_MODE_BLINKED_2:
-            default:
-4
+2
-                break;
-        }
@@ -316 +346 @@
-                        else if (((conf.zebra_mode == ZEBRA_MODE_ZEBRA_1 || conf.zebra_mode == ZEBRA_MODE_ZEBRA_2) && (y-x-timer)&f)) buf[s]=COLOR_TRANSPARENT;
-                             else buf[s]=(yy>over)?cl_over:(yy<conf.zebra_under)?cl_under:COLOR_TRANSPARENT;
-
+
+
+
-                    }
-                    s+=screen_buffer_width-screen_width;
@@ -331 +363 @@
-                    draw_restore();
-                } else {
-set(buf, COLOR_TRANSPARENT
+cpy(buf, cur_buf
-                    gui_osd_draw_zebra_osd();
-                    memcpy(scr_buf, buf, screen_buffer_size);
@@ -392 +424 @@
-//-------------------------------------------------------------------
-void gui_osd_draw_histo() {
+    static long old_histo_magnification=0;
-    switch (conf.histo_layout) {
-        case OSD_HISTO_LAYOUT_Y:
@@ -442 +475 @@
-    }
-    if ((conf.show_overexp ) && kbd_is_key_pressed(KEY_SHOOT_HALF) && (under_exposed || over_exposed))
-histo
+osd
-    if (conf.histo_auto_ajust){
-      if (histo_magnification) {
-        sprintf(osd_buf, " %d.%02dx ", histo_magnification/1000, histo_magnification/10%100);
-histo
+osd
-      } 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);
-
+if (old_histo_magnification) 
-        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));
-      }
-    }
+    old_histo_magnification=histo_magnification;
-}
-

branches/juciphox/core/luascript.c

@@ -10 +10 @@
-#include "shot_histogram.h"
-#include "ubasic.h"
+#include "stdlib.h"
-
-static int luaCB_shoot( lua_State* L )
@@ -634 +635 @@
-  }
-  lua_pushnumber( L, temp );
+  return 1;
+}
+
+static int luaCB_get_time( lua_State* L )
+{
+  int r = -1;
+  unsigned long t2 = time(NULL);
+  static struct tm *ttm;
+  ttm = localtime(&t2);
+  const char *t = luaL_checkstring( L, 1 );
+  if (strncmp("s", t, 1)==0) r = ( L, ttm->tm_sec );
+  else if (strncmp("m", t, 1)==0) r = ( L, ttm->tm_min );
+  else if (strncmp("h", t, 1)==0) r = ( L, ttm->tm_hour );
+  else if (strncmp("D", t, 1)==0) r = ( L, ttm->tm_mday );
+  else if (strncmp("M", t, 1)==0) r = ( L, ttm->tm_mon+1 );
+  else if (strncmp("Y", t, 1)==0) r = ( L, 1900+ttm->tm_year );
+  lua_pushnumber( L, r );
-  return 1;
-}
@@ -832 +850 @@
-  FUNC(bitnot);
-
-
+
+

branches/juciphox/doc/version.txt

@@ -5 +5 @@
-
-log
+
+486 / 0.3.6
+Jucifer
+
++ added LjL's cropped zebra -mod (http://chdk.setepontos.com/index.php/topic,1849.msg17467.html#msg17467)
++ added get_time("unit") for Lua, where unit can be Y[ear], M[onth], D[ay], h[our], m[inute] or s[econd] ([]=optional/example)
+
-
-0.3.5 / PP

branches/juciphox/version.inc

@@ -1 @@
-5
+6