Changeset 928 for trunk/core/gui.c

Timestamp:

08/29/10 09:47:13 (3 years ago)

Author:

fe50

Message:

New edge overlay, rewritten zebra, SX20 stuff

Note:

• some of this (edge overlay, zebra) affects ALL cameras !
• since there are changes in the CHDK configuration, it's recommended to use a new config file (i.e. to rename/delete the cchdk.cfg file)

• new edge overlay by ultimA, from ​http://chdk.setepontos.com/index.php/topic,650.msg54368.html#msg54368 & ​http://chdk.setepontos.com/index.php/topic,5583.0.html
• rewritten zebra to save ram & avoid flickerig, by f_m_b, from the SX20 porting thread
• SX20 1.02d fixes for darkframe subtraction and USB remote
• SX20 1.02d now can be powered on directly in record mode by holding the button down for ~1s
• SX20: games & other stuff enabled again since new zebra needs less memory

The SX20 1.02D now is enabled in the main makefile for the autobuild server

File:

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

trunk/core/gui.c

@@ -161 +161 @@
 static void gui_menuproc_edge_save(int arg);
 static void gui_menuproc_edge_load(int arg);
-static void gui_menuproc_edge_free(int arg);
 #ifdef OPT_DEBUGGING
 void gui_compare_props(int arg);
@@ -256 +255 @@
         static void gui_debug_shortcut(void);
 #endif
+
+static const char* gui_edge_pano_enum(int change, int arg);
+
 void rinit();
 
@@ -635 +637 @@
 static CMenuItem edge_overlay_submenu_items[] = {
     {0x5c,LANG_MENU_EDGE_OVERLAY_ENABLE,     MENUITEM_BOOL,          &conf.edge_overlay_enable },
-    {0x33,LANG_MENU_EDGE_SAVE,                  MENUITEM_PROC,          (int*)gui_menuproc_edge_save },
-    {0x5c,LANG_MENU_EDGE_ZOOM,     MENUITEM_BOOL,          &conf.edge_overlay_zoom },
-    {0x5c,LANG_MENU_EDGE_LOCK,     MENUITEM_BOOL,          &conf.edge_overlay_lock },
+    {0x5c,LANG_MENU_EDGE_FILTER,     MENUITEM_BOOL,          &conf.edge_overlay_filter },
+    {0x5c,LANG_MENU_EDGE_PANO,     MENUITEM_ENUM,          (int*)gui_edge_pano_enum },
+    {0x7f,LANG_MENU_EDGE_PANO_OVERLAP,   MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.edge_overlay_pano_overlap, MENU_MINMAX(0, 100)},
+    {0x5c,LANG_MENU_EDGE_SHOW,     MENUITEM_BOOL,          &conf.edge_overlay_show },
     {0x7f,LANG_MENU_EDGE_OVERLAY_TRESH,      MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.edge_overlay_thresh, MENU_MINMAX(0, 255)},
     {0x65,LANG_MENU_EDGE_OVERLAY_COLOR,      MENUITEM_COLOR_FG,      (int*)&conf.edge_overlay_color },
     {0x5c,LANG_MENU_EDGE_PLAY,                  MENUITEM_BOOL,          &conf.edge_overlay_play }, //does not work on cams like s-series, which dont have a real "hardware" play/rec switch, need a workaround, probably another button
-    {0x33,LANG_MENU_EDGE_FREE,                  MENUITEM_PROC,          (int*)gui_menuproc_edge_free },
+    {0x33,LANG_MENU_EDGE_SAVE,                  MENUITEM_PROC,          (int*)gui_menuproc_edge_save },
+    {0x5c,LANG_MENU_EDGE_ZOOM,     MENUITEM_BOOL,          &conf.edge_overlay_zoom },
     {0x33,LANG_MENU_EDGE_LOAD,                  MENUITEM_PROC,          (int*)gui_menuproc_edge_load },
     {0x51,LANG_MENU_BACK,                    MENUITEM_UP },
@@ -3201 +3205 @@
 }
 
-void gui_menuproc_edge_free(int arg) {
-    free_memory_edge_overlay();
-}
-
 void gui_menuproc_edge_save(int arg) {
     save_edge_overlay();
@@ -3415 +3415 @@
 }
 
-#endif
+static const char* gui_edge_pano_enum(int change, int arg)
+{
+    static const char* modes[]={ "Off", "Right", "Down", "Left", "Up", "Free"};
+
+    conf.edge_overlay_pano+=change;
+    if (conf.edge_overlay_pano<0)
+        conf.edge_overlay_pano=0;
+    else if (conf.edge_overlay_pano>=(sizeof(modes)/sizeof(modes[0])))
+        conf.edge_overlay_pano=sizeof(modes)/sizeof(modes[0])-1;
+
+    return modes[conf.edge_overlay_pano]; 
+}
+
+#endif