Changeset 17260 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman.Views

Timestamp:

09/17/19 15:41:46 (5 years ago)

Author:

abeham

Message:

#2521: Worked on PTSP refactoring

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman.Views/3.3

Files:

• CoordinatesTSPDataView.cs (modified) (1 diff)
• EuclideanTSPDataView.Designer.cs (modified) (1 diff)
• MatrixTSPDataView.Designer.cs (modified) (1 diff)
• MatrixTSPDataView.cs (modified) (1 diff)
• TSPSolutionView.Designer.cs (modified) (1 diff)
• TSPSolutionView.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman.Views/3.3/CoordinatesTSPDataView.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.TravelingSalesman.Views {
-  [View("Matrix TSP Data View")]
+  [View("Coordinates TSP Data View")]
   [Content(typeof(CoordinatesTSPData), IsDefaultView = true)]
   public partial class CoordinatesTSPDataView : NamedItemView {

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman.Views/3.3/EuclideanTSPDataView.Designer.cs

@@ -87 +87 @@
     #endregion
 
-    private System.Windows.Forms.ComboBox roundingModeComboBox;
-    private System.Windows.Forms.Label roundingModeLabel;
+    protected System.Windows.Forms.ComboBox roundingModeComboBox;
+    protected System.Windows.Forms.Label roundingModeLabel;
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman.Views/3.3/MatrixTSPDataView.Designer.cs

@@ -166 +166 @@
     #endregion
 
-    private Data.Views.StringConvertibleMatrixView distanceMatrixView;
-    private System.Windows.Forms.TabControl tabControl;
-    private System.Windows.Forms.TabPage coordinatesTabPage;
-    private System.Windows.Forms.SplitContainer coordinatesSplitContainer;
-    private Data.Views.StringConvertibleMatrixView coordinatesMatrixView;
-    private System.Windows.Forms.TabPage distancesTabPage;
-    private System.Windows.Forms.PictureBox coordinatesPictureBox;
+    protected Data.Views.StringConvertibleMatrixView distanceMatrixView;
+    protected System.Windows.Forms.TabControl tabControl;
+    protected System.Windows.Forms.TabPage coordinatesTabPage;
+    protected System.Windows.Forms.SplitContainer coordinatesSplitContainer;
+    protected Data.Views.StringConvertibleMatrixView coordinatesMatrixView;
+    protected System.Windows.Forms.TabPage distancesTabPage;
+    protected System.Windows.Forms.PictureBox coordinatesPictureBox;
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman.Views/3.3/MatrixTSPDataView.cs

@@ -60 +60 @@
     }
 
-    private void GenerateImage() {
+    protected virtual void GenerateImage() {
       if (coordinatesPictureBox.Width > 0 && coordinatesPictureBox.Height > 0) {
         DoubleMatrix coordinates = Content?.DisplayCoordinates;

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman.Views/3.3/TSPSolutionView.Designer.cs

@@ -215 +215 @@
     #endregion
 
-    private System.Windows.Forms.PictureBox pictureBox;
-    private HeuristicLab.MainForm.WindowsForms.DragOverTabControl tabControl;
-    private System.Windows.Forms.TabPage visualizationTabPage;
-    private System.Windows.Forms.TabPage valueTabPage;
-    private System.Windows.Forms.GroupBox tourGroupBox;
-    private HeuristicLab.MainForm.WindowsForms.ViewHost tourViewHost;
-    private System.Windows.Forms.SplitContainer splitContainer;
-    private System.Windows.Forms.GroupBox qualityGroupBox;
-    private HeuristicLab.MainForm.WindowsForms.ViewHost qualityViewHost;
+    protected System.Windows.Forms.PictureBox pictureBox;
+    protected HeuristicLab.MainForm.WindowsForms.DragOverTabControl tabControl;
+    protected System.Windows.Forms.TabPage visualizationTabPage;
+    protected System.Windows.Forms.TabPage valueTabPage;
+    protected System.Windows.Forms.GroupBox tourGroupBox;
+    protected HeuristicLab.MainForm.WindowsForms.ViewHost tourViewHost;
+    protected System.Windows.Forms.SplitContainer splitContainer;
+    protected System.Windows.Forms.GroupBox qualityGroupBox;
+    protected HeuristicLab.MainForm.WindowsForms.ViewHost qualityViewHost;
 
 

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman.Views/3.3/TSPSolutionView.cs

@@ -34 +34 @@
   /// </summary>
   [View("TSP Solution View")]
-  [Content(typeof(TSPSolution), true)]
-  public sealed partial class TSPSolutionView : ItemView {
-    public new TSPSolution Content {
-      get { return (TSPSolution)base.Content; }
+  [Content(typeof(ITSPSolution), true)]
+  public partial class TSPSolutionView : ItemView {
+    public new ITSPSolution Content {
+      get { return (ITSPSolution)base.Content; }
       set { base.Content = value; }
     }
@@ -77 +77 @@
     }
 
-    private void GenerateImage() {
+    protected virtual void GenerateImage() {
       if ((pictureBox.Width > 0) && (pictureBox.Height > 0)) {
         if (Content == null) {
@@ -130 +130 @@
     }
 
-    private void ContentOnPropertyChanged(object sender, PropertyChangedEventArgs e) {
+    protected virtual void ContentOnPropertyChanged(object sender, PropertyChangedEventArgs e) {
       if (InvokeRequired)
         Invoke((Action<object, PropertyChangedEventArgs>)ContentOnPropertyChanged, sender, e);