diff --git a/OpenNest.WinForms.Tests/OpenNest.WinForms.Tests.csproj b/OpenNest.WinForms.Tests/OpenNest.WinForms.Tests.csproj index 33472225..d989b834 100644 --- a/OpenNest.WinForms.Tests/OpenNest.WinForms.Tests.csproj +++ b/OpenNest.WinForms.Tests/OpenNest.WinForms.Tests.csproj @@ -15,6 +15,7 @@ + diff --git a/OpenNest/Forms/MainForm.Designer.cs b/OpenNest/Forms/MainForm.Designer.cs index 79832ea8..9d8dcf1e 100644 --- a/OpenNest/Forms/MainForm.Designer.cs +++ b/OpenNest/Forms/MainForm.Designer.cs @@ -168,7 +168,6 @@ namespace OpenNest.Forms plateSizeStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); plateQtyStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); plateUtilStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); - gpuStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); selectionStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); toolStrip1 = new System.Windows.Forms.ToolStrip(); btnNew = new System.Windows.Forms.ToolStripButton(); @@ -1071,7 +1070,7 @@ namespace OpenNest.Forms // // statusStrip1 // - statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { statusLabel1, locationStatusLabel, selectionStatusLabel, spacerLabel, plateIndexStatusLabel, plateSizeStatusLabel, plateQtyStatusLabel, plateUtilStatusLabel, gpuStatusLabel }); + statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { statusLabel1, locationStatusLabel, selectionStatusLabel, spacerLabel, plateIndexStatusLabel, plateSizeStatusLabel, plateQtyStatusLabel, plateUtilStatusLabel }); statusStrip1.Location = new System.Drawing.Point(0, 630); statusStrip1.Name = "statusStrip1"; statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 16, 0); @@ -1139,13 +1138,6 @@ namespace OpenNest.Forms plateUtilStatusLabel.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0); plateUtilStatusLabel.Size = new System.Drawing.Size(75, 19); plateUtilStatusLabel.Text = "Util : 0.0%"; - // - // gpuStatusLabel - // - gpuStatusLabel.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Left; - gpuStatusLabel.Name = "gpuStatusLabel"; - gpuStatusLabel.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0); - gpuStatusLabel.Size = new System.Drawing.Size(14, 19); // // toolStrip1 // @@ -1430,7 +1422,6 @@ namespace OpenNest.Forms private System.Windows.Forms.ToolStripMenuItem mnuPlateExpandSpacing; private System.Windows.Forms.ToolStripButton btnSaveAs; private System.Windows.Forms.ToolStripMenuItem centerPartsToolStripMenuItem; - private System.Windows.Forms.ToolStripStatusLabel gpuStatusLabel; private System.Windows.Forms.ToolStripStatusLabel selectionStatusLabel; private System.Windows.Forms.ToolStripLabel engineLabel; private System.Windows.Forms.ToolStripComboBox engineComboBox; diff --git a/OpenNest/Forms/MainForm.cs b/OpenNest/Forms/MainForm.cs index 73b4e6b6..b890288c 100644 --- a/OpenNest/Forms/MainForm.cs +++ b/OpenNest/Forms/MainForm.cs @@ -19,7 +19,6 @@ using OpenNest.Engine.Jobs; using OpenNest.Engine.Jobs.Adapters; using OpenNest.Engine.Jobs.Placement; using OpenNest.Geometry; -using OpenNest.Gpu; using OpenNest.IO; using OpenNest.Properties; @@ -136,13 +135,6 @@ namespace OpenNest.Forms LoadPosts(); EnableCheck(); UpdateStatus(); - UpdateGpuStatus(); - - //if (GpuEvaluatorFactory.GpuAvailable) - // BestFitCache.CreateEvaluator = (drawing, spacing) => GpuEvaluatorFactory.Create(drawing, spacing); - - //if (GpuEvaluatorFactory.GpuAvailable) - // BestFitCache.CreateSlideComputer = () => GpuEvaluatorFactory.CreateSlideComputer(); // Jobs-side plug-in discovery: INestingEngine implementations are registered per // assembly/type with per-DLL isolation. Existing plug-ins must implement the jobs @@ -197,7 +189,7 @@ namespace OpenNest.Forms if (result == DialogResult.Yes) updater.ApplyAndRestart(); }; - statusStrip1.Items.Insert(statusStrip1.Items.IndexOf(gpuStatusLabel), updateStatusLabel); + statusStrip1.Items.Add(updateStatusLabel); updater = new global::OpenNest.UpdaterService(); updater.UpdateReady += version => @@ -523,20 +515,6 @@ namespace OpenNest.Forms UpdateSelectionStatus(); } - private void UpdateGpuStatus() - { - if (GpuEvaluatorFactory.GpuAvailable) - { - gpuStatusLabel.Text = $"GPU : {GpuEvaluatorFactory.DeviceName}"; - gpuStatusLabel.ForeColor = Color.DarkGreen; - } - else - { - gpuStatusLabel.Text = "GPU : None (CPU)"; - gpuStatusLabel.ForeColor = Color.Gray; - } - } - private void EngineComboBox_SelectedIndexChanged(object sender, EventArgs e) { if (engineComboBox.SelectedItem is string name) diff --git a/OpenNest/OpenNest.csproj b/OpenNest/OpenNest.csproj index da812550..3393f0fe 100644 --- a/OpenNest/OpenNest.csproj +++ b/OpenNest/OpenNest.csproj @@ -26,7 +26,6 @@ -