Changeset 2035

Timestamp:

08/02/12 11:36:45 (10 months ago)

Author:

tsv

Message:

tsvstar-ui:

• Bugfixes of simple mode
• Av/Tv? bracket and AutoIso? OverExp? fields become quickdisabled

Location:

branches/tsvstar-uitest

Files:

• core/conf.c (modified) (2 diffs)
• core/gui.c (modified) (7 diffs)
• core/gui_menu.c (modified) (7 diffs)
• core/gui_menu.h (modified) (1 diff)
• core/gui_osd.c (modified) (1 diff)
• core/raw.c (modified) (1 diff)
• core/shooting.c (modified) (6 diffs)
• include/gui.h (modified) (1 diff)

branches/tsvstar-uitest/core/conf.c

@@ -97 +97 @@
     if (conf.clear_override)
     {
-        conf.av_override_value=0;
-        conf.tv_override_koef=0;
-        conf.subj_dist_override_koef=0;
-        conf.iso_override_koef=0;
+                value_turn_state( &conf.tv_override_value, -1 );
+                value_turn_state( &conf.av_override_value, -1 );
+                value_turn_state( &conf.subj_dist_override_value, -1 );
+                value_turn_state( &conf.iso_override_value, -1 );
         conf.nd_filter_state=0;
     }
@@ -106 +106 @@
     if (conf.clear_zoom_override)
     {
-        conf.zoom_override = 0;
+                value_turn_state( &conf.conf.zoom_override, -1 );
     }
 #endif
     if (conf.clear_bracket)
     {
-        conf.av_bracket_value=0;
-        conf.tv_bracket_value=0;
-        conf.iso_bracket_koef=0;
-        conf.subj_dist_bracket_koef=0;
+        value_turn_state( &conf.av_bracket_value, -1);
+        value_turn_state( &conf.tv_bracket_value, -1);
+        value_turn_state( &conf.iso_bracket_value, -1);
+        value_turn_state( &conf.subj_dist_bracket_value, -1);
     }
     if (conf.clear_video)

branches/tsvstar-uitest/core/gui.c

@@ -101 +101 @@
 //-------------------------------------------------------------------
 
-static const char* gui_bracket_values_modes[] =             { "Off", "1/3 Ev","2/3 Ev", "1 Ev", "1 1/3Ev", "1 2/3Ev", "2 Ev", "2 1/3Ev", "2 2/3Ev", "3 Ev", "3 1/3Ev", "3 2/3Ev", "4 Ev"};
-static const char* gui_override_koef_modes[] =              { "Off", "1", "10", "100", "1000" };
 static const char* gui_bracket_type_modes[] =               { "+/-", "-","+"};
 
