'log_el':

- add *.ini file
- small changes

git-svn-id: svn://kolibrios.org@2523 a494cfbc-eb01-0410-851d-a64ba20cac60

programs/media/log_el/trunk/le_pole.inc

@@ -219,13 +219,13 @@ proc but_test_pole, pole:dword
 	mov eax,pole_b_sort
 	mov edi,open_file_lif
 	stdcall convert_int_to_str
-	stdcall [buf2d_draw_text], buf_0, buf_font,edi,5,ebx,color_s0 ;à¨á㥬 b_sort
+	stdcall [buf2d_draw_text], buf_0, buf_font,edi,5,ebx,[shem_colors] ;à¨á㥬 b_sort
 	add ebx,18
 
 	mov eax,[esi]
 	add esi,4
 	stdcall convert_int_to_str
-	stdcall [buf2d_draw_text], buf_0, buf_font,edi,5,ebx,color_s0 ;à¨á㥬 ç¨á«® â®ç¥ª
+	stdcall [buf2d_draw_text], buf_0, buf_font,edi,5,ebx,[shem_colors] ;à¨á㥬 ç¨á«® â®ç¥ª
 	add ebx,9
 
 	cmp ecx,1
@@ -245,7 +245,7 @@ proc but_test_pole, pole:dword
 		mov eax,[esi]
 		add esi,4
 		stdcall convert_int_to_str
-		stdcall [buf2d_draw_text], buf_0, buf_font,edi,5,ebx,color_border ;à¨á㥬 4 áâப¨ 㪠§ â¥«¥©
+		stdcall [buf2d_draw_text], buf_0, buf_font,edi,5,ebx,[color_border] ;à¨á㥬 4 áâப¨ 㪠§ â¥«¥©
 		add ebx,9
 		loop @b
 
@@ -797,7 +797,7 @@ proc pole_paint, pole:dword
 	dec ebx
 	add ecx,2
 	add edx,2
-	stdcall [buf2d_rect_by_size], buf_0, eax,ebx, ecx,edx, color_border
+	stdcall [buf2d_rect_by_size], buf_0, eax,ebx, ecx,edx, [color_border]
 
 	;eax -> firstC
 	;ebx -> i

programs/media/log_el/trunk/log_el.asm

@@ -9,13 +9,16 @@ use32
 	dd 0
 	dd sys_path
 
-color_border equ 0xff0000
+ini_def_c_bkgnd equ 0
+ini_def_c_border equ 0xff0000
 color_s0 equ 0xff ;ᨣ­ « 0
 color_s1 equ 0xffffff ;ᨣ­ « 1
 color_s2 equ 0xff00 ;â®çª  ¡¥§ ¯¥à¥á¥ç¥­¨ï
 color_s3 equ 0xff0000 ;¢à¥¬¥­­®¥ §­ ç¥­¨¥ ¤«ï á®åà ­¥­¨ï
 color_caption equ 0x808080
 
+color_border dd ini_def_c_border
+
 debug equ 0
 
 ;­®¬ à  ¨ª®­®ª:
@@ -50,7 +53,7 @@ include 'le_pole.inc'
 include 'le_signal.inc'
 
 @use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
-caption db '‹®£¨ç¥áª¨¥ í«¥¬¥­âë 26.03.12',0 ;¯®¤¯¨áì ®ª­ 
+caption db '‹®£¨ç¥áª¨¥ í«¥¬¥­âë 29.03.12',0 ;¯®¤¯¨áì ®ª­ 
 
 panel_0_coord_top equ 5 ;¢¥àå­ïï ª®®à¤¨­ â  0-£® à鸞 ¯ ­¥«¨ ¨­áâà㬥­â®¢
 panel_1_coord_top equ 35
@@ -164,7 +167,7 @@ run_file_70 FileInfoBlock
 image_data dd 0 ;㪠§ â¥«ì ­  ¢à¥¬¥­­ãî ¯ ¬ïâì. ¤«ï ­ã¦¥­ ¯à¥®¡à §®¢ ­¨ï ¨§®¡à ¦¥­¨ï
 
 IMAGE_TOOLBAR_ICON_SIZE equ 16*16*3
-IMAGE_TOOLBAR_SIZE equ IMAGE_TOOLBAR_ICON_SIZE*24
+IMAGE_TOOLBAR_SIZE equ IMAGE_TOOLBAR_ICON_SIZE*25
 image_data_toolbar dd 0
 
 TREE_ICON_SYS16_BMP_SIZE equ IMAGE_TOOLBAR_ICON_SIZE*11+54 ;à §¬¥à bmp ä ©«  á á¨á⥬­ë¬¨ ¨ª®­ª ¬¨
@@ -217,7 +220,13 @@ macro load_image_file path,buf,size { ;
 	@@:
 }
 
-
+ini_name db 'log_el.ini',0 ;¨¬ï ä ©« 
+ini_sec_color db 'Colors',0
+key_color_bkgnd db 'background',0
+key_color_border db 'border',0
+key_color_s0 db 's0',0
+key_color_s1 db 's1',0
+key_color_s2 db 's2',0
 
 align 4
 start:
@@ -230,7 +239,23 @@ start:
 	@@:
 	mcall 48,3,sc,sizeof.system_colors
 	mcall 40,0x27
