Set work coordinate #1004

breiler · 2018-04-10T17:29:05Z

Added functionality for setting work coordinates requested in #977.

It's also possible to use simple mathematical expressions such as the following:

codecov-io · 2018-04-10T17:34:17Z

Codecov Report

Merging #1004 into master will increase coverage by 0.1%.
The diff coverage is 23.52%.

@@             Coverage Diff             @@
##             master    #1004     +/-   ##
===========================================
+ Coverage     29.94%   30.05%   +0.1%     
- Complexity      995     1007     +12     
===========================================
  Files           140      141      +1     
  Lines          9807     9871     +64     
  Branches        895      902      +7     
===========================================
+ Hits           2937     2967     +30     
- Misses         6584     6616     +32     
- Partials        286      288      +2

Impacted Files	Coverage Δ	Complexity Δ
...r/uielements/helpers/MachineStatusFontManager.java	`0% <ø> (ø)`	`0 <0> (ø)`	⬇️
...illwinder/universalgcodesender/GrblController.java	`53.73% <0%> (-1.07%)`	`69 <0> (ø)`
...uielements/components/WorkCoordinateTextField.java	`0% <0%> (ø)`	`0 <0> (?)`
...desender/uielements/panels/MachineStatusPanel.java	`0% <0%> (ø)`	`0 <0> (ø)`	⬇️
...inder/universalgcodesender/AbstractController.java	`62.16% <0%> (-0.16%)`	`95 <0> (ø)`
...illwinder/universalgcodesender/model/Position.java	`51.72% <60%> (+1.72%)`	`10 <3> (+3)`	⬆️
...com/willwinder/universalgcodesender/GrblUtils.java	`69.9% <71.42%> (+0.28%)`	`82 <4> (+1)`	⬆️
...lwinder/universalgcodesender/model/GUIBackend.java	`45.84% <85.71%> (+3.33%)`	`57 <3> (+6)`	⬆️
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update dc49d9e...39d5c5f. Read the comment docs.

winder

Wow, this is really cool. I would have expected it to be a lot more complicated, nice job.

winder · 2018-04-10T17:55:58Z

ugs-core/src/com/willwinder/universalgcodesender/AbstractController.java

