Changeset 2868 for trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Core
- Timestamp:
- 02/25/10 17:28:31 (15 years ago)
- Location:
- trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Core
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Core/ControllerBase.cs
r2768 r2868 310 310 311 311 312 //Make sure the static selection class knows about the model313 Selection.Controller = this;314 312 //Initialize the colorscheme 315 313 ArtPalette.Init(); … … 527 525 FillStyleCommand cmd = new FillStyleCommand( 528 526 this, 529 Selection.SelectedItems.Copy(),527 this.Model.Selection.SelectedItems.Copy(), 530 528 paintStyle); 531 529 … … 544 542 PenStyleCommand cmd = new PenStyleCommand( 545 543 this, 546 Selection.SelectedItems.Copy(),544 this.Model.Selection.SelectedItems.Copy(), 547 545 penStyle); 548 546 … … 1275 1273 } 1276 1274 1277 foreach (IDiagramEntity entity in Selection.SelectedItems)1275 foreach (IDiagramEntity entity in this.Model.Selection.SelectedItems) 1278 1276 { 1279 1277 if (entity is IKeyboardListener) … … 1292 1290 } 1293 1291 1294 foreach (IDiagramEntity entity in Selection.SelectedItems)1292 foreach (IDiagramEntity entity in this.Model.Selection.SelectedItems) 1295 1293 { 1296 1294 if (entity is IKeyboardListener) … … 1308 1306 } 1309 1307 1310 foreach (IDiagramEntity entity inSelection.SelectedItems)1308 foreach (IDiagramEntity entity in this.Model.Selection.SelectedItems) 1311 1309 { 1312 1310 if (entity is IKeyboardListener) … … 1378 1376 //raise the event to give the host the opportunity to show the properties of the selected item(s) 1379 1377 //Note that if the selection is empty the property grid will show 'nothing'. 1380 RaiseOnShowSelectionProperties(new SelectionEventArgs( Selection.SelectedItems.ToArray()));1378 RaiseOnShowSelectionProperties(new SelectionEventArgs(this.Model.Selection.SelectedItems.ToArray())); 1381 1379 1382 1380 foreach(IMouseListener listener in mouseListeners) … … 1483 1481 { 1484 1482 this.View.ResetTracker(); 1485 Selection.Clear();1486 Selection.SelectedItems = this.Model.CurrentPage.Entities;1483 this.Model.Selection.Clear(); 1484 this.Model.Selection.SelectedItems = this.Model.CurrentPage.Entities; 1487 1485 this.View.ShowTracker(); 1488 1486 this.View.Invalidate(); -
trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Core/Interfaces/IModel.cs
r2768 r2868 95 95 } 96 96 97 Selection Selection { get; set; } 98 97 99 float MeasurementScale 98 100 { -
trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Core/Scene graph/Model.cs
r2861 r2868 260 260 } 261 261 262 private Selection selection; 263 public Selection Selection { 264 get { return this.selection; } 265 set { this.selection = value; } 266 } 267 262 268 // ------------------------------------------------------------------ 263 269 /// <summary> … … 1164 1170 public void RemoveSelectedItems() 1165 1171 { 1166 if ( Selection.SelectedItems.Count < 1)1172 if (this.Selection.SelectedItems.Count < 1) 1167 1173 { 1168 1174 return; 1169 1175 } 1170 1176 1171 int numberOfItems = Selection.SelectedItems.Count;1177 int numberOfItems = this.Selection.SelectedItems.Count; 1172 1178 for (int i = 0; i < numberOfItems - 1; i++) 1173 1179 { -
trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Core/ViewBase.cs
r2768 r2868 1010 1010 public void ShowTracker() 1011 1011 { 1012 if( Selection.SelectedItems != null &&1013 1014 { 1015 CollectionBase<IDiagramEntity> ents = 1012 if(this.Model.Selection.SelectedItems != null && 1013 this.Model.Selection.SelectedItems.Count > 0) 1014 { 1015 CollectionBase<IDiagramEntity> ents =this.Model.Selection.SelectedItems; 1016 1016 bool showHandles = false; 1017 1017
Note: See TracChangeset
for help on using the changeset viewer.