Skip to content

Commit 19036b2

Browse files
svenhbsvenhb
authored
Version 1.7.6.0
1 parent ca005cd commit 19036b2

25 files changed

+31731
-30097
lines changed

‎GRBL-Plotter/MachineControl/ControlJogPathCreator.resx‎

Lines changed: 27 additions & 135 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
<value>8</value>
173173
</data>
174174
<data name="button3.Location" type="System.Drawing.Point, System.Drawing">
175-
<value>127, -1</value>
175+
<value>127, -2</value>
176176
</data>
177177
<data name="button3.Size" type="System.Drawing.Size, System.Drawing">
178178
<value>23, 23</value>
@@ -313,7 +313,7 @@
313313
<value>4</value>
314314
</data>
315315
<data name="nUDRaster.Location" type="System.Drawing.Point, System.Drawing">
316-
<value>92, 14</value>
316+
<value>92, 18</value>
317317
</data>
318318
<data name="nUDRaster.Size" type="System.Drawing.Size, System.Drawing">
319319
<value>52, 20</value>
@@ -376,7 +376,7 @@
376376
<value>NoControl</value>
377377
</data>
378378
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
379-
<value>6, 16</value>
379+
<value>6, 20</value>
380380
</data>
381381
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
382382
<value>38, 13</value>
@@ -423,138 +423,6 @@
423423
<data name="&gt;&gt;gBPathCreator.ZOrder" xml:space="preserve">
424424
<value>1</value>
425425
</data>
426-
<data name="&gt;&gt;label4.Name" xml:space="preserve">
427-
<value>label4</value>
428-
</data>
429-
<data name="&gt;&gt;label4.Type" xml:space="preserve">
430-
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
431-
</data>
432-
<data name="&gt;&gt;label4.Parent" xml:space="preserve">
433-
<value>gBJogParameter</value>
434-
</data>
435-
<data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
436-
<value>0</value>
437-
</data>
438-
<data name="&gt;&gt;label3.Name" xml:space="preserve">
439-
<value>label3</value>
440-
</data>
441-
<data name="&gt;&gt;label3.Type" xml:space="preserve">
442-
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
443-
</data>
444-
<data name="&gt;&gt;label3.Parent" xml:space="preserve">
445-
<value>gBJogParameter</value>
446-
</data>
447-
<data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
448-
<value>1</value>
449-
</data>
450-
<data name="&gt;&gt;tBCodeEnd.Name" xml:space="preserve">
451-
<value>tBCodeEnd</value>
452-
</data>
453-
<data name="&gt;&gt;tBCodeEnd.Type" xml:space="preserve">
454-
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
455-
</data>
456-
<data name="&gt;&gt;tBCodeEnd.Parent" xml:space="preserve">
457-
<value>gBJogParameter</value>
458-
</data>
459-
<data name="&gt;&gt;tBCodeEnd.ZOrder" xml:space="preserve">
460-
<value>2</value>
461-
</data>
462-
<data name="&gt;&gt;tBCodeStart.Name" xml:space="preserve">
463-
<value>tBCodeStart</value>
464-
</data>
465-
<data name="&gt;&gt;tBCodeStart.Type" xml:space="preserve">
466-
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
467-
</data>
468-
<data name="&gt;&gt;tBCodeStart.Parent" xml:space="preserve">
469-
<value>gBJogParameter</value>
470-
</data>
471-
<data name="&gt;&gt;tBCodeStart.ZOrder" xml:space="preserve">
472-
<value>3</value>
473-
</data>
474-
<data name="&gt;&gt;btnExport.Name" xml:space="preserve">
475-
<value>btnExport</value>
476-
</data>
477-
<data name="&gt;&gt;btnExport.Type" xml:space="preserve">
478-
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
479-
</data>
480-
<data name="&gt;&gt;btnExport.Parent" xml:space="preserve">
481-
<value>gBJogParameter</value>
482-
</data>
483-
<data name="&gt;&gt;btnExport.ZOrder" xml:space="preserve">
484-
<value>4</value>
485-
</data>
486-
<data name="&gt;&gt;btnJogStop.Name" xml:space="preserve">
487-
<value>btnJogStop</value>
488-
</data>
489-
<data name="&gt;&gt;btnJogStop.Type" xml:space="preserve">
490-
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
491-
</data>
492-
<data name="&gt;&gt;btnJogStop.Parent" xml:space="preserve">
493-
<value>gBJogParameter</value>
494-
</data>
495-
<data name="&gt;&gt;btnJogStop.ZOrder" xml:space="preserve">
496-
<value>5</value>
497-
</data>
498-
<data name="&gt;&gt;btnJogStart.Name" xml:space="preserve">
499-
<value>btnJogStart</value>
500-
</data>
501-
<data name="&gt;&gt;btnJogStart.Type" xml:space="preserve">
502-
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
503-
</data>
504-
<data name="&gt;&gt;btnJogStart.Parent" xml:space="preserve">
505-
<value>gBJogParameter</value>
506-
</data>
507-
<data name="&gt;&gt;btnJogStart.ZOrder" xml:space="preserve">
508-
<value>6</value>
509-
</data>
510-
<data name="&gt;&gt;label2.Name" xml:space="preserve">
511-
<value>label2</value>
512-
</data>
513-
<data name="&gt;&gt;label2.Type" xml:space="preserve">
514-
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
515-
</data>
516-
<data name="&gt;&gt;label2.Parent" xml:space="preserve">
517-
<value>gBJogParameter</value>
518-
</data>
519-
<data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
520-
<value>7</value>
521-
</data>
522-
<data name="&gt;&gt;nUDFeedrate.Name" xml:space="preserve">
523-
<value>nUDFeedrate</value>
524-
</data>
525-
<data name="&gt;&gt;nUDFeedrate.Type" xml:space="preserve">
526-
<value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
527-
</data>
528-
<data name="&gt;&gt;nUDFeedrate.Parent" xml:space="preserve">
529-
<value>gBJogParameter</value>
530-
</data>
531-
<data name="&gt;&gt;nUDFeedrate.ZOrder" xml:space="preserve">
532-
<value>8</value>
533-
</data>
534-
<data name="gBJogParameter.Location" type="System.Drawing.Point, System.Drawing">
535-
<value>458, 221</value>
536-
</data>
537-
<data name="gBJogParameter.Size" type="System.Drawing.Size, System.Drawing">
538-
<value>150, 235</value>
539-
</data>
540-
<data name="gBJogParameter.TabIndex" type="System.Int32, mscorlib">
541-
<value>6</value>
542-
</data>
543-
<data name="gBJogParameter.Text" xml:space="preserve">
544-
<value>Jog parameter</value>
545-
</data>
546-
<data name="&gt;&gt;gBJogParameter.Name" xml:space="preserve">
547-
<value>gBJogParameter</value>
548-
</data>
549-
<data name="&gt;&gt;gBJogParameter.Type" xml:space="preserve">
550-
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
551-
</data>
552-
<data name="&gt;&gt;gBJogParameter.Parent" xml:space="preserve">
553-
<value>$this</value>
554-
</data>
555-
<data name="&gt;&gt;gBJogParameter.ZOrder" xml:space="preserve">
556-
<value>0</value>
557-
</data>
558426
<data name="label4.AutoSize" type="System.Boolean, mscorlib">
559427
<value>True</value>
560428
</data>
@@ -819,6 +687,30 @@
819687
<data name="&gt;&gt;nUDFeedrate.ZOrder" xml:space="preserve">
820688
<value>8</value>
821689
</data>
690+
<data name="gBJogParameter.Location" type="System.Drawing.Point, System.Drawing">
691+
<value>458, 221</value>
692+
</data>
693+
<data name="gBJogParameter.Size" type="System.Drawing.Size, System.Drawing">
694+
<value>150, 235</value>
695+
</data>
696+
<data name="gBJogParameter.TabIndex" type="System.Int32, mscorlib">
697+
<value>6</value>
698+
</data>
699+
<data name="gBJogParameter.Text" xml:space="preserve">
700+
<value>Jog parameter</value>
701+
</data>
702+
<data name="&gt;&gt;gBJogParameter.Name" xml:space="preserve">
703+
<value>gBJogParameter</value>
704+
</data>
705+
<data name="&gt;&gt;gBJogParameter.Type" xml:space="preserve">
706+
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
707+
</data>
708+
<data name="&gt;&gt;gBJogParameter.Parent" xml:space="preserve">
709+
<value>$this</value>
710+
</data>
711+
<data name="&gt;&gt;gBJogParameter.ZOrder" xml:space="preserve">
712+
<value>0</value>
713+
</data>
822714
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
823715
<value>True</value>
824716
</metadata>

