Split drawing code into separate files #934

wieslawsoltes · 2022-01-06T11:52:39Z

Reference Issue

Part of #590
Continuation of #931

What does this implement/fix? Explain your changes.

Splits of all drawing code inside NO_SDC if/def into separate files. This should be easier to read and maintain also make next step closer for #590

Any other comments?

Notable changes from master:

SvgGaussianBlur

Moved PreCalculate to NO_SDC if/def
Moved all fields related to PreCalculate/Apply to NO_SDC if/def

SvgDocument

Moved SkipGdiPlusCapabilityCheck to NO_SDC if/def
Moved SystemIsGdiPlusCapable to NO_SDC if/def
Moved EnsureSystemIsGdiPlusCapable to NO_SDC if/def
Moved ExceptionCaughtIsGdiPlusRelated to NO_SDC if/def
Moved Win32 related api in SvgDocument to a separate file

SvgLinearGradientServer

Moved NormalizeUnit to NO_SDC if/def
Moved CandidateIntersections to NO_SDC if/def
Moved CalculateClosestIntersectionPoint to NO_SDC if/def
Moved MovePointAlongVector to NO_SDC if/def
Moved LineF to NO_SDC if/def
Moved LinePoints to NO_SDC if/def
Moved GradientPoints to NO_SDC if/def

SvgMarker

Moved AdjustForViewBoxWidth to NO_SDC if/def
Moved AdjustForViewBoxHeight to NO_SDC if/def

SvgRadialGradientServer

Moved NormalizeUnit to NO_SDC if/def
Remove unused _lockObj field

SvgArcSegment

Moved CalculateVectorAngle to NO_SDC if/def
Made class partial

SvgClosePathSegment

Made class partial

SvgCubicCurveSegment

Made class partial

SvgLineSegment

Made class partial

SvgMoveToSegment

Made class partial
Made class sealed as the other path segments classes are too

SvgPathSegment

Made class partial

SvgQuadraticCurveSegment

Made class partial
Moved CalculateFirstControlPoint to NO_SDC if/def
Moved CalculateSecondControlPoint to NO_SDC if/def

IGraphicsProvider

Moved entire interface into NO_SDC if/def as it's only used there

ISvgRenderer

Moved entire interface into NO_SDC if/def as it's only used there

ISvgClipable

Moved entire interface into NO_SDC if/def as it's only used there

SvgUnit

Made struct partial
Moved ToDeviceValue into NO_SDC if/def as it's only used there
Moved implicit operator float to NO_SDC if/def
Moved GetDevicePoint to NO_SDC if/def
Moved GetDevicePointOffset to NO_SDC if/def
Moved GetDeviceSize to NO_SDC if/def

GdiFontDefn

Moved entire class into NO_SDC if/def as it's only used there

SvgFontDefn

Moved entire class into NO_SDC if/def as it's only used there

IFontDefn

Moved entire interface into NO_SDC if/def as it's only used there

SvgMatrix

Made class partial

SvgTransform

Made class partial

SvgRotate

Made class partial

SvgScale

Made class partial

SvgShear

Made class partial

SvgSkew

Made class partial

SvgTransformCollection

Made class partial

SvgTranslate

Made class partial

SvgPoint

Made struct partial

SvgExtentions

Added GetRectangle method into NO_SDC if/def as SvgUnit float implicit operator is not available

Interface specific to System.Drawing renderer:

ISvgClipable
ISvgBoundable
ISvgStylable - only Path method, the rest is not related
IGraphicsProvider
ISvgRenderer
ISvgElement - only Render method, the rest is not related
IFontDefn
ISvgTransformable - PushTransforms/PopTransforms methods
ISvgElement - only Render method, the rest is not related

Classes specific to System.Drawing renderer:

ImageBuffer
RawBitmap
SvgRenderer
SvgFontManager
GdiFontDefn
PathStatistics
SvgFontDefn

Source/Basic Shapes/SvgLine.Drawing.cs

mrbean-bremen · 2022-01-06T17:08:57Z

Yes, I think this is a good idea. As far as I can see, you didn't change any code so far, just moved out the drawing code into partial classes. As this is a bit difficult to review, you may want to add a note if you do change anything else.

wieslawsoltes · 2022-01-06T17:22:24Z

Yes, I think this is a good idea. As far as I can see, you didn't change any code so far, just moved out the drawing code into partial classes. As this is a bit difficult to review, you may want to add a note if you do change anything else.

Ok will add PR comments if something is changed.

wieslawsoltes · 2022-01-06T22:23:02Z

Yes, I think this is a good idea. As far as I can see, you didn't change any code so far, just moved out the drawing code into partial classes. As this is a bit difficult to review, you may want to add a note if you do change anything else.