+const char* gui_bracket_values_enum(int change, int arg)
+{
+        static const char* modes[] =             { "-Off-", "1/3 Ev","2/3 Ev", "1 Ev", "1 1/3Ev", "1 2/3Ev", "2 Ev", "2 1/3Ev", "2 2/3Ev", "3 Ev", "3 1/3Ev", "3 2/3Ev", "4 Ev"};
+        return gui_change_simple_qenum( (int*)arg, change, modes, sizeof(modes)/sizeof(modes[0]) );
+}
+
 static CMenuItem bracketing_in_continuous_submenu_items[] = {
-    MENU_ENUM2  (0x63,LANG_MENU_TV_BRACKET_VALUE,           &conf.tv_bracket_value,         gui_bracket_values_modes ),
+    MENU_ITEM   (0x63,LANG_MENU_TV_BRACKET_VALUE,           MENUITEM_ENUM|MENUITEM_QUICKDISABLE,    gui_bracket_values_enum, &conf.tv_bracket_value ),
 #if CAM_HAS_IRIS_DIAPHRAGM
-    MENU_ENUM2  (0x62,LANG_MENU_AV_BRACKET_VALUE,           &conf.av_bracket_value,         gui_bracket_values_modes ),
+    MENU_ITEM   (0x62,LANG_MENU_AV_BRACKET_VALUE,           MENUITEM_ENUM|MENUITEM_QUICKDISABLE,    gui_bracket_values_enum, &conf.av_bracket_value ),
 #endif
 #if CAM_CAN_SD_OVERRIDE
@@ -269 +273 @@
 static const int shutter2_values[]={0, 4, 6, 8, 12, 15, 20, 25, 30, 40, 50, 60, 80, 100, 125, 160, 200, 250, 500, 1000 };
 
-static const char* gui_overexp_ev_modes[]={ "Off", "-1/3 Ev", "-2/3 Ev", "-1 Ev", "-1 1/3Ev", "-1 2/3Ev", "-2 Ev" };
+const char* gui_overexp_ev_enum(int change, int arg)
+{
+        static const char* modes[]={ "Off", "-1/3 Ev", "-2/3 Ev", "-1 Ev", "-1 1/3Ev", "-1 2/3Ev", "-2 Ev" };
+        return gui_change_simple_qenum( (int*)arg, change, modes, sizeof(modes)/sizeof(modes[0]) );
+}
+
 
 void cb_autoiso_menu_change(unsigned int item);
@@ -293 +302 @@
 #endif
 
-    MENU_ENUM2  (0x5f,LANG_MENU_AUTOISO_OVEREXP_EV,             &conf.overexp_ev_enum, gui_overexp_ev_modes ),
+    MENU_ITEM   (0x5f,LANG_MENU_AUTOISO_OVEREXP_EV,         MENUITEM_ENUM|MENUITEM_QUICKDISABLE,    gui_overexp_ev_enum, &conf.overexp_ev_enum ),
     MENU_ITEM   (0x57,LANG_MENU_ZEBRA_OVER,                     MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.autoiso2_over,                MENU_MINMAX(0, 32) ),
     MENU_ITEM   (0x5f,LANG_MENU_AUTOISO_OVEREXP_THRES,          MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.overexp_threshold,            MENU_MINMAX(1, 20) ),
@@ -309 +318 @@
         menuitem_foreach2( &autoiso_submenu, LANG_MENU_AUTOISO_USER_FACTOR, 0, func );
 
-        func = (conf.overexp_ev_enum);
+        func = (conf.overexp_ev_enum>0);
         menuitem_foreach2( &autoiso_submenu, LANG_MENU_ZEBRA_OVER, 0, func );
         menuitem_foreach2( &autoiso_submenu, LANG_MENU_AUTOISO_OVEREXP_THRES, 0, func );
@@ -1132 +1141 @@
     conf.tv_override_value+=change;
     if (conf.tv_enum_type) {
-       if (conf.tv_override_value<0) {
+       if (conf.tv_override_value<0 && change ) {
           conf.tv_override_value=tv_override_amount-1;
         }
        else if ((unsigned)conf.tv_override_value>=(tv_override_amount))
          conf.tv_override_value=0;
+                if ( conf.tv_override_value < 0 )
+                        return "Off";
        return tv_override[conf.tv_override_value]; 
     }
@@ -1166 +1177 @@
 const char* gui_av_override_enum(int change, int arg)
 {
-    conf.av_override_value+=change;
-    if (conf.av_override_value<0) conf.av_override_value=shooting_get_aperture_sizes_table_size()+6;
-    else if (conf.av_override_value>shooting_get_aperture_sizes_table_size()+6) conf.av_override_value=0;
-
-    if (conf.av_override_value == 0)
+        gui_qenum_value_change( &conf.av_override_value, change, shooting_get_aperture_sizes_table_size()+7 );
+
+    if (conf.av_override_value <= 0)
         return "Off";
     else 
@@ -1261 +1270 @@
 
 static CMenuItem operation_submenu_items[] = {
-    //MENU_ENUM2  (0x5f,LANG_MENU_OVERRIDE_DISABLE,           &conf.override_disable, gui_override_disable_modes ),
     MENU_ITEM  (0x5f,LANG_MENU_OVERRIDE_DISABLE,           MENUITEM_ENUM,    gui_override_disable, &conf.override_disable ),
     MENU_ITEM   (0x5c,LANG_MENU_OVERRIDE_DISABLE_ALL,       MENUITEM_BOOL,          &conf.override_disable_all,         0 ),

branches/tsvstar-uitest/core/gui_menu.c

@@ -68 +68 @@
 }
 
+// specific processing of migrated to quickdisabled enum fields
+void gui_qenum_value_change(int* value, int change, unsigned num_items ) {
+    *value+=change;
+
+        if (!change && !*value ) {*value=-2; }
+    if (*value<1 && change ) *value = num_items-1;
+    else if (*value>=num_items) *value=1;
+}
+
+const char* gui_change_simple_qenum(int* value, int change, const char** items, unsigned num_items) {
+    gui_qenum_value_change(value, change, num_items);
+        if (*value<=0)
+                return "Off";
+    return items[*value];
+}
 
 //-------------------------------------------------------------------
@@ -199 +214 @@
 //-------------------------------------------------------------------
 // Turn value on/off (quickdisable items)
-// Argument: 1 turn on, -1 turn off
+// Argument: 1 turn on, -1 turn off, 0 - toggle
 // Return: 1 if changed, 0 otherwise
 int value_turn_state( int* valueptr, int dir )
 {
   // return if item already have same quickdisable status
+  if ( !dir ) 
+        dir = ( *valueptr<0 )?1:-1;
+
   if ( dir >0 ) {
    if ( *valueptr >= 0 )
@@ -220 +238 @@
 //-------------------------------------------------------------------
 // Turn current item on/off (quickdisable items)
-// Argument: 1 turn on, -1 turn off
+// Argument: 1 turn on, -1 turn off, 0 - toggle
 // Return: 1 if ok, 0 otherwise
 static int turn_current_item( int dir )
@@ -742 +760 @@
         case KEY_MENU:
             // The only way to get this point - "edit" submode
-            if ( *(curr_menu->menu[gui_menu_curr_item].value) < 0 )
-              turn_current_item_on();
-            else
-              turn_current_item_off();
+                        turn_current_item(0);   // toggle state
+                        do_callback();
             break;
         case KEY_SET:
@@ -848 +864 @@
 #else
         case KEY_DISPLAY:
-            if (conf.user_menu_enable == 3 && curr_menu->title == LANG_MENU_USER_MENU) {
+            if ( flag_editmode ) {
+                                gui_menu_cancel_editmode();                                       
+            } else if (conf.user_menu_enable == 3 && curr_menu->title == LANG_MENU_USER_MENU) {
                 gui_menu_back();
             }
@@ -1130 +1148 @@
     extern CMenu root_menu;
 
-    gui_menu_unload_module_menus();
-
     // In edit submode - MenuButton mean "Toggle feature" and processed by gui_menu_kbd_process
     if ( gui_menu_get_editmode() ) {
@@ -1137 +1153 @@
                 return;
     }
+
+    gui_menu_unload_module_menus();
 
     conf_save_new_settings_if_changed();

branches/tsvstar-uitest/core/gui_menu.h

@@ -80 +80 @@
 extern const char* gui_change_simple_enum(int* value, int change, const char** items, unsigned num_items);
 extern const char* gui_change_enum2(const CMenuItem *menu_item, int change);
+extern void gui_qenum_value_change(int* value, int change, unsigned num_items );
+extern const char* gui_change_simple_qenum(int* value, int change, const char** items, unsigned num_items);
 
 //-------------------------------------------------------------------

branches/tsvstar-uitest/core/gui_osd.c

@@ -261 +261 @@
         gui_print_osd_state_string_int("ISO:", shooting_get_iso_override_value());
     if ((gui_mode==GUI_MODE_OSD) || (shooting_get_drive_mode() && m!=MODE_STITCH && m!=MODE_SCN_BEST_IMAGE)) {
-    if ((conf.tv_bracket_value && !(conf.override_disable==1 && conf.override_disable_all)) || (conf.av_bracket_value && !(conf.override_disable==1 && conf.override_disable_all))  || (conf.iso_bracket_value>0 && conf.iso_bracket_koef && !(conf.override_disable==1 && conf.override_disable_all)) || ((conf.subj_dist_bracket_value>0) && (conf.subj_dist_bracket_koef) && (shooting_can_focus() && !(conf.override_disable==1 && conf.override_disable_all))))
+    if ((conf.tv_bracket_value>0 && !(conf.override_disable==1 && conf.override_disable_all)) || (conf.av_bracket_value>0 && !(conf.override_disable==1 && conf.override_disable_all))  || (conf.iso_bracket_value>0 && conf.iso_bracket_koef && !(conf.override_disable==1 && conf.override_disable_all)) || ((conf.subj_dist_bracket_value>0) && (conf.subj_dist_bracket_koef) && (shooting_can_focus() && !(conf.override_disable==1 && conf.override_disable_all))))
         gui_print_osd_state_string_chr("BRACKET:", shooting_get_bracket_type());
-      if (conf.tv_bracket_value && !(conf.override_disable==1 && conf.override_disable_all))
+      if (conf.tv_bracket_value>0 && !(conf.override_disable==1 && conf.override_disable_all))
         gui_print_osd_state_string_chr("TV:", shooting_get_tv_bracket_value());
-      else if  (conf.av_bracket_value && !(conf.override_disable==1 && conf.override_disable_all))
+      else if  (conf.av_bracket_value>0 && !(conf.override_disable==1 && conf.override_disable_all))
         gui_print_osd_state_string_chr("AV:", shooting_get_av_bracket_value());
       else if  (conf.iso_bracket_value>0 && conf.iso_bracket_koef   && !(conf.override_disable==1 && conf.override_disable_all))

branches/tsvstar-uitest/core/raw.c

@@ -92 +92 @@
     shooting_bracketing();
 
-    if(conf.tv_bracket_value || conf.av_bracket_value || conf.iso_bracket_value>0 || conf.subj_dist_bracket_value>0 ) {
+    if(conf.tv_bracket_value>0 || conf.av_bracket_value>0 || conf.iso_bracket_value>0 || conf.subj_dist_bracket_value>0 ) {
         if(state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)
             br_counter = 1;

branches/tsvstar-uitest/core/shooting.c

@@ -299 +299 @@
 const char * shooting_get_tv_bracket_value()
 {
+        if (conf.tv_bracket_value<0)
+                return expo_shift[0];
     return expo_shift[conf.tv_bracket_value];
 }
@@ -335 +337 @@
 const char * shooting_get_av_bracket_value()
 {
+        if ( conf.av_bracket_value<0)
+                return expo_shift[0];
     return expo_shift[conf.av_bracket_value];
 }
@@ -1197 +1201 @@
     if (m==MODE_M || m==MODE_TV || m==MODE_STITCH) return; //Only operate outside of M and Tv
         int ev_overexp = 0;
-        if ( conf.overexp_ev_enum )
+        if ( conf.overexp_ev_enum>0 )
         {
                 // No shoot_histogram exist here because no future shot exist yet :)
@@ -1355 +1359 @@
             else bracketing.tv96=shooting_get_user_tv96();
         }
-        bracketing.tv96_step=32*conf.tv_bracket_value;
+        bracketing.tv96_step=(conf.tv_bracket_value<=0)?0:(32*conf.tv_bracket_value);
+
     }
     // other shoots
@@ -1384 +1389 @@
         else
             bracketing.av96 = shooting_get_user_av96();
-        bracketing.av96_step = 32*conf.av_bracket_value;
+        bracketing.av96_step = (conf.av_bracket_value<=0)?0:(32*conf.av_bracket_value);
     }
     // other shoots
@@ -1489 +1494 @@
 void bracketing_step(int when)
 {
-    if (conf.tv_bracket_value && !(conf.override_disable==1 && conf.override_disable_all))
+    if (conf.tv_bracket_value>0 && !(conf.override_disable==1 && conf.override_disable_all))
         shooting_tv_bracketing(when);
-    else if (conf.av_bracket_value && !(conf.override_disable==1 && conf.override_disable_all))
+    else if (conf.av_bracket_value>0 && !(conf.override_disable==1 && conf.override_disable_all))
         shooting_av_bracketing(when);
-    else if ((conf.iso_bracket_value && !(conf.override_disable==1 && conf.override_disable_all)) && (conf.iso_bracket_koef))
+    else if ((conf.iso_bracket_value>0 && !(conf.override_disable==1 && conf.override_disable_all)) && (conf.iso_bracket_koef))
         shooting_iso_bracketing(when);
-    else if ((conf.subj_dist_bracket_value && !(conf.override_disable==1 && conf.override_disable_all)) && (conf.subj_dist_bracket_koef))
+    else if ((conf.subj_dist_bracket_value>0 && !(conf.override_disable==1 && conf.override_disable_all)) && (conf.subj_dist_bracket_koef))
         shooting_subject_distance_bracketing(when);           
-    else if ((conf.subj_dist_bracket_value) && (conf.subj_dist_bracket_koef))
+    else if ((conf.subj_dist_bracket_value>0) && (conf.subj_dist_bracket_koef))
         shooting_subject_distance_bracketing(when);
 }

branches/tsvstar-uitest/include/gui.h

@@ -86 +86 @@
 extern void gui_reset_alt_helper();
 
-extern void gui_enum_value_change(int *value, int change, unsigned num_items);
 extern const char* gui_subj_dist_override_value_enum(int change, int arg);
 extern const char* gui_subj_dist_override_koef_enum(int change, int arg);