Skip to content

Commit

Permalink
fixed for replicator 5 profiles
Browse files Browse the repository at this point in the history
  • Loading branch information
@nothinglabs
nothinglabs committed Sep 10, 2014
1 parent 11ca9b2 commit bf4bd3f
Show file tree
Hide file tree
Showing 13 changed files with 144 additions and 135 deletions.
Binary file modified application.linux32/lib/proftweak.jar
View file
Binary file not shown.
31 changes: 16 additions & 15 deletions application.linux32/source/proftweak.java
View file
Expand Up @@ -358,7 +358,7 @@ else if (platform == LINUX) {
appTitle.setTextAlign(GAlign.LEFT, GAlign.MIDDLE);
appTitle.setLocalColorScheme(9);

GLabel appDesc = new GLabel(this, 385, 40, 300, 14, "A MakerWare profile editor (v1.2)");
GLabel appDesc = new GLabel(this, 385, 40, 300, 14, "A MakerWare profile editor (v1.3)");
appDesc.setFont(new Font("Dialog", Font.BOLD, 14));
appDesc.setTextAlign(GAlign.LEFT, GAlign.MIDDLE);
appDesc.setLocalColorScheme(9);
Expand Down Expand Up @@ -912,21 +912,22 @@ public void handleButtonEvents(GButton button, GEvent event) {
f.mkdir();
saveJSONObject(json, profileDir + saveNameText + "/miracle.json");


JCopy cp = new JCopy();
File f1 = new File(profileDir + profileSelector.getSelectedText() + "/end.gcode");
File f2 = new File(profileDir + saveNameText + "/end.gcode");
cp.copyFile(f1, f2);

f1 = new File(profileDir + profileSelector.getSelectedText() + "/start.gcode");
f2 = new File(profileDir + saveNameText + "/start.gcode");
cp.copyFile(f1, f2);

//don't fail if profile.json is missing (not used by makerbot desktop)
//don't fail if auxilary files are missing (not used by makerbot desktop / replicator 5)
try {
f1 = new File(profileDir + profileSelector.getSelectedText() + "/profile.json");
f2 = new File(profileDir + saveNameText + "/profile.json");
cp.copyFile(f1, f2); } catch (Exception e) {}
JCopy cp = new JCopy();
File f1 = new File(profileDir + profileSelector.getSelectedText() + "/end.gcode");
File f2 = new File(profileDir + saveNameText + "/end.gcode");
cp.copyFile(f1, f2);

f1 = new File(profileDir + profileSelector.getSelectedText() + "/start.gcode");
f2 = new File(profileDir + saveNameText + "/start.gcode");
cp.copyFile(f1, f2);

//only profile.json is missing for Makerbot desktop / earlier replicators
f1 = new File(profileDir + profileSelector.getSelectedText() + "/profile.json");
f2 = new File(profileDir + saveNameText + "/profile.json");
cp.copyFile(f1, f2);
} catch (Exception e) {}

if (button.tag == "SaveNewButton")
{
Expand Down
31 changes: 16 additions & 15 deletions application.linux32/source/proftweak.pde
View file
Expand Up @@ -335,7 +335,7 @@ try {
appTitle.setTextAlign(GAlign.LEFT, GAlign.MIDDLE);
appTitle.setLocalColorScheme(9);

GLabel appDesc = new GLabel(this, 385, 40, 300, 14, "A MakerWare profile editor (v1.2)");
GLabel appDesc = new GLabel(this, 385, 40, 300, 14, "A MakerWare profile editor (v1.3)");
appDesc.setFont(new Font("Dialog", Font.BOLD, 14));
appDesc.setTextAlign(GAlign.LEFT, GAlign.MIDDLE);
appDesc.setLocalColorScheme(9);
Expand Down Expand Up @@ -889,21 +889,22 @@ public void handleButtonEvents(GButton button, GEvent event) {
f.mkdir();
saveJSONObject(json, profileDir + saveNameText + "/miracle.json");


JCopy cp = new JCopy();
File f1 = new File(profileDir + profileSelector.getSelectedText() + "/end.gcode");
File f2 = new File(profileDir + saveNameText + "/end.gcode");
cp.copyFile(f1, f2);

f1 = new File(profileDir + profileSelector.getSelectedText() + "/start.gcode");
f2 = new File(profileDir + saveNameText + "/start.gcode");
cp.copyFile(f1, f2);

//don't fail if profile.json is missing (not used by makerbot desktop)
//don't fail if auxilary files are missing (not used by makerbot desktop / replicator 5)
try {
f1 = new File(profileDir + profileSelector.getSelectedText() + "/profile.json");
f2 = new File(profileDir + saveNameText + "/profile.json");
cp.copyFile(f1, f2); } catch (Exception e) {}
JCopy cp = new JCopy();
File f1 = new File(profileDir + profileSelector.getSelectedText() + "/end.gcode");
File f2 = new File(profileDir + saveNameText + "/end.gcode");
cp.copyFile(f1, f2);

f1 = new File(profileDir + profileSelector.getSelectedText() + "/start.gcode");
f2 = new File(profileDir + saveNameText + "/start.gcode");
cp.copyFile(f1, f2);

//only profile.json is missing for Makerbot desktop / earlier replicators
f1 = new File(profileDir + profileSelector.getSelectedText() + "/profile.json");
f2 = new File(profileDir + saveNameText + "/profile.json");
cp.copyFile(f1, f2);
} catch (Exception e) {}

if (button.tag == "SaveNewButton")
{
Expand Down
Binary file modified application.linux64/lib/proftweak.jar
View file
Binary file not shown.
31 changes: 16 additions & 15 deletions application.linux64/source/proftweak.java
View file
Expand Up @@ -358,7 +358,7 @@ else if (platform == LINUX) {
appTitle.setTextAlign(GAlign.LEFT, GAlign.MIDDLE);
appTitle.setLocalColorScheme(9);

GLabel appDesc = new GLabel(this, 385, 40, 300, 14, "A MakerWare profile editor (v1.2)");
GLabel appDesc = new GLabel(this, 385, 40, 300, 14, "A MakerWare profile editor (v1.3)");
appDesc.setFont(new Font("Dialog", Font.BOLD, 14));
appDesc.setTextAlign(GAlign.LEFT, GAlign.MIDDLE);
appDesc.setLocalColorScheme(9);
Expand Down Expand Up @@ -912,21 +912,22 @@ public void handleButtonEvents(GButton button, GEvent event) {
f.mkdir();
saveJSONObject(json, profileDir + saveNameText + "/miracle.json");


JCopy cp = new JCopy();
File f1 = new File(profileDir + profileSelector.getSelectedText() + "/end.gcode");
File f2 = new File(profileDir + saveNameText + "/end.gcode");
cp.copyFile(f1, f2);

f1 = new File(profileDir + profileSelector.getSelectedText() + "/start.gcode");
f2 = new File(profileDir + saveNameText + "/start.gcode");
cp.copyFile(f1, f2);

//don't fail if profile.json is missing (not used by makerbot desktop)
//don't fail if auxilary files are missing (not used by makerbot desktop / replicator 5)
try {
f1 = new File(profileDir + profileSelector.getSelectedText() + "/profile.json");
f2 = new File(profileDir + saveNameText + "/profile.json");
cp.copyFile(f1, f2); } catch (Exception e) {}
JCopy cp = new JCopy();
File f1 = new File(profileDir + profileSelector.getSelectedText() + "/end.gcode");
File f2 = new File(profileDir + saveNameText + "/end.gcode");
cp.copyFile(f1, f2);

f1 = new File(profileDir + profileSelector.getSelectedText() + "/start.gcode");
f2 = new File(profileDir + saveNameText + "/start.gcode");
cp.copyFile(f1, f2);

//only profile.json is missing for Makerbot desktop / earlier replicators
f1 = new File(profileDir + profileSelector.getSelectedText() + "/profile.json");
f2 = new File(profileDir + saveNameText + "/profile.json");
cp.copyFile(f1, f2);
} catch (Exception e) {}

if (button.tag == "SaveNewButton")
{
Expand Down
31 changes: 16 additions & 15 deletions application.linux64/source/proftweak.pde
View file
Expand Up @@ -335,7 +335,7 @@ try {
appTitle.setTextAlign(GAlign.LEFT, GAlign.MIDDLE);
appTitle.setLocalColorScheme(9);

GLabel appDesc = new GLabel(this, 385, 40, 300, 14, "A MakerWare profile editor (v1.2)");
GLabel appDesc = new GLabel(this, 385, 40, 300, 14, "A MakerWare profile editor (v1.3)");
appDesc.setFont(new Font("Dialog", Font.BOLD, 14));
appDesc.setTextAlign(GAlign.LEFT, GAlign.MIDDLE);
appDesc.setLocalColorScheme(9);
Expand Down Expand Up @@ -889,21 +889,22 @@ public void handleButtonEvents(GButton button, GEvent event) {
f.mkdir();
saveJSONObject(json, profileDir + saveNameText + "/miracle.json");


JCopy cp = new JCopy();
File f1 = new File(profileDir + profileSelector.getSelectedText() + "/end.gcode");
File f2 = new File(profileDir + saveNameText + "/end.gcode");
cp.copyFile(f1, f2);

f1 = new File(profileDir + profileSelector.getSelectedText() + "/start.gcode");
f2 = new File(profileDir + saveNameText + "/start.gcode");
cp.copyFile(f1, f2);

//don't fail if profile.json is missing (not used by makerbot desktop)
//don't fail if auxilary files are missing (not used by makerbot desktop / replicator 5)
try {
f1 = new File(profileDir + profileSelector.getSelectedText() + "/profile.json");
f2 = new File(profileDir + saveNameText + "/profile.json");
cp.copyFile(f1, f2); } catch (Exception e) {}
JCopy cp = new JCopy();
File f1 = new File(profileDir + profileSelector.getSelectedText() + "/end.gcode");
File f2 = new File(profileDir + saveNameText + "/end.gcode");
cp.copyFile(f1, f2);

f1 = new File(profileDir + profileSelector.getSelectedText() + "/start.gcode");
f2 = new File(profileDir + saveNameText + "/start.gcode");
cp.copyFile(f1, f2);

//only profile.json is missing for Makerbot desktop / earlier replicators
f1 = new File(profileDir + profileSelector.getSelectedText() + "/profile.json");
f2 = new File(profileDir + saveNameText + "/profile.json");
cp.copyFile(f1, f2);
} catch (Exception e) {}

if (button.tag == "SaveNewButton")
{
Expand Down
Binary file modified application.macosx/proftweak.app/Contents/Resources/Java/proftweak.jar
View file
Binary file not shown.
31 changes: 16 additions & 15 deletions application.macosx/source/proftweak.java
View file
Expand Up @@ -358,7 +358,7 @@ else if (platform == LINUX) {
appTitle.setTextAlign(GAlign.LEFT, GAlign.MIDDLE);
appTitle.setLocalColorScheme(9);

GLabel appDesc = new GLabel(this, 385, 40, 300, 14, "A MakerWare profile editor (v1.2)");
GLabel appDesc = new GLabel(this, 385, 40, 300, 14, "A MakerWare profile editor (v1.3)");
appDesc.setFont(new Font("Dialog", Font.BOLD, 14));
appDesc.setTextAlign(GAlign.LEFT, GAlign.MIDDLE);
appDesc.setLocalColorScheme(9);
Expand Down Expand Up @@ -912,21 +912,22 @@ public void handleButtonEvents(GButton button, GEvent event) {
f.mkdir();
saveJSONObject(json, profileDir + saveNameText + "/miracle.json");


JCopy cp = new JCopy();
File f1 = new File(profileDir + profileSelector.getSelectedText() + "/end.gcode");
File f2 = new File(profileDir + saveNameText + "/end.gcode");
cp.copyFile(f1, f2);

f1 = new File(profileDir + profileSelector.getSelectedText() + "/start.gcode");
f2 = new File(profileDir + saveNameText + "/start.gcode");
cp.copyFile(f1, f2);

//don't fail if profile.json is missing (not used by makerbot desktop)
//don't fail if auxilary files are missing (not used by makerbot desktop / replicator 5)
try {
f1 = new File(profileDir + profileSelector.getSelectedText() + "/profile.json");
f2 = new File(profileDir + saveNameText + "/profile.json");
cp.copyFile(f1, f2); } catch (Exception e) {}
JCopy cp = new JCopy();
File f1 = new File(profileDir + profileSelector.getSelectedText() + "/end.gcode");
File f2 = new File(profileDir + saveNameText + "/end.gcode");
cp.copyFile(f1, f2);

f1 = new File(profileDir + profileSelector.getSelectedText() + "/start.gcode");
f2 = new File(profileDir + saveNameText + "/start.gcode");
cp.copyFile(f1, f2);

//only profile.json is missing for Makerbot desktop / earlier replicators
f1 = new File(profileDir + profileSelector.getSelectedText() + "/profile.json");
f2 = new File(profileDir + saveNameText + "/profile.json");
cp.copyFile(f1, f2);
} catch (Exception e) {}

if (button.tag == "SaveNewButton")
{
Expand Down
31 changes: 16 additions & 15 deletions application.macosx/source/proftweak.pde
View file
Expand Up @@ -335,7 +335,7 @@ try {
appTitle.setTextAlign(GAlign.LEFT, GAlign.MIDDLE);
appTitle.setLocalColorScheme(9);

GLabel appDesc = new GLabel(this, 385, 40, 300, 14, "A MakerWare profile editor (v1.2)");
GLabel appDesc = new GLabel(this, 385, 40, 300, 14, "A MakerWare profile editor (v1.3)");
appDesc.setFont(new Font("Dialog", Font.BOLD, 14));
appDesc.setTextAlign(GAlign.LEFT, GAlign.MIDDLE);
appDesc.setLocalColorScheme(9);
Expand Down Expand Up @@ -889,21 +889,22 @@ public void handleButtonEvents(GButton button, GEvent event) {
f.mkdir();
saveJSONObject(json, profileDir + saveNameText + "/miracle.json");


JCopy cp = new JCopy();
File f1 = new File(profileDir + profileSelector.getSelectedText() + "/end.gcode");
File f2 = new File(profileDir + saveNameText + "/end.gcode");
cp.copyFile(f1, f2);

f1 = new File(profileDir + profileSelector.getSelectedText() + "/start.gcode");
f2 = new File(profileDir + saveNameText + "/start.gcode");
cp.copyFile(f1, f2);

//don't fail if profile.json is missing (not used by makerbot desktop)
//don't fail if auxilary files are missing (not used by makerbot desktop / replicator 5)
try {
f1 = new File(profileDir + profileSelector.getSelectedText() + "/profile.json");
f2 = new File(profileDir + saveNameText + "/profile.json");
cp.copyFile(f1, f2); } catch (Exception e) {}
JCopy cp = new JCopy();
File f1 = new File(profileDir + profileSelector.getSelectedText() + "/end.gcode");
File f2 = new File(profileDir + saveNameText + "/end.gcode");
cp.copyFile(f1, f2);

f1 = new File(profileDir + profileSelector.getSelectedText() + "/start.gcode");
f2 = new File(profileDir + saveNameText + "/start.gcode");
cp.copyFile(f1, f2);

//only profile.json is missing for Makerbot desktop / earlier replicators
f1 = new File(profileDir + profileSelector.getSelectedText() + "/profile.json");
f2 = new File(profileDir + saveNameText + "/profile.json");
cp.copyFile(f1, f2);
} catch (Exception e) {}

if (button.tag == "SaveNewButton")
{
Expand Down
Binary file modified application.windows32/lib/proftweak.jar
View file
Binary file not shown.
31 changes: 16 additions & 15 deletions application.windows32/source/proftweak.java
View file
Expand Up @@ -358,7 +358,7 @@ else if (platform == LINUX) {
appTitle.setTextAlign(GAlign.LEFT, GAlign.MIDDLE);
appTitle.setLocalColorScheme(9);

GLabel appDesc = new GLabel(this, 385, 40, 300, 14, "A MakerWare profile editor (v1.2)");
GLabel appDesc = new GLabel(this, 385, 40, 300, 14, "A MakerWare profile editor (v1.3)");
appDesc.setFont(new Font("Dialog", Font.BOLD, 14));
appDesc.setTextAlign(GAlign.LEFT, GAlign.MIDDLE);
appDesc.setLocalColorScheme(9);
Expand Down Expand Up @@ -912,21 +912,22 @@ public void handleButtonEvents(GButton button, GEvent event) {
f.mkdir();
saveJSONObject(json, profileDir + saveNameText + "/miracle.json");


JCopy cp = new JCopy();
File f1 = new File(profileDir + profileSelector.getSelectedText() + "/end.gcode");
File f2 = new File(profileDir + saveNameText + "/end.gcode");
cp.copyFile(f1, f2);

f1 = new File(profileDir + profileSelector.getSelectedText() + "/start.gcode");
f2 = new File(profileDir + saveNameText + "/start.gcode");
cp.copyFile(f1, f2);

//don't fail if profile.json is missing (not used by makerbot desktop)
//don't fail if auxilary files are missing (not used by makerbot desktop / replicator 5)
try {
f1 = new File(profileDir + profileSelector.getSelectedText() + "/profile.json");
f2 = new File(profileDir + saveNameText + "/profile.json");
cp.copyFile(f1, f2); } catch (Exception e) {}
JCopy cp = new JCopy();
File f1 = new File(profileDir + profileSelector.getSelectedText() + "/end.gcode");
File f2 = new File(profileDir + saveNameText + "/end.gcode");
cp.copyFile(f1, f2);

f1 = new File(profileDir + profileSelector.getSelectedText() + "/start.gcode");
f2 = new File(profileDir + saveNameText + "/start.gcode");
cp.copyFile(f1, f2);

//only profile.json is missing for Makerbot desktop / earlier replicators
f1 = new File(profileDir + profileSelector.getSelectedText() + "/profile.json");
f2 = new File(profileDir + saveNameText + "/profile.json");
cp.copyFile(f1, f2);
} catch (Exception e) {}

if (button.tag == "SaveNewButton")
{
Expand Down
31 changes: 16 additions & 15 deletions application.windows32/source/proftweak.pde
View file
Expand Up @@ -335,7 +335,7 @@ try {
appTitle.setTextAlign(GAlign.LEFT, GAlign.MIDDLE);
appTitle.setLocalColorScheme(9);

GLabel appDesc = new GLabel(this, 385, 40, 300, 14, "A MakerWare profile editor (v1.2)");
GLabel appDesc = new GLabel(this, 385, 40, 300, 14, "A MakerWare profile editor (v1.3)");
appDesc.setFont(new Font("Dialog", Font.BOLD, 14));
appDesc.setTextAlign(GAlign.LEFT, GAlign.MIDDLE);
appDesc.setLocalColorScheme(9);
Expand Down Expand Up @@ -889,21 +889,22 @@ public void handleButtonEvents(GButton button, GEvent event) {
f.mkdir();
saveJSONObject(json, profileDir + saveNameText + "/miracle.json");


JCopy cp = new JCopy();
File f1 = new File(profileDir + profileSelector.getSelectedText() + "/end.gcode");
File f2 = new File(profileDir + saveNameText + "/end.gcode");
cp.copyFile(f1, f2);

f1 = new File(profileDir + profileSelector.getSelectedText() + "/start.gcode");
f2 = new File(profileDir + saveNameText + "/start.gcode");
cp.copyFile(f1, f2);

//don't fail if profile.json is missing (not used by makerbot desktop)
//don't fail if auxilary files are missing (not used by makerbot desktop / replicator 5)
try {
f1 = new File(profileDir + profileSelector.getSelectedText() + "/profile.json");
f2 = new File(profileDir + saveNameText + "/profile.json");
cp.copyFile(f1, f2); } catch (Exception e) {}
JCopy cp = new JCopy();
File f1 = new File(profileDir + profileSelector.getSelectedText() + "/end.gcode");
File f2 = new File(profileDir + saveNameText + "/end.gcode");
cp.copyFile(f1, f2);

f1 = new File(profileDir + profileSelector.getSelectedText() + "/start.gcode");
f2 = new File(profileDir + saveNameText + "/start.gcode");
cp.copyFile(f1, f2);

//only profile.json is missing for Makerbot desktop / earlier replicators
f1 = new File(profileDir + profileSelector.getSelectedText() + "/profile.json");
f2 = new File(profileDir + saveNameText + "/profile.json");
cp.copyFile(f1, f2);
} catch (Exception e) {}

if (button.tag == "SaveNewButton")
{
Expand Down

0 comments on commit bf4bd3f

Please sign in to comment.