Changeset 9363 for branches/OaaS/HeuristicLab.ExtLibs/HeuristicLab.Netron
- Timestamp:
- 04/16/13 13:13:41 (11 years ago)
- Location:
- branches/OaaS
- Files:
-
- 1 deleted
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/OaaS
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll 23 24 packages
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/OaaS/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/Controller.cs
r8000 r9363 45 45 46 46 public override bool ActivateTextEditor(ITextProvider textProvider) { 47 TextEditor.GetEditor(textProvider); 48 TextEditor.Show(); 49 return true; 47 return false; 50 48 } 51 49 -
branches/OaaS/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/CustomTools/CustomPanTool.cs
r8000 r9363 32 32 33 33 public CustomPanTool() : base(ToolName) { } 34 35 34 public CustomPanTool(string toolName) : base(toolName) { } 36 35 … … 52 51 IDiagramControl control = Controller.ParentControl; 53 52 Point origin = Controller.View.Origin; 54 55 53 Point offset = new Point(previousMouseLocation.X - currentLocation.X, previousMouseLocation.Y - currentLocation.Y); 56 57 54 origin.Offset(offset); 58 55 59 56 if (origin.X < 0) origin.X = 0; 60 61 62 57 if (origin.Y < 0) origin.Y = 0; 63 58 … … 68 63 } 69 64 70 public void MouseUp(MouseEventArgs e) { 71 //if (IsActive && !IsSuspended) this.previousMouseLocation = Point.Empty; 72 } 65 public void MouseUp(MouseEventArgs e) { } 73 66 #endregion 74 67 … … 77 70 if (e.KeyCode == Keys.Escape) 78 71 DeactivateTool(); 79 else if (e.KeyCode == Keys.Space)80 ActivateTool();81 72 } 82 73 83 public void KeyUp(KeyEventArgs e) { 84 if (e.KeyCode == Keys.Space) 85 DeactivateTool(); 86 } 74 public void KeyUp(KeyEventArgs e) { } 87 75 88 76 public void KeyPress(KeyPressEventArgs e) { } -
branches/OaaS/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/Ghosts.cs
r4068 r9363 35 35 namespace HeuristicLab.Netron { 36 36 internal static class GhostsFactory { 37 private static RectGhost mRectangular;38 private static LineGhost mLine;39 private static EllipticGhost mEllipse;40 private static MultiLineGhost mMultiLine;41 private static CurvedLineGhost mCurvedLine;42 private static PolygonGhost mPolygon;43 44 private static IView mView;45 public static IView View {46 get { return mView; }47 set { mView = value; }48 }49 50 37 [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] 51 public static IGhost GetGhost(object pars, GhostTypes type ) {38 public static IGhost GetGhost(object pars, GhostTypes type, IView View) { 52 39 Point[] points; 53 40 switch (type) { 54 41 case GhostTypes.Rectangle: 55 if (mRectangular == null) 56 mRectangular = new RectGhost(View); 42 var mRectangular = new RectGhost(View); 57 43 points = (Point[])pars; 58 44 mRectangular.Start = points[0]; … … 60 46 return mRectangular; 61 47 case GhostTypes.Ellipse: 62 if (mEllipse == null) 63 mEllipse = new EllipticGhost(View); 48 var mEllipse = new EllipticGhost(View); 64 49 points = (Point[])pars; 65 50 mEllipse.Start = points[0]; … … 67 52 return mEllipse; 68 53 case GhostTypes.Line: 69 if (mLine == null) 70 mLine = new LineGhost(View); 54 var mLine = new LineGhost(View); 71 55 points = (Point[])pars; 72 56 mLine.Start = points[0]; … … 74 58 return mLine; 75 59 case GhostTypes.MultiLine: 76 if (mMultiLine == null) 77 mMultiLine = new MultiLineGhost(View); 60 var mMultiLine = new MultiLineGhost(View); 78 61 points = (Point[])pars; 79 62 mMultiLine.Points = points; 80 63 return mMultiLine; 81 64 case GhostTypes.CurvedLine: 82 if (mCurvedLine == null) 83 mCurvedLine = new CurvedLineGhost(View); 65 var mCurvedLine = new CurvedLineGhost(View); 84 66 points = (Point[])pars; 85 67 mCurvedLine.Points = points; 86 68 return mCurvedLine; 87 69 case GhostTypes.Polygon: 88 if (mPolygon == null) 89 mPolygon = new PolygonGhost(View); 70 var mPolygon = new PolygonGhost(View); 90 71 points = (Point[])pars; 91 72 mPolygon.Points = points; -
branches/OaaS/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446.csproj
r8000 r9363 122 122 <Compile Include="Plugin.cs" /> 123 123 <Compile Include="Properties\AssemblyInfo.cs" /> 124 <Compile Include="TextEditor.cs" />125 124 <Compile Include="View.cs" /> 126 125 </ItemGroup> -
branches/OaaS/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/NetronVisualization.cs
r7259 r9363 49 49 this.AttachToDocument(Document); 50 50 this.Controller.View = View; 51 TextEditor.Init(this);52 51 53 52 View.OnCursorChange += new EventHandler<CursorEventArgs>(mView_OnCursorChange); -
branches/OaaS/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/View.cs
r4068 r9363 42 42 this.HorizontalRuler.Visible = true; 43 43 this.VerticalRuler.Visible = true; 44 GhostsFactory.View = this;45 44 } 46 45 … … 102 101 Ghost = GhostsFactory.GetGhost( 103 102 new Point[] { ltPoint, rbPoint }, 104 GhostTypes.Ellipse );103 GhostTypes.Ellipse, this); 105 104 } 106 105 public override void PaintGhostRectangle( … … 112 111 Ghost = GhostsFactory.GetGhost( 113 112 new Point[] { ltPoint, rbPoint }, 114 GhostTypes.Rectangle );113 GhostTypes.Rectangle, this); 115 114 } 116 115 public override void PaintAntsRectangle( … … 129 128 Ghost = GhostsFactory.GetGhost( 130 129 new Point[] { ltPoint, rbPoint }, 131 GhostTypes.Line );130 GhostTypes.Line, this); 132 131 } 133 132 public override void PaintGhostLine( … … 139 138 switch (curveType) { 140 139 case MultiPointType.Straight: 141 Ghost = GhostsFactory.GetGhost(points, GhostTypes.MultiLine );140 Ghost = GhostsFactory.GetGhost(points, GhostTypes.MultiLine, this); 142 141 break; 143 142 case MultiPointType.Polygon: 144 Ghost = GhostsFactory.GetGhost(points, GhostTypes.Polygon );143 Ghost = GhostsFactory.GetGhost(points, GhostTypes.Polygon, this); 145 144 break; 146 145 case MultiPointType.Curve: 147 Ghost = GhostsFactory.GetGhost(points, GhostTypes.CurvedLine );146 Ghost = GhostsFactory.GetGhost(points, GhostTypes.CurvedLine, this); 148 147 break; 149 148 -
branches/OaaS/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446.csproj
r6866 r9363 593 593 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> 594 594 <PropertyGroup> 595 595 <PreBuildEvent> 596 596 </PreBuildEvent> 597 597 <PostBuildEvent>
Note: See TracChangeset
for help on using the changeset viewer.