Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up obsolete code in Ruida driver #217

Merged
merged 2 commits into from
Apr 21, 2024
Merged

Clean up obsolete code in Ruida driver #217

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8869625
Remove properties obsoleted by c2bee3a
TheAssassin Mar 22, 2024
1afe209
Clean up another obsolete property
TheAssassin Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 7 additions & 34 deletions src/main/java/de/thomas_oster/liblasercut/drivers/Ruida.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,45 +180,18 @@ public boolean canEstimateJobDuration()
return false;
}

/**
* 'runway' for laser to get up to speed when rastering (in mm)
*
*/
// Kept to retain compatibility with older configs
@Deprecated
protected transient boolean useBidirectionalRastering = true;
@Deprecated
private transient Double rasterPadding = 0.;

@Override
public double getRasterPadding() {
return 0;
}

/*
* allow padding to move laser head outside of 'bed'
*/
@Deprecated
private transient boolean allowOutsidePadding;

// fixed value of 0 because the x-sweep processing mode adds all necessary padding. See writeJobCode().
@Override
public boolean getRasterPaddingAllowOutsideMachineSpace() {
return false;
}

/**
* When rastering, whether to always cut from left to right, or to cut in both
* directions? (i.e. use the return stroke to raster as well)
*/
@Deprecated
protected transient boolean useBidirectionalRastering = true;

public boolean getUseBidirectionalRastering()
{
// currently only bidirectional rastering is supported (work mode has to be tested for unidirectional rastering)
return true;
}

public void setUseBidirectionalRastering(boolean useBidirectionalRastering)
{
this.useBidirectionalRastering = useBidirectionalRastering;
public double getRasterPadding() {
return 0;
}

private void find_and_write_bounding_box(LaserJob job) throws IOException
Expand Down Expand Up @@ -596,7 +569,7 @@ public void writeJobCode(LaserJob job, ProgressListener pl) throws IOException {
if ((p instanceof RasterPart) || (p instanceof Raster3dPart))
{
engrave = true;
p = convertRasterizableToVectorPart((RasterizableJobPart)p, job, getUseBidirectionalRastering(), true, true);
p = convertRasterizableToVectorPart((RasterizableJobPart)p, job, true, true, true);
}
/* FALLTHRU */
if (p instanceof VectorPart)
Expand Down
Loading