scnc
/
burai
mirror of https://github.com/BURAI-team/burai.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update DesignerEditor

This commit is contained in:
nisihara1 2017-08-09 15:47:33 +09:00
parent 6677e16975
commit 41f037da44
2 changed files with 257 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/burai/app/project/editor/designer/QEFXDesignerEditor.fxml
View File

@ -115,8 +115,8 @@
<ToggleButton fx:id="legendToggle" mnemonicParsing="false" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="3" />
<ToggleButton fx:id="axisToggle" mnemonicParsing="false" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="4" />
<Button fx:id="styleButton" mnemonicParsing="false" text="\@" GridPane.columnIndex="2" />
<Button fx:id="backButton" mnemonicParsing="false" text="\@" GridPane.columnIndex="2" GridPane.rowIndex="1" />
<Button fx:id="fontButton" mnemonicParsing="false" text="\@" GridPane.columnIndex="2" GridPane.rowIndex="2" />
<Button fx:id="backColorButton" mnemonicParsing="false" text="\@" GridPane.columnIndex="2" GridPane.rowIndex="1" />
<Button fx:id="fontColorButton" mnemonicParsing="false" text="\@" GridPane.columnIndex="2" GridPane.rowIndex="2" />
<Button fx:id="legendButton" mnemonicParsing="false" text="\@" GridPane.columnIndex="2" GridPane.rowIndex="3" />
<Button fx:id="axisButton" mnemonicParsing="false" text="\@" GridPane.columnIndex="2" GridPane.rowIndex="4" />
</children>
@ -147,11 +147,11 @@
<Label text="Select Element" />
<Label text="Atomic Color" GridPane.rowIndex="1" />
<Label text="Atomic Radius" GridPane.rowIndex="2" />
<ComboBox prefWidth="200.0" GridPane.columnIndex="1" />
<ColorPicker prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<Button fx:id="elemButton" mnemonicParsing="false" prefWidth="200.0" GridPane.columnIndex="1" />
<ColorPicker fx:id="atomColorPicker" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<GridPane prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
<children>
<TextField fx:id="totchargeField1" prefWidth="200.0" />
<TextField fx:id="atomRadiusField" prefWidth="200.0" />
</children>
<columnConstraints>
<ColumnConstraints prefWidth="200.0" />
@ -160,9 +160,8 @@
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
</GridPane>
<Button fx:id="ecutrhoButton2" mnemonicParsing="false" text="\@" GridPane.columnIndex="2" />
<Button fx:id="ecutrhoButton" mnemonicParsing="false" text="\@" GridPane.columnIndex="2" GridPane.rowIndex="1" />
<Button fx:id="ecutwfcButton" mnemonicParsing="false" text="\@" GridPane.columnIndex="2" GridPane.rowIndex="2" />
<Button fx:id="atomColorButton" mnemonicParsing="false" text="\@" GridPane.columnIndex="2" GridPane.rowIndex="1" />
<Button fx:id="atomRadiusButton" mnemonicParsing="false" text="\@" GridPane.columnIndex="2" GridPane.rowIndex="2" />
</children>
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" prefWidth="120.0" />
@ -201,7 +200,7 @@
<Label text="Bond Width" />
<GridPane prefWidth="200.0" GridPane.columnIndex="1">
<children>
<TextField fx:id="totchargeField" prefWidth="200.0" />
<TextField fx:id="bondWidthField" prefWidth="200.0" />
</children>
<columnConstraints>
<ColumnConstraints prefWidth="200.0" />
@ -210,7 +209,7 @@
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
</GridPane>
<Button fx:id="totchargeButton" mnemonicParsing="false" text="\@" GridPane.columnIndex="2" />
<Button fx:id="bondWidthButton" mnemonicParsing="false" text="\@" GridPane.columnIndex="2" />
</children>
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" prefWidth="120.0" />
@ -247,11 +246,11 @@
<Label text="Show Cell ?" />
<Label text="Cell Color" GridPane.rowIndex="1" />
<Label text="Cell Width" GridPane.rowIndex="2" />
<ToggleButton fx:id="forceToggle1" mnemonicParsing="false" prefWidth="200.0" GridPane.columnIndex="1" />
<ColorPicker prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<ToggleButton fx:id="cellToggle" mnemonicParsing="false" prefWidth="200.0" GridPane.columnIndex="1" />
<ColorPicker fx:id="cellColorPicker" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<GridPane prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
<children>
<TextField fx:id="totchargeField11" prefWidth="200.0" />
<TextField fx:id="cellWidthField" prefWidth="200.0" />
</children>
<columnConstraints>
<ColumnConstraints prefWidth="200.0" />
@ -260,9 +259,9 @@
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
</GridPane>
<Button fx:id="ecutrhoButton11" mnemonicParsing="false" text="\@" GridPane.columnIndex="2" />
<Button fx:id="ecutrhoButton1" mnemonicParsing="false" text="\@" GridPane.columnIndex="2" GridPane.rowIndex="1" />
<Button fx:id="ecutwfcButton1" mnemonicParsing="false" text="\@" GridPane.columnIndex="2" GridPane.rowIndex="2" />
<Button fx:id="cellButton" mnemonicParsing="false" text="\@" GridPane.columnIndex="2" />
<Button fx:id="cellColorButton" mnemonicParsing="false" text="\@" GridPane.columnIndex="2" GridPane.rowIndex="1" />
<Button fx:id="cellWidthButton" mnemonicParsing="false" text="\@" GridPane.columnIndex="2" GridPane.rowIndex="2" />
</children>
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" prefWidth="120.0" />

