Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 261 → Rev 262

/DUBwise/trunk/j2me/src/DUBwiseCanvas.java
101,8 → 101,8
public final static int[] graph_colors={0x156315,0xCC1315,0xf8ef02,0x19194d};
public int[] graph_sources={0,1,2,3};
public String[] graph_names={"nick int","roll int","nick acc","roll acc"};
public int[][] graph_data;
public int graph_offset=0;
// public int[][] graph_data;
//public int graph_offset=0;
// public int lcd_char_width=0;
public int lcd_char_height=0;
128,7 → 128,7
public byte state=STATEID_INITIAL;
public byte nextstate=STATEID_INITIAL;
int local_max=-1;
// int local_max=-1;
 
int y_off=0;
int spacer=0;
243,7 → 243,7
if ( mk.ufo_prober.is_navi()||mk.ufo_prober.is_mk() )
tmp_menu_add(l(STRINGID_LCD),ACTIONID_LCD);
 
if ( mk.ufo_prober.is_mk() )
// if ( mk.ufo_prober.is_mk() )
tmp_menu_add(l(STRINGID_GRAPH),ACTIONID_GRAPH);
 
if (( mk.ufo_prober.is_navi()||mk.ufo_prober.is_mk()||mk.ufo_prober.is_mk3mag() ))
672,6 → 672,7
lp= LocationProvider.getInstance(crit2);
 
*/
 
if(c != null ) {
// Use coordinate information
phone_lat= c.getLatitude();
704,12 → 705,16
chg_state(STATEID_SUCCESS_MSG);
}
break;
 
/*
case STATEID_GRAPH:
 
graph_offset--;
if (graph_offset==-graph_data[0].length)
graph_offset=0;
break;
 
*/
case STATEID_CAMMODE:
try
1001,7 → 1006,7
}
}
 
 
/*
public int check_local_max(int val)
{
if ( val>local_max)
1010,10 → 1015,10
local_max=-val;
return val;
}
*/
 
 
 
 
public void symbol_paint(Graphics g,int x,int tile,int row)
{
g.setClip(x,0,(symbols_img_tile_width),symbols_img_tile_height);;
1647,29 → 1652,34
case STATEID_GRAPH:
g.setClip(0,0,canvas_width,canvas_height);
 
g.setStrokeStyle(Graphics.DOTTED);
//
g.setColor(0xe1dddd);
g.setFont(f2);
// LEGEND
if (settings.graph_legend)
for (int d=0;d<GRAPH_COUNT;d++)
{/*
g.setColor(graph_colors[d]);
g.fillRect(0,y_off +spacer1/2-2 ,20,4);
g.setColor(skin_fg_color());
g.drawString(graph_names[d] + mk.debug_data.analog[graph_sources[d]],23,y_off,Graphics.TOP | Graphics.LEFT);
y_off+=spacer1;
*/
g.setColor(graph_colors[d]);
g.fillRect(canvas_width-20,canvas_height-spacer*(d+1)+(spacer)/2-2 ,20,4);
g.setColor(skin_fg_color());
g.drawString(graph_names[d] /*+ mk.debug_data.analog[graph_sources[d]]*/,canvas_width-23,canvas_height-spacer*(d+1),Graphics.TOP | Graphics.RIGHT);
// y_off+=spacer1;
}
{
g.setStrokeStyle(Graphics.DOTTED);
for (int d=0;d<GRAPH_COUNT;d++)
{
// g.setColor(graph_colors[d]);
// g.fillRect(0,y_off +spacer1/2-2 ,20,4);
// g.setColor(skin_fg_color());
// g.drawString(graph_names[d] + mk.debug_data.analog[graph_sources[d]],23,y_off,Graphics.TOP | Graphics.LEFT);
// y_off+=spacer1;
g.setColor(graph_colors[d]);
g.fillRect(canvas_width-20,canvas_height-spacer*(d+1)+(spacer)/2-2 ,20,4);
g.setColor(skin_fg_color());
g.drawString(graph_names[d] ,canvas_width-23,canvas_height-spacer*(d+1),Graphics.TOP | Graphics.RIGHT);
// y_off+=spacer1;
}
 
g.setStrokeStyle(Graphics.SOLID);
}
 
if (settings.graph_scale)
{
1709,31 → 1719,50
for (int gr=0;gr<GRAPH_COUNT;gr++)
{
 
 
// !!TODO checkme
g.setColor(graph_colors[gr]);
 
graph_data[gr][-graph_offset]=check_local_max(mk.debug_data.analog[graph_sources[gr]]);
 
// check_local_max(mk.debug_data.analog[graph_sources[gr]]);
line_scaler= local_max/graph_height+1;
line_scaler= mk.debug_buff_max/graph_height+1;
 
 
for ( int x=0;x<canvas_width;x++)
for ( int x=0;x<canvas_width-1;x++)
{
int p= (((-graph_offset+x-canvas_width-5)));
/*int p= (((-graph_offset+x-canvas_width-5)));
if (p<1)
p+=graph_data[0].length;
p%=(graph_data[0].length-1);
draw_graph_part(g,x,graph_data[gr][p]/line_scaler,graph_data[gr][p+1]/line_scaler);
*/
int p= (((mk.debug_buff_off+x-canvas_width)));
if (p<0)
p+=mk.debug_buff_len;
p%=(mk.debug_buff_len-2);
 
if (p<mk.debug_buff_lastset)
 
draw_graph_part(g,x,mk.debug_buff[p][gr]/line_scaler,mk.debug_buff[p+1][gr]/line_scaler);
 
// System.out.println("--p"+p + "gr " + gr + " l " + mk.debug_buff.length +" ls:" + mk.debug_buff_lastset );
}
}
 
 
/*
int[] pixels=new int[canvas_width*canvas_height];
for (int x=0;x<canvas_width;x++)
for (int y=0;y<canvas_height;y++)
if (x==y) pixels[x+canvas_width*y]=0xFFFFFFFF;
 
Image test= Image.createRGBImage(pixels,canvas_width,canvas_height,true);
g.drawImage(test,0,0,Graphics.TOP | Graphics.LEFT );
*/
 
break;
 
case STATEID_LCD:
1799,7 → 1828,7
 
 
} catch (Exception e) {}
} catch (Exception e) { System.out.println("error in paint " + e);}
 
}
Player mPlayer;
1819,6 → 1848,9
 
