Skip to content

Commit

Permalink
Provide focus property to Ruida driver
Browse files Browse the repository at this point in the history
Focus is not in use as of yet (will follow in a future commit), however this commit already implements the necessary UI changes and cleans up a now-obsolete (partially) redundant class.
  • Loading branch information
TheAssassin committed Mar 22, 2024
1 parent 9de1657 commit fc040a0
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 269 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,15 @@
* Add 'min power' to FloatPowerSpeedFrequencyProperty
*/

public class FloatMinMaxPowerSpeedFrequencyProperty extends FloatPowerSpeedFrequencyProperty {
public class FloatMinMaxPowerSpeedFocusFrequencyProperty extends FloatPowerSpeedFocusFrequencyProperty {

private float min_power = 10.0f;
private static final String MIN_POWER = "min power";

public FloatMinMaxPowerSpeedFrequencyProperty()
public FloatMinMaxPowerSpeedFocusFrequencyProperty()
{
super();
}

public FloatMinMaxPowerSpeedFrequencyProperty(LaserProperty o)
{
for (String k : o.getPropertyKeys())
{
Object p;
p = o.getProperty(k);
if (p != null) {
this.setProperty(k, p);
}
}
}

/**
* Get the value of min power
Expand Down Expand Up @@ -128,9 +116,9 @@ public void setProperty(String name, Object value)
}

@Override
public FloatMinMaxPowerSpeedFrequencyProperty clone()
public FloatMinMaxPowerSpeedFocusFrequencyProperty clone()
{
FloatMinMaxPowerSpeedFrequencyProperty result = new FloatMinMaxPowerSpeedFrequencyProperty();
FloatMinMaxPowerSpeedFocusFrequencyProperty result = new FloatMinMaxPowerSpeedFocusFrequencyProperty();
Object p;
for (String s:this.getPropertyKeys())
{
Expand All @@ -147,10 +135,10 @@ public boolean equals(Object obj) {
if (obj == null) {
return false;
}
if (!(obj instanceof FloatMinMaxPowerSpeedFrequencyProperty)) {
if (!(obj instanceof FloatMinMaxPowerSpeedFocusFrequencyProperty)) {
return false;
}
final FloatMinMaxPowerSpeedFrequencyProperty other = (FloatMinMaxPowerSpeedFrequencyProperty) obj;
final FloatMinMaxPowerSpeedFocusFrequencyProperty other = (FloatMinMaxPowerSpeedFocusFrequencyProperty) obj;
if (this.min_power != other.min_power) {
return false;
}
Expand Down

This file was deleted.

Loading

0 comments on commit fc040a0

Please sign in to comment.