diff --git a/src/burai/app/project/viewer/result/graph/QEFXDosButton.java b/src/burai/app/project/viewer/result/graph/QEFXDosButton.java index a721cca..f123d33 100644 --- a/src/burai/app/project/viewer/result/graph/QEFXDosButton.java +++ b/src/burai/app/project/viewer/result/graph/QEFXDosButton.java @@ -29,7 +29,8 @@ public class QEFXDosButton extends QEFXGraphButton { private static final String BUTTON_FONT_COLOR = "-fx-text-fill: ivory"; private static final String BUTTON_BACKGROUND = "-fx-background-color: derive(lightslategrey, -45.0%)"; - public static QEFXResultButtonWrapper getWrapper(QEFXProjectController projectController, Project project) { + public static QEFXResultButtonWrapper getWrapper(QEFXProjectController projectController, + Project project) { if (projectController == null) { return null; } @@ -50,12 +51,14 @@ public class QEFXDosButton extends QEFXGraphButton { } List dosDataList = projectDos.listDosData(); - if (dosDataList == null || dosDataList.size() < 2) { + //if (dosDataList == null || dosDataList.size() < 2) { + if (dosDataList == null || dosDataList.size() < 1) { return null; } String dirPath = project == null ? null : project.getDirectoryPath(); - String fileName = project == null ? null : (project.getPrefixName() + ".pdos_tot"); + //String fileName = project == null ? null : (project.getPrefixName() + ".pdos_tot"); + String fileName = project == null ? null : (project.getPrefixName() + ".dos"); File file = null; if (dirPath != null && fileName != null) { diff --git a/src/burai/run/RunningType.java b/src/burai/run/RunningType.java index 8d69a09..f592fb2 100644 --- a/src/burai/run/RunningType.java +++ b/src/burai/run/RunningType.java @@ -374,7 +374,18 @@ public enum RunningType { conditionList.add((project, input) -> true); conditionList.add((project, input) -> true); - conditionList.add((project, input) -> true); + + conditionList.add((project, input) -> { + QENamelist nmlSystem = input == null ? null : input.getNamelist(QEInput.NAMELIST_SYSTEM); + if (nmlSystem == null) { + return false; + } + + QEValue value = nmlSystem.getValue("occupations"); + String occup = value == null ? "" : value.getCharacterValue(); + return !(occup.startsWith("tetrahedra")); + }); + break; case Project.INPUT_MODE_BAND: