From 03ab0f1d9565625f6225e39ebe558bab949f1ac3 Mon Sep 17 00:00:00 2001 From: Bane Stojkovic Date: Sat, 19 Nov 2022 12:28:53 +0100 Subject: [PATCH] Do not apply any user-default property values when creating a standard datasheet model (e.g. a capacitor) --- .../diylc/presenter/InstantiationManager.java | 7 +++++-- .../src/org/diylc/presenter/update.xml | 16 ++++++++++++++++ diylc/diylc-swing/dict.txt | 4 ---- diylc/diylc-swing/library/main.jar | Bin 906504 -> 906504 bytes 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/diylc/diylc-core/src/org/diylc/presenter/InstantiationManager.java b/diylc/diylc-core/src/org/diylc/presenter/InstantiationManager.java index e63f33e4..5ee0d7dc 100644 --- a/diylc/diylc-core/src/org/diylc/presenter/InstantiationManager.java +++ b/diylc/diylc-core/src/org/diylc/presenter/InstantiationManager.java @@ -298,8 +298,11 @@ public class InstantiationManager { } loadComponentShapeFromTemplate(component, template); - - fillWithDefaultProperties(component, template); + + if (model == null) { + // do not fill with defaults if creating by a model + fillWithDefaultProperties(component, template); + } // Write to recent components List recentComponentTypes = diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml index f806b25e..6b8838c6 100644 --- a/diylc/diylc-core/src/org/diylc/presenter/update.xml +++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml @@ -4177,5 +4177,21 @@ https://github.com/bancika/diy-layout-creator/releases + + + 4 + 34 + 0 + + 2022-11-16 00:00:00.000 CET + + + + BUG_FIX + Do not apply any user-default property values when creating a standard datasheet model (e.g. a capacitor) + + + https://github.com/bancika/diy-layout-creator/releases + diff --git a/diylc/diylc-swing/dict.txt b/diylc/diylc-swing/dict.txt index 40f04b39..5f715562 100644 --- a/diylc/diylc-swing/dict.txt +++ b/diylc/diylc-swing/dict.txt @@ -123,8 +123,6 @@ PCB PNP Poles Português -Primary Lead Spacing -Primary Leads Rectangle Rev log S-G-D JFET @@ -134,8 +132,6 @@ SPDT SPDT (On/Off/On) SPDT (On/On) SPST -Secondary Lead Spacing -Secondary Leads Shorting Single - North Single - South diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index fdedd3c517b202a94c92a494b0ef8b70b23cd004..edf00aaf291e483d7f205491df3f3a50596de202 100644 GIT binary patch delta 6784 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 delta 6784 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 Q;oViz>v@eJ=NgOsFER=F*#H0l