@mrbean-bremen @H1Gdev Added notes to PR description.

H1Gdev · 2022-01-07T06:06:16Z

@wieslawsoltes
@mrbean-bremen

I think it's not readable in IDE...
How about using File nesting ?

I think the following will be helpful.
https://stackoverflow.com/questions/59406201/filenesting-not-working-for-class-or-shared-library-projects

wieslawsoltes · 2022-01-07T07:33:45Z

@wieslawsoltes @mrbean-bremen

I think it's not readable in IDE... How about using File nesting ?

I think the following will be helpful. https://stackoverflow.com/questions/59406201/filenesting-not-working-for-class-or-shared-library-projects

I think next step would be moving all drawing code into separate project.

mrbean-bremen · 2022-01-07T07:55:26Z

I think next step would be moving all drawing code into separate project.

Yes, exactly.

H1Gdev · 2022-01-07T13:09:28Z

@mrbean-bremen

It seems that the PR related to this will make a big change toward .Net 6.
So I think it's better to release to Nuget once based on 7c643dd.

mrbean-bremen · 2022-01-07T13:33:00Z

So I think it's better to release to Nuget once based on 7c643dd.

Yes, I also thought that we should make a release before these changes, good point.

wieslawsoltes · 2022-01-07T18:13:48Z

This PR is ready for final review. Moving to separate project is more complex task and requires some interfaces and code refactoring with breaking changes so I would do that work is separate PR.

mrbean-bremen · 2022-01-08T19:51:15Z

I'll see if I can review this tomorrow, and also make a release of the current version (bit knocked out today after the Booster).

mrbean-bremen · 2022-01-09T20:32:02Z

