WebSVN - FlightCtrl - Path Comparison - /branches/ligi_j2me/ Rev 410 and /branches/ligi

Ignore whitespace Rev 410 → Rev 411

/branches/ligi_j2me/README
153,4 → 153,5
0.38 - scrolling intro string ( some EYE-Candy )
0.39 - rotation instead of clipping in main menu select
0.40 - Input Values in ParameterEditor via KEY0..KEY9
0.41 - block motortest values > 255
0.41 - block motortest values > 255 / BugFixes / better Parameter Input

/branches/ligi_j2me/bin/0.40/DUBwise_240x320.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/branches/ligi_j2me/bin/0.40/DUBwise_128x.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/branches/ligi_j2me/bin/0.40/DUBwise_240x320.jad
File deleted

/branches/ligi_j2me/bin/0.40/DUBwise_128x.jad
File deleted

/branches/ligi_j2me/bin/0.40/DUBwise_176x220.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/branches/ligi_j2me/bin/0.40/DUBwise_176x220.jad
File deleted

/branches/ligi_j2me/bin/0.41_test/MANIFEST.MF
File deleted

/branches/ligi_j2me/bin/0.41_test/DUBwise_176x220.jad
File deleted

/branches/ligi_j2me/bin/0.41_test/DUBwise_240x320.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/branches/ligi_j2me/bin/0.41_test/DUBwise_128x.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/branches/ligi_j2me/bin/0.41_test/DUBwise_240x320.jad
File deleted

/branches/ligi_j2me/bin/0.41_test/DUBwise_128x.jad
File deleted

/branches/ligi_j2me/bin/0.41_test/DUBwise_176x220.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

 /branches/ligi_j2me/bin/v0.40/DUBwise_128x.jad
 ,0 → 1,8
+MIDlet-Jar-URL: DUBwise_128x.jar
+MIDlet-Jar-Size: 50813
+MIDlet-Name: DUBwise
+MIDlet-Vendor: LiGi
+MIDlet-Version: 0.40
+MIDlet-1: DUBwise, i.png, DUBwise
+MIDletX-No-Command: true
+MIDlet-Icon: i.png

/branches/ligi_j2me/bin/v0.40/DUBwise_128x.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /branches/ligi_j2me/bin/v0.40/DUBwise_176x220.jad
 ,0 → 1,8
+MIDlet-Jar-URL: DUBwise_176x220.jar
+MIDlet-Jar-Size: 57037
+MIDlet-Name: DUBwise
+MIDlet-Vendor: LiGi
+MIDlet-Version: 0.40
+MIDlet-1: DUBwise, i.png, DUBwise
+MIDletX-No-Command: true
+MIDlet-Icon: i.png

/branches/ligi_j2me/bin/v0.40/DUBwise_176x220.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /branches/ligi_j2me/bin/v0.40/DUBwise_240x320.jad
 ,0 → 1,8
+MIDlet-Jar-URL: DUBwise_240x320.jar
+MIDlet-Jar-Size: 51110
+MIDlet-Name: DUBwise
+MIDlet-Vendor: LiGi
+MIDlet-Version: 0.40
+MIDlet-1: DUBwise, i.png, DUBwise
+MIDletX-No-Command: true
+MIDlet-Icon: i.png

/branches/ligi_j2me/bin/v0.40/DUBwise_240x320.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /branches/ligi_j2me/bin/v0.41/DUBwise_128x.jad
 ,0 → 1,8
+MIDlet-Jar-URL: DUBwise_128x.jar
+MIDlet-Jar-Size: 50990
+MIDlet-Name: DUBwise
+MIDlet-Vendor: LiGi
+MIDlet-Version: 0.41
+MIDlet-1: DUBwise, i.png, DUBwise
+MIDletX-No-Command: true
+MIDlet-Icon: i.png

/branches/ligi_j2me/bin/v0.41/DUBwise_128x.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /branches/ligi_j2me/bin/v0.41/DUBwise_176x220.jad
 ,0 → 1,8
+MIDlet-Jar-URL: DUBwise_176x220.jar
+MIDlet-Jar-Size: 57214
+MIDlet-Name: DUBwise
+MIDlet-Vendor: LiGi
+MIDlet-Version: 0.41
+MIDlet-1: DUBwise, i.png, DUBwise
+MIDletX-No-Command: true
+MIDlet-Icon: i.png

/branches/ligi_j2me/bin/v0.41/DUBwise_176x220.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /branches/ligi_j2me/bin/v0.41/DUBwise_240x320.jad
 ,0 → 1,8
+MIDlet-Jar-URL: DUBwise_240x320.jar
+MIDlet-Jar-Size: 51287
+MIDlet-Name: DUBwise
+MIDlet-Vendor: LiGi
+MIDlet-Version: 0.41
+MIDlet-1: DUBwise, i.png, DUBwise
+MIDletX-No-Command: true
+MIDlet-Icon: i.png

/branches/ligi_j2me/bin/v0.41/DUBwise_240x320.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /branches/ligi_j2me/src/MKMiniCanvas.java
 ,8 → 120,6
     }
     public void paint_lcd(Graphics g,boolean bottomup)
     {
 ,15 → 380,24
                         local_max=Math.abs(mk.debug_data.accroll());
                     line_scaler= local_max/(this.getHeight()/2)+1;
                 }
             spacer=(g.getFont().getHeight());
