Przeglądaj źródła

bug fixes - still save graph table

Andreas T. Meyer-Berg 6 lat temu
rodzic
commit
00d15f1c98

+ 0 - 1
src/ui/controller/LoadController.java

@@ -375,7 +375,6 @@ public class LoadController {
                 break;
             case ELEMENT:
                 HolonElement ele = eleDispatch.get(sav);
-                ele.setGraphPoints(graphpoint);
                 break;
             default:
                 break;

+ 1 - 1
src/ui/view/AddObjectPopUp.java

@@ -230,7 +230,7 @@ public class AddObjectPopUp extends JDialog {
 								// theObject = new
 								// HolonObject(objectName.getText());
 								// theObject.setElements(hElements);
-								// theObject.setImage(imagePath);
+								// theObject.setImage(imagePath);// TODO Auto-generated catch block
 								try {
 									if (editState) {
 										controller.delObjectCategory(givenCategory, toEdit.getName());

+ 17 - 2
src/ui/view/CreateTemplatePopUp.java

@@ -282,10 +282,14 @@ public class CreateTemplatePopUp extends JDialog {
 
 	}
 	
+	/**
+	 * create the template and add it to the category
+	 */
 	private void createTemplate(){
-		template.setName(textField_name.getText());
-		template.setImage(textField_imagePath.getText());
 		try {
+			template.setName(textField_name.getText());
+			template.setImage(textField_imagePath.getText());
+			template.getElements().forEach(ele -> ele.setSaving(new Pair(choice.getSelectedItem(), template.getName())));
 			controller.addObject(controller.searchCategory(choice.getItem(choice.getSelectedIndex())), template.getName(), template.getElements(), template.getImage());
 			this.dispose();
 		} catch (IOException e) {
@@ -294,6 +298,10 @@ public class CreateTemplatePopUp extends JDialog {
 		}
 	}
 	
+
+	/**
+	 * Add an Holon Element to the template
+	 */
 	private void addElement(){
 		AddElementPopUp popUp = new AddElementPopUp(parent);
 		popUp.setActualCps(template);
@@ -302,9 +310,13 @@ public class CreateTemplatePopUp extends JDialog {
 		if(he!=null){
 			listModel.addElement(he.getEleName()+": "+he.getOverallEnergy()+"U");
 			template.addElement(he);
+			he.setSaving(new Pair<>(category, textField_name.getText()));
 		}
 	}
 	
+	/**
+	 * Removes the Selected Element from the template
+	 */
 	private void removeElement(){
 	int index = list.getSelectedIndex();
 	if(index == -1)return;
@@ -312,6 +324,9 @@ public class CreateTemplatePopUp extends JDialog {
 	listModel.remove(index);
 	}
 	
+	/**
+	 * Edits the selected HolonElement
+	 */
 	private void editElement(){
 		int index = list.getSelectedIndex();
 		if(index == -1)return;