Subversion Repositories Kolibri OS

Rev

Rev 7662 | Rev 8252 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7662 Rev 7663
Line 12... Line 12...
12 
include 'lang.inc'
 12 
include 'lang.inc'
13 
include 'cnc_editor.inc'
 13 
include 'cnc_editor.inc'
14 
include '../../develop/info3ds/info_fun_float.inc'
 14 
include '../../develop/info3ds/info_fun_float.inc'
Line 15... Line 15...
15 
 
 15 
 
16 
@use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
 16 
@use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
Line 17... Line 17...
17 
caption db 'CNC editor 22.05.19',0 ;¯®¤¯¨áì ®ª­ 
 17 
caption db 'CNC editor 23.05.19',0 ;¯®¤¯¨áì ®ª­ 
Line 18... Line 18...
18 
 
 18 
 
Line 408... Line 408...
408 
	mcall ,,,13 ;align sel points right
 408 
	mcall ,,,13 ;align sel points right
409 
	add ebx,25 shl 16
 409 
	add ebx,25 shl 16
410 
	mcall ,,,14 ;align sel points top
 410 
	mcall ,,,14 ;align sel points top
411 
	add ebx,25 shl 16
 411 
	add ebx,25 shl 16
412 
	mcall ,,,15 ;align sel points bottom
 412 
	mcall ,,,15 ;align sel points bottom
413 
 
 - 
 
414 
	add ebx,25 shl 16
 413 
	add ebx,25 shl 16
- 
 
 414 
	mcall ,,,16 ;optimize figure
- 
 
 415 
 
- 
 
 416 
	add ebx,30 shl 16
415 
	mcall ,,,16 ;copy to clipboard
 417 
	mcall ,,,17 ;copy to clipboard
416 
	add ebx,25 shl 16
 418 
	add ebx,25 shl 16
417 
	mcall ,,,17 ;paste from clipboard
 419 
	mcall ,,,18 ;paste from clipboard
Line 418... Line 420...
418 
 
 420 
 
419 
	add ebx,25 shl 16
 421 
	add ebx,25 shl 16
Line 420... Line 422...
420 
	mcall ,,,18 ;sel points del
 422 
	mcall ,,,19 ;sel points del
421 
 
 423 
 
Line 422... Line 424...
422 
	add ebx,30 shl 16
 424 
	add ebx,30 shl 16
423 
	mcall ,,,19 ;restore zoom
 425 
	mcall ,,,20 ;restore zoom
Line 424... Line 426...
424 
 
 426 
 
425 
	add ebx,30 shl 16
 427 
	add ebx,30 shl 16
Line 426... Line 428...
426 
	mcall ,,,20 ;.png
 428 
	mcall ,,,21 ;.png
427 
 
 429 
 
Line 428... Line 430...
428 
	add ebx,25 shl 16
 430 
	add ebx,25 shl 16
Line 467... Line 469...
467 
	int 0x40
 469 
	int 0x40
468 
	add ebx,IMAGE_TOOLBAR_ICON_SIZE
 470 
	add ebx,IMAGE_TOOLBAR_ICON_SIZE
469 
	add edx,(25 shl 16) ;aling sel points bottom
 471 
	add edx,(25 shl 16) ;aling sel points bottom
470 
	int 0x40
 472 
	int 0x40
471 
	add ebx,IMAGE_TOOLBAR_ICON_SIZE
 473 
	add ebx,IMAGE_TOOLBAR_ICON_SIZE
- 
 
 474 
	add edx,(25 shl 16) ;optimize figure
- 
 
 475 
	int 0x40
- 
 
 476 
	add ebx,IMAGE_TOOLBAR_ICON_SIZE
472 
	add edx,(25 shl 16) ;copy to clipboard
 477 
	add edx,(30 shl 16) ;copy to clipboard
473 
	int 0x40
 478 
	int 0x40
474 
	add ebx,IMAGE_TOOLBAR_ICON_SIZE
 479 
	add ebx,IMAGE_TOOLBAR_ICON_SIZE
475 
	add edx,(25 shl 16) ;paste from clipboard
 480 
	add edx,(25 shl 16) ;paste from clipboard
