Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 251 → Rev 252

/DUBwise/trunk/j2me/src/DUBwiseCanvas.java
457,6 → 457,7
frame_pos++;
 
// handle Device Change
if (mk.ufo_prober.change_notify)
{
mk.ufo_prober.change_notify=false;
530,6 → 531,33
lcd_lines[0]=""+mk.error_str;
break;
 
case STATEID_PARAM_MASSWRITE:
 
if (param_masswrite_write_pos==5)
{
nextstate=STATEID_PARAM_MENU;
success_msg="Parameter Write OK";
chg_state(STATEID_SUCCESS_MSG);
}
else
{
if (param_masswrite_write_pos!=0)
try { Thread.sleep(2000); }
catch (Exception e)
{debug.log("Problem Sleeping "); }
lcd_lines[0]="Writing Params";
lcd_lines[1]=DUBwiseHelper.pound_progress(param_masswrite_write_pos,5);
 
mk.params.set_by_mk_data(params2masswrite[param_masswrite_write_pos]);
mk.params.act_paramset=param_masswrite_write_pos;
mk.write_params(mk.params.act_paramset);
param_masswrite_write_pos++;
}
break;
case STATEID_READ_PARAMS:
if (mk.watchdog.act_paramset==5)
{
567,7 → 595,8
catch (Exception e)
{ }
// chg_state(STATEID_COPY_PARAMS);
nextstate=STATEID_HANDLE_PARAMS;
 
nextstate=STATEID_PARAM_MENU;
success_msg="Parameter Copy OK";
chg_state(STATEID_SUCCESS_MSG);
574,8 → 603,9
}
else
{
select_paramset4edit=true;
chg_state(STATEID_SELECT_PARAMSET);
select_paramset4edit=true;
 
}
 
}
582,8 → 612,9
else
{
lcd_lines[0]="Reading Settings ";
lcd_lines[1]=mk.watchdog.act_paramset+"/5 |"+ (mk.watchdog.act_paramset>0?"#":"_") + (mk.watchdog.act_paramset>1?"#":"_") + (mk.watchdog.act_paramset>2?"#":"_")+ (mk.watchdog.act_paramset>3?"#":"_")+ (mk.watchdog.act_paramset>4?"#":"_") + "| ";
lcd_lines[1]=DUBwiseHelper.pound_progress(mk.watchdog.act_paramset,5);
if (mk.params.found_incompatible)
{
mk.error_str="incompatible params";
728,11 → 759,11
switch (settings.act_skin)
{
case SKINID_DARK:
return 0x000000;
return BG_COLOR_SKIN_DARK;
 
default:
case SKINID_LIGHT:
return 0xFFFFFF;
return BG_COLOR_SKIN_LIGHT;
}
}
 
743,11 → 774,11
switch (settings.act_skin)
{
case SKINID_DARK:
return 0xFFFFFF;
return FG_COLOR_SKIN_DARK;
default:
case SKINID_LIGHT:
return 0x000000;
return FG_COLOR_SKIN_LIGHT;
}
}
 
780,7 → 811,6
canvas_height=this.getHeight();
 
 
 
if (debug.showing)
{
debug.paint(g);
794,9 → 824,7
firstrun=false;
}
y_off=0;
 
 
 
