diff --git a/.github/workflows/delete_tag_asset.yml b/.github/workflows/delete_tag_asset.yml new file mode 100644 index 0000000..033f8d0 --- /dev/null +++ b/.github/workflows/delete_tag_asset.yml @@ -0,0 +1,23 @@ +name: delete-old-assets-nightly-manual + +on: [workflow_dispatch] + +jobs: + build: + runs-on: ubuntu-latest + steps: + #- name: Checkout code + # uses: actions/checkout@v2 + + - name: Delete old release assets + uses: mknejp/delete-release-assets@v1 + with: + token: ${{ github.token }} + tag: nightly # This may also be of the form 'refs/tags/staging' + + # Optional another repository + repository: AndiMb/eLamX2 + + assets: | + eLamX.3.0.0.exe + eLamX.2.7.2.exe diff --git a/File_View/src/de/elamx/fileview/nodes/Bundle.properties b/File_View/src/de/elamx/fileview/nodes/Bundle.properties index c71a98a..29aa40f 100644 --- a/File_View/src/de/elamx/fileview/nodes/Bundle.properties +++ b/File_View/src/de/elamx/fileview/nodes/Bundle.properties @@ -64,4 +64,7 @@ LaminateNode.stackingsequence.short=The Stacking Sequence of the laminate. LaminateNode.Offset=Offset DefaultMaterial.ADDITIONALPROPERTIES=Additional Properties MaterialNode.name=Materials -LaminatesNode.name=Laminates \ No newline at end of file +LaminatesNode.name=Laminates +Warning.negativeelasticmodulus=A negative elastic modulus has been defined.
Please check your input. +Warning.negativeshearmodulus=A negative shear modulus has been defined.
Please check your input. +Warning.negativepoissonratio=A negative Poisson's ratio has been defined.
Please check your input. \ No newline at end of file diff --git a/File_View/src/de/elamx/fileview/nodes/Bundle_de.properties b/File_View/src/de/elamx/fileview/nodes/Bundle_de.properties index 33143ea..947b8ae 100644 --- a/File_View/src/de/elamx/fileview/nodes/Bundle_de.properties +++ b/File_View/src/de/elamx/fileview/nodes/Bundle_de.properties @@ -46,3 +46,6 @@ DefaultMaterial.SHEARMODULUS13.description=transversaler Schubmodul der Sc DefaultMaterial.SHEARMODULUS13=transversaler Schubmodul DefaultMaterial.SHEARMODULUS23.description=transversaler Schubmodul der Schicht [N/mm2] DefaultMaterial.SHEARMODULUS23=transversaler Schubmodul +Warning.negativeelasticmodulus=Es wurde ein negativer Elastizit\u00e4tsmodul definiert.
Bitte pr\u00fcfen Sie Ihre Eingabe. +Warning.negativeshearmodulus=Es wurde ein negativer Schubmodul definiert.
Bitte pr\u00fcfen Sie Ihre Eingabe. +Warning.negativepoissonratio=Es wurde eine negative Querkontraktionszahl definiert.
Bitte pr\u00fcfen Sie Ihre Eingabe. diff --git a/File_View/src/de/elamx/fileview/nodes/DefaultMaterialNode.java b/File_View/src/de/elamx/fileview/nodes/DefaultMaterialNode.java index af59acc..0fd36d7 100644 --- a/File_View/src/de/elamx/fileview/nodes/DefaultMaterialNode.java +++ b/File_View/src/de/elamx/fileview/nodes/DefaultMaterialNode.java @@ -47,6 +47,8 @@ import java.util.ResourceBundle; import java.util.Set; import javax.swing.Action; +import org.openide.DialogDisplayer; +import org.openide.NotifyDescriptor; import org.openide.awt.Actions; import org.openide.nodes.AbstractNode; import org.openide.nodes.Children; @@ -297,6 +299,21 @@ public void propertyChange(PropertyChangeEvent evt) { this.fireDisplayNameChange((String) evt.getOldValue(), (String) evt.getNewValue()); return; } + if (evt.getPropertyName().equals(DefaultMaterial.PROP_EPAR) || evt.getPropertyName().equals(DefaultMaterial.PROP_ENOR)) { + if (((double)evt.getNewValue() != (double)evt.getOldValue()) && ((double)evt.getNewValue() < 0.)) { + DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(DefaultMaterialNode.class, "Warning.negativeelasticmodulus"), NotifyDescriptor.WARNING_MESSAGE)); + } + } + if (evt.getPropertyName().equals(DefaultMaterial.PROP_NUE12)) { + if (((double)evt.getNewValue() != (double)evt.getOldValue()) && ((double)evt.getNewValue() < 0.)) { + DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(DefaultMaterialNode.class, "Warning.negativepoissonratio"), NotifyDescriptor.WARNING_MESSAGE)); + } + } + if (evt.getPropertyName().equals(DefaultMaterial.PROP_G) || evt.getPropertyName().equals(DefaultMaterial.PROP_G13) || evt.getPropertyName().equals(DefaultMaterial.PROP_G23)) { + if (((double)evt.getNewValue() != (double)evt.getOldValue()) && ((double)evt.getNewValue() < 0.)) { + DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(DefaultMaterialNode.class, "Warning.negativeshearmodulus"), NotifyDescriptor.WARNING_MESSAGE)); + } + } this.firePropertyChange(evt.getPropertyName(), evt.getOldValue(), evt.getNewValue()); } diff --git a/Laminate/src/de/elamx/laminate/Bundle.properties b/Laminate/src/de/elamx/laminate/Bundle.properties index 24578f3..d1fa5a4 100644 --- a/Laminate/src/de/elamx/laminate/Bundle.properties +++ b/Laminate/src/de/elamx/laminate/Bundle.properties @@ -2,6 +2,3 @@ OpenIDE-Module-Name=Laminate LaminateSummaryTableModel.Table.caption.angle=Angle LaminateSummaryTableModel.Table.caption.sumti=&Sigma ti LaminateSummaryTableModel.Table.caption.percti=% ttot -Warning.negativeelasticmodulus=A negative elastic modulus has been defined.
Please check your input. -Warning.negativeshearmodulus=A negative shear modulus has been defined.
Please check your input. -Warning.negativepoissonratio=A negative Poisson's ratio has been defined.
Please check your input. diff --git a/Laminate/src/de/elamx/laminate/Bundle_de.properties b/Laminate/src/de/elamx/laminate/Bundle_de.properties index 84fc089..09fc682 100644 --- a/Laminate/src/de/elamx/laminate/Bundle_de.properties +++ b/Laminate/src/de/elamx/laminate/Bundle_de.properties @@ -3,6 +3,3 @@ # and open the template in the editor. LaminateSummaryTableModel.Table.caption.angle=Winkel LaminateSummaryTableModel.Table.caption.percti=% tges -Warning.negativeelasticmodulus=Es wurde ein negativer Elastizit\u00e4tsmodul definiert.
Bitte pr\u00fcfen Sie Ihre Eingabe. -Warning.negativeshearmodulus=Es wurde ein negativer Schubmodul definiert.
Bitte pr\u00fcfen Sie Ihre Eingabe. -Warning.negativepoissonratio=Es wurde eine negative Querkontraktionszahl definiert.
Bitte pr\u00fcfen Sie Ihre Eingabe. diff --git a/Laminate/src/de/elamx/laminate/DefaultMaterial.java b/Laminate/src/de/elamx/laminate/DefaultMaterial.java index 4c1420f..74088b5 100644 --- a/Laminate/src/de/elamx/laminate/DefaultMaterial.java +++ b/Laminate/src/de/elamx/laminate/DefaultMaterial.java @@ -27,9 +27,6 @@ import java.util.Objects; import java.util.UUID; -import org.openide.DialogDisplayer; -import org.openide.NotifyDescriptor; -import org.openide.util.NbBundle; /** * @@ -122,9 +119,6 @@ public void setEpar(double Epar){ double oldEpar = this.Epar; this.Epar = Epar; firePropertyChange(PROP_EPAR, oldEpar, Epar); - if ((Epar != oldEpar) && (Epar < 0.)) { - DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(DefaultMaterial.class, "Warning.negativeelasticmodulus"), NotifyDescriptor.WARNING_MESSAGE)); - } } /** * Liefert den E-Modul in Faserrichtung E|| des Materials. @@ -141,9 +135,6 @@ public void setEnor(double Enor){ double oldEnor = this.Enor; this.Enor = Enor; firePropertyChange(PROP_ENOR, oldEnor, this.Enor); - if ((Enor != oldEnor) && (Enor < 0.)) { - DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(DefaultMaterial.class, "Warning.negativeelasticmodulus"), NotifyDescriptor.WARNING_MESSAGE)); - } } /** * Liefert den E-Modul quer zur Faserrichtung E⊥ des Materials. @@ -162,9 +153,6 @@ public void setNue12(double nue){ double oldNue12 = this.nue12; nue12 = nue; firePropertyChange(PROP_NUE12, oldNue12, nue12); - if ((nue != oldNue12) && (nue < 0.)) { - DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(DefaultMaterial.class, "Warning.negativepoissonratio"), NotifyDescriptor.WARNING_MESSAGE)); - } } /** * Liefert die Querkontraktionszahl ν12 des Materials. Dabei gilt folgende @@ -183,9 +171,6 @@ public void setG(double G){ double oldG = this.G; this.G = G; firePropertyChange(PROP_G, oldG, this.G); - if ((G != oldG) && (G < 0.)) { - DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(DefaultMaterial.class, "Warning.negativeshearmodulus"), NotifyDescriptor.WARNING_MESSAGE)); - } } /** * Liefert den Schubmoduls G||⊥ des Materials. @@ -202,9 +187,6 @@ public void setG13(double G13){ double oldG13 = this.G13; this.G13 = G13; firePropertyChange(PROP_G13, oldG13, this.G13); - if ((G13 != oldG13) && (G13 < 0.)) { - DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(DefaultMaterial.class, "Warning.negativeshearmodulus"), NotifyDescriptor.WARNING_MESSAGE)); - } } /** * Liefert die transversale Schubsteifigkeit G||⊥ des Materials. @@ -221,9 +203,6 @@ public void setG23(double G23){ double oldG23 = this.G23; this.G23 = G23; firePropertyChange(PROP_G23, oldG23, this.G23); - if ((G23 != oldG23) && (G23 < 0.)) { - DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(DefaultMaterial.class, "Warning.negativeshearmodulus"), NotifyDescriptor.WARNING_MESSAGE)); - } } /** * Liefert die transversale Schubsteifigkeit G⊥⊥ des Materials. diff --git a/Micromechanics/src/de/elamx/micromechanics/Bundle.properties b/Micromechanics/src/de/elamx/micromechanics/Bundle.properties index d377698..f66becc 100644 --- a/Micromechanics/src/de/elamx/micromechanics/Bundle.properties +++ b/Micromechanics/src/de/elamx/micromechanics/Bundle.properties @@ -1,4 +1 @@ -OpenIDE-Module-Name=Micromechanics -Warning.negativeelasticmodulus=A negative elastic modulus has been defined.
Please check your input. -Warning.negativeshearmodulus=A negative shear modulus has been defined.
Please check your input. -Warning.negativepoissonratio=A negative Poisson's ratio has been defined.
Please check your input. \ No newline at end of file +OpenIDE-Module-Name=Micromechanics \ No newline at end of file diff --git a/Micromechanics/src/de/elamx/micromechanics/Bundle_de.properties b/Micromechanics/src/de/elamx/micromechanics/Bundle_de.properties index 0408dcd..5812e06 100644 --- a/Micromechanics/src/de/elamx/micromechanics/Bundle_de.properties +++ b/Micromechanics/src/de/elamx/micromechanics/Bundle_de.properties @@ -1,4 +1 @@ -OpenIDE-Module-Name=Mikromechanik -Warning.negativeelasticmodulus=Es wurde ein negativer Elastizit\u00e4tsmodul definiert.
Bitte pr\u00fcfen Sie Ihre Eingabe. -Warning.negativeshearmodulus=Es wurde ein negativer Schubmodul definiert.
Bitte pr\u00fcfen Sie Ihre Eingabe. -Warning.negativepoissonratio=Es wurde eine negative Querkontraktionszahl definiert.
Bitte pr\u00fcfen Sie Ihre Eingabe. \ No newline at end of file +OpenIDE-Module-Name=Mikromechanik \ No newline at end of file diff --git a/Micromechanics/src/de/elamx/micromechanics/Fiber.java b/Micromechanics/src/de/elamx/micromechanics/Fiber.java index 6d6102c..a94ddf5 100644 --- a/Micromechanics/src/de/elamx/micromechanics/Fiber.java +++ b/Micromechanics/src/de/elamx/micromechanics/Fiber.java @@ -27,9 +27,6 @@ import de.elamx.laminate.Material; import java.util.UUID; -import org.openide.DialogDisplayer; -import org.openide.NotifyDescriptor; -import org.openide.util.NbBundle; /** * @@ -108,9 +105,6 @@ public void setEpar(double Epar){ double oldEpar = this.Epar; this.Epar = Epar; firePropertyChange(PROP_EPAR, oldEpar, Epar); - if ((Epar != oldEpar) && (Epar < 0.)) { - DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(Fiber.class, "Warning.negativeelasticmodulus"), NotifyDescriptor.WARNING_MESSAGE)); - } } /** * Liefert den E-Modul in Faserrichtung E|| des Materials. @@ -127,9 +121,6 @@ public void setEnor(double Enor){ double oldEnor = this.Enor; this.Enor = Enor; firePropertyChange(PROP_ENOR, oldEnor, this.Enor); - if ((Enor != oldEnor) && (Enor < 0.)) { - DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(Fiber.class, "Warning.negativeelasticmodulus"), NotifyDescriptor.WARNING_MESSAGE)); - } } /** * Liefert den E-Modul quer zur Faserrichtung E⊥ des Materials. @@ -148,9 +139,6 @@ public void setNue12(double nue){ double oldNue12 = this.nue12; nue12 = nue; firePropertyChange(PROP_NUE12, oldNue12, nue12); - if ((nue12 != oldNue12) && (nue12 < 0.)) { - DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(Fiber.class, "Warning.negativepoissonratio"), NotifyDescriptor.WARNING_MESSAGE)); - } } /** * Liefert die Querkontraktionszahl ν12 des Materials. Dabei gilt folgende @@ -169,9 +157,6 @@ public void setG(double G){ double oldG = this.G; this.G = G; firePropertyChange(PROP_G, oldG, this.G); - if ((G != oldG) && (G < 0.)) { - DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(Fiber.class, "Warning.negativeshearmodulus"), NotifyDescriptor.WARNING_MESSAGE)); - } } /** * Liefert den Schubmoduls G||⊥ des Materials. @@ -188,9 +173,6 @@ public void setG13(double G13){ double oldG13 = this.G13; this.G13 = G13; firePropertyChange(PROP_G13, oldG13, this.G13); - if ((G13 != oldG13) && (G13 < 0.)) { - DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(Fiber.class, "Warning.negativeshearmodulus"), NotifyDescriptor.WARNING_MESSAGE)); - } } /** * Liefert die transversale Schubsteifigkeit G||⊥ des Materials. @@ -207,9 +189,6 @@ public void setG23(double G23){ double oldG23 = this.G23; this.G23 = G23; firePropertyChange(PROP_G23, oldG23, this.G23); - if ((G23 != oldG23) && (G23 < 0.)) { - DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(Fiber.class, "Warning.negativeshearmodulus"), NotifyDescriptor.WARNING_MESSAGE)); - } } /** * Liefert die transversale Schubsteifigkeit G⊥⊥ des Materials. diff --git a/Micromechanics/src/de/elamx/micromechanics/Matrix.java b/Micromechanics/src/de/elamx/micromechanics/Matrix.java index 66d86f6..ac59440 100644 --- a/Micromechanics/src/de/elamx/micromechanics/Matrix.java +++ b/Micromechanics/src/de/elamx/micromechanics/Matrix.java @@ -27,9 +27,6 @@ import de.elamx.laminate.Material; import java.util.UUID; -import org.openide.DialogDisplayer; -import org.openide.NotifyDescriptor; -import org.openide.util.NbBundle; /** * @@ -128,9 +125,6 @@ public void setNue(double nue) { double oldG = G; G = E / (2 * (1.0 + nue)); firePropertyChange(PROP_G, oldG, G); - if ((nue != oldNue) && (nue < 0.)) { - DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(Matrix.class, "Warning.negativepoissonratio"), NotifyDescriptor.WARNING_MESSAGE)); - } } /** @@ -145,9 +139,6 @@ public void setE(double E) { double oldG = G; G = E / (2 * (1.0 + nue)); firePropertyChange(PROP_G, oldG, G); - if ((E != oldE) && (E < 0.)) { - DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(Matrix.class, "Warning.negativeelasticmodulus"), NotifyDescriptor.WARNING_MESSAGE)); - } } public double getE() { diff --git a/Micromechanics/src/de/elamx/micromechanics/MicroMechanicMaterial.java b/Micromechanics/src/de/elamx/micromechanics/MicroMechanicMaterial.java index 7b0566b..d2a606d 100644 --- a/Micromechanics/src/de/elamx/micromechanics/MicroMechanicMaterial.java +++ b/Micromechanics/src/de/elamx/micromechanics/MicroMechanicMaterial.java @@ -34,10 +34,7 @@ import java.beans.PropertyChangeListener; import java.util.Collection; import java.util.UUID; -import org.openide.DialogDisplayer; -import org.openide.NotifyDescriptor; import org.openide.util.Lookup; -import org.openide.util.NbBundle; import org.openide.util.lookup.Lookups; /** @@ -402,9 +399,6 @@ public void setEpar(double Epar){ double oldEpar = this.Epar; this.Epar = Epar; firePropertyChange(PROP_EPAR, oldEpar, Epar); - if ((Epar != oldEpar) && (Epar < 0.)) { - DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(MicroMechanicMaterial.class, "Warning.negativeelasticmodulus"), NotifyDescriptor.WARNING_MESSAGE)); - } } /** @@ -415,9 +409,6 @@ public void setEnor(double Enor){ double oldEnor = this.Enor; this.Enor = Enor; firePropertyChange(PROP_ENOR, oldEnor, this.Enor); - if ((Enor != oldEnor) && (Enor < 0.)) { - DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(MicroMechanicMaterial.class, "Warning.negativeelasticmodulus"), NotifyDescriptor.WARNING_MESSAGE)); - } } /** @@ -430,9 +421,6 @@ public void setNue12(double nue){ double oldNue12 = this.nue12; nue12 = nue; firePropertyChange(PROP_NUE12, oldNue12, nue12); - if ((nue != oldNue12) && (nue < 0.)) { - DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(MicroMechanicMaterial.class, "Warning.negativepoissonratio"), NotifyDescriptor.WARNING_MESSAGE)); - } } /** @@ -443,9 +431,6 @@ public void setG(double G){ double oldG = this.G; this.G = G; firePropertyChange(PROP_G, oldG, this.G); - if ((G != oldG) && (G < 0.)) { - DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(MicroMechanicMaterial.class, "Warning.negativeshearmodulus"), NotifyDescriptor.WARNING_MESSAGE)); - } } /** @@ -456,9 +441,6 @@ public void setG13(double G13){ double oldG13 = this.G13; this.G13 = G13; firePropertyChange(PROP_G13, oldG13, this.G13); - if ((G13 != oldG13) && (G13 < 0.)) { - DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(MicroMechanicMaterial.class, "Warning.negativeshearmodulus"), NotifyDescriptor.WARNING_MESSAGE)); - } } /** * Liefert die transversale Schubsteifigkeit G||⊥ des Materials. @@ -475,9 +457,6 @@ public void setG23(double G23){ double oldG23 = this.G23; this.G23 = G23; firePropertyChange(PROP_G23, oldG23, this.G23); - if ((G23 != oldG23) && (G23 < 0.)) { - DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(MicroMechanicMaterial.class, "Warning.negativeshearmodulus"), NotifyDescriptor.WARNING_MESSAGE)); - } } /** * Liefert die transversale Schubsteifigkeit G⊥⊥ des Materials. diff --git a/MicromechanicsUI/src/de/elamx/micromechanicsui/nodes/Bundle.properties b/MicromechanicsUI/src/de/elamx/micromechanicsui/nodes/Bundle.properties index c81c3ad..26bdec6 100644 --- a/MicromechanicsUI/src/de/elamx/micromechanicsui/nodes/Bundle.properties +++ b/MicromechanicsUI/src/de/elamx/micromechanicsui/nodes/Bundle.properties @@ -143,3 +143,7 @@ MicroMechanicMaterialNode.SHEARMODULUS13.html=GT,||&perp MicroMechanicMaterialNode.SHEARMODULUS23.description=Transversal shear modulus of the Layer [N/mm2] MicroMechanicMaterialNode.SHEARMODULUS23=Transversal Shear Modulus MicroMechanicMaterialNode.SHEARMODULUS23.html=GT,&perp&perp + +Warning.negativeelasticmodulus=A negative elastic modulus has been defined.
Please check your input. +Warning.negativeshearmodulus=A negative shear modulus has been defined.
Please check your input. +Warning.negativepoissonratio=A negative Poisson's ratio has been defined.
Please check your input. diff --git a/MicromechanicsUI/src/de/elamx/micromechanicsui/nodes/Bundle_de.properties b/MicromechanicsUI/src/de/elamx/micromechanicsui/nodes/Bundle_de.properties index 494da8b..47a1a82 100644 --- a/MicromechanicsUI/src/de/elamx/micromechanicsui/nodes/Bundle_de.properties +++ b/MicromechanicsUI/src/de/elamx/micromechanicsui/nodes/Bundle_de.properties @@ -91,3 +91,7 @@ MicroMechanicMaterialNode.SHEARMODULUS13.description=transversaler Schubmo MicroMechanicMaterialNode.SHEARMODULUS23.description=transversaler Schubmodul der Schicht [N/mm2] MicroMechanicMaterialNode.SHEARMODULUS13=transversaler Schubmodul MicroMechanicMaterialNode.SHEARMODULUS23=transversaler Schubmodul + +Warning.negativeelasticmodulus=Es wurde ein negativer Elastizit\u00e4tsmodul definiert.
Bitte pr\u00fcfen Sie Ihre Eingabe. +Warning.negativeshearmodulus=Es wurde ein negativer Schubmodul definiert.
Bitte pr\u00fcfen Sie Ihre Eingabe. +Warning.negativepoissonratio=Es wurde eine negative Querkontraktionszahl definiert.
Bitte pr\u00fcfen Sie Ihre Eingabe. diff --git a/MicromechanicsUI/src/de/elamx/micromechanicsui/nodes/FibreNode.java b/MicromechanicsUI/src/de/elamx/micromechanicsui/nodes/FibreNode.java index e5faeef..52499c7 100644 --- a/MicromechanicsUI/src/de/elamx/micromechanicsui/nodes/FibreNode.java +++ b/MicromechanicsUI/src/de/elamx/micromechanicsui/nodes/FibreNode.java @@ -42,6 +42,8 @@ import java.util.List; import java.util.ResourceBundle; import javax.swing.Action; +import org.openide.DialogDisplayer; +import org.openide.NotifyDescriptor; import org.openide.awt.Actions; import org.openide.nodes.AbstractNode; import org.openide.nodes.Children; @@ -191,6 +193,21 @@ public void propertyChange(PropertyChangeEvent evt) { this.fireDisplayNameChange((String)evt.getOldValue(), (String)evt.getNewValue()); return; } + if (evt.getPropertyName().equals(Fiber.PROP_EPAR) || evt.getPropertyName().equals(Fiber.PROP_ENOR)) { + if (((double)evt.getNewValue() != (double)evt.getOldValue()) && ((double)evt.getNewValue() < 0.)) { + DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(FibreNode.class, "Warning.negativeelasticmodulus"), NotifyDescriptor.WARNING_MESSAGE)); + } + } + if (evt.getPropertyName().equals(Fiber.PROP_NUE12)) { + if (((double)evt.getNewValue() != (double)evt.getOldValue()) && ((double)evt.getNewValue() < 0.)) { + DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(FibreNode.class, "Warning.negativepoissonratio"), NotifyDescriptor.WARNING_MESSAGE)); + } + } + if (evt.getPropertyName().equals(Fiber.PROP_G) || evt.getPropertyName().equals(Fiber.PROP_G13) || evt.getPropertyName().equals(Fiber.PROP_G23)) { + if (((double)evt.getNewValue() != (double)evt.getOldValue()) && ((double)evt.getNewValue() < 0.)) { + DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(FibreNode.class, "Warning.negativeshearmodulus"), NotifyDescriptor.WARNING_MESSAGE)); + } + } this.firePropertyChange(evt.getPropertyName(), evt.getOldValue(), evt.getNewValue()); } diff --git a/MicromechanicsUI/src/de/elamx/micromechanicsui/nodes/MatrixNode.java b/MicromechanicsUI/src/de/elamx/micromechanicsui/nodes/MatrixNode.java index dc0e68f..b4c7398 100644 --- a/MicromechanicsUI/src/de/elamx/micromechanicsui/nodes/MatrixNode.java +++ b/MicromechanicsUI/src/de/elamx/micromechanicsui/nodes/MatrixNode.java @@ -42,6 +42,8 @@ import java.util.List; import java.util.ResourceBundle; import javax.swing.Action; +import org.openide.DialogDisplayer; +import org.openide.NotifyDescriptor; import org.openide.awt.Actions; import org.openide.nodes.AbstractNode; import org.openide.nodes.Children; @@ -168,6 +170,16 @@ public void propertyChange(PropertyChangeEvent evt) { this.fireDisplayNameChange((String)evt.getOldValue(), (String)evt.getNewValue()); return; } + if (evt.getPropertyName().equals(Matrix.PROP_E)) { + if (((double)evt.getNewValue() != (double)evt.getOldValue()) && ((double)evt.getNewValue() < 0.)) { + DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(MatrixNode.class, "Warning.negativeelasticmodulus"), NotifyDescriptor.WARNING_MESSAGE)); + } + } + if (evt.getPropertyName().equals(Matrix.PROP_NUE)) { + if (((double)evt.getNewValue() != (double)evt.getOldValue()) && ((double)evt.getNewValue() < 0.)) { + DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(MatrixNode.class, "Warning.negativepoissonratio"), NotifyDescriptor.WARNING_MESSAGE)); + } + } this.firePropertyChange(evt.getPropertyName(), evt.getOldValue(), evt.getNewValue()); } diff --git a/MicromechanicsUI/src/de/elamx/micromechanicsui/nodes/MicroMechanicMaterialNode.java b/MicromechanicsUI/src/de/elamx/micromechanicsui/nodes/MicroMechanicMaterialNode.java index b04c8bc..7ba12ad 100644 --- a/MicromechanicsUI/src/de/elamx/micromechanicsui/nodes/MicroMechanicMaterialNode.java +++ b/MicromechanicsUI/src/de/elamx/micromechanicsui/nodes/MicroMechanicMaterialNode.java @@ -53,6 +53,8 @@ import java.util.List; import java.util.ResourceBundle; import javax.swing.Action; +import org.openide.DialogDisplayer; +import org.openide.NotifyDescriptor; import org.openide.awt.Actions; import org.openide.nodes.AbstractNode; import org.openide.nodes.Children; @@ -323,6 +325,21 @@ public void propertyChange(PropertyChangeEvent evt) { this.fireDisplayNameChange((String)evt.getOldValue(), (String)evt.getNewValue()); return; } + if (evt.getPropertyName().equals(MicroMechanicMaterial.PROP_EPAR) || evt.getPropertyName().equals(MicroMechanicMaterial.PROP_ENOR)) { + if (((double)evt.getNewValue() != (double)evt.getOldValue()) && ((double)evt.getNewValue() < 0.)) { + DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(MicroMechanicMaterialNode.class, "Warning.negativeelasticmodulus"), NotifyDescriptor.WARNING_MESSAGE)); + } + } + if (evt.getPropertyName().equals(MicroMechanicMaterial.PROP_NUE12)) { + if (((double)evt.getNewValue() != (double)evt.getOldValue()) && ((double)evt.getNewValue() < 0.)) { + DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(MicroMechanicMaterialNode.class, "Warning.negativepoissonratio"), NotifyDescriptor.WARNING_MESSAGE)); + } + } + if (evt.getPropertyName().equals(MicroMechanicMaterial.PROP_G) || evt.getPropertyName().equals(MicroMechanicMaterial.PROP_G13) || evt.getPropertyName().equals(MicroMechanicMaterial.PROP_G23)) { + if (((double)evt.getNewValue() != (double)evt.getOldValue()) && ((double)evt.getNewValue() < 0.)) { + DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NbBundle.getMessage(MicroMechanicMaterialNode.class, "Warning.negativeshearmodulus"), NotifyDescriptor.WARNING_MESSAGE)); + } + } this.firePropertyChange(evt.getPropertyName(), evt.getOldValue(), evt.getNewValue()); } diff --git a/README.md b/README.md index 9f1d075..0ccf833 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,14 @@ eLamX² is an OpenSource, Java-written composite calculator, which is being deve ## Coding eLamX² -1. get and openJDK build, e.g. from https://adoptium.net/de/download/ +1. get and openJDK build, e.g. from https://adoptium.net/de/temurin/releases/ 2. Unpack/install JDK 3. get Apache Netbeans from https://netbeans.apache.org/download 4. unpack/install Apache Netbeans 5. Open Apache Netbeans 6. clone eLamX2 https://github.com/AndiMb/eLamX2 7. Init GIT submodule View3DSuite by running "git submodule update --init --recursive" in the eLamX² clone directory + +## Documentation + +A documentation of the theory and usage of eLamX² can be found in the [wiki](https://github.com/AndiMb/eLamX2/wiki).