-            g.setColor(0xFFFFFF);
-            g.fillRect(0,0,this.getWidth(),this.getHeight());
-            g.drawImage(bg_img,bg_offset,0, g.TOP | g.LEFT);
-            if (bg_offset+bg_img.getWidth()<this.getWidth())
-                g.drawImage(bg_img,bg_offset+bg_img.getWidth(),0, g.TOP | g.LEFT);
+            if (state==STATEID_EDIT_PARAMS)
+                {
+                    g.setColor(0x000000);
+                    g.fillRect(0,0,this.getWidth(),this.getHeight());
+                }
+                else
+                {
+                    g.setColor(0xFFFFFF);
+                    g.fillRect(0,0,this.getWidth(),this.getHeight());
+                    g.drawImage(bg_img,bg_offset,0, g.TOP | g.LEFT);
+                    if (bg_offset+bg_img.getWidth()<this.getWidth())
+                        g.drawImage(bg_img,bg_offset+bg_img.getWidth(),0, g.TOP | g.LEFT);
+                }
             g.setColor(0x000000);
             switch(state)

 /branches/ligi_j2me/src/MKParamsEditor.java
 ,8 → 114,12
                 if (tab_entry_types[act_tab][i]== PARAMTYPE_BOOLEAN)
                     lcd_lines[2+2*i]=(((canvas.mk.params.get_field_from_act(tab_entry_src[act_tab][i][0])&(1<<tab_entry_src[act_tab][i][1]))==0)?"off":"on" ) ;
                 if (tab_entry_types[act_tab][i]== PARAMTYPE_BYTE)
-                    lcd_lines[2+2*i]=""+canvas.mk.params.get_field_from_act(tab_entry_src[act_tab][i][0]);
+                    {
+                        lcd_lines[2+2*i]=""+canvas.mk.params.get_field_from_act(tab_entry_src[act_tab][i][0]);
+                        if ((canvas.mk.params.get_field_from_act(tab_entry_src[act_tab][i][0])>250)&&(canvas.mk.params.get_field_from_act(tab_entry_src[act_tab][i][0])<256))
+     lcd_lines[2+2*i]+="[Poti"+(canvas.mk.params.get_field_from_act(tab_entry_src[act_tab][i][0])-250) +"]";
+                    }
             }
         for (int i=0;i<act_lcd_lines;i++)
 ,6 → 149,8
     public final static int KEYCODE_CLEAR=-8;
+    public boolean editing_number=false;
     public void keypress (int keyCode,int action)
     {
         if (act_y==0) switch (action)
 ,8 → 169,11
                     {
                         if ((keyCode >= Canvas.KEY_NUM0) && (keyCode <= Canvas.KEY_NUM9))
                             {
-                                if( Math.abs(canvas.mk.params.get_field_from_act(tab_entry_src[act_tab][act_y/2-1][0]))*10+(keyCode - Canvas.KEY_NUM0)<1000)
+                                if((editing_number)&&( Math.abs(canvas.mk.params.get_field_from_act(tab_entry_src[act_tab][act_y/2-1][0]))*10+(keyCode - Canvas.KEY_NUM0)<1000))
                                 canvas.mk.params.set_field_from_act(tab_entry_src[act_tab][act_y/2-1][0] , Math.abs(canvas.mk.params.get_field_from_act(tab_entry_src[act_tab][act_y/2-1][0]))*10+(keyCode - Canvas.KEY_NUM0));
+                                else
+                                canvas.mk.params.set_field_from_act(tab_entry_src[act_tab][act_y/2-1][0] , (keyCode - Canvas.KEY_NUM0));
+                                editing_number=true;
                                 return;
                             }
                         else
 ,7 → 180,7
                             if ( keyCode==KEYCODE_CLEAR)
                                 canvas.mk.params.set_field_from_act(tab_entry_src[act_tab][act_y/2-1][0],0);
                     }
+                editing_number=false;
                     switch (action)
                         {
 ,7 → 193,7
                                     canvas.mk.params.field_from_act_xor(tab_entry_src[act_tab][act_y/2-1][0],1<<tab_entry_src[act_tab][act_y/2-1][1]);
                                     break;
                                 case PARAMTYPE_BYTE:
-                                    if (canvas.mk.params.get_field_from_act(tab_entry_src[act_tab][act_y/2-1][0])<255)
                                     canvas.mk.params.field_from_act_add(tab_entry_src[act_tab][act_y/2-1][0],1);
                                     break;
                                 }
 ,8 → 208,8
                                     break;
                                 case PARAMTYPE_BYTE:
-                                    if (canvas.mk.params.get_field_from_act(tab_entry_src[act_tab][act_y/2-1][0])>0)
-                                        canvas.mk.params.field_from_act_add(tab_entry_src[act_tab][act_y/2-1][0],-1);
+                                    canvas.mk.params.field_from_act_add(tab_entry_src[act_tab][act_y/2-1][0],-1);
                                     break;
                                 }

 /branches/ligi_j2me/src/MKParamsParser.java
 ,14 → 24,19
     {       return field[act_paramset][pos];    }
     public void set_field_from_act(int pos,int val)
-    {  field[act_paramset][pos]=val;    }
+    {
+        if (val>255) val=255;
+        if (val<0) val=255;
+        field[act_paramset][pos]=val;
+    }
     public void field_from_act_add(int pos,int val)
     {
-        field[act_paramset][pos]+=val;
+        set_field_from_act(pos , get_field_from_act(pos)+val);
     }
+    // for boolean Flags
     public void field_from_act_xor(int pos,int val)
     {
         field[act_paramset][pos]^=val;

Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 410 → Rev 411