Browse Source

gui units fix

David Heck 4 years ago
parent
commit
45929d43a3
2 changed files with 5 additions and 5 deletions
  1. 1 1
      src/blackstart/controlAlgorithm.java
  2. 4 4
      src/ui/view/AddStorageElementPopUp.java

+ 1 - 1
src/blackstart/controlAlgorithm.java

@@ -539,7 +539,7 @@ public class controlAlgorithm implements AddOn {
 		println("currenctpossiblestorage: " + SPC.currentPossibleStorageProduction());
 		for (StorageElement ele :
 				getStorageElements()) {
-			println(ele.getEleName() + " " + ele.getId() + ", soc: " + (ele.getStateOfCharge()/60)/1000 + "kWh,"  + " maxpower: " + ele.getMaxOutRatio() + " W, distance: " + (ele.getLowDistance()+ele.getHighDistance()));
+			println(ele.getEleName() + " " + ele.getId() + ", soc: " + (ele.getStateOfCharge()/60)/1000 + "kWh,"  + " maxpower: " + ele.getMaxOutRatio()/1000 + " kW, distance: " + (ele.getLowDistance()+ele.getHighDistance()));
 		}
 	}
 

+ 4 - 4
src/ui/view/AddStorageElementPopUp.java

@@ -115,7 +115,7 @@ public class AddStorageElementPopUp extends JDialog {
         contentPanel.add(lblinRatio);
 
         maxInRatio = new JTextField();
-        maxInRatio.setText("5000");
+        maxInRatio.setText("2");
         maxInRatio.setColumns(10);
         maxInRatio.setBounds(130, 90, 110, 20);
         contentPanel.add(maxInRatio);
@@ -125,7 +125,7 @@ public class AddStorageElementPopUp extends JDialog {
         contentPanel.add(lbloutRatio);
 
         maxOutRatio = new JTextField();
-        maxOutRatio.setText("5000");
+        maxOutRatio.setText("4.6");
         maxOutRatio.setColumns(10);
         maxOutRatio.setBounds(130, 130, 110, 20);
         contentPanel.add(maxOutRatio);
@@ -207,8 +207,8 @@ public class AddStorageElementPopUp extends JDialog {
         if (elementName.getText().length() != 0 && !repeated) {
             try {
                 float elementCapacity = Float.parseFloat(capacity.getText())*1000;
-                float maxIn = Float.parseFloat(maxInRatio.getText());
-                float maxOut = Float.parseFloat(maxOutRatio.getText());
+                float maxIn = Float.parseFloat(maxInRatio.getText())*1000;
+                float maxOut = Float.parseFloat(maxOutRatio.getText())*1000;
                 int elementAmount = Integer.parseInt(amount.getText());
                 if(hl == null){
                     hl = new StorageElement(elementName.getText(), elementAmount, 0, model, elementCapacity, maxIn, maxOut);