Mercurial > public > ostc4
diff Discovery/Src/t3.c @ 619:8fa2de4414a8
Added t3 quick menu for marker synchronisation:
By selecting the "Check" optin of the quickmenu available in the T3_Profile view only, the live profile data may be syncronised with the marker data stored in the log profile. The implementation does not mentain a history storage. In case all markes have been checked the next check will cause the live data to be shown. another check will then map the profile again to the first marker.
To support this functionality menu infra structures have been added to the menu handling functions.
| author | Ideenmodellierer |
|---|---|
| date | Wed, 27 Jan 2021 22:10:11 +0100 |
| parents | beeb23d18443 |
| children | 8f78faf88fc5 |
line wrap: on
line diff
--- a/Discovery/Src/t3.c Wed Jan 27 22:04:45 2021 +0100 +++ b/Discovery/Src/t3.c Wed Jan 27 22:10:11 2021 +0100 @@ -262,6 +262,17 @@ point_t start, stop; uint16_t diveMinutes = 0; + const SDecoinfo * pDecoinfo; + + if(stateUsed->diveSettings.deco_type.ub.standard == GF_MODE) + { + pDecoinfo = &stateUsed->decolistBuehlmann; + } + else + { + pDecoinfo = &stateUsed->decolistVPM; + } + wintemp.left = t3c1.WindowX0; wintemp.right = t3c1.WindowX0 + CV_PROFILE_WIDTH; wintemp.top = 480 - BigFontSeperationTopBottom + 5; @@ -309,6 +320,12 @@ snprintf(text,TEXTSIZE,"\002%01.1fm", max_depth / 100.0); GFX_write_string(&FontT42,&t3c1,text,0); + + if(pDecoinfo->output_time_to_surface_seconds) /* draw deco data first => will be overlayed by all other informations */ + { + GFX_graph_print(&t3screen,&wintemp,wintemp.top * -1,1,0,max_depth, getMiniLiveDecoPointerToData(),drawDataLength, CLUT_NiceGreen, NULL); + } + if(replayDataLength != 0) { GFX_graph_print(&t3screen, &wintemp, 0,1,0, max_depth, pReplayData, drawDataLength, CLUT_Font031, NULL); @@ -320,7 +337,6 @@ if(liveDataLength > 3) { - GFX_graph_print(&t3screen,&wintemp,wintemp.top * -1,1,0,max_depth, getMiniLiveDecoPointerToData(),drawDataLength, CLUT_NiceGreen, NULL); GFX_graph_print(&t3screen, &wintemp, 0,1,0, max_depth, getMiniLiveReplayPointerToData(), drawDataLength, CLUT_Font030, NULL); } } @@ -665,6 +681,10 @@ GFX_write_string_color(&FontT42,tXr1,text,1,CLUT_WarningYellow); break; + case StDCHECK: snprintf(text,TEXTSIZE,"\a\003\001%c%c", TXT_2BYTE, TXT2BYTE_CheckMarker); + GFX_write_string_color(&FontT42,tXr1,text,1,CLUT_WarningYellow); + break; + default: /* show divetime */ Divetime.Total = stateUsed->lifeData.dive_time_seconds_without_surface_time;