hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor doc material loading to OpenRocketDocument

Browse Source
This commit is contained in:
SiboVG 2024-08-07 15:41:04 +02:00
parent 65116fcb58
commit 0d5952cfa3
2 changed files with 148 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java
View File

@ -4,6 +4,7 @@ import java.io.File;
import java.util.*; import java.util.*;
import info.openrocket.core.file.wavefrontobj.export.OBJExportOptions; import info.openrocket.core.file.wavefrontobj.export.OBJExportOptions;
import info.openrocket.core.material.Material;
import info.openrocket.core.preferences.ApplicationPreferences; import info.openrocket.core.preferences.ApplicationPreferences;
import info.openrocket.core.preferences.DocumentPreferences; import info.openrocket.core.preferences.DocumentPreferences;
import info.openrocket.core.rocketcomponent.*; import info.openrocket.core.rocketcomponent.*;
@ -881,4 +882,21 @@ public class OpenRocketDocument implements ComponentChangeListener, StateChangeL
public DocumentPreferences getDocumentPreferences() { public DocumentPreferences getDocumentPreferences() {
return docPrefs; return docPrefs;
} }
/**
* Load all materials that are user-defined and document materials to the document material database.
*/
public void reloadDocumentMaterials() {
for (RocketComponent c : getRocket()) {
List<Material> materials = c.getAllMaterials();
if (materials == null) {
continue;
}
for (Material m : materials) {
if (m.isUserDefined() && m.isDocumentMaterial()) {
getDocumentPreferences().addMaterial(m);
}
}
}
}
} }

19
core/src/main/java/info/openrocket/core/file/GeneralRocketLoader.java
View File

@ -246,23 +246,6 @@ public class GeneralRocketLoader {
} }
} }
/**
* Load all materials that are user-defined and document materials to the document material database.
*/
private void loadMaterialsToDocument() {
for (RocketComponent c : doc.getRocket()) {
List<Material> materials = c.getAllMaterials();
if (materials == null) {
continue;
}
for (Material m : materials) {
if (m.isUserDefined() && m.isDocumentMaterial()) {
doc.getDocumentPreferences().addMaterial(m);
}
}
}
}
private void loadUsing(RocketLoader loader, InputStream source, String fileName) throws RocketLoadException { private void loadUsing(RocketLoader loader, InputStream source, String fileName) throws RocketLoadException {
warnings.clear(); warnings.clear();
DocumentLoadingContext context = new DocumentLoadingContext(); DocumentLoadingContext context = new DocumentLoadingContext();
@ -273,6 +256,6 @@ public class GeneralRocketLoader {
warnings.addAll(loader.getWarnings()); warnings.addAll(loader.getWarnings());
// Check for custom materials that need to be added to the document material database // Check for custom materials that need to be added to the document material database
loadMaterialsToDocument(); doc.reloadDocumentMaterials();
} }
} }