From 67c613b701b6f410af4540679e281b2212229d8b Mon Sep 17 00:00:00 2001 From: EIDMANN Andreas Date: Wed, 24 May 2017 17:15:09 +0200 Subject: [PATCH] fix: add type in diagram.cs --- XSDDiagrams/Rendering/Diagram.cs | 8 +++++--- XSDDiagrams/Rendering/DiagramGdiRenderer.cs | 6 ++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/XSDDiagrams/Rendering/Diagram.cs b/XSDDiagrams/Rendering/Diagram.cs index c6b6707..0a019c7 100644 --- a/XSDDiagrams/Rendering/Diagram.cs +++ b/XSDDiagrams/Rendering/Diagram.cs @@ -143,7 +143,8 @@ namespace XSDDiagram.Rendering childDiagramElement.Diagram = this; childDiagramElement.TabSchema = childElement; - childDiagramElement.Name = childElement.name != null ? childElement.name : ""; + string type = childDiagramElement.GetTypeAnnotation(); + childDiagramElement.Name = childElement.name != null ? childElement.name + " : " + type : ""; childDiagramElement.NameSpace = nameSpace; childDiagramElement.ItemType = DiagramItemType.element; int occurrence; @@ -225,8 +226,9 @@ namespace XSDDiagram.Rendering { DiagramItem childDiagramElement = new DiagramItem(); childDiagramElement.Diagram = this; - childDiagramElement.TabSchema = childElement; - childDiagramElement.Name = childElement.name != null ? childElement.name : ""; + childDiagramElement.TabSchema = childElement; + + childDiagramElement.Name = childElement.name != null ? childElement.name : ""; childDiagramElement.NameSpace = nameSpace; childDiagramElement.ItemType = DiagramItemType.type; childDiagramElement.MinOccurrence = 1; diff --git a/XSDDiagrams/Rendering/DiagramGdiRenderer.cs b/XSDDiagrams/Rendering/DiagramGdiRenderer.cs index 44605b5..b29e8fa 100644 --- a/XSDDiagrams/Rendering/DiagramGdiRenderer.cs +++ b/XSDDiagrams/Rendering/DiagramGdiRenderer.cs @@ -492,10 +492,8 @@ namespace XSDDiagram.Rendering stringFormatText.Alignment = StringAlignment.Center; stringFormatText.LineAlignment = StringAlignment.Center; stringFormatText.FormatFlags |= StringFormatFlags.NoClip; //MONOFIX - - - string type = drawingItem.GetTypeAnnotation(); - _graphics.DrawString(drawingItem.Name +" : "+type,drawingItem.FontScaled, foreground, new RectangleF(scaledElementBox.X, scaledElementBox.Y, scaledElementBox.Width, scaledElementBox.Height), stringFormatText); + + _graphics.DrawString(drawingItem.Name,drawingItem.FontScaled, foreground, new RectangleF(scaledElementBox.X, scaledElementBox.Y, scaledElementBox.Width, scaledElementBox.Height), stringFormatText); } // Draw Documentation