Skip to content

Commit

Permalink
updated designer
Browse files Browse the repository at this point in the history
  • Loading branch information
moritzvieli committed Sep 8, 2024
1 parent 91bfe29 commit d3f6b5d
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 72 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ mv "$(date '+%Y-%m-%d')-RocketShow.zip" /home/pi

### Update process

- Update POM and dist/currentversion2.xml versions
- Add the release notes in dist/currentversion2.xml and update the date on top
- Update POM
- Update dist/currentversion2.xml version/date on top and add the release notes
- Build the jar with Maven
- Copy target/rocketshow.jar to rocketshow.net/update/test/rocketshow.jar (and parent-directory to release it directly)
- Copy dist/currentversion2.xml to rocketshow.net/update/test/currentversion2.xml (and parent-directory to release it directly)
Expand Down
8 changes: 6 additions & 2 deletions dist/currentversion2.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<versionInfo>
<version>2.4.0</version>
<date>2024-07-31</date>
<version>2.4.1</version>
<date>2024-09-07</date>
<changeNoteList>
<changeNote>
<version>2.4.1</version>
<changes>Better display of fixture capabilities in the designer. Performance improvements.</changes>
</changeNote>
<changeNote>
<version>2.4.0</version>
<changes>Support designer fixtures with multiple beams, various bugfixes</changes>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
import lombok.Setter;

import java.util.List;

Expand All @@ -11,6 +13,8 @@
* @author Moritz A. Vieli
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@Getter
@Setter
public class FixtureCapability {

public enum FixtureCapabilityType {
Expand Down Expand Up @@ -87,67 +91,4 @@ public enum FixtureCapabilityColor {
private String brightnessStart;
private String brightnessEnd;

public FixtureCapabilityType getType() {
return type;
}

public void setType(FixtureCapabilityType type) {
this.type = type;
}

public FixtureCapabilityColor getColor() {
return color;
}

public void setColor(FixtureCapabilityColor color) {
this.color = color;
}

public List<Integer> getDmxRange() {
return dmxRange;
}

public void setDmxRange(List<Integer> dmxRange) {
this.dmxRange = dmxRange;
}

public Object getWheel() {
return null;
}

public void setWheel(Object wheel) {
this.wheel = wheel;
}

public Integer getSlotNumber() {
return slotNumber;
}

public void setSlotNumber(Integer slotNumber) {
this.slotNumber = slotNumber;
}

public String getBrightness() {
return brightness;
}

public void setBrightness(String brightness) {
this.brightness = brightness;
}

public String getBrightnessStart() {
return brightnessStart;
}

public void setBrightnessStart(String brightnessStart) {
this.brightnessStart = brightnessStart;
}

public String getBrightnessEnd() {
return brightnessEnd;
}

public void setBrightnessEnd(String brightnessEnd) {
this.brightnessEnd = brightnessEnd;
}
}
8 changes: 4 additions & 4 deletions src/main/webapp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/main/webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@angular/router": "^17.3.11",
"@ngx-translate/core": "^15.0.0",
"@ngx-translate/http-loader": "^3.0.1",
"@rocketshow/designer": "^1.36.0",
"@rocketshow/designer": "^1.37.0",
"angular2-websocket": "^0.9.7",
"bootstrap": "^4.1.2",
"core-js": "^2.5.7",
Expand Down

0 comments on commit d3f6b5d

Please sign in to comment.