Skip to content

Commit

Permalink
#178 adjust kartierabschnitt and querbauwerke editor/renderer/reports
Browse files Browse the repository at this point in the history
  • Loading branch information
@therter
therter committed Oct 30, 2024
1 parent d2b9dcf commit 733e765
Show file tree
Hide file tree
Showing 32 changed files with 4,535 additions and 1,069 deletions.
2 changes: 1 addition & 1 deletion src/main/java/de/cismet/cids/custom/actions/wrrl_db_mv/FgskDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ public FgskDialog(final boolean modal, final MappingComponent mappingComponent)
}

cmdRemove.setVisible(mos != null);
cmdOk.setEnabled((positions.length > 1) || (mos.length > 1));
cmdOk.setEnabled(((positions != null) && (positions.length > 1)) || ((mos != null) && (mos.length > 1)));
}

//~ Methods ----------------------------------------------------------------
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/de/cismet/cids/custom/objecteditors/wrrl_db_mv/DghEditor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1493,8 +1493,10 @@ public void actionPerformed(final java.awt.event.ActionEvent evt) {

panBew.setBorder(javax.swing.BorderFactory.createTitledBorder(
javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0), 2),
org.openide.util.NbBundle.getMessage(DghEditor.class, "DghEditor.panBew.border.title", new Object[] {
}),
org.openide.util.NbBundle.getMessage(
DghEditor.class,
"DghEditor.panBew.border.title",
new Object[] {}),
javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION,
javax.swing.border.TitledBorder.DEFAULT_POSITION,
new java.awt.Font("Dialog", 0, 12),
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/de/cismet/cids/custom/objecteditors/wrrl_db_mv/FgskKartierabschnittEditor.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
</NonVisualComponents>
<Properties>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[1100, 720]"/>
<Dimension value="[1100, 780]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[1100, 720]"/>
<Dimension value="[1100, 780]"/>
</Property>
</Properties>
<AuxValues>
Expand All @@ -45,18 +45,18 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,2,-70,0,0,4,87"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,3,26,0,0,4,87"/>
</AuxValues>

<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JTabbedPane" name="tpMain">
<Properties>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[1100, 710]"/>
<Dimension value="[1100, 770]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[1100, 710]"/>
<Dimension value="[1100, 770]"/>
</Property>
</Properties>
<Constraints>
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/de/cismet/cids/custom/objecteditors/wrrl_db_mv/FgskKartierabschnittEditor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -471,12 +471,12 @@ private void initComponents() {
gridBagConstraints.insets = new java.awt.Insets(7, 25, 7, 25);
panFooter.add(lblFoot, gridBagConstraints);

setMinimumSize(new java.awt.Dimension(1100, 720));
setPreferredSize(new java.awt.Dimension(1100, 720));
setMinimumSize(new java.awt.Dimension(1100, 780));
setPreferredSize(new java.awt.Dimension(1100, 780));
setLayout(new java.awt.BorderLayout());

tpMain.setMinimumSize(new java.awt.Dimension(1100, 710));
tpMain.setPreferredSize(new java.awt.Dimension(1100, 710));
tpMain.setMinimumSize(new java.awt.Dimension(1100, 770));
tpMain.setPreferredSize(new java.awt.Dimension(1100, 770));

panKartierabschnitt.setOpaque(false);
panKartierabschnitt.setLayout(new java.awt.GridBagLayout());
Expand Down
46 changes: 44 additions & 2 deletions ...a/de/cismet/cids/custom/objecteditors/wrrl_db_mv/FgskKartierabschnittGewaesserumfeld.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,13 +288,13 @@

<Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
<SubComponents>
<Component class="javax.swing.JLabel" name="lblHeading2">
<Component class="javax.swing.JLabel" name="lblRandBeschattung">
<Properties>
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="ff" green="ff" red="ff" type="rgb"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="de/cismet/cids/custom/objecteditors/wrrl_db_mv/Bundle.properties" key="FgskKartierabschnittGewaesserumfeld.lblHeading2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
<ResourceString bundle="de/cismet/cids/custom/objecteditors/wrrl_db_mv/Bundle.properties" key="FgskKartierabschnittGewaesserumfeld.lblRandBeschattung.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
</Component>
Expand Down Expand Up @@ -404,6 +404,48 @@
</Constraint>
</Constraints>

<Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
</Container>
<Component class="javax.swing.JLabel" name="lblBeschattung">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="de/cismet/cids/custom/objecteditors/wrrl_db_mv/Bundle.properties" key="FgskKartierabschnittGewaesserumfeld.lblBeschattung.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[200, 17]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[200, 17]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[200, 17]"/>
</Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="3" gridWidth="2" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="15" insetsLeft="10" insetsBottom="5" insetsRight="5" anchor="18" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Container class="de.cismet.cids.editors.DefaultBindableRadioButtonField" name="rdBeschattung">
<Properties>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[300, 80]"/>
</Property>
<Property name="opaque" type="boolean" value="false"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[300, 80]"/>
</Property>
</Properties>
<BindingProperties>
<BindingProperty name="selectedElements" source="Form" sourcePath="${cidsBean.beschattung_id}" target="rdBeschattung" targetPath="selectedElements" updateStrategy="0" immediately="false"/>
</BindingProperties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="4" gridWidth="2" gridHeight="2" fill="0" ipadX="0" ipadY="0" insetsTop="5" insetsLeft="10" insetsBottom="5" insetsRight="10" anchor="18" weightX="1.0" weightY="1.0"/>
</Constraint>
</Constraints>

<Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
</Container>
</SubComponents>
Expand Down
54 changes: 48 additions & 6 deletions ...a/de/cismet/cids/custom/objecteditors/wrrl_db_mv/FgskKartierabschnittGewaesserumfeld.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@ public class FgskKartierabschnittGewaesserumfeld extends javax.swing.JPanel impl
private de.cismet.cids.custom.objecteditors.wrrl_db_mv.KartierabschnittSchaeUmfeldstrukturen
kartierabschnittSchaeUmfeldstrukturen1;
private de.cismet.cids.custom.objecteditors.wrrl_db_mv.KartierabschnittUebersicht kartierabschnittUebersicht1;
private javax.swing.JLabel lblBeschattung;
private javax.swing.JLabel lblHeading;
private javax.swing.JLabel lblHeading1;
private javax.swing.JLabel lblHeading2;
private javax.swing.JLabel lblRandBeschattung;
private javax.swing.JLabel lblSpacing1;
private javax.swing.JLabel lblSpacing2;
private javax.swing.JLabel lblUferverbauL;
Expand All @@ -61,6 +62,7 @@ public class FgskKartierabschnittGewaesserumfeld extends javax.swing.JPanel impl
private javax.swing.JPanel panInfoContent;
private javax.swing.JPanel panInfoContent1;
private javax.swing.JPanel panInfoContent2;
private de.cismet.cids.editors.DefaultBindableRadioButtonField rdBeschattung;
private de.cismet.cids.editors.DefaultBindableRadioButtonField rdUferverbauL;
private de.cismet.cids.editors.DefaultBindableRadioButtonField rdUferverbauR;
private de.cismet.cids.editors.DefaultBindableRadioButtonField rdZustandL;
Expand Down Expand Up @@ -115,13 +117,15 @@ private void initComponents() {
jpZustand = new javax.swing.JPanel();
panInfo3 = new de.cismet.tools.gui.RoundedPanel();
panHeadInfo2 = new de.cismet.tools.gui.SemiRoundedPanel();
lblHeading2 = new javax.swing.JLabel();
lblRandBeschattung = new javax.swing.JLabel();
panInfoContent2 = new javax.swing.JPanel();
lblZustandL = new javax.swing.JLabel();
lblSpacing2 = new javax.swing.JLabel();
lblZustandR = new javax.swing.JLabel();
rdZustandL = new de.cismet.cids.editors.DefaultBindableRadioButtonField();
rdZustandR = new de.cismet.cids.editors.DefaultBindableRadioButtonField();
lblBeschattung = new javax.swing.JLabel();
rdBeschattung = new de.cismet.cids.editors.DefaultBindableRadioButtonField();
kartierabschnittBesUmfeld1 = new de.cismet.cids.custom.objecteditors.wrrl_db_mv.KartierabschnittBesUmfeld();
kartierabschnittSchaeUmfeldstrukturen1 =
new de.cismet.cids.custom.objecteditors.wrrl_db_mv.KartierabschnittSchaeUmfeldstrukturen();
Expand Down Expand Up @@ -278,11 +282,11 @@ private void initComponents() {
panHeadInfo2.setPreferredSize(new java.awt.Dimension(109, 24));
panHeadInfo2.setLayout(new java.awt.FlowLayout());

lblHeading2.setForeground(new java.awt.Color(255, 255, 255));
lblHeading2.setText(org.openide.util.NbBundle.getMessage(
lblRandBeschattung.setForeground(new java.awt.Color(255, 255, 255));
lblRandBeschattung.setText(org.openide.util.NbBundle.getMessage(
FgskKartierabschnittGewaesserumfeld.class,
"FgskKartierabschnittGewaesserumfeld.lblHeading2.text")); // NOI18N
panHeadInfo2.add(lblHeading2);
"FgskKartierabschnittGewaesserumfeld.lblRandBeschattung.text")); // NOI18N
panHeadInfo2.add(lblRandBeschattung);

panInfo3.add(panHeadInfo2, java.awt.BorderLayout.NORTH);

Expand Down Expand Up @@ -365,6 +369,44 @@ private void initComponents() {
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 10);
panInfoContent2.add(rdZustandR, gridBagConstraints);

lblBeschattung.setText(org.openide.util.NbBundle.getMessage(
FgskKartierabschnittGewaesserumfeld.class,
"FgskKartierabschnittGewaesserumfeld.lblBeschattung.text")); // NOI18N
lblBeschattung.setMaximumSize(new java.awt.Dimension(200, 17));
lblBeschattung.setMinimumSize(new java.awt.Dimension(200, 17));
lblBeschattung.setPreferredSize(new java.awt.Dimension(200, 17));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 3;
gridBagConstraints.gridwidth = 2;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
gridBagConstraints.insets = new java.awt.Insets(15, 10, 5, 5);
panInfoContent2.add(lblBeschattung, gridBagConstraints);

rdBeschattung.setMinimumSize(new java.awt.Dimension(300, 80));
rdBeschattung.setOpaque(false);
rdBeschattung.setPreferredSize(new java.awt.Dimension(300, 80));

binding = org.jdesktop.beansbinding.Bindings.createAutoBinding(
org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ_WRITE,
this,
org.jdesktop.beansbinding.ELProperty.create("${cidsBean.beschattung_id}"),
rdBeschattung,
org.jdesktop.beansbinding.BeanProperty.create("selectedElements"));
bindingGroup.addBinding(binding);

gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 4;
gridBagConstraints.gridwidth = 2;
gridBagConstraints.gridheight = 2;
gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
gridBagConstraints.weightx = 1.0;
gridBagConstraints.weighty = 1.0;
gridBagConstraints.insets = new java.awt.Insets(5, 10, 5, 10);
panInfoContent2.add(rdBeschattung, gridBagConstraints);

panInfo3.add(panInfoContent2, java.awt.BorderLayout.CENTER);

jpZustand.add(panInfo3, java.awt.BorderLayout.CENTER);
Expand Down
Loading

0 comments on commit 733e765

Please sign in to comment.