Skip to content

Commit

Permalink
범위명령 추가를 마지막으로 베타4 제작
Browse files Browse the repository at this point in the history
  • Loading branch information
EX867 committed Sep 22, 2017
1 parent e235de0 commit 1ae52ce
Show file tree
Hide file tree
Showing 32 changed files with 412 additions and 222 deletions.
6 changes: 4 additions & 2 deletions PW2_0/ExtraUI.pde
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ void drawInputLine() {
stroke(UIcolors[I_FOREGROUND]);
int i1=getUIid("I_DEFAULTINPUT");
int i2=getUIid("I_OLDINPUT");
int i3=getUIid("I_CYXMODE");
int i3=getUIidRev("I_RIGHTOFFMODE");
int i4=getUIid("I_CYXMODE");
line(50, UI[i1].position.y, UI[i1].position.x-UI[i1].size.x-40, UI[i1].position.y);
line(50, UI[i2].position.y, UI[i2].position.x-UI[i2].size.x-40, UI[i2].position.y);
line(50, UI[i3].position.y, UI[i3].position.x-UI[i3].size.x-40, UI[i3].position.y);
line(50, UI[i1].position.y, 50, UI[i3].position.y);
line(50, UI[i4].position.y, UI[i3].position.x-UI[i4].size.x-40, UI[i4].position.y);
line(50, UI[i1].position.y, 50, UI[i4].position.y);
noStroke();
}
43 changes: 28 additions & 15 deletions PW2_0/PW2_0.pde
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ void detectProcessing() {
}
float Width=1420;
float Height=920;
String VERSION="{\"type\"=\"beta\",\"major\"=2,\"minor\"=0,\"patch\"=0,\"build\"=4,\"build_date\"=\"17----\"}";//type=beta or production
float initialWidth=1420;
float initialHeight=920;
String VERSION="{\"type\"=\"beta\",\"major\"=2,\"minor\"=0,\"patch\"=0,\"build\"=4,\"build_date\"=\"170922\"}";//type=beta or production
String startText="PositionWriter <major>.<minor> <type> [<build>] (<build_date> build)";//template for startText. see buildVersion() to get actual string.
String title_suffix=" | Position Writer 2.0";
String title_filename="";
Expand All @@ -29,6 +31,7 @@ boolean loadedOnce_led=false;
boolean loadedOnce_keySound=false;

