/elec/propeller-clock

To get this branch, use:
bzr branch http://bzr.ed.am/elec/propeller-clock

« back to all changes in this revision

Viewing changes to src/digital_clock_mode.cc

  • Committer: edam
  • Date: 2012-02-28 17:03:09 UTC
  • Revision ID: edam@waxworlds.org-20120228170309-gaaj6k3prrgvwvp8
remove TextRenderer singleton and save space

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/digital_clock_mode.cc
22
22
 */
23
23
#include "digital_clock_mode.h"
24
24
#include "display.h"
25
 
#include "text.h"
26
25
#include "text_renderer.h"
27
 
#include "time.h"
28
26
 
29
27
 
30
28
DigitalClockMode::DigitalClockMode()
31
29
        :
32
 
        MinorMode( 4 )
33
 
{
 
30
        MinorMode( 2 )
 
31
{
 
32
}
 
33
 
 
34
 
 
35
void DigitalClockMode::draw( int segment )
 
36
{
 
37
        TextRenderer::draw_scroll( segment );
34
38
}
35
39
 
36
40
 
38
42
{
39
43
        MinorMode::press();
40
44
 
41
 
//      set_message( false );
42
 
}
43
 
 
44
 
 
45
 
void DigitalClockMode::draw( int segment )
46
 
{
47
 
        Text::draw( 0, segment );
48
 
//      Text::draw( 1, segment );
49
 
        TextRenderer::output_buffer();
50
 
}
51
 
 
52
 
 
53
 
void DigitalClockMode::draw_reset()
54
 
{
55
 
        // gotta update message, the time might have changed!
56
 
        set_message( true );
57
 
 
58
 
        Text::draw_reset();
 
45
        set_message();
59
46
}
60
47
 
61
48
 
65
52
 
66
53
        Display::leds_off();
67
54
 
68
 
        Text::reset();
69
 
        set_message( false );
 
55
        set_message();
70
56
}
71
57
 
72
58
 
73
 
void DigitalClockMode::set_message( bool update )
 
59
void DigitalClockMode::set_message()
74
60
{
75
 
        Time &time = Time::get_instance();
76
 
 
77
 
        PString str0( Text::_messages[ 0 ], MESSAGE_LEN );
78
 
//      PString str1( Text::_messages[ 1 ], MESSAGE_LEN );
79
 
        str0.begin();
80
 
//      str1.begin();
81
 
//      switch( get_flavour() )
82
 
//      {
83
 
//      case 0:
84
 
//              str0.format( "%d:%02d:%02 %s", time.get_hours() % 12,
85
 
//                                      time.get_minutes(), time.get_seconds(),
86
 
//                                      time.get_hours() / 12 > 0? "pm" : "am" );
87
 
//              Text::set_message( 0, str0 );
88
 
//              str1.print( "-" );
89
 
//              Text::set_message( 1, str1 );
90
 
//              if( update ) {
91
 
//                      Text::reset_message( 0, Text::MODE_TOP +
92
 
//                                                               Text::MODE_ALL );
93
 
//                      Text::reset_message( 1, Text::MODE_BOTTOM +
94
 
//                                                               Text::MODE_ONEQUARTER );
95
 
//              }
96
 
//              break;
97
 
//      case 1:
98
 
                str0.format( "%d%s %s, %d", time.get_day(),
99
 
                                        time.get_day_suffix(),
100
 
                                        time.get_month_name(), time.get_year() );
101
 
                Text::set_message( 0, str0 );
102
 
//              Text::set_message( 1, str1 );
103
 
                if( !update ) {
104
 
                        Text::reset_message( 0, Text::MODE_HSCROLL | Text::MODE_TOP |
105
 
                                                                 Text::MODE_THREEQUARTERS );
106
 
//                      Text::reset_message( 1, Text::MODE_BOTTOM +
107
 
//                                                               Text::MODE_ONEQUARTER );
108
 
                }
109
 
//              break;
110
 
//      }
111
 
 
112
 
        TextRenderer::select_font( get_flavour() );
 
61
        PString &str = TextRenderer::get_pstring();
 
62
        str.begin();
 
63
        str.print( "Mode " );
 
64
        str.print( get_flavour() );
113
65
}