This repository has been archived by the owner on Jan 12, 2019. It is now read-only.
forked from vegos/ZoomG3_ArduinoMIDI
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Preparing for a pull request in pi4j project
- Loading branch information
1 parent
530273e
commit 21b58e2
Showing
18 changed files
with
1,760 additions
and
1,466 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
185 changes: 131 additions & 54 deletions
185
Display/src/com/pi4j/component/display/DisplayBuffer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,54 +1,131 @@ | ||
| package com.pi4j.component.display; | ||
|
|
||
| import java.awt.Color; | ||
| import java.util.LinkedList; | ||
| import java.util.Optional; | ||
| import java.util.Queue; | ||
|
|
||
| public class DisplayBuffer { | ||
| private Queue<PixelBuffer> changes = new LinkedList<>(); | ||
|
|
||
| private PixelBuffer[][] buffer; | ||
|
|
||
| private final int width; | ||
| private final int height; | ||
| private final Color defaultColor; | ||
|
|
||
| public DisplayBuffer(int width, int height, Color defaultColor) { | ||
| this.width = width; | ||
| this.height = height; | ||
| this.buffer = new PixelBuffer[width][height]; | ||
| this.defaultColor = defaultColor; | ||
| } | ||
|
|
||
| public void setPixel(int x, int y, Color color) { | ||
| Optional<PixelBuffer> pixel = getPixel(x, y); | ||
|
|
||
| if (!pixel.isPresent()) | ||
| return; // or throws? | ||
|
|
||
| if (pixel.get().getColor().equals(color)) | ||
| return; | ||
|
|
||
| pixel.get().setColor(color); | ||
| changes.add(pixel.get()); | ||
| } | ||
|
|
||
| private Optional<PixelBuffer> getPixel(int x, int y) { | ||
| if (x < 0 || x > width-1 | ||
| || y < 0 || y > height-1) | ||
| return Optional.empty(); | ||
|
|
||
| PixelBuffer pixel = buffer[x][y]; | ||
| if (pixel == null) { | ||
| pixel = new PixelBuffer(x, y, defaultColor); | ||
| buffer[x][y] = pixel; | ||
| } | ||
|
|
||
| return Optional.of(pixel); | ||
| } | ||
|
|
||
| public Queue<PixelBuffer> getChanges() { | ||
| return changes; | ||
| } | ||
| } | ||
| package com.pi4j.component.display; | ||
|
|
||
| import java.awt.Color; | ||
| import java.util.LinkedList; | ||
| import java.util.Optional; | ||
| import java.util.Queue; | ||
|
|
||
| /* | ||
| * #%L | ||
| * ********************************************************************** | ||
| * ORGANIZATION : Pi4J | ||
| * PROJECT : Pi4J :: Device Abstractions | ||
| * FILENAME : DisplayBuffer.java | ||
| * | ||
| * This file is part of the Pi4J project. More information about | ||
| * this project can be found here: http://www.pi4j.com/ | ||
| * ********************************************************************** | ||
| * %% | ||
| * Copyright (C) 2012 - 2016 Pi4J | ||
| * %% | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Lesser Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Lesser Public | ||
| * License along with this program. If not, see | ||
| * <http://www.gnu.org/licenses/lgpl-3.0.html>. | ||
| * #L% | ||
| * | ||
| * @author SrMouraSilva | ||
| */ | ||
|
|
||
| /** | ||
| * <p>DisplayBuffer its a good auto dettecter changes. </p> | ||
| * | ||
| * <p> | ||
| * Change the required pixels and - for update the | ||
| * real component display - calls getChanges() method.</p> | ||
| * | ||
| * <p> | ||
| * This will only return the pixel that has actually changed, avoiding unnecessary updates. | ||
| * </p> | ||
| * | ||
| * <p> | ||
| * This buffer is a good choice for displays that | ||
| * is necessary send pixels colors one by one (usually a pixel | ||
| * is a byte in this case). <br /> | ||
| * If a byte represents more than one color, this probably don't work. | ||
| * You need create a special implementation in these cases. | ||
| * Find class PCB8544DisplayDataRam for inspiration! | ||
| * </p> | ||
| */ | ||
| public class DisplayBuffer { | ||
| private Queue<PixelBuffer> changes = new LinkedList<>(); | ||
|
|
||
| private PixelBuffer[][] buffer; | ||
|
|
||
| private final int width; | ||
| private final int height; | ||
| private final Color defaultColor; | ||
|
|
||
| /** | ||
| * @param width Total columns | ||
| * @param height Total rows | ||
| * @param defaultColor Initializes the pixels with this color | ||
| */ | ||
| public DisplayBuffer(int width, int height, Color defaultColor) { | ||
| this.width = width; | ||
| this.height = height; | ||
| this.buffer = new PixelBuffer[width][height]; | ||
| this.defaultColor = defaultColor; | ||
| } | ||
|
|
||
| /** | ||
| * Set a specific pixel for a color | ||
| * | ||
| * @param x Row position. 0 is first, top to down direction | ||
| * @param y Column position. 0 is first, left to right direction | ||
| * @param color | ||
| */ | ||
| public void setPixel(int x, int y, Color color) { | ||
| Optional<PixelBuffer> pixel = getPixel(x, y); | ||
|
|
||
| if (!pixel.isPresent()) | ||
| return; // or throws? | ||
|
|
||
| if (pixel.get().getColor().equals(color)) | ||
| return; | ||
|
|
||
| pixel.get().setColor(color); | ||
| changes.add(pixel.get()); | ||
| } | ||
|
|
||
| private Optional<PixelBuffer> getPixel(int x, int y) { | ||
| if (x < 0 || x > width-1 | ||
| || y < 0 || y > height-1) | ||
| return Optional.empty(); | ||
|
|
||
| PixelBuffer pixel = buffer[x][y]; | ||
| if (pixel == null) { | ||
| pixel = new PixelBuffer(x, y, defaultColor); | ||
| buffer[x][y] = pixel; | ||
| } | ||
|
|
||
| return Optional.of(pixel); | ||
| } | ||
|
|
||
| /** | ||
| * @return All changes detected<br /> | ||
| * | ||
| * <strong>CAUTION:<strong> | ||
| * For clear the updates changes, call a remove method | ||
| * of queue returned: | ||
| * <pre><code> | ||
| * Queue<PixelBuffer> pixelsChanged = buffer.getChanges(); | ||
| * while (!pixelsChanged.isEmpty()) { | ||
| * PixelBuffer pixel = pixelsChanged.remove(); | ||
| * //Update the display | ||
| * } | ||
| * </pre> | ||
| */ | ||
| public Queue<PixelBuffer> getChanges() { | ||
| return changes; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,62 @@ | ||
| package com.pi4j.component.display; | ||
|
|
||
| import java.awt.Color; | ||
|
|
||
| public class PixelBuffer { | ||
| public final int x; | ||
| public final int y; | ||
| private Color color; | ||
|
|
||
| public PixelBuffer(final int x, final int y, Color color) { | ||
| this.x = x; | ||
| this.y = y; | ||
| this.color = color; | ||
| } | ||
|
|
||
| public Color getColor() { | ||
| return color; | ||
| } | ||
|
|
||
| public void setColor(Color color) { | ||
| this.color = color; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "Pixel(x="+x+", y="+y+")"; | ||
| } | ||
| } | ||
| package com.pi4j.component.display; | ||
|
|
||
| import java.awt.Color; | ||
|
|
||
| /* | ||
| * #%L | ||
| * ********************************************************************** | ||
| * ORGANIZATION : Pi4J | ||
| * PROJECT : Pi4J :: Device Abstractions | ||
| * FILENAME : PixelBuffer.java | ||
| * | ||
| * This file is part of the Pi4J project. More information about | ||
| * this project can be found here: http://www.pi4j.com/ | ||
| * ********************************************************************** | ||
| * %% | ||
| * Copyright (C) 2012 - 2016 Pi4J | ||
| * %% | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Lesser Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Lesser Public | ||
| * License along with this program. If not, see | ||
| * <http://www.gnu.org/licenses/lgpl-3.0.html>. | ||
| * #L% | ||
| * | ||
| * @author SrMouraSilva | ||
| */ | ||
|
|
||
| /** | ||
| * <p>Store in memory a pixel color state</p> | ||
| */ | ||
| public class PixelBuffer { | ||
| public final int x; | ||
| public final int y; | ||
| private Color color; | ||
|
|
||
| public PixelBuffer(final int x, final int y, Color color) { | ||
| this.x = x; | ||
| this.y = y; | ||
| this.color = color; | ||
| } | ||
|
|
||
| public Color getColor() { | ||
| return color; | ||
| } | ||
|
|
||
| public void setColor(Color color) { | ||
| this.color = color; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "Pixel(x="+x+", y="+y+")"; | ||
| } | ||
| } |
Oops, something went wrong.