@@ -187,7 +187,12 @@ public void resetCoordinatesToZero() throws Exception {
    public void resetCoordinateToZero(final Axis coord) throws Exception {


Does it make sense to have resetCoordinateToZero and resetCoordinatesToZero have default implementations which call setWorkPosition?

That is a good idea!

winder · 2018-04-10T17:59:05Z

ugs-core/src/com/willwinder/universalgcodesender/GrblUtils.java

 *
 * @author wwinder
 */
 public class GrblUtils {
-// Note: 5 characters of this buffer reserved for real time commands.
+    private static final DecimalFormat decimalFormatter = new DecimalFormat("0.0000");


There is a constant Localization.dfs which can be used here to make sure the decimal separator doesn't change to a comma for different regions. new DecimalFormat("0.0000", Localization.dfs);

winder · 2018-04-10T18:07:26Z

ugs-core/src/com/willwinder/universalgcodesender/model/GUIBackend.java

+    }
+
+    @Override
+    public void setWorkPositionUsingExpression(final Axis axis, final String expression) throws Exception {


Wow, this is really cool. I had no idea you could do something like this.

Me neither, google was my friend! 😄

jahnj0584 · 2018-04-10T19:38:30Z

Wicked. How complex of equations can you do? I assume it only modifies the current WCS?

…

On Tue, Apr 10, 2018, 3:19 PM Will Winder, ***@***.***> wrote: ***@***.**** approved this pull request. Wow, this is really cool. I would have expected it to be a lot more complicated, nice job. ------------------------------ In ugs-core/src/com/willwinder/universalgcodesender/AbstractController.java <#1004 (comment)> : > @@ -187,7 +187,12 @@ public void resetCoordinatesToZero() throws Exception { public void resetCoordinateToZero(final Axis coord) throws Exception { Does it make sense to have resetCoordinateToZero and resetCoordinatesToZero have default implementations which call setWorkPosition? ------------------------------ In ugs-core/src/com/willwinder/universalgcodesender/GrblUtils.java <#1004 (comment)> : > * * @author wwinder */ public class GrblUtils { -// Note: 5 characters of this buffer reserved for real time commands. + private static final DecimalFormat decimalFormatter = new DecimalFormat("0.0000"); There is a constant Localization.dfs which can be used here to make sure the decimal separator doesn't change to a comma for different regions. new DecimalFormat("0.0000", Localization.dfs); ------------------------------ In ugs-core/src/com/willwinder/universalgcodesender/model/GUIBackend.java <#1004 (comment)> : > @@ -808,7 +812,33 @@ public void sendMessageForConsole(String msg) { //should still send! Controller probably shouldn't ever be null. } } - + + @OverRide + public void setWorkPosition(Axis axis, double position) throws Exception { + controller.setWorkPosition(axis, position); + } + + @OverRide + public void setWorkPositionUsingExpression(final Axis axis, final String expression) throws Exception { Wow, this is really cool. I had no idea you could do something like this. — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#1004 (review)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AQlzDI-qonNDx3hfZXt6byOoVFa2YbUgks5tnPeogaJpZM4TOsAz> .

winder · 2018-04-10T19:52:32Z

If the expression starts with +, -, * or / the current value is inserted to the left, otherwise it evaluates whatever you put in directly.

So if the axis is at 10, "+ 2" is evaluated as "10 + 2". But if you type in "2 + 2" it evaluates to 4 even though you are at 10.

The scripting language is javascript so you can put whatever you want in there. I tried the << bitshift operator and it worked, you can chain them together so if you are at 11, * 1 << 1 it evaluates as 11*1<<1 which turns into 22.

jahnj0584 · 2018-04-10T19:57:07Z

But you could do something like "/2 -29" when you want it to be 29mm away from the center?

…

On Tue, Apr 10, 2018, 4:53 PM Will Winder, ***@***.***> wrote: If the expression starts with +, -, * or / the current value is inserted to the left, otherwise it evaluates whatever you put in directly. So if the axis is at 10, "+ 2" is evaluated as "10 + 2". But if you type in "2 + 2" it evaluates to 4 even though you are at 10. The scripting language is javascript so you can put whatever you want in there. I tried the << bitshift operator and it worked, you can chain them together so if you are at 11, * 1 << 1 it evaluates as 11*1<<1 which turns into 22. — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#1004 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AQlzDKAdtuRCZp2SV1BHgFD3SdtG5v_pks5tnQ2DgaJpZM4TOsAz> .

flounderscore · 2018-04-10T19:57:44Z

How can I set the current position to a negative value? It seems like it would attempt do perform math instead.

…

On Tue, Apr 10, 2018 at 3:52 PM, Will Winder ***@***.***> wrote: If the expression starts with +, -, * or / the current value is inserted to the left, otherwise it evaluates whatever you put in directly. So if the axis is at 10, "+ 2" is evaluated as "10 + 2". But if you type in "2 + 2" it evaluates to 4 even though you are at 10. The scripting language is javascript so you can put whatever you want in there. I tried the << bitshift operator and it worked, you can chain them together so if you are at 11, * 1 << 1 it evaluates as 11*1<<1 which turns into 22. — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#1004 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ANiDSYmIubJJOc8zGk3thCi3vmMJiwnfks5tnQ2DgaJpZM4TOsAz> .

winder · 2018-04-10T19:59:18Z

@jahnj0584 it would depend on your order of operations, but I think so. Let us know, I just merged it in :)

winder · 2018-04-10T20:06:01Z

@flounderscore you're right, you would have to do 10 * -1

winder · 2018-04-10T20:06:52Z

@flounderscore or zero out the axis first so that the math is right.

flounderscore · 2018-04-10T20:08:11Z

Any chance to make the math feature optional? All my coordinates are typically <0.
Edit: Or explicitly have a "variable" representing the current position, e.g. "#/2 - 5".

breiler added 4 commits April 10, 2018 19:01

Removed the use of deprecated code

6439611

Added methods for setting the work coordinates

cc731a1

Made the work position text field editable.

cf5ae43

Fixed broken test

39d5c5f

breiler requested a review from winder April 10, 2018 18:08

winder approved these changes Apr 10, 2018

View reviewed changes

winder merged commit e6bc552 into winder:master Apr 10, 2018

breiler mentioned this pull request Apr 11, 2018

Adjusted the expression handler #1006

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Set work coordinate #1004

Set work coordinate #1004

breiler commented Apr 10, 2018

codecov-io commented Apr 10, 2018

winder left a comment

winder Apr 10, 2018

breiler Apr 11, 2018

winder Apr 10, 2018

winder Apr 10, 2018

breiler Apr 11, 2018

jahnj0584 commented Apr 10, 2018 via email

winder commented Apr 10, 2018

jahnj0584 commented Apr 10, 2018 via email

flounderscore commented Apr 10, 2018 via email

winder commented Apr 10, 2018

winder commented Apr 10, 2018

winder commented Apr 10, 2018

flounderscore commented Apr 10, 2018 •

edited

		@@ -187,7 +187,12 @@ public void resetCoordinatesToZero() throws Exception {
		public void resetCoordinateToZero(final Axis coord) throws Exception {

Set work coordinate #1004

Set work coordinate #1004

Conversation

breiler commented Apr 10, 2018

codecov-io commented Apr 10, 2018

Codecov Report

winder left a comment

Choose a reason for hiding this comment

winder Apr 10, 2018

Choose a reason for hiding this comment

breiler Apr 11, 2018

Choose a reason for hiding this comment

winder Apr 10, 2018

Choose a reason for hiding this comment

winder Apr 10, 2018

Choose a reason for hiding this comment

breiler Apr 11, 2018

Choose a reason for hiding this comment

jahnj0584 commented Apr 10, 2018 via email

winder commented Apr 10, 2018

jahnj0584 commented Apr 10, 2018 via email

flounderscore commented Apr 10, 2018 via email

winder commented Apr 10, 2018

winder commented Apr 10, 2018

winder commented Apr 10, 2018

flounderscore commented Apr 10, 2018 • edited

flounderscore commented Apr 10, 2018 •

edited