Commit graph

642 commits

Author SHA1 Message Date
Jaex
84b25135fb Removed corner radius setting from rectangle drawing, don't override OnDraw in rounded rectangle shape to use rectangle shape with corner radius assigned, don't show corner radius setting for speech balloon until it can be resolved 2016-09-03 11:26:02 +03:00
Jaex
1d24e205b2 Use AddPolygon method instead of AddLine loop 2016-09-02 20:02:06 +03:00
Jaex
749bf6e3f0 Use DrawLines method instead of AddLine loop 2016-09-02 19:53:53 +03:00
Jaex
c483491611 Added corner radius setting to rectangle and text drawing, dynamic pixel offset mode depending on border size to fix anti aliasing issues 2016-09-02 18:48:03 +03:00
Jaex
d3271e597b Added shape category 2016-09-02 10:09:24 +03:00
Jaex
e3232dee70 Rename effect enum names 2016-09-02 09:16:52 +03:00
Jaex
9f6b3cf63a fixed #1778: Swap ctrl + mouse wheel with mouse wheel that way people can't accidentally change tool 2016-08-31 14:55:30 +03:00
Jaex
b0b4cf86d2 Store tail position separately 2016-08-31 03:14:24 +03:00
Jaex
9e645c07fb Instead of using static tail width for speech balloon, using multiplier so it can scale correctly 2016-08-31 02:45:15 +03:00
Jaex
e14b6f20ea Fix border issue 2016-08-25 02:57:02 +03:00
Jaex
3eb7ffbea8 Show tool options for speech balloon 2016-08-25 02:01:07 +03:00
Jaex
6c29817c50 Handle speech balloon border drawing issues 2016-08-24 22:18:54 +03:00
Jaex
146f6eca53 Added speech balloon icon 2016-08-24 21:00:19 +03:00
Jaex
053745a66b Only draw tail if it is required 2016-08-24 20:11:09 +03:00
Jaex
ee5849ec53 Clip balloon rectangle while drawing tail 2016-08-24 19:50:27 +03:00
Jaex
871b583da2 Draw tail in speech balloon but still unable to figure out how to union both rectangle and tail 2016-08-24 19:23:49 +03:00
Jaex
141993b5db Adding SpeechBalloonDrawingShape interim commit 2016-08-24 18:34:02 +03:00
Jaex
25460cb4b9 Added ShowNodes virtual function to BaseShape instead of using ShowResizeNodes property 2016-08-24 16:59:53 +03:00
Jaex
5b7cd4063d Show nodes for image and text drawing OnCreating 2016-08-24 16:41:40 +03:00
Jaex
4577ac9673 Ignore extra node in BaseShape 2016-08-24 16:29:50 +03:00
Jaex
d74892f883 Added extra node to be used for speech balloon tail in future 2016-08-24 15:52:09 +03:00
Jaex
b454f2e7f7 In text tool automatically resize rectangle to fit text so won't need to drag rectangle, when text input box is canceled remove shape 2016-08-24 01:04:48 +03:00
Jaex
a3b8eb88a8 Added centerText parameter to SetText method 2016-08-23 21:02:52 +03:00
Jaex
f432754b87 Added support to paste text with ctrl + v in region capture 2016-08-23 20:33:48 +03:00
Jaex
f9ec01a2c1 If image dialog is canceled then remove image shape 2016-08-23 16:39:15 +03:00
Jaex
59f0b43c18 Change SetImage method to allow centering image to cursor 2016-08-23 16:30:59 +03:00
Jaex
8469f3065d Added OnCreating function to BaseShape 2016-08-23 16:03:48 +03:00
Jaex
603ca595c1 On image shape created or double clicked open image file dialog 2016-08-19 16:16:40 +03:00
Jaex
0b0efdc129 Added icon to image drawing 2016-08-19 13:50:52 +03:00
Jaex
e60556cdaf Add enum description 2016-08-19 13:32:27 +03:00
Jaex
2a115ed205 Added IDisposable to ShapeManager and BaseShape 2016-08-19 13:22:12 +03:00
Jaex
72693d46d1 Adding image paste (ctrl + v) support to region capture 2016-08-19 12:59:46 +03:00
Jaex
029d63f457 Use round cap for line drawing 2016-08-19 07:55:47 +03:00
Jaex
0017bbfc73 Rename classes 2016-08-17 11:35:06 +03:00
Jaex
c5a68e9945 Create node inside ShapeManager 2016-08-17 09:35:38 +03:00
Jaex
b6a54e0979 Use LineJoin.Round in freehand pen 2016-08-17 02:47:32 +03:00
Jaex
952312662e If freehand only have one point then draw ellipse to that point using border size 2016-08-17 02:41:13 +03:00
Jaex
51d72b6a4e Use round caps for freehand pen 2016-08-17 02:33:53 +03:00
Jaex
a38c79e46c Added undo shape keybind (ctrl + z) 2016-08-15 23:48:27 +03:00
Jaex
4c3a8c3dd4 Before open options menu select intersect shape 2016-08-15 22:29:48 +03:00
Jaex
4b0a323c9c Allow moving freehand drawing 2016-08-15 03:55:44 +03:00
Jaex
9258a20533 Show border color and size options for freehand drawing 2016-08-15 03:42:23 +03:00
Jaex
5100580601 Added icon for freehand drawing 2016-08-15 02:43:33 +03:00
Jaex
84c3a977d6 Adding freehand drawing support 2016-08-15 02:11:21 +03:00
Jaex
2497875b0a Added ShowResizeNodes to BaseShape 2016-08-15 02:02:27 +03:00
Jaex
5762b08e5e Q press will change check state of control 2016-08-15 00:58:10 +03:00
Jaex
937643a8a6 fixed #1776: Added Q key bind to change multi region setting 2016-08-14 23:32:01 +03:00
Jaex
5b077d4871 fixed #1714: Center resize nodes to cursor that way magnifier can show exact pixel 2016-08-09 19:16:48 +03:00
Jaex
2537316a33 Using expression bodies in few properties 2016-08-09 01:24:17 +03:00
Jaex
ecbd01a923 Store hover area as BaseShape to be able to hover freehand etc. properly 2016-08-09 01:05:01 +03:00
Jaex
14ecc618e9 Added IsRegionShape to BaseShape 2016-08-09 00:15:52 +03:00
Jaex
36b460dfda Added AddRoundedRectangleProper extension 2016-08-08 21:59:09 +03:00
Jaex
2d6853029c Fix rounded rectangle region 1 off issue 2016-08-08 21:31:07 +03:00
Jaex
4eee080b59 On freehand region & step drawing resize call move method so arrow keys can move without require holding ctrl key 2016-08-08 11:46:45 +03:00
Jaex
e07351fc6c Resize line from end position by default 2016-08-08 11:44:03 +03:00
Jaex
c62e374620 Don't show snap areas on freehand region 2016-08-06 16:53:29 +03:00
Jaex
08d1d85df8 Removed NodeType, Changed ShowNodes to FixedSize 2016-08-05 17:20:08 +03:00
Jaex
05490a90e5 Added ShowNodes property so shape can disable nodes 2016-08-05 16:48:46 +03:00
Jaex
5829085cb6 Moved node logic to BaseShape 2016-08-05 16:35:44 +03:00
Jaex
282d543a91 Removed NodeManager and moved its codes to ShapeManager for preparation to have node logic inside BaseShape 2016-08-05 16:17:53 +03:00
Jaex
4d01f94cb7 Start resizing from bottom right instead of top left 2016-08-05 15:24:29 +03:00
Jaex
0834ca540c Make ShapeManager and NodeManager internal 2016-08-05 15:10:05 +03:00
Jaex
1409c72716 Rename ResizeManager to NodeManager 2016-08-05 14:43:57 +03:00
Jaex
2622c2469c Move key move/resize methods to ShapeManager from ResizeManager, Removed Show/Hide methods from ResizeManager instead using Visible property 2016-08-05 14:37:20 +03:00
Jaex
7be1c5e519 Move/resize key code changes to be more easily understandable 2016-08-05 13:44:47 +03:00
Jaex
883f725d80 Added node to last point of freehand region to be able to continue drawing 2016-08-05 13:13:16 +03:00
Jaex
7ac883e8b9 Allow moving all freehand points while creating it using ctrl 2016-08-05 11:43:52 +03:00
Jaex
d33b19e3c7 When region capture opened show current region shape type 2016-08-04 14:18:21 +03:00
Jaex
a51c132828 If shift hold when creating first point then create two points that way polygon mode can create line 2016-08-04 13:37:57 +03:00
Jaex
3b2d2d3045 When shift pressed create new point once to move for polygon mode 2016-08-04 13:19:42 +03:00
Jaex
1315f47340 When drawing freehand region you can hold "Shift" to draw direct lines which will act like polygon region 2016-08-04 04:13:57 +03:00
Jaex
efa8704879 CloseFigure already adds line from end to start so no need to add it manually 2016-08-04 03:07:00 +03:00
Jaex
f95afed046 Ignore region freehand for hover 2016-08-03 12:31:15 +03:00
Jaex
881a3c22da Don't allow freehand resize 2016-08-03 12:19:01 +03:00
Jaex
eacac76a75 Shape resize logic moved to BaseShape from ResizeManager 2016-08-03 12:15:26 +03:00
Jaex
4dbaa392e6 Override Move in freehand region shape 2016-08-03 12:08:06 +03:00
Jaex
4414ed888e Shape move logic moved to BaseShape from ResizeManager 2016-08-03 12:01:39 +03:00
Jaex
b367bcb747 Disable resize nodes for freehand region 2016-08-03 11:45:12 +03:00
Jaex
fc01094172 Added drag move support to freehand region 2016-08-03 10:09:21 +03:00
Jaex
664b8d1889 Fix freehand quick capture 2016-08-03 09:54:00 +03:00
Jaex
8eb62bcb0d Added resx text and icon to freehand region 2016-08-03 09:38:40 +03:00
Jaex
6358f04a31 Removed freehand capture hotkey 2016-08-03 09:32:35 +03:00
Jaex
3a7510d2a2 Calculate freehand rectangle on update, close figure on shape path requested 2016-08-03 08:59:52 +03:00
Jaex
c0ab0507f3 BaseShape refactor, shape update logic moved to BaseShape 2016-08-03 08:35:34 +03:00
Jaex
5c80ba8b94 Adding freehand region support to region capture 2016-08-03 03:48:11 +03:00
Jaex
24ada5cc9a Apply region path to image with anti aliasing 2016-08-02 11:29:17 +03:00
Jaex
0a78019274 CodeMaid cleanup 2016-07-30 04:21:18 +03:00
Jaex
35e0a826b6 Added constant settings to RegionCaptureOptions 2016-07-27 04:56:20 +03:00
Jaex
4ccc050e97 fixed #1716: Region capture WASD move/resize support 2016-07-17 09:25:53 +03:00
Jaex
abc69b51ee Added remaining strings to resources 2016-07-13 04:14:54 +03:00
Jaex
aa72322c9a Don't draw square to cursor if border size is 0 2016-07-07 10:58:04 +03:00
Jaex
a2c905a0c8 When switched to drawing mode, draw small square in cursor using border color and size 2016-07-05 08:52:49 +03:00
Jaex
f237ea6255 When drawing shape is selected show border color inside cursor 2016-07-04 14:26:19 +03:00
Jaex
fa89cd660a Don't store snap distance in region capture options 2016-06-25 11:30:32 +03:00
Jaex
8926d113cc Don't store move speed in region capture options 2016-06-25 10:55:32 +03:00
Jaex
b166fe2ef6 Proper way to check snap distance 2016-06-25 10:44:39 +03:00
Jaex
e7723e48f6 fixed #1638: If double clicked in same frame was causing issue 2016-06-24 22:38:23 +03:00
Jaex
8b8eacda66 Don't close region capture when double clicked and there is no region 2016-06-24 22:09:31 +03:00
Jaex
fd9d52dc91 Adding rest of region capture settings to task settings form 2016-06-23 09:48:22 +03:00
Jaex
fefcf2cf26 In region capture menu key will open right click menu 2016-06-22 16:09:15 +03:00
Jaex
0b71daed4e RegionCaptureOptions rename and changes 2016-06-22 10:51:57 +03:00
Jaex
5bab479325 Added configurable mouse click actions for region capture 2016-06-13 19:48:41 +03:00
Jaex
b10eba0950 Hold Alt to resize from bottom right corner 2016-06-12 20:04:06 +03:00
Jaex
b09576ddfe Update region capture tips 2016-06-12 19:32:33 +03:00
Jaex
f0876a151c Mouse 4 click will swap shape type too 2016-06-12 14:37:03 +03:00
Jaex
dd746bf6e1 Remember last region and annotation tool, also open region capture with last region tool selected 2016-06-12 14:28:01 +03:00
Jaex
3f2a15ded9 Use home button for left top resizing, end button for right bottom resizing 2016-06-12 13:48:56 +03:00
Jaex
040445791d Swap tab button with alt for resize location 2016-06-12 13:42:09 +03:00
Jaex
f025d32c06 "Tab" button will swap between last region tool and last annotation tool 2016-06-12 12:52:47 +03:00
Jaex
0f9ee0be33 Swap ctrl and shift actions for selected shape moving/resizing that way it will be consistent with create moving hotkey (ctrl when creating shape) 2016-06-11 13:38:47 +03:00
Jaex
ba04944c9e When region capture form focus lost disable modifier actions 2016-06-11 13:34:27 +03:00
Jaex
6dbcae7b42 Removed CurrentPosition variable, using shape.EndPosition instead 2016-06-11 13:28:59 +03:00
Jaex
da5f614273 Removed PositionOnClick variable, using shape.StartPosition instead 2016-06-11 13:23:02 +03:00
Jaex
70d959da89 Added shape move support when creating (hold ctrl when dragging region) 2016-06-11 12:48:58 +03:00
Jaex
ad21a0bad2 Fix double click empty area issue 2016-06-10 16:54:54 +03:00
Jaex
d48913093c If current shape and hover area is not valid then cancel shape 2016-06-09 03:33:12 +03:00
Jaex
1050a6c583 Added Intersects method to BaseShape 2016-05-29 13:10:48 +03:00
Jaex
39dfd0cc88 Disable annotation hotkeys in non annotation mode 2016-05-26 23:55:10 +03:00
Jaex
8688e9e0d7 Added IgnoreSeparatorClick extension for context menu strip, using it on annotation context menu 2016-05-26 03:18:13 +03:00
Jaex
3d8c76b493 Escape will close context menu in key up so form won't receive it 2016-05-26 02:40:44 +03:00
Jaex
55cda0b140 Added show tips to options menu 2016-05-25 23:07:34 +03:00
Jaex
3604a1a48a Added hotkey for step label 2016-05-25 23:04:46 +03:00
Jaex
4db775f8e0 Decrease font size for 3 digits step label 2016-05-25 22:34:30 +03:00
Jaex
e23f10deb2 Use border color for step label text color 2016-05-25 22:29:25 +03:00
Jaex
1b67c9e2b9 Show nodes for fixed size region too 2016-05-25 21:42:46 +03:00
Jaex
a87b4d48a4 If fixed size and region mode then show hover area for fixed size 2016-05-25 21:23:02 +03:00
Jaex
dda1f78f36 Added fixed size mode to options menu 2016-05-25 20:56:27 +03:00
Jaex
b2bc0a634d Changed step label font because with Arial text was not centered correctly 2016-05-25 00:11:24 +03:00
Jaex
add923d914 Use int instead of float for nodes 2016-05-24 20:31:40 +03:00
Jaex
13bde6b875 Snap line to every 45 degrees 2016-05-24 01:30:23 +03:00
Jaex
9f7f66d56e Use checked bold renderer in region capture menu 2016-05-24 00:49:27 +03:00
Jaex
3201c05643 Arrow will inherit Line, Text will inherit Rectangle 2016-05-23 19:34:41 +03:00
Jaex
e98ef03b9e Line and arrow IsValidShape override 2016-05-23 19:18:09 +03:00
Jaex
8af49b0a51 Added default colors for step tool 2016-05-23 18:31:22 +03:00
Jaex
ebdcc7273d Fit two digit numbers to step label 2016-05-23 02:53:10 +03:00
Jaex
c7a7a45fe4 Don't show hover with line, arrow, step tools 2016-05-23 02:30:25 +03:00
Jaex
6fdf5eee97 Move shape rectangle validation to BaseShape 2016-05-23 02:18:29 +03:00
Jaex
5271a82b3f EndRegionSelection improvements to fix hover issues 2016-05-23 01:42:52 +03:00
Jaex
eb8a9e5a90 Order step shapes before draw 2016-05-22 23:43:19 +03:00
Jaex
b131585a9d Step label create with default size and move it 2016-05-22 23:19:13 +03:00
Jaex
70300cdd8f Adding step drawing 2016-05-22 22:19:25 +03:00
Jaex
63c685bf1d Use anti aliasing for text drawing 2016-05-22 22:11:34 +03:00
Jaex
1233a7e29c Removed DrawFinal from BaseDrawing, renamed Draw to OnDraw 2016-05-21 15:26:49 +03:00
Jaex
ea9f3f2312 Change default text colors 2016-05-21 01:20:56 +03:00
Jaex
d4aadafd58 Text color settings independent from other shapes now 2016-05-21 00:56:18 +03:00
Jaex
ec18026d9c Added UpdateContextMenu method 2016-05-21 00:31:16 +03:00
Jaex
c6aa3c2ce1 Show border color, border size, fill color options for text drawing 2016-05-21 00:13:00 +03:00
Jaex
50a715daba Fix text drawing 2016-05-21 00:09:31 +03:00
Jaex
de14669306 In context menu updated selected control options properly 2016-05-21 00:09:09 +03:00
Jaex
fa2c5c73c3 Adding border color, border size, fill color specific to text drawing 2016-05-20 23:19:07 +03:00
Jaex
67f69559fc Don't draw text if rectangle is too small 2016-05-20 21:34:20 +03:00
Jaex
6cf94d9cf8 base.UpdateShapeConfig needed in RoundedRectangleDrawingShape 2016-05-20 20:41:49 +03:00
Jaex
9e35ee9591 Created AnnotationOptions class 2016-05-20 20:34:45 +03:00
Jaex
55c3087892 Added UpdateShapeConfig method so shapes can update their own config 2016-05-20 20:01:00 +03:00
Jaex
428dabe972 Clone text options for each new text drawing and when text options changed apply it to main options 2016-05-20 19:07:29 +03:00
Jaex
110d1eede0 Allow border size 0 for fill color only shapes 2016-05-20 18:49:38 +03:00
Jaex
c52eb0cdc8 Don't save text inside options 2016-05-20 18:45:55 +03:00
Jaex
93caa9a549 Created TextDrawingOptions class 2016-05-20 17:11:48 +03:00
Jaex
42cd1e36a5 Added horizontal and vertical alignment options to text drawing 2016-05-20 16:44:56 +03:00
Jaex
60016ecd9f Added font selection to input box 2016-05-20 03:47:04 +03:00
Jaex
54d4633f0f Added bold, italic, underline options to input box 2016-05-20 02:53:45 +03:00
Jaex
29189deb38 Added custom input box for text drawing 2016-05-20 01:57:49 +03:00
Jaex
f2c7257a36 Use border color for text color, before double click event stop moving 2016-05-20 01:30:20 +03:00
Jaex
18dc27b166 Added text drawing support to region capture 2016-05-20 01:13:19 +03:00
Jaex
dab01f00b4 Blur, pixelate, highlight changes to improve visibility of region 2016-05-19 17:44:32 +03:00
Jaex
c5e601a34d Added BaseEffectShape 2016-05-11 01:17:51 +03:00
Jaex
0e7ba6cbe9 Draw blur radius and pixel size inside region 2016-05-10 01:50:20 +03:00
Jaex
8289dc21ea Rename AreaManager to ShapeManager 2016-05-09 21:57:40 +03:00
Jaex
88ecf435c7 Added corner lines to blur, pixelate, highlight 2016-05-09 01:34:15 +03:00
Jaex
562d3192d3 Added highlight color option 2016-05-07 17:03:26 +03:00
Jaex
cd2cbbabc2 Added corner radius, blur radius, pixel size options to menu. Removed corner radius hotkey because now it is changeable from menu. Numpad hotkey changes to fit all drawings. 2016-05-07 16:24:32 +03:00
Jaex
431b733fae Give previous result to DrawOutput instead of SurfaceImage so effects can be applied to top of each other 2016-05-07 03:28:58 +03:00
Jaex
d7d65a3946 Added highlight drawing 2016-05-07 03:11:31 +03:00
Jaex
da9077b6c1 Remember blur radius and pixel size 2016-05-06 20:24:39 +03:00
Jaex
520e2b85cb Added Pixelate drawing shape 2016-05-06 20:04:24 +03:00
Jaex
7cfc326f79 Added simple blur drawing shape which renders blur only in output 2016-05-06 19:55:16 +03:00
Jaex
265a37fbd4 UpdateShape on rounded rectangle radius change, check color transparency properly 2016-05-06 16:02:46 +03:00
Jaex
d763c0475f Update current shape after shape options changed 2016-05-06 14:48:50 +03:00
Jaex
2b317a2167 Improvements to set shape rectangle automatically 2016-05-06 02:23:18 +03:00
Jaex
c4f7268106 Show two circle nodes for line and arrow selection 2016-05-06 01:15:41 +03:00
Jaex
1633d4100e Removed triangle and diamond region capture, added hotkey for rest of drawing types 2016-05-05 21:14:44 +03:00
Jaex
90bb7e8b99 Added ellipse drawing 2016-05-05 20:42:56 +03:00
Jaex
a9b446e15e Added line drawing 2016-05-05 20:03:57 +03:00
Jaex
18feef96c7 Added arrow drawing support, it is not possible to resize with nodes yet 2016-05-05 19:43:42 +03:00
Jaex
7c9f37b33a Using anti aliasing in rounded rectangle 2016-05-03 22:03:55 +03:00
Jaex
42fb490c4c Added shadow to rectangle drawing 2016-05-03 20:58:18 +03:00
Jaex
09fdffc32d Only allow selection and moving shapes if current shape is same as selected shape that way you can do region capture top of drawings without select drawing shape 2016-05-03 14:06:15 +03:00
Jaex
a568e98617 Show nodes on drawing shapes, added border size 2016-05-03 13:48:37 +03:00
Jaex
db15ee55cb Interim commit for shape drawing 2016-05-03 13:06:58 +03:00
Jaex
1672ee3f5c Region capture functionality now working same as before with new shape system 2016-05-03 12:35:10 +03:00
Jaex
109d876c41 AddShapePath function moved inside BaseRegionShape 2016-05-03 10:57:49 +03:00
Jaex
0709035daf Interim commit for region capture drawing support and shape system, currently just made it compile and will require many changes to support drawing shapes 2016-05-03 10:46:45 +03:00