boolean jeonjehong=false;
boolean initialOpen=false;
/*
// === Note for writing manual === //
* : "Shift+Number" in Manualinput has deleted.
Expand All @@ -44,16 +47,13 @@ boolean jeonjehong=false;
//other
2.+ : multi threading
2.+ : enhance midi input&&output support**
2.+ : disable auto input mode**
2.+ : add html+vel color autoinput(option)
2.+ : change getUIid() to binary search (or hashmap)
2.+ : change DelayValue to DelayValueSum and do binary search
2.+ : change Analyzer.getDelayValue() to use cached values
2.+ : add KeySoundPlayer and midi->autoPlay tools
2.+ : support skip blank characters character in find replace.
2.+ : directly edit and save zip(for users)
2.+ : (option) keySound autosave, undo
2.+ : linux file chooser (element name Button:I_PATH)
2.+ : linux file chooser
2.+ : multi language support
2.+ : led editor multi tab support
2.+ : note on highlight
Expand All @@ -64,20 +64,24 @@ boolean jeonjehong=false;
2.+ : remote controller support (https://stackoverflow.com/questions/21628146/using-sockets-between-android-device-and-pc-same-network)
2.+ : midi<->led converter
2.+ : autoplay led link - triggering led(run triggering and frame both in led editor, stop link with clear button - this will enable rnd command in led editor too.)
2.+ : drag to print range commands
skinedit : change theme to appcompat-material
uncloud : wait uncloud update!!
uncloud : customize list : display date and upload state inside list.
uncloud : infoviewer design upgrade.
// ==== ERROR ==== //
// ==== WARNING ==== //
hardcoded 8(textEditor)
hardcoded numbers(textEditor,skinedit)
*/
float initialScale;
void settings() {
size(880+480+60, 800+60+60);
smooth(8);
//size(displayHeight*142/92,displayHeight);
//scale=(float)142/92;
initialScale=min((float)displayWidth/1920, (float)displayHeight/1080);
initialWidth=1420;//*displayScale;
initialHeight=920;//*displayScale;
size(int(1420*initialScale), int(920*initialScale));
scale=initialScale;//(float)142/92;
}
//https://github.com/processing/processing/wiki/Export-Info-and-Tips
boolean Debug=false;
Expand Down Expand Up @@ -140,6 +144,11 @@ void setup_main() {
jeonjehong=true;
println("jeonjehong=true");
}
if (new File(joinPath(getDataPath(), "Initial")).isFile()) {
initialOpen=true;
println("initial=true");
new File(joinPath(getDataPath(), "Initial")).delete();
}
//load data and settings
//...
//setup data
Expand All @@ -159,6 +168,10 @@ void setup_main() {
//
testSetup();
title_filename=newFile();
// === Initial Open === //
if (initialOpen) {
registerPrepare(getFrameid("F_INITIAL"));
}
// === Load in start === // loadedOnce_xxx can't be true on start, but settings.xml can set it to true on start. if true, reload.
if (loadedOnce_keySound) {
printLog("LoadInStart", title_keysoundfoldername);
Expand Down Expand Up @@ -187,13 +200,13 @@ void setup_main() {
} else {
title_keyledfilename=title_filename;
}
//
//end things
surface.setTitle(title_filename+title_edited+title_suffix);
checkVersion();
popMatrix();
popMatrix();
statusR.text=startText;
statusR.render();
popMatrix();
uncloud_setup();
}
long drawStart=0;
Expand Down Expand Up @@ -323,22 +336,22 @@ void editable_keyTyped() {
temp.render();
frameSlider.render();
} else if (functionId==S_AUTOINPUTUP) {
if (Mode==AUTOINPUT) {
if (Mode==AUTOINPUT||Mode==RIGHTOFFMODE) {
if (selectedColorType==DS_VEL)((VelocityButton)UI[velnumId]).cursorUp();
else ((ColorPicker)UI[htmlselId]).cursorUp();
}
} else if (functionId==S_AUTOINPUTLEFT) {
if (Mode==AUTOINPUT) {
if (Mode==AUTOINPUT||Mode==RIGHTOFFMODE) {
if (selectedColorType==DS_VEL)((VelocityButton)UI[velnumId]).cursorLeft();
else ((ColorPicker)UI[htmlselId]).cursorLeft();
}
} else if (functionId==S_AUTOINPUTDOWN) {
if (Mode==AUTOINPUT) {
if (Mode==AUTOINPUT||Mode==RIGHTOFFMODE) {
if (selectedColorType==DS_VEL)((VelocityButton)UI[velnumId]).cursorDown();
else ((ColorPicker)UI[htmlselId]).cursorDown();
}
} else if (functionId==S_AUTOINPUTRIGHT) {
if (Mode==AUTOINPUT) {
if (Mode==AUTOINPUT||Mode==RIGHTOFFMODE) {
if (selectedColorType==DS_VEL)((VelocityButton)UI[velnumId]).cursorRight();
else ((ColorPicker)UI[htmlselId]).cursorRight();
}
Expand Down
1 change: 1 addition & 0 deletions PW2_0/ResGen.pde
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ void generateSettings() {
text+=" <I_AUTOSTOP value=\""+str(((Button)UI[getUIid("I_AUTOSTOP")]).value)+"\"></I_AUTOSTOP>\n";
text+=" <I_DEFAULTINPUT value=\""+str(((Button)UI[getUIid("I_DEFAULTINPUT")]).value)+"\"></I_DEFAULTINPUT>\n";
text+=" <I_OLDINPUT value=\""+str(((Button)UI[getUIid("I_OLDINPUT")]).value)+"\"></I_OLDINPUT>\n";
text+=" <I_RIGHTOFFMODE value=\""+str(((Button)UI[getUIid("I_RIGHTOFFMODE")]).value)+"\"></I_RIGHTOFFMODE>\n";
text+=" <I_CYXMODE value=\""+str(((Button)UI[getUIid("I_CYXMODE")]).value)+"\"></I_CYXMODE>\n";
text+=" <I_LANGUAGE value=\""+((DropDown)UI[getUIid("I_LANGUAGE")]).selection+"\"></I_LANGUAGE>\n";
text+=" <I_DESCRIPTIONTIME value=\""+((TextBox)UI[getUIid("I_DESCRIPTIONTIME")]).value+"\"></I_DESCRIPTIONTIME>\n";
Expand Down
Loading

0 comments on commit 1ae52ce

Please sign in to comment.