‎GRBL-Plotter/MachineControl/ControlProbing.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ internal XyzPoint SetPosProbe
245245
if ((probingAxisIndex >= 0) && (probingAxisIndex <= 2))
246246
{
247247
SendCommandEvent(new CmdEventArgs((string.Format("{0} {1}{2:0.000}", CoordCommand, probingAxis[probingAxisIndex], tmpProbePos).Replace(',', '.'))));
248-
probingMoveSave = string.Format("G90 G00 {0}{1} (move to save pos.)", probingAxis[probingAxisIndex], probingSave[probingAxisIndex]); // will be sent in timer1_Tick
248+
probingMoveSave = string.Format("G90 G00 {0}{1} (move to save pos.)", probingAxis[probingAxisIndex], probingSave[probingAxisIndex]); // will be sent in Timer_Tick
249249
lblEFProgress.Text = tmpEF;
250250
}
251251
angle = probePosOld.AngleTo(probePosNew);

‎GRBL-Plotter/MachineControl/ControlProbing.zh-CN.resx‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -433,18 +433,6 @@ Z将移回起始位置</value>
433433
<data name="label5.Text" xml:space="preserve">
434434
<value>X</value>
435435
</data>
436-
<data name="BtnStartEF.Text" xml:space="preserve">
437-
<value>开始</value>
438-
</data>
439-
<data name="BtnStartCF.Text" xml:space="preserve">
440-
<value>开始</value>
441-
</data>
442-
<data name="BtnCancelCF.Text" xml:space="preserve">
443-
<value>取消</value>
444-
</data>
445-
<data name="BtnStartTL.Text" xml:space="preserve">
446-
<value>开始</value>
447-
</data>
448436
<data name="tBAngle.Text" xml:space="preserve">
449437
<value>0,00</value>
450438
</data>

0 commit comments

Comments
 (0)