Skip to content

Commit

Permalink
use traditiona file copy
Browse files Browse the repository at this point in the history
  • Loading branch information
madhephaestus committed Jun 19, 2023
1 parent 05823df commit 3ff458e
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.WatchEvent;
import java.text.DecimalFormat;
Expand All @@ -18,7 +19,6 @@
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.InvalidRemoteException;
import org.eclipse.jgit.api.errors.TransportException;
import org.python.google.common.io.Files;

import com.neuronrobotics.bowlerstudio.IssueReportingExceptionHandler;
import com.neuronrobotics.bowlerstudio.physics.TransformFactory;
Expand All @@ -27,6 +27,7 @@
import com.neuronrobotics.bowlerstudio.util.FileChangeWatcher;
import com.neuronrobotics.bowlerstudio.util.FileWatchDeviceWrapper;
import com.neuronrobotics.bowlerstudio.util.IFileChangeListener;
import com.neuronrobotics.bowlerstudio.vitamins.VitaminBomManager;
import com.neuronrobotics.bowlerstudio.vitamins.Vitamins;
import com.neuronrobotics.sdk.addons.kinematics.AbstractKinematicsNR;
import com.neuronrobotics.sdk.addons.kinematics.AbstractLink;
Expand Down Expand Up @@ -765,31 +766,33 @@ public LinkConfiguration getLinkConfiguration(CSG cad) {
}

public ArrayList<File> generateStls(MobileBase base, File baseDirForFiles, boolean kinematic) throws Exception {
File dir = new File(baseDirForFiles.getAbsolutePath() + "/" + base.getScriptingName());
if (!dir.exists())
dir.mkdirs();
IgenerateBed bed=null;
String baseURL = base.getGitSelfSource()[0];
File baseWorkspaceFile = ScriptingEngine.getRepositoryCloneDirectory(baseURL);
bed = getPrintBed(baseDirForFiles, bed, baseWorkspaceFile);
bed = getPrintBed(dir, bed, baseWorkspaceFile);
if (bed == null || kinematic) {
return _generateStls(base, baseDirForFiles, kinematic);
return _generateStls(base, dir, kinematic);
}

System.out.println("Found arrangeBed API in CAD engine");
List<CSG> totalAssembly = bed.arrangeBed(base);
getUi().setAllCSG(totalAssembly, getCadScriptFromMobileBase(base));
File dir = new File(baseDirForFiles.getAbsolutePath() + "/" + base.getScriptingName());
if (!dir.exists())
dir.mkdirs();


return new CadFileExporter(getUi()).generateManufacturingParts(totalAssembly, dir);
}
public IgenerateBed getPrintBed(File baseDirForFiles, IgenerateBed bed, File baseWorkspaceFile) throws IOException {
File bomCSV = new File(baseWorkspaceFile.getAbsolutePath()+"/manufacturing/bom.csv");
File bomCSV = new File(baseWorkspaceFile.getAbsolutePath()+"/"+VitaminBomManager.MANUFACTURING_BOM_CSV);
if(bomCSV.exists()) {
Files.copy(bomCSV,new File(baseDirForFiles.getAbsolutePath()+"/bom.csv"));

Files.copy(bomCSV.toPath(),new File(baseDirForFiles.getAbsolutePath()+"/bom.csv").toPath());
}
File bom = new File(baseWorkspaceFile.getAbsolutePath()+"/manufacturing/bom.json");
File bom = new File(baseWorkspaceFile.getAbsolutePath()+"/"+VitaminBomManager.MANUFACTURING_BOM_JSON);
if(bom.exists()) {
Files.copy(bom,new File(baseDirForFiles.getAbsolutePath()+"/bom.json"));
Files.copy(bom.toPath(),new File(baseDirForFiles.getAbsolutePath()+"/bom.json").toPath());
}
try{
bed= getIgenerateBed();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
import javafx.scene.paint.Color;

public class VitaminBomManager {
public static final String MANUFACTURING_BOM_BASE = "manufacturing/bom";
public static final String MANUFACTURING_BOM_JSON = MANUFACTURING_BOM_BASE+".json";
public static final String MANUFACTURING_BOM_CSV = MANUFACTURING_BOM_BASE+".csv";

private class VitaminElement {
String name;
Expand All @@ -38,7 +41,7 @@ private class VitaminElement {
public VitaminBomManager(String url) throws IOException {
baseURL = url;
File baseWorkspaceFile = ScriptingEngine.getRepositoryCloneDirectory(baseURL);
File bom = new File(baseWorkspaceFile.getAbsolutePath() + "/manufacturing/bom.json");
File bom = new File(baseWorkspaceFile.getAbsolutePath() + "/"+MANUFACTURING_BOM_JSON);
if (!bom.exists()) {
if (!bom.getParentFile().exists()) {
bom.getParentFile().mkdir();
Expand Down Expand Up @@ -151,7 +154,7 @@ private synchronized void saveLocal() {
}

try {
ScriptingEngine.commit(baseURL, ScriptingEngine.getBranch(baseURL),"manufacturing/bom.json", content,
ScriptingEngine.commit(baseURL, ScriptingEngine.getBranch(baseURL),MANUFACTURING_BOM_JSON, content,
"Save Bill Of Material", true);
ScriptingEngine.commit(baseURL, ScriptingEngine.getBranch(baseURL),"manufacturing/bom.csv", csv,
"Save Bill Of Material", true);
Expand Down

0 comments on commit 3ff458e

Please sign in to comment.