476 
	int 0x40
 481 
	int 0x40
477 
	add ebx,IMAGE_TOOLBAR_ICON_SIZE
 482 
	add ebx,IMAGE_TOOLBAR_ICON_SIZE
Line 625... Line 630...
625 
	jne @f
 630 
	jne @f
626 
		call but_sel_points_align_coord_ymin
 631 
		call but_sel_points_align_coord_ymin
627 
	@@:
 632 
	@@:
628 
	cmp ah,16
 633 
	cmp ah,16
629 
	jne @f
 634 
	jne @f
630 
		call but_clipboard_copy_points
 635 
		call but_points_optimize
631 
		jmp still
 636 
		jmp still
632 
	@@:
 637 
	@@:
633 
	cmp ah,17
 638 
	cmp ah,17
634 
	jne @f
 639 
	jne @f
635 
		call but_clipboard_paste_points
 640 
		call but_clipboard_copy_points
636 
		jmp still
 641 
		jmp still
637 
	@@:
 642 
	@@:
638 
	cmp ah,18
 643 
	cmp ah,18
639 
	jne @f
 644 
	jne @f
640 
		call but_sel_points_del
 645 
		call but_clipboard_paste_points
641 
		jmp still
 646 
		jmp still
642 
	@@:
 647 
	@@:
643 
	cmp ah,19
 648 
	cmp ah,19
644 
	jne @f
 649 
	jne @f
645 
		call but_restore_zoom
 650 
		call but_sel_points_del
646 
		jmp still
 651 
		jmp still
647 
	@@:
 652 
	@@:
648 
	cmp ah,20
 653 
	cmp ah,20
649 
	jne @f
 654 
	jne @f
650 
		call but_save_png
 655 
		call but_restore_zoom
651 
		jmp still
 656 
		jmp still
652 
	@@:
 657 
	@@:
653 
	cmp ah,21
 658 
	cmp ah,21
654 
	jne @f
 659 
	jne @f
- 
 
 660 
		call but_save_png
- 
 
 661 
		jmp still
- 
 
 662 
	@@:
- 
 
 663 
	cmp ah,22
- 
 
 664 
	jne @f
655 
		call but_dlg_opt_scale
 665 
		call but_dlg_opt_scale
656 
		jmp still
 666 
		jmp still
657 
	@@:
 667 
	@@:
Line 658... Line 668...
658 
 
 668 
 
659 
	;cmp ah,22
 669 
	;cmp ah,23
660 
	;jne @f
 670 
	;jne @f
661 
		;call but_...
 671 
		;call but_...
662 
		;jmp still
 672 
		;jmp still
663 
	;@@:
 673 
	;@@:
Line 1815... Line 1825...
1815 
	.no_point:
 1825 
	.no_point:
1816 
popad
 1826 
popad
1817 
	ret
 1827 
	ret
1818 
endp
 1828 
endp
Line -... Line 1829...
- 
 
 1829 
 
- 
 
 1830 
;description:
- 
 
 1831 
; ®¯â¨¬¨§ æ¨ï 䨣ãàë
- 
 
 1832 
align 4
- 
 
 1833 
proc but_points_optimize uses eax
- 
 
 1834 
	stdcall [tl_node_get_data],tree1
- 
 
 1835 
	or eax,eax
- 
 
 1836 
	jz .no_point
- 
 
 1837 
	cmp [eax+Figure.OType],'Fig'
- 
 
 1838 
	jne .no_point
- 
 
 1839 
		stdcall points_optimize,eax
- 
 
 1840 
		mov dword[offs_last_timer],0 ;¤«ï ®¡­®¢«¥­¨ï ¯® â ©¬¥àã
- 
 
 1841 
	.no_point:
- 
 
 1842 
	ret
- 
 
 1843 
endp
1819 
 
 1844 
 
1820 
align 4
 1845 
align 4
1821 
proc but_restore_zoom uses eax
 1846 
proc but_restore_zoom uses eax
1822 
	stdcall [tl_node_get_data],tree1
 1847 
	stdcall [tl_node_get_data],tree1
1823 
	or eax,eax
 1848 
	or eax,eax