public void draw_graph_part(Graphics g,int x,int y1,int y2)
{
 
g.drawLine(x,line_middle_y-y1,x+1,line_middle_y-y2);
/*
if ( canvas_width>200)
{
g.fillRect(x,line_middle_y-y1,1,1 );
1825,7 → 1857,7
if (y1>y2)
g.fillRect(x,line_middle_y-y1,1,y1-y2);
else
g.fillRect(x,line_middle_y-y2,1,y2-y1);
g.fillRect(x,line_middle_y-y2,1,y2-y1);
 
}
else
1837,6 → 1869,7
g.fillRect(x,line_middle_y-y2,1,y2-y1);
}
*/
}
 
 
1856,11 → 1889,12
settings_editor = null;
params_editor = null;
err_img=null;
graph_data=null;
 
// graph_data=null;
mk.destroy_debug_buff();
act_menu_select_bak[state]=act_menu_select;
act_menu_select=act_menu_select_bak[next_state];
 
 
/*
// tasks on state exit
2089,15 → 2123,24
 
 
case STATEID_GRAPH:
 
 
mk.setup_debug_buff(graph_sources,this.getWidth(),settings.graph_interval);
 
mk.user_intent=USER_INTENT_GRAPH;
 
/*
graph_data=new int[GRAPH_COUNT][this.getWidth()*2];
for (int c=0;c<graph_data[0].length;c++)
for (int d=0;d<GRAPH_COUNT;d++)
graph_data[d][c]=-1;
mk.user_intent=USER_INTENT_GRAPH;
 
local_max=1;
*/
break;
 
}