- small fix in modeling captions
- add new colors to *.ini file

git-svn-id: svn://kolibrios.org@2574 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
IgorA 2012-04-05 18:57:55 +00:00
parent d0105fc6d5
commit 8e7190b49a
4 changed files with 41 additions and 15 deletions

View File

@ -235,7 +235,7 @@ proc but_test_pole, pole:dword
mov eax,[esi] mov eax,[esi]
add esi,4 add esi,4
stdcall convert_int_to_str 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 add ebx,9
loop @b loop @b
.end_dr: .end_dr:
@ -565,7 +565,7 @@ endp
align 4 align 4
proc el_draw, h_elem:dword proc el_draw, h_elem:dword
pushad pushad
;el_offs_nam
mov edi,[h_elem] mov edi,[h_elem]
mov eax,[edi] ;coord x mov eax,[edi] ;coord x
mov ebx,[edi+4] ;coord y mov ebx,[edi+4] ;coord y
@ -697,7 +697,7 @@ proc capt_draw uses eax ebx edi esi, h_capt:dword
cmp esi,3 cmp esi,3
jl @f jl @f
;à¨á®¢ ­¨¥ à ¬ª¨, ¢®ªà㣠§ ­ï⮩ â®çª¨ ;à¨á®¢ ­¨¥ à ¬ª¨, ¢®ªà㣠§ ­ï⮩ â®çª¨
stdcall draw_point_border, eax,ebx, color_caption stdcall draw_point_border, eax,ebx, [color_captions]
@@: @@:
add eax,[Cor_x] add eax,[Cor_x]
@ -719,7 +719,7 @@ proc capt_draw uses eax ebx edi esi, h_capt:dword
add edi,capt_offs ;edi - 㪠§ â¥«ì ­  ¯®«­ãî ¯®¤¯¨áì (á ª®®à¤¨­ â ¬¨) add edi,capt_offs ;edi - 㪠§ â¥«ì ­  ¯®«­ãî ¯®¤¯¨áì (á ª®®à¤¨­ â ¬¨)
call str_next_val call str_next_val
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 ret
endp endp

File diff suppressed because one or more lines are too long

View File

@ -15,7 +15,6 @@ color_s0 equ 0xff ;ᨣ
color_s1 equ 0xffffff ;ᨣ­ « 1 color_s1 equ 0xffffff ;ᨣ­ « 1
color_s2 equ 0xff00 ;â®çª  ¡¥§ ¯¥à¥á¥ç¥­¨ï color_s2 equ 0xff00 ;â®çª  ¡¥§ ¯¥à¥á¥ç¥­¨ï
color_s3 equ 0xff0000 ;¢à¥¬¥­­®¥ §­ ç¥­¨¥ ¤«ï á®åà ­¥­¨ï color_s3 equ 0xff0000 ;¢à¥¬¥­­®¥ §­ ç¥­¨¥ ¤«ï á®åà ­¥­¨ï
color_caption equ 0x808080
color_border dd ini_def_c_border color_border dd ini_def_c_border
@ -53,7 +52,7 @@ include 'le_pole.inc'
include 'le_signal.inc' include 'le_signal.inc'
@use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load @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_0_coord_top equ 5 ;¢¥àå­ïï ª®®à¤¨­ â  0-£® à鸞 ¯ ­¥«¨ ¨­áâà㬥­â®¢
panel_1_coord_top equ 35 panel_1_coord_top equ 35
@ -227,6 +226,7 @@ key_color_border db 'border',0
key_color_s0 db 's0',0 key_color_s0 db 's0',0
key_color_s1 db 's1',0 key_color_s1 db 's1',0
key_color_s2 db 's2',0 key_color_s2 db 's2',0
key_color_captions db 'captions',0
align 4 align 4
start: start:
@ -253,6 +253,19 @@ start:
mov dword[shem_colors+4],eax mov dword[shem_colors+4],eax
stdcall dword[ini_get_color],file_name,ini_sec_color,key_color_s2,color_s2 stdcall dword[ini_get_color],file_name,ini_sec_color,key_color_s2,color_s2
mov dword[shem_colors+8],eax 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 [OpenDialog_Init],OpenDialog_data
@ -1062,6 +1075,7 @@ shem_elems dd 0 ;
shem_captions dd 0 shem_captions dd 0
shem_colors: shem_colors:
dd color_s0, color_s1, color_s2, color_s3 dd color_s0, color_s1, color_s2, color_s3
color_captions dd 0x808080
align 4 align 4
open_file_lif: open_file_lif:
@ -2122,6 +2136,7 @@ proc but_run_stop
@@: @@:
;¯®¤£®â®¢ª  áå¥¬ë ª § ¯ãáªã ;¯®¤£®â®¢ª  áå¥¬ë ª § ¯ãáªã
call sign_clear call sign_clear
call sign_set_captions_angles
.end_f: .end_f:
ret ret
endp endp

View File

@ -1,6 +1,17 @@
[Colors] [Colors]
background=255,255,255 ;цвет фона background=255,255,255 ;梥â ä®­ 
border=128,0,0 ;... границы border=128,0,0 ;.. £à ­¨æë
s0 = 0,128,255 ;... провода s0 = 0,128,255 ;.. ¯à®¢®¤ 
s1 = 255,0,0 ;... сигнала s1 = 255,0,0 ;.. ᨣ­ « 
s2 = 0,0,192 ;... пересечений 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