-	stdcall [OpenDialog_Init],OpenDialog_data ;¯®¤£®â®¢ª  ¤¨ «®£ 
+
+	;*** áç¨â뢠­¨¥ ­ áâ஥ª ¨§ *.ini ä ©« 
+	copy_path ini_name,sys_path,file_name,0x0
+
+	stdcall dword[ini_get_color],file_name,ini_sec_color,key_color_bkgnd,ini_def_c_bkgnd
+	mov	dword[buf_0.color],eax
+	stdcall dword[ini_get_color],file_name,ini_sec_color,key_color_border,ini_def_c_border
+	mov	dword[color_border],eax
+	stdcall dword[ini_get_color],file_name,ini_sec_color,key_color_s0,color_s0
+	mov	dword[shem_colors],eax
+	stdcall dword[ini_get_color],file_name,ini_sec_color,key_color_s1,color_s1
+	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 [OpenDialog_Init],OpenDialog_data
 	stdcall [buf2d_create], buf_0 ;ᮧ¤ ­¨¥ ¡ãä¥à 
 	load_image_file 'toolbar.png', image_data_toolbar,IMAGE_TOOLBAR_SIZE
 
@@ -282,6 +307,7 @@ start:
 		loop @b
 	stdcall [tl_cur_beg], tree2
 
+	;*** ãáâ ­®¢ª  ¢à¥¬¥­¨ ¤«ï â ©¬¥à 
 	mcall 26,9
 	mov [last_time],eax
 
@@ -814,7 +840,7 @@ pushad
 	mov esi,[sc.work_button]
 	int 0x40
 
-	add ebx,25 shl 16
+	add ebx,30 shl 16
 	mov edx,31
 	int 0x40
 
@@ -830,6 +856,10 @@ pushad
 	mov edx,34
 	int 0x40
 
+	add ebx,25 shl 16
+	mov edx,35
+	int 0x40
+
 	; *** à¨á®¢ ­¨¥ ¨ª®­®ª ­  ª­®¯ª å ***
 	mov eax,7
 	mov ebx,[image_data_toolbar]
@@ -840,19 +870,23 @@ pushad
 	int 0x40
 
 	add ebx,IMAGE_TOOLBAR_ICON_SIZE
-	add edx,(25 shl 16) ;icon pen 1
+	add edx,(30 shl 16) ;icon - à¨á®¢ ­¨¥ ¯à®¢®¤ 
 	int 0x40
 
 	add ebx,IMAGE_TOOLBAR_ICON_SIZE
-	add edx,(25 shl 16) ;icon pen 2
+	add edx,(25 shl 16) ;icon - à¨á®¢ ­¨¥ ¯¥à¥á¥ç¥­¨© ¯à®¢®¤®¢
 	int 0x40
 
 	add ebx,IMAGE_TOOLBAR_ICON_SIZE
-	add edx,(25 shl 16) ;icon pen 3
+	add edx,(25 shl 16) ;icon - à¨á®¢ ­¨¥ «®£¨ç¥áª¨å í«¥¬¥­â®¢
 	int 0x40
 
 	add ebx,IMAGE_TOOLBAR_ICON_SIZE
-	add edx,(25 shl 16) ;icon add elemet
+	add edx,(25 shl 16) ;icon - à¨á®¢ ­¨¥ ¯®¤¯¨á¥©
+	int 0x40
+
+	add ebx,IMAGE_TOOLBAR_ICON_SIZE
+	add edx,(25 shl 16) ;icon - § â¨à çª 
 	int 0x40
 
 	mcall 12,2
@@ -977,13 +1011,13 @@ button:
 		stdcall set_pen_mode,2,1,((9 shl 8)+9) shl 16
 	@@:
 	cmp ah,33
-	jne @f
-		stdcall set_pen_mode,3,2,((15 shl 8)+9) shl 16 ;ãáâ ­®¢ª  ०¨¬  áâ¨à ­¨ï ¯à®¢®¤ 
-	@@:
-	cmp ah,34
 	jne @f
 		stdcall set_pen_mode,4,3,((9 shl 8)+9) shl 16 ;ãáâ ­®¢ª  ०¨¬  ᮧ¤ ­¨ï í«¥¬¥­â®¢
 	@@:
+	cmp ah,35
+	jne @f
+		stdcall set_pen_mode,3,2,((15 shl 8)+9) shl 16 ;ãáâ ­®¢ª  ०¨¬  áâ¨à ­¨ï ¯à®¢®¤ 
+	@@:
 	cmp ah,1
 	jne still
 .exit:
@@ -2309,7 +2343,7 @@ buf_0: dd 0 ;
 .t: dw panel_1_coord_top ;+6 top
 .w: dd 395 ;+8 w
 .h: dd 340 ;+12 h
-.color: dd 0 ;+16 color
+.color: dd ini_def_c_bkgnd ;+16 color
 	db 24 ;+20 bit in pixel
 
 align 4

programs/media/log_el/trunk/log_el.ini

@@ -0,0 +1,6 @@
+[Colors]
+background=255,255,255 ;цвет фона
+border=128,0,0 ;... границы
+s0 = 0,128,255 ;... провода
+s1 = 255,0,0 ;... сигнала
+s2 = 0,0,192 ;... пересечений