try {
 
 
846,10 → 874,15
 
g.setClip(symbol_left,0,symbols_img_tile_width,symbols_img_tile_height);;
if (mk.connected)
symbol_paint(g,symbol_left,(((mk.stats.bytes_in>>3)&1)==1)?2:3,0);
symbol_paint(g,symbol_left,(((mk.stats.bytes_in>>3)&1)==1)?2:3,0);
 
else
symbol_paint(g,symbol_left,1,0);
{
if (mk.mk_url.startsWith("btspp://"))
symbol_paint(g,symbol_left,1,0);
 
}
// g.drawImage(symbols_img,(-1)*(symbols_img.getWidth()/10),0, g.TOP | g.LEFT);
 
 
881,20 → 914,23
 
 
//symbol_left+= g.getFont().stringWidth("88,8V");//;
 
/*
symbol_paint(g,symbol_left,6,0);
symbol_left+=5*(symbols_img_tile_width)/4;
 
if (mk.SenderOkay()!=0)
*/
if (mk.SenderOkay()>0)
{
symbol_paint(g,symbol_left,(mk.SenderOkay())/100,1);
symbol_paint(g,symbol_left,6,0);
symbol_left+=5*(symbols_img_tile_width)/4;
/*symbol_paint(g,symbol_left,(mk.SenderOkay())/100,1);
symbol_left+=(symbols_img_tile_width);
 
symbol_paint(g,symbol_left,(mk.SenderOkay()/10)%10,1);
symbol_left+=(symbols_img_tile_width);
symbol_left+=(symbols_img_tile_width);*/
}
symbol_paint(g,symbol_left,(mk.SenderOkay())%10,1);
symbol_left+=6*(symbols_img_tile_width)/4;
// symbol_paint(g,symbol_left,(mk.SenderOkay())%10,1);
//symbol_left+=6*(symbols_img_tile_width)/4;
 
// g.drawString(""+mk.SenderOkay() ,symbol_left,y_off,Graphics.TOP | Graphics.LEFT);
1255,20 → 1291,16
case STATEID_STRINGINPUT:
case STATEID_ABOUT:
case STATEID_IPINPUT:
 
paint_lcd(g);
break;
 
case STATEID_PARAM_MASSWRITE:
case STATEID_READ_PARAMS:
//#if bluetooth=="on"
case STATEID_SCANNING:
//#endif
paint_lcd(g);
break;
 
 
//#if bluetooth=="on"
case STATEID_SCANNING:
paint_lcd(g);
break;
//#endif
 
case STATEID_RAWDEBUG:
g.setFont(f2);
rawdebug_off_y=0;
1725,12 → 1757,18
break;
 
 
case STATEID_PARAM_MASSWRITE:
mk.user_intent=USER_INTENT_PARAMS;
lcd_lines=new String[2];
lcd_lines[0]="";
lcd_lines[1]="";
break;
 
case STATEID_READ_PARAMS:
mk.user_intent=USER_INTENT_PARAMS;
lcd_lines=new String[2];
lcd_lines[0]="Reading Settings ";
lcd_lines[1]=mk.watchdog.act_paramset+"/5 |"+ (mk.watchdog.act_paramset>0?"#":"_") + (mk.watchdog.act_paramset>1?"#":"_") + (mk.watchdog.act_paramset>2?"#":"_")+ (mk.watchdog.act_paramset>3?"#":"_")+ (mk.watchdog.act_paramset>4?"#":"_") + "| ";
lcd_lines[1]=DUBwiseHelper.pound_progress(mk.watchdog.act_paramset,5);
 
break;
 
1914,6 → 1952,10
public final static String PARAM_SAVE_STORE_NAME="MKParamsV1";
 
int[][] params2masswrite;
int param_masswrite_write_pos;
public void process_action(byte actionid)
{
switch(actionid)
1927,6 → 1969,25
{
ByteArrayInputStream bin = new ByteArrayInputStream(recStore.getRecord(1));
DataInputStream din = new DataInputStream( bin );
 
 
// params_version
if ( mk.params.params_version!=din.readInt())
{
mk.error_str="Params Incompatible";
chg_state(STATEID_ERROR_MSG);
break;
}
 
int p_length=din.readInt();
params2masswrite=new int[5][p_length];
 
for ( int p=0;p<5;p++)
for ( int p_pos=0;p_pos<p_length;p_pos++)
params2masswrite[p][p_pos]=din.readInt();
 
param_masswrite_write_pos=0;
chg_state(STATEID_PARAM_MASSWRITE);
}
else throw(new Exception("rms err"));
recStore.closeRecordStore();
2549,7 → 2610,7
if (select_paramset4edit)
chg_state(STATEID_PARAM_MENU);
else
chg_state(STATEID_HANDLE_PARAMS);
chg_state(STATEID_HANDLE_PARAMS); // from save as
}
else