Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 76 → Rev 77

/DUBwise/src/MKMiniCanvas.java
48,6 → 48,7
final static int SKINID_DARK= 0;
final static int SKINID_LIGHT = 1;
 
//holds id of actual skin
byte act_skin=SKINID_DARK;
 
 
64,6 → 65,9
int line_scaler=20;
 
int rawdebug_cursor_y=0;
int rawdebug_off_y=0;
 
public int line_middle_y;
 
boolean quit=false;
132,7 → 136,20
public void paint_menu(Graphics g)
{
for ( int i=0;i<menu_items.length;i++)
lcd_lines[i]=(act_menu_select==i?"# ":" ") + menu_items[i];
{
if ((frame_pos%3)!=0)
{
lcd_lines[i]=(act_menu_select==i?">":" ") + menu_items[i];
for ( int ii=0;ii<(18-menu_items[i].length());ii++)
lcd_lines[i]+=" ";
if (act_menu_select==i)
lcd_lines[i]+="<";
}
else
lcd_lines[i]=" " + menu_items[i];
 
}
paint_lcd(g,true);
}
 
565,11 → 582,33
 
case STATEID_RAWDEBUG:
g.setFont(f2);
for (int i=0;i<16;i++)
rawdebug_off_y=0;
if ((rawdebug_cursor_y+2)*spacer1>this.getHeight())
rawdebug_off_y=((rawdebug_cursor_y+2)*spacer1-this.getHeight())/spacer1;
for (int i=0;i<(this.getHeight()/spacer1);i++)
{
g.drawString(mk.debug_data.names[i] + mk.debug_data.analog[i] ,0,y_off,Graphics.TOP | Graphics.LEFT);
g.drawString(mk.debug_data.names[16+i] + mk.debug_data.analog[16+i] ,this.getWidth()/2,y_off,Graphics.TOP | Graphics.LEFT);
if (i+rawdebug_off_y==rawdebug_cursor_y)
{
g.setColor(0x0000CC);
g.fillRect(0,y_off,this.getWidth(),spacer1);
 
switch (act_skin)
{
case SKINID_DARK:
g.setColor(0x2dcf20);
break;
case SKINID_LIGHT:
g.setColor(0x000000);
break;
}
}
if (i+rawdebug_off_y<32) //todo better style
g.drawString(mk.debug_data.names[i+rawdebug_off_y] + mk.debug_data.analog[i+rawdebug_off_y] ,0,y_off,Graphics.TOP | Graphics.LEFT);
y_off+=spacer1;
}
 
 
613,7 → 652,7
// !!TODO!! check exactly which version those Datas where introduced
if (mk.version.compare(0,60)==mk.version.VERSION_PREVIOUS)
{
g.drawString("Power: " + (mk.debug_data.UBatt()/10) + "," +(mk.debug_data.UBatt()%10)+"V" ,0,y_off,Graphics.TOP | Graphics.LEFT);
g.drawString("Voltage: " + (mk.debug_data.UBatt()/10) + "," +(mk.debug_data.UBatt()%10)+"V" ,0,y_off,Graphics.TOP | Graphics.LEFT);
g.drawString("Sender: " + mk.debug_data.SenderOkay(),this.getWidth()/2,y_off,Graphics.TOP | Graphics.LEFT);
y_off+=spacer;
}
646,7 → 685,7
for (int x=0;x<20;x++)
{
g.setClip((lcd_img.getWidth()/222)*x,y_off,(lcd_img.getWidth()/222),lcd_img.getHeight());
g.drawImage(lcd_img,(lcd_img.getWidth()/222)*x-(mk.LCD.LCD_str[foo].charAt(x)-' ')*(lcd_img.getWidth()/222),y_off, g.TOP | g.LEFT);
g.drawImage(lcd_img,(lcd_img.getWidth()/222)*x-(mk.LCD.get_act_page()[foo].charAt(x)-' ')*(lcd_img.getWidth()/222),y_off, g.TOP | g.LEFT);
 
}
y_off+=lcd_img.getHeight();
911,6 → 950,26
}
switch(state)
{
case STATEID_RAWDEBUG:
switch (getGameAction (keyCode))
{
case UP:
if (rawdebug_cursor_y==0)
rawdebug_cursor_y=31;
else
rawdebug_cursor_y--;
break;
case DOWN:
if (rawdebug_cursor_y==31)
rawdebug_cursor_y=0;
else
rawdebug_cursor_y++;
break;
 
}
break;
case STATEID_KEYCONTROL:
if (keyCode==KEY_POUND)
keycontrol_exit |= 1;
1034,7 → 1093,6
 
case SETTINGSMENU_BACK:
chg_state(STATEID_MAINMENU);
chg_state(STATEID_SETTINGSMENU);
break;
}
1130,19 → 1188,22
 
case STATEID_FLIGHTVIEW:
 
if ((keyCode >= this.KEY_NUM0) && (keyCode <= this.KEY_NUM9))
mk.LCD.set_page(keyCode-this.KEY_NUM0);
else
switch (getGameAction (keyCode))
{
case LEFT:
case UP:
mk.LCD.LCD_PREVPAGE();
break;
case RIGHT:
case DOWN:
mk.LCD.LCD_NEXTPAGE();
break;
 
case LEFT:
chg_state(STATEID_MAINMENU);
break;
 
}
break;