Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
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:
6 edited

Legend:

Unmodified
Added
Removed

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

    r17251 r17260  
    2828
    2929namespace HeuristicLab.Problems.TravelingSalesman.Views {
    30   [View("Matrix TSP Data View")]
     30  [View("Coordinates TSP Data View")]
    3131  [Content(typeof(CoordinatesTSPData), IsDefaultView = true)]
    3232  public partial class CoordinatesTSPDataView : NamedItemView {

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

    r17251 r17260  
    8787    #endregion
    8888
    89     private System.Windows.Forms.ComboBox roundingModeComboBox;
    90     private System.Windows.Forms.Label roundingModeLabel;
     89    protected System.Windows.Forms.ComboBox roundingModeComboBox;
     90    protected System.Windows.Forms.Label roundingModeLabel;
    9191  }
    9292}

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

    r17251 r17260  
    166166    #endregion
    167167
    168     private Data.Views.StringConvertibleMatrixView distanceMatrixView;
    169     private System.Windows.Forms.TabControl tabControl;
    170     private System.Windows.Forms.TabPage coordinatesTabPage;
    171     private System.Windows.Forms.SplitContainer coordinatesSplitContainer;
    172     private Data.Views.StringConvertibleMatrixView coordinatesMatrixView;
    173     private System.Windows.Forms.TabPage distancesTabPage;
    174     private System.Windows.Forms.PictureBox coordinatesPictureBox;
     168    protected Data.Views.StringConvertibleMatrixView distanceMatrixView;
     169    protected System.Windows.Forms.TabControl tabControl;
     170    protected System.Windows.Forms.TabPage coordinatesTabPage;
     171    protected System.Windows.Forms.SplitContainer coordinatesSplitContainer;
     172    protected Data.Views.StringConvertibleMatrixView coordinatesMatrixView;
     173    protected System.Windows.Forms.TabPage distancesTabPage;
     174    protected System.Windows.Forms.PictureBox coordinatesPictureBox;
    175175  }
    176176}

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

    r17251 r17260  
    6060    }
    6161
    62     private void GenerateImage() {
     62    protected virtual void GenerateImage() {
    6363      if (coordinatesPictureBox.Width > 0 && coordinatesPictureBox.Height > 0) {
    6464        DoubleMatrix coordinates = Content?.DisplayCoordinates;

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

    r17248 r17260  
    215215    #endregion
    216216
    217     private System.Windows.Forms.PictureBox pictureBox;
    218     private HeuristicLab.MainForm.WindowsForms.DragOverTabControl tabControl;
    219     private System.Windows.Forms.TabPage visualizationTabPage;
    220     private System.Windows.Forms.TabPage valueTabPage;
    221     private System.Windows.Forms.GroupBox tourGroupBox;
    222     private HeuristicLab.MainForm.WindowsForms.ViewHost tourViewHost;
    223     private System.Windows.Forms.SplitContainer splitContainer;
    224     private System.Windows.Forms.GroupBox qualityGroupBox;
    225     private HeuristicLab.MainForm.WindowsForms.ViewHost qualityViewHost;
     217    protected System.Windows.Forms.PictureBox pictureBox;
     218    protected HeuristicLab.MainForm.WindowsForms.DragOverTabControl tabControl;
     219    protected System.Windows.Forms.TabPage visualizationTabPage;
     220    protected System.Windows.Forms.TabPage valueTabPage;
     221    protected System.Windows.Forms.GroupBox tourGroupBox;
     222    protected HeuristicLab.MainForm.WindowsForms.ViewHost tourViewHost;
     223    protected System.Windows.Forms.SplitContainer splitContainer;
     224    protected System.Windows.Forms.GroupBox qualityGroupBox;
     225    protected HeuristicLab.MainForm.WindowsForms.ViewHost qualityViewHost;
    226226
    227227

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

    r17248 r17260  
    3434  /// </summary>
    3535  [View("TSP Solution View")]
    36   [Content(typeof(TSPSolution), true)]
    37   public sealed partial class TSPSolutionView : ItemView {
    38     public new TSPSolution Content {
    39       get { return (TSPSolution)base.Content; }
     36  [Content(typeof(ITSPSolution), true)]
     37  public partial class TSPSolutionView : ItemView {
     38    public new ITSPSolution Content {
     39      get { return (ITSPSolution)base.Content; }
    4040      set { base.Content = value; }
    4141    }
    … …  
    7777    }
    7878
    79     private void GenerateImage() {
     79    protected virtual void GenerateImage() {
    8080      if ((pictureBox.Width > 0) && (pictureBox.Height > 0)) {
    8181        if (Content == null) {
    … …  
    130130    }
    131131
    132     private void ContentOnPropertyChanged(object sender, PropertyChangedEventArgs e) {
     132    protected virtual void ContentOnPropertyChanged(object sender, PropertyChangedEventArgs e) {
    133133      if (InvokeRequired)
    134134        Invoke((Action<object, PropertyChangedEventArgs>)ContentOnPropertyChanged, sender, e);
Note: See TracChangeset for help on using the changeset viewer.