sigonasr2/SlideshowViewer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added in logging level 2 for Debugging purposes.

Browse Source
This commit is contained in:
sigonasr2 2017-09-18 21:14:05 -05:00
parent 6e904003b9
commit febc1816e9
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
SlideshowViewer/SlideshowViewer.jar
View File

Binary file not shown.

25
SlideshowViewer/src/sig/SlideshowViewer/SlideshowViewer.java
View File

@ -53,7 +53,8 @@ public class SlideshowViewer {
public static long nextImageChange = 0; public static long nextImageChange = 0;
public static int slideshowDelay = 60; public static int slideshowDelay = 60;
public static int slideshowMarker = 0; public static int slideshowMarker = 0;
final public static String PROGRAM_VERSION = "1.1"; final public static String PROGRAM_VERSION = "1.2";
public static int debugLevel = 1;
public static List<String> debugqueue = new ArrayList<String>(); public static List<String> debugqueue = new ArrayList<String>();
static Timer programClock = new Timer(1000,new ActionListener(){ static Timer programClock = new Timer(1000,new ActionListener(){
@Override @Override
@ -377,6 +378,12 @@ public class SlideshowViewer {
debugqueue.add(string); debugqueue.add(string);
System.out.println(string); System.out.println(string);
} }
private static void PrintDebugMessageToSystemAndAddToQueue(String string) {
if (debugLevel>=2) {
debugqueue.add(string);
System.out.println(string);
}
}
public static void PrintToSystemAndAddToDebugBox(String message) { public static void PrintToSystemAndAddToDebugBox(String message) {
if (debugBox!=null) { if (debugBox!=null) {
@ -390,19 +397,22 @@ public class SlideshowViewer {
public static void FlushDebugQueue() { public static void FlushDebugQueue() {
if (debugBox!=null) { if (debugBox!=null) {
for (String s : debugqueue) { for (String s : debugqueue) {
debugBox.setText((debugBox.getText().length()>5000?debugBox.getText().substring(debugBox.getText().length()-5000, debugBox.getText().length()-1):debugBox.getText())+s+"\n"); debugBox.setText((debugBox.getText().length()>5000?debugBox.getText().substring(debugBox.getText().length()-5000, debugBox.getText().length()-1):debugBox.getText())+s+"\n");
} }
debugqueue.clear(); debugqueue.clear();
} }
} }
protected static void performStep() { protected static void performStep() {
//PrintDebugMessageToSystemAndAddToQueue("Running Step...");
DetectDirectoryChange(); DetectDirectoryChange();
if (button.getText().contains("Stop")) { if (button.getText().contains("Stop")) {
PrintDebugMessageToSystemAndAddToQueue("Button says Stop...Proceed with Tick.");
currentTick++; currentTick++;
PrintDebugMessageToSystemAndAddToQueue(" Tick is now "+currentTick);
if (currentTick >= nextImageChange) { if (currentTick >= nextImageChange) {
SelectImage(); SelectImage();
PrintDebugMessageToSystemAndAddToQueue(" Changing image...");
} }
} }
int currentdelay = 60; int currentdelay = 60;
@ -419,6 +429,7 @@ public class SlideshowViewer {
FlushDebugQueue(); FlushDebugQueue();
} }
slideshowDelay = currentdelay; slideshowDelay = currentdelay;
//PrintDebugMessageToSystemAndAddToQueue(" Delay is "+slideshowDelay);
} }
private static void DetectDirectoryChange() { private static void DetectDirectoryChange() {
@ -486,6 +497,7 @@ public class SlideshowViewer {
sig.SlideshowViewer.FileUtils.logToFile("DELAY="+slideshowDelay+"", "config_slideshow.txt"); sig.SlideshowViewer.FileUtils.logToFile("DELAY="+slideshowDelay+"", "config_slideshow.txt");
sig.SlideshowViewer.FileUtils.logToFile("MARKER="+slideshowMarker+"", "config_slideshow.txt"); sig.SlideshowViewer.FileUtils.logToFile("MARKER="+slideshowMarker+"", "config_slideshow.txt");
sig.SlideshowViewer.FileUtils.logToFile("VERSION="+PROGRAM_VERSION+"", "config_slideshow.txt"); sig.SlideshowViewer.FileUtils.logToFile("VERSION="+PROGRAM_VERSION+"", "config_slideshow.txt");
sig.SlideshowViewer.FileUtils.logToFile("LOGGINGLEVEL="+debugLevel+"", "config_slideshow.txt");
} }
private static void LoadConfigurationFile() { private static void LoadConfigurationFile() {
@ -496,6 +508,10 @@ public class SlideshowViewer {
System.out.println("\nConfig does not have correct number of data points! Set it up as version 1.0!"); System.out.println("\nConfig does not have correct number of data points! Set it up as version 1.0!");
sig.SlideshowViewer.FileUtils.logToFile("VERSION=1.0", "config_slideshow.txt"); sig.SlideshowViewer.FileUtils.logToFile("VERSION=1.0", "config_slideshow.txt");
} }
if (data.length==6) {
System.out.println("\nConfig does not have correct number of data points! Set it up with logginglevel!");
sig.SlideshowViewer.FileUtils.logToFile("LOGGINGLEVEL=1", "config_slideshow.txt");
}
data = sig.SlideshowViewer.FileUtils.readFromFile("config_slideshow.txt"); data = sig.SlideshowViewer.FileUtils.readFromFile("config_slideshow.txt");
int counter = 0; int counter = 0;
for (String line : data) { for (String line : data) {
@ -532,6 +548,9 @@ public class SlideshowViewer {
outputFilePath = "./slideshow_image.png"; outputFilePath = "./slideshow_image.png";
} }
}break; }break;
case 6:{
debugLevel = Integer.parseInt(split);
}break;
default: default:
return; return;
} }