I made a release based on the current version (really have to understand how this works with Nerdbank.GitVersioning, I couldn't get it to work correctly and worked around it), but didn't get the time for a review (again). Though from a cursory glance it looks as if nothing is really changed apart from the restructuring (which is what I would expect). Maybe @H1Gdev can have a look, and I will see if I can merge this finally later tomorrow.

mrbean-bremen

As far as I can see, this all looks good. Anyway, the compiler is your friend in this case - thanks for this time-consuming piece of work.

mrbean-bremen · 2022-01-10T18:37:58Z

Source/SvgExtentions.cs

+#if !NO_SDC
        public static RectangleF GetRectangle(this SvgRectangle r)
        {
            return new RectangleF(r.X, r.Y, r.Width, r.Height);
        }
-
+#endif


This should not be factored out?

I would leave that when we split into separate project, there are more such issues to solve

Ok, I think we can merge this, thanks!

…ONTRIBUTING.md Generators Nuget README.md Samples Source Tests doc docfx.json index.md license.txt Split all classes classes with drawing code BuildProcessTemplates CONTRIBUTING.md Generators Nuget README.md Samples Source Tests doc docfx.json index.md license.txt Put NO_SDC if/def around drawing interfaces (ISvgClipable, IGraphicsProvider, ISvgRenderer, IFontDefn) BuildProcessTemplates CONTRIBUTING.md Generators Nuget README.md Samples Source Tests doc docfx.json index.md license.txt Put NO_SDC if/def around drawing only classes (GdiFontDefn, SvgFontDefn) BuildProcessTemplates CONTRIBUTING.md Generators Nuget README.md Samples Source Tests doc docfx.json index.md license.txt Move implicit operator float to NO_SDC if/def BuildProcessTemplates CONTRIBUTING.md Generators Nuget README.md Samples Source Tests doc docfx.json index.md license.txt Move GetRectangle method into NO_SDC if/def

H1Gdev

I was out on the weekends and couldn't review.

Unnecessary code remains due to the separation. I think these removals are necessary to clarify the dependencies.
Please consider in next PR.

H1Gdev · 2022-01-10T23:38:14Z

Source/SvgDocument.Drawing.cs

+
+namespace Svg
+{
+    public partial class SvgDocument : SvgFragment, ITypeDescriptorContext


I think not need ITypeDescriptorContext.

Slit SvgCircle

acde25e

wieslawsoltes mentioned this pull request Jan 6, 2022

Enable building code without System.Drawing.Common dependency #931

Merged

wieslawsoltes added 5 commits January 6, 2022 12:56

Split SvgEllipse

7f6f35f

Split SvgLine

6ea1f2a

Split SvgMarkerElement

1713f5e

Split SvgPathBasedElement

8680cd0

Split SvgPolygon

f0484c5

H1Gdev reviewed Jan 6, 2022

View reviewed changes

Source/Basic Shapes/SvgLine.Drawing.cs Outdated Show resolved Hide resolved

wieslawsoltes added 16 commits January 6, 2022 15:20

Split SvgPolyline

e528424

Split SvgRectangle

3b87578

Split SvgVisualElement

5f3c4a9

Rename file

24e5c7c

Remove redundant qualifier

795b5d2

Remove unused usings

1ebebe0

Split SvgClipPath

e64b9c9

Split SvgViewBox

55b6226

Split SvgDefinitionList

49ead35

Split SvgFragment

66726ca

Split SvgGroup

b7d191a

Split SvgImage

920388c

Split SvgSwitch

c6256d8

Split SvgSymbol

cdaf669

Split SvgUse

e4db2e7

Split SvgForeignObject

1d191a7

mrbean-bremen changed the title ~~Slit drawing code into separate files~~ Split drawing code into separate files Jan 6, 2022

wieslawsoltes added 3 commits January 6, 2022 19:02

Split SvgBlend

51fba25

Split SvgColourMatrix

5af262d

Split SvgComponentTransfer

46f94f4

wieslawsoltes added 13 commits January 6, 2022 22:36

Split SvgTextRef

9ee3a16

Split SvgMatrix

0d4adb9

Split SvgTransform

a1e5e96

Split SvgRotate

e27c58e

Split SvgScale

ba6accb

Split SvgShear

fdf843b

Split SvgSkew

d128393

Split SvgTransformCollection

0cff3fb

Split SvgTranslate

aab4018

Split SvgPoint

0b845ca

Add NO_SDC if/def

b1b3921

Move implicit operator float to NO_SDC if/def

e34ab16

Move GetRectangle method into NO_SDC if/def

0d36376

wieslawsoltes marked this pull request as ready for review January 6, 2022 22:22

mrbean-bremen approved these changes Jan 10, 2022

View reviewed changes

mrbean-bremen merged commit a7e1e12 into svg-net:master Jan 10, 2022

wieslawsoltes deleted the SplitDrawingCode branch January 10, 2022 19:35

This was referenced Jan 10, 2022

Move field to Drawing part of SvgImage #936

Merged

Split drawing code into separate project #937

Closed

H1Gdev reviewed Jan 10, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Split drawing code into separate files #934

Split drawing code into separate files #934

wieslawsoltes commented Jan 6, 2022 •

edited

Loading

mrbean-bremen commented Jan 6, 2022

wieslawsoltes commented Jan 6, 2022

wieslawsoltes commented Jan 6, 2022

H1Gdev commented Jan 7, 2022

wieslawsoltes commented Jan 7, 2022

mrbean-bremen commented Jan 7, 2022

H1Gdev commented Jan 7, 2022

mrbean-bremen commented Jan 7, 2022

wieslawsoltes commented Jan 7, 2022

mrbean-bremen commented Jan 8, 2022

mrbean-bremen commented Jan 9, 2022 •

edited

Loading

mrbean-bremen left a comment

mrbean-bremen Jan 10, 2022

wieslawsoltes Jan 10, 2022

mrbean-bremen Jan 10, 2022

H1Gdev left a comment

H1Gdev Jan 10, 2022 •

edited

Loading

Split drawing code into separate files #934

Split drawing code into separate files #934

Conversation

wieslawsoltes commented Jan 6, 2022 • edited Loading

Reference Issue

What does this implement/fix? Explain your changes.

Any other comments?

Notable changes from master:

Interface specific to System.Drawing renderer:

Classes specific to System.Drawing renderer:

mrbean-bremen commented Jan 6, 2022

wieslawsoltes commented Jan 6, 2022

wieslawsoltes commented Jan 6, 2022

H1Gdev commented Jan 7, 2022

wieslawsoltes commented Jan 7, 2022

mrbean-bremen commented Jan 7, 2022

H1Gdev commented Jan 7, 2022

mrbean-bremen commented Jan 7, 2022

wieslawsoltes commented Jan 7, 2022

mrbean-bremen commented Jan 8, 2022

mrbean-bremen commented Jan 9, 2022 • edited Loading

mrbean-bremen left a comment

Choose a reason for hiding this comment

mrbean-bremen Jan 10, 2022

Choose a reason for hiding this comment

wieslawsoltes Jan 10, 2022

Choose a reason for hiding this comment

mrbean-bremen Jan 10, 2022

Choose a reason for hiding this comment

H1Gdev left a comment

Choose a reason for hiding this comment

H1Gdev Jan 10, 2022 • edited Loading

Choose a reason for hiding this comment

wieslawsoltes commented Jan 6, 2022 •

edited

Loading

mrbean-bremen commented Jan 9, 2022 •

edited

Loading

H1Gdev Jan 10, 2022 •

edited

Loading