diff --git a/Tidstagning/Form1.Designer.cs b/Tidstagning/Form1.Designer.cs index 3dc1667..9ad9864 100644 --- a/Tidstagning/Form1.Designer.cs +++ b/Tidstagning/Form1.Designer.cs @@ -35,16 +35,13 @@ this.button1 = new System.Windows.Forms.Button(); this.txtDebug = new System.Windows.Forms.TextBox(); this.panel1 = new System.Windows.Forms.Panel(); - this.startProcedureParsed = new System.Windows.Forms.Label(); this.checkStartProcedure = new System.Windows.Forms.CheckBox(); this.btnStart = new System.Windows.Forms.Button(); this.btnStop = new System.Windows.Forms.Button(); this.txtHeader = new System.Windows.Forms.TextBox(); this.grid = new System.Windows.Forms.DataGridView(); this.Complete = new System.Windows.Forms.DataGridViewButtonColumn(); - this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.DNF = new System.Windows.Forms.DataGridViewButtonColumn(); - this.entryBindingSource = new System.Windows.Forms.BindingSource(this.components); this.txtLog = new System.Windows.Forms.TableLayoutPanel(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.comboSoundTime = new System.Windows.Forms.ComboBox(); @@ -52,11 +49,14 @@ this.comboComport = new System.Windows.Forms.ComboBox(); this.lblClock = new System.Windows.Forms.Label(); this.Clock = new System.Windows.Forms.Timer(this.components); + this.textStartProcedure = new System.Windows.Forms.TextBox(); + this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.entryBindingSource = new System.Windows.Forms.BindingSource(this.components); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.grid)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.entryBindingSource)).BeginInit(); this.txtLog.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.entryBindingSource)).BeginInit(); this.SuspendLayout(); // // btnTest @@ -66,7 +66,7 @@ this.btnTest.Name = "btnTest"; this.btnTest.Size = new System.Drawing.Size(185, 37); this.btnTest.TabIndex = 3; - this.btnTest.Text = "Test horn"; + this.btnTest.Text = "HORN 🔊"; this.btnTest.UseVisualStyleBackColor = true; this.btnTest.Click += new System.EventHandler(this.btnTest_Click); // @@ -84,35 +84,26 @@ // this.txtDebug.Dock = System.Windows.Forms.DockStyle.Fill; this.txtDebug.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F); - this.txtDebug.Location = new System.Drawing.Point(253, 557); + this.txtDebug.Location = new System.Drawing.Point(273, 551); this.txtDebug.Multiline = true; this.txtDebug.Name = "txtDebug"; this.txtDebug.ReadOnly = true; this.txtDebug.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.txtDebug.Size = new System.Drawing.Size(559, 134); + this.txtDebug.Size = new System.Drawing.Size(539, 140); this.txtDebug.TabIndex = 10; // // panel1 // - this.panel1.Controls.Add(this.startProcedureParsed); + this.panel1.Controls.Add(this.textStartProcedure); this.panel1.Controls.Add(this.checkStartProcedure); this.panel1.Controls.Add(this.btnStart); this.panel1.Controls.Add(this.btnStop); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel1.Location = new System.Drawing.Point(3, 72); + this.panel1.Location = new System.Drawing.Point(3, 44); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(244, 479); + this.panel1.Size = new System.Drawing.Size(264, 501); this.panel1.TabIndex = 8; // - // startProcedureParsed - // - this.startProcedureParsed.AutoSize = true; - this.startProcedureParsed.Font = new System.Drawing.Font("Consolas", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.startProcedureParsed.Location = new System.Drawing.Point(7, 138); - this.startProcedureParsed.Name = "startProcedureParsed"; - this.startProcedureParsed.Size = new System.Drawing.Size(0, 19); - this.startProcedureParsed.TabIndex = 9; - // // checkStartProcedure // this.checkStartProcedure.AutoSize = true; @@ -153,7 +144,7 @@ this.txtHeader.Font = new System.Drawing.Font("Microsoft Sans Serif", 18.25F); this.txtHeader.Location = new System.Drawing.Point(3, 3); this.txtHeader.Name = "txtHeader"; - this.txtHeader.Size = new System.Drawing.Size(244, 35); + this.txtHeader.Size = new System.Drawing.Size(264, 35); this.txtHeader.TabIndex = 3; // // grid @@ -170,7 +161,7 @@ this.txtLog.SetColumnSpan(this.grid, 2); this.grid.DataSource = this.entryBindingSource; this.grid.Dock = System.Windows.Forms.DockStyle.Fill; - this.grid.Location = new System.Drawing.Point(253, 3); + this.grid.Location = new System.Drawing.Point(273, 3); this.grid.Name = "grid"; this.grid.ReadOnly = true; this.grid.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders; @@ -178,7 +169,7 @@ this.grid.RowsDefaultCellStyle = dataGridViewCellStyle1; this.txtLog.SetRowSpan(this.grid, 2); this.grid.RowTemplate.Height = 30; - this.grid.Size = new System.Drawing.Size(1059, 548); + this.grid.Size = new System.Drawing.Size(1039, 542); this.grid.TabIndex = 0; this.grid.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grid_Click); this.grid.MouseMove += new System.Windows.Forms.MouseEventHandler(this.grid_MouseMove); @@ -192,13 +183,6 @@ this.Complete.ReadOnly = true; this.Complete.Text = "Mål"; // - // nameDataGridViewTextBoxColumn - // - this.nameDataGridViewTextBoxColumn.DataPropertyName = "SailNumber"; - this.nameDataGridViewTextBoxColumn.HeaderText = "Sejlnummer"; - this.nameDataGridViewTextBoxColumn.Name = "nameDataGridViewTextBoxColumn"; - this.nameDataGridViewTextBoxColumn.ReadOnly = true; - // // DNF // this.DNF.HeaderText = "DNF"; @@ -207,14 +191,10 @@ this.DNF.Text = "Udgået"; this.DNF.UseColumnTextForButtonValue = true; // - // entryBindingSource - // - this.entryBindingSource.DataSource = typeof(Tidstagning.Entry); - // // txtLog // this.txtLog.ColumnCount = 3; - this.txtLog.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 250F)); + this.txtLog.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 270F)); this.txtLog.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.txtLog.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 500F)); this.txtLog.Controls.Add(this.grid, 1, 0); @@ -227,9 +207,9 @@ this.txtLog.Location = new System.Drawing.Point(0, 0); this.txtLog.Name = "txtLog"; this.txtLog.RowCount = 3; - this.txtLog.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F)); - this.txtLog.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 70F)); - this.txtLog.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); + this.txtLog.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.txtLog.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 77.77778F)); + this.txtLog.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 22.22222F)); this.txtLog.Size = new System.Drawing.Size(1315, 694); this.txtLog.TabIndex = 8; // @@ -240,7 +220,7 @@ this.flowLayoutPanel1.Controls.Add(this.label1); this.flowLayoutPanel1.Controls.Add(this.comboComport); this.flowLayoutPanel1.Controls.Add(this.button1); - this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 557); + this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 551); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Size = new System.Drawing.Size(194, 125); this.flowLayoutPanel1.TabIndex = 15; @@ -290,9 +270,9 @@ | System.Windows.Forms.AnchorStyles.Right))); this.lblClock.AutoSize = true; this.lblClock.Font = new System.Drawing.Font("Microsoft Sans Serif", 72F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblClock.Location = new System.Drawing.Point(818, 554); + this.lblClock.Location = new System.Drawing.Point(818, 548); this.lblClock.Name = "lblClock"; - this.lblClock.Size = new System.Drawing.Size(494, 140); + this.lblClock.Size = new System.Drawing.Size(494, 146); this.lblClock.TabIndex = 16; this.lblClock.Text = "--:--:--"; this.lblClock.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -302,6 +282,31 @@ this.Clock.Enabled = true; this.Clock.Tick += new System.EventHandler(this.Clock_Tick); // + // textStartProcedure + // + this.textStartProcedure.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.textStartProcedure.Font = new System.Drawing.Font("Consolas", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textStartProcedure.Location = new System.Drawing.Point(3, 137); + this.textStartProcedure.Multiline = true; + this.textStartProcedure.Name = "textStartProcedure"; + this.textStartProcedure.ReadOnly = true; + this.textStartProcedure.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; + this.textStartProcedure.Size = new System.Drawing.Size(258, 361); + this.textStartProcedure.TabIndex = 10; + this.textStartProcedure.WordWrap = false; + // + // nameDataGridViewTextBoxColumn + // + this.nameDataGridViewTextBoxColumn.DataPropertyName = "SailNumber"; + this.nameDataGridViewTextBoxColumn.HeaderText = "Sejlnummer"; + this.nameDataGridViewTextBoxColumn.Name = "nameDataGridViewTextBoxColumn"; + this.nameDataGridViewTextBoxColumn.ReadOnly = true; + // + // entryBindingSource + // + this.entryBindingSource.DataSource = typeof(Tidstagning.Entry); + // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -318,11 +323,11 @@ this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.grid)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.entryBindingSource)).EndInit(); this.txtLog.ResumeLayout(false); this.txtLog.PerformLayout(); this.flowLayoutPanel1.ResumeLayout(false); this.flowLayoutPanel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.entryBindingSource)).EndInit(); this.ResumeLayout(false); } @@ -349,7 +354,7 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.ComboBox comboComport; private System.Windows.Forms.Label lblClock; - private System.Windows.Forms.Label startProcedureParsed; + private System.Windows.Forms.TextBox textStartProcedure; } } diff --git a/Tidstagning/Form1.cs b/Tidstagning/Form1.cs index abb48d1..7f857b8 100644 --- a/Tidstagning/Form1.cs +++ b/Tidstagning/Form1.cs @@ -162,7 +162,7 @@ namespace Tidstagning private void Clock_Tick(object sender, EventArgs e) { lblClock.Text = DateTime.Now.ToString("HH:mm:ss"); - startProcedureParsed.Text = startprocedure.TextualRepresentation(); + textStartProcedure.Text = startprocedure.TextualRepresentation(); } private void comboSoundTime_SelectedIndexChanged(object sender, EventArgs e) diff --git a/Tidstagning/Procedure.cs b/Tidstagning/Procedure.cs index c6e53c4..6263b77 100644 --- a/Tidstagning/Procedure.cs +++ b/Tidstagning/Procedure.cs @@ -52,7 +52,6 @@ namespace Tidstagning string t = ""; if (signaler.Count > 0) { - t += "Signaler:\n"; foreach (DateTime signal in signaler) { if (DateTime.Now > (signal.AddMilliseconds(signalLength))) @@ -67,7 +66,7 @@ namespace Tidstagning { t += " "; } - t += signal.ToString() + "\n"; + t += signal.ToString() + "\r\n"; } } return t;