251
src/burai/app/project/editor/designer/QEFXDesignerEditorController.java
View File

@ -10,23 +10,30 @@
package burai.app.project.editor.designer;
import java.net.URL;
import java.util.Arrays;
import java.util.Optional;
import java.util.ResourceBundle;
import burai.app.QEFXAppController;
import burai.app.project.QEFXProjectController;
import burai.app.project.editor.input.items.QEFXItem;
import burai.app.project.viewer.designer.QEFXDesignerViewer;
import burai.atoms.design.AtomDesign;
import burai.atoms.design.AtomsStyle;
import burai.atoms.design.Design;
import burai.atoms.element.ElementUtil;
import burai.com.graphic.ToggleGraphics;
import burai.com.graphic.svg.SVGLibrary;
import burai.com.graphic.svg.SVGLibrary.SVGData;
import burai.com.keys.KeyNames;
import burai.com.periodic.ElementButton;
import burai.com.periodic.PeriodicTable;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
import javafx.scene.control.ColorPicker;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
import javafx.scene.control.ToggleButton;
import javafx.scene.paint.Color;
@ -43,6 +50,8 @@ public class QEFXDesignerEditorController extends QEFXAppController {
private static final double TOGGLE_WIDTH = 185.0;
private static final double TOGGLE_HEIGHT = 24.0;
private static final String ELEMENT_EMPTY_TEXT = "no element";
private QEFXDesignerViewer viewer;
private Design design;
@ -75,13 +84,13 @@ public class QEFXDesignerEditorController extends QEFXAppController {
private ColorPicker backColorPicker;
@FXML
private Button backButton;
private Button backColorButton;
@FXML
private ColorPicker fontColorPicker;
@FXML
private Button fontButton;
private Button fontColorButton;
@FXML
private ToggleButton legendToggle;
@ -95,6 +104,47 @@ public class QEFXDesignerEditorController extends QEFXAppController {
@FXML
private Button axisButton;
private String elemName;
@FXML
private Button elemButton;
@FXML
private ColorPicker atomColorPicker;
@FXML
private Button atomColorButton;
@FXML
private TextField atomRadiusField;
@FXML
private Button atomRadiusButton;
@FXML
private TextField bondWidthField;
@FXML
private Button bondWidthButton;
@FXML
private ToggleButton cellToggle;
@FXML
private Button cellButton;
@FXML
private ColorPicker cellColorPicker;
@FXML
private Button cellColorButton;
@FXML
private TextField cellWidthField;
@FXML
private Button cellWidthButton;
public QEFXDesignerEditorController(QEFXProjectController projectController, QEFXDesignerViewer viewer) {
super(projectController == null ? null : projectController.getMainController());
@ -121,7 +171,15 @@ public class QEFXDesignerEditorController extends QEFXAppController {
this.setupShowLegend();
this.setupShowAxis();
// TODO
this.setupElement();
this.setupAtomColor();
this.setupAtomRadius();
this.setupBondWidth();
this.setupShowCell();
this.setupCellColor();
this.setupCellWidth();
}
private void updateToggleGraphics(ToggleButton toggle) {
@ -260,9 +318,9 @@ public class QEFXDesignerEditorController extends QEFXAppController {
}
});
if (this.backButton != null) {
QEFXItem.setupDefaultButton(this.backButton);
this.backButton.setOnAction(event -> {
if (this.backColorButton != null) {
QEFXItem.setupDefaultButton(this.backColorButton);
this.backColorButton.setOnAction(event -> {
this.backColorPicker.setValue(Color.DIMGRAY);
});
}
@ -281,9 +339,9 @@ public class QEFXDesignerEditorController extends QEFXAppController {
}
});
if (this.fontButton != null) {
QEFXItem.setupDefaultButton(this.fontButton);
this.fontButton.setOnAction(event -> {
if (this.fontColorButton != null) {
QEFXItem.setupDefaultButton(this.fontColorButton);
this.fontColorButton.setOnAction(event -> {
this.fontColorPicker.setValue(Color.BLACK);
});
}
@ -300,6 +358,9 @@ public class QEFXDesignerEditorController extends QEFXAppController {
this.updateToggleGraphics(this.legendToggle);
this.legendToggle.selectedProperty().addListener(o -> {
this.updateToggleGraphics(this.legendToggle);
if (this.design != null) {
this.design.setShowingLegend(this.legendToggle.isSelected());
}
});
if (this.legendButton != null) {
@ -321,6 +382,9 @@ public class QEFXDesignerEditorController extends QEFXAppController {
this.updateToggleGraphics(this.axisToggle);
this.axisToggle.selectedProperty().addListener(o -> {
this.updateToggleGraphics(this.axisToggle);
if (this.design != null) {
this.design.setShowingAxis(this.axisToggle.isSelected());
}
});
if (this.axisButton != null) {
@ -331,4 +395,173 @@ public class QEFXDesignerEditorController extends QEFXAppController {
}
}
private void setupElement() {
this.elemName = null;
if (this.elemButton == null) {
return;
}
String text = null;
String[] names = this.design.namesOfAtoms();
if (names != null && names.length > 0) {
Arrays.sort(names);
text = ElementUtil.toElementName(names[0]);
}
if (text != null) {
text = text.trim();
}
if (text == null || text.isEmpty()) {
text = ELEMENT_EMPTY_TEXT;
}
this.elemButton.setText(text);
this.updateElemName();
this.elemButton.setOnAction(event -> {
PeriodicTable periodicTable = new PeriodicTable();
Optional<ElementButton> optElement = periodicTable.showAndWait();
if (optElement == null || !optElement.isPresent()) {
return;
}
ElementButton element = optElement.get();
String name = element.getName();
if (name != null) {
name = name.trim();
}
if (name != null && !name.isEmpty()) {
this.elemButton.setText(name);
this.updateElemName();
}
});
}
private void updateElemName() {
this.elemName = null;
String text = this.elemButton == null ? null : this.elemButton.getText();
if (text == null) {
return;
}
text = text.trim();
if (text.isEmpty()) {
return;
}
if (ELEMENT_EMPTY_TEXT.equals(text)) {
return;
}
this.elemName = text;
}
private AtomDesign getAtomDesign() {
if (this.design == null || this.elemName == null) {
return null;
}
return this.design.getAtomDesign(this.elemName);
}
private void setupAtomColor() {
if (this.atomColorPicker == null) {
return;
}
AtomDesign atomDesign = this.getAtomDesign();
this.atomColorPicker.setValue(atomDesign == null ? null : atomDesign.getColor());
this.atomColorPicker.valueProperty().addListener(o -> {
AtomDesign atomDesign_ = this.getAtomDesign();
if (atomDesign_ == null) {
return;
}
Color color = this.atomColorPicker.getValue();
if (color != null) {
atomDesign_.setColor(color);
}
});
if (this.atomColorButton != null) {
QEFXItem.setupDefaultButton(this.atomColorButton);
this.atomColorButton.setOnAction(event -> {
if (this.elemName != null) {
this.atomColorPicker.setValue(ElementUtil.getColor(this.elemName));
}
});
}
}
private void setupAtomRadius() {
if (this.atomRadiusField == null) {
return;
}
// TODO
}
private void setupBondWidth() {
if (this.bondWidthField == null) {
return;
}
// TODO
}
private void setupShowCell() {
if (this.cellToggle == null) {
return;
}
this.cellToggle.setText("");
this.cellToggle.setStyle(TOGGLE_STYLE);
this.cellToggle.setSelected(this.design == null ? false : this.design.isShowingCell());
this.updateToggleGraphics(this.cellToggle);
this.cellToggle.selectedProperty().addListener(o -> {
this.updateToggleGraphics(this.cellToggle);
if (this.design != null) {
this.design.setShowingCell(this.cellToggle.isSelected());
}
});
if (this.cellButton != null) {
QEFXItem.setupDefaultButton(this.cellButton);
this.cellButton.setOnAction(event -> {
this.cellToggle.setSelected(true);
});
}
}
private void setupCellColor() {
if (this.cellColorPicker == null) {
return;
}
this.cellColorPicker.setValue(this.design == null ? null : this.design.getCellColor());
this.cellColorPicker.valueProperty().addListener(o -> {
Color color = this.cellColorPicker.getValue();
if (this.design != null && color != null) {
this.design.setCellColor(color);
}
});
if (this.cellColorButton != null) {
QEFXItem.setupDefaultButton(this.cellColorButton);
this.cellColorButton.setOnAction(event -> {
this.cellColorPicker.setValue(Color.BLACK);
});
}
}
private void setupCellWidth() {
if (this.cellWidthField == null) {
return;
}
// TODO
}
}