Subversion Repositories Kolibri OS

Compare Revisions

No changes between revisions

Ignore whitespace Rev 2573 → Rev 2574

/programs/media/log_el/trunk/le_pole.inc
235,7 → 235,7
mov eax,[esi]
add esi,4
stdcall convert_int_to_str
stdcall [buf2d_draw_text], buf_0, buf_font,edi,5,ebx,color_caption ;à¨á㥬 㪠§ â¥«¨ ­  ¬ áᨢë â®ç¥ª
stdcall [buf2d_draw_text], buf_0, buf_font,edi,5,ebx,[color_captions] ;à¨á㥬 㪠§ â¥«¨ ­  ¬ áᨢë â®ç¥ª
add ebx,9
loop @b
.end_dr:
565,7 → 565,7
align 4
proc el_draw, h_elem:dword
pushad
;el_offs_nam
 
mov edi,[h_elem]
mov eax,[edi] ;coord x
mov ebx,[edi+4] ;coord y
697,7 → 697,7
cmp esi,3
jl @f
;à¨á®¢ ­¨¥ à ¬ª¨, ¢®ªà㣠§ ­ï⮩ â®çª¨
stdcall draw_point_border, eax,ebx, color_caption
stdcall draw_point_border, eax,ebx, [color_captions]
@@:
 
add eax,[Cor_x]
719,7 → 719,7
add edi,capt_offs ;edi - 㪠§ â¥«ì ­  ¯®«­ãî ¯®¤¯¨áì (á ª®®à¤¨­ â ¬¨)
call str_next_val
call str_next_val
stdcall [buf2d_draw_text], buf_0, buf_font,edi,eax,ebx,color_caption ;à¨á㥬 áâபã á ⥪á⮬
stdcall [buf2d_draw_text], buf_0, buf_font,edi,eax,ebx,[color_captions] ;à¨á㥬 áâபã á ⥪á⮬
ret
endp
 
/programs/media/log_el/trunk/le_signal.inc
289,7 → 289,7
@@ -304,7 +304,8 @@
@@ -322,3 +323,41 @@
/programs/media/log_el/trunk/log_el.asm
15,7 → 15,6
color_s1 equ 0xffffff ;ᨣ­ « 1
color_s2 equ 0xff00 ;â®çª  ¡¥§ ¯¥à¥á¥ç¥­¨ï
color_s3 equ 0xff0000 ;¢à¥¬¥­­®¥ §­ ç¥­¨¥ ¤«ï á®åà ­¥­¨ï
color_caption equ 0x808080
 
color_border dd ini_def_c_border
 
53,7 → 52,7
include 'le_signal.inc'
 
@use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
caption db '‹®£¨ç¥áª¨¥ í«¥¬¥­âë 29.03.12',0 ;¯®¤¯¨áì ®ª­ 
caption db '‹®£¨ç¥áª¨¥ í«¥¬¥­âë 05.04.12',0 ;¯®¤¯¨áì ®ª­ 
 
panel_0_coord_top equ 5 ;¢¥àå­ïï ª®®à¤¨­ â  0-£® à鸞 ¯ ­¥«¨ ¨­áâà㬥­â®¢
panel_1_coord_top equ 35
110,7 → 109,7
elOpt 'and[3]',0xffff00,5,7,tbl_and.3, tbl_il_3, 3
elOpt 'and[4]',0xffff00,5,9,tbl_and.4, tbl_il_4, 4
elOpt 'and[5]',0xffff00,5,11,tbl_and.5, tbl_il_5, 5
elOpt 'not', 0xffff, 3,3,tbl_not, tbl_il_1, 1
elOpt 'not', 0xffff, 3,3,tbl_not, tbl_il_1, 1
elOpt 'xor', 0x8000ff,5,5,tbl_xor, tbl_il_2, 2
elOpt 'sm[1]', 0x8080ff,7,7,tbl_sm, tbl_il_3, 1,4
;elOpt 'cd[8]', 0x8000, 7,17,tbl_cd_8,tbl_il_8, 6,2,2 ;è¨äà â®à ­  8 ¢å®¤®¢
227,6 → 226,7
key_color_s0 db 's0',0
key_color_s1 db 's1',0
key_color_s2 db 's2',0
key_color_captions db 'captions',0
 
align 4
start:
253,7 → 253,20
mov dword[shem_colors+4],eax
stdcall dword[ini_get_color],file_name,ini_sec_color,key_color_s2,color_s2
mov dword[shem_colors+8],eax
stdcall dword[ini_get_color],file_name,ini_sec_color,key_color_captions,[color_captions]
mov dword[color_captions],eax
 
mov ebx,el_opt_beg+el_offs_nam
mov ecx,(el_opt_beg.end-el_opt_beg)/size_el_opt ;ª®««¨ç¥á⢮ ⨯®¢ í«¥¬¥­â®¢
cld
@@:
push ecx
stdcall dword[ini_get_color],file_name,ini_sec_color,ebx,[ebx+el_offs_col-el_offs_nam]
pop ecx
mov dword[ebx+el_offs_col-el_offs_nam],eax
add ebx,size_el_opt
loop @b
 
;*** ¯®¤£®â®¢ª  ¤¨ «®£ 
stdcall [OpenDialog_Init],OpenDialog_data
stdcall [buf2d_create], buf_0 ;ᮧ¤ ­¨¥ ¡ãä¥à 
1062,6 → 1075,7
shem_captions dd 0
shem_colors:
dd color_s0, color_s1, color_s2, color_s3
color_captions dd 0x808080
 
align 4
open_file_lif:
1506,8 → 1520,8
je .cycle1_end
cmp word[esi],el_icon_elems ;¯®«ã祭¨¥ ç¥à¥§ esi ⨯ ¨ª®­ª¨
jne .end_add_p1
; stdcall [tl_node_poi_get_data], esi, tree1
; pop ecx
; stdcall [tl_node_poi_get_data], esi, tree1
; pop ecx
inc dword[shem_elems]
if 0
xor edx,edx ;edx - ­®¬¥à ¢å®¤­®© ­®£¨
2122,6 → 2136,7
@@:
;¯®¤£®â®¢ª  áå¥¬ë ª § ¯ãáªã
call sign_clear
call sign_set_captions_angles
.end_f:
ret
endp
/programs/media/log_el/trunk/log_el.ini
1,6 → 1,17
[Colors]
background=255,255,255 ;öâåò ôîíà
border=128,0,0 ;... ãðàíèöû
s0 = 0,128,255 ;... ïðîâîäà
s1 = 255,0,0 ;... ñèãíàëà
s2 = 0,0,192 ;... ïåðåñå÷åíèé
background=255,255,255 ;梥â ä®­ 
border=128,0,0 ;.. £à ­¨æë
s0 = 0,128,255 ;.. ¯à®¢®¤ 
s1 = 255,0,0 ;.. ᨣ­ « 
s2 = 0,0,192 ;.. ¯¥à¥á¥ç¥­¨©
captions=128,128,128 ;.. ¯®¤¯¨á¥©
not =0,64,192
xor =0,192,0
or[2] =192,0,0
or[3] =192,0,0
or[4] =192,0,0
or[5] =192,0,0
and[2]=192,0,192
and[3]=192,0,192
and[4]=192,0,192
and[5]=192,0,192