From f3e8509ff3a2ace12e47919476bfd3fd3468fee5 Mon Sep 17 00:00:00 2001 From: Bane Stojkovic Date: Thu, 10 Nov 2022 23:23:53 +0100 Subject: [PATCH] Batch model values to avoid too long menus --- .../passive/RadialFilmCapacitor.datasheet | 464 +++++++++--------- .../swing/plugins/canvas/CanvasPlugin.java | 88 +--- .../toolbox/ComponentButtonFactory.java | 55 ++- .../diylc/swing/plugins/tree/TreePanel.java | 5 +- 4 files changed, 277 insertions(+), 335 deletions(-) diff --git a/diylc/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.datasheet b/diylc/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.datasheet index 1864a7a9..e65137e8 100644 --- a/diylc/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.datasheet +++ b/diylc/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.datasheet @@ -1037,10 +1037,10 @@ WIMA MKS-4,50 V,1.0 uF,10,4,7.5,#FF6666,#A03140,#000000 WIMA MKS-4,50 V,1.5 uF,10.3,5,7.5,#FF6666,#A03140,#000000 WIMA MKS-4,50 V,2.2 uF,10.3,5.7,7.5,#FF6666,#A03140,#000000 WIMA MKS-4,50 V,3.3 uF,10.3,5.7,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,50 V,4.7 uF,10.3,7.2,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,50 V,4.7 uF,13,6,10,#FF6666,#A03140,#000000 -WIMA MKS-4,50 V,6.8 uF,10.3,7.2,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,50 V,6.8 uF,13,6,10,#FF6666,#A03140,#000000 +WIMA MKS-4,50 V,4.7 uF A,10.3,7.2,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,50 V,4.7 uF B,13,6,10,#FF6666,#A03140,#000000 +WIMA MKS-4,50 V,6.8 uF A,10.3,7.2,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,50 V,6.8 uF B,13,6,10,#FF6666,#A03140,#000000 WIMA MKS-4,50 V,10 uF,18,9,15,#FF6666,#A03140,#000000 WIMA MKS-4,50 V,15 uF,26.5,11,22.5,#FF6666,#A03140,#000000 WIMA MKS-4,50 V,18 uF,31.5,9,27.5,#FF6666,#A03140,#000000 @@ -1063,212 +1063,212 @@ WIMA MKS-4,50 V,390 uF,41.5,40,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,50 V,470 uF,57,35,52.5,#FF6666,#A03140,#000000 WIMA MKS-4,50 V,560 uF,57,45,52.5,#FF6666,#A03140,#000000 WIMA MKS-4,50 V,680 uF,57,45,52.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,0.1 uF,10,2.5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,0.1 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,0.15 uF,10,2.5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,0.15 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,0.22 uF,10,3,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,0.22 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,0.33 uF,10,4,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,0.33 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,0.47 uF,10,4,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,0.47 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,0.68 uF,10.3,5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,0.68 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,1.0 uF,10.3,5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,1.0 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,1.5 uF,10.3,5.7,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,1.5 uF,13,5,10,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,2.2 uF,13,5,10,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,2.2 uF,18,6,15,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,3.3 uF,13,6,10,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,3.3 uF,18,7,15,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,4.7 uF,18,7,15,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,4.7 uF,26.5,6,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,6.8 uF,18,8,15,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,6.8 uF,26.5,7,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,10 uF,26.5,8.5,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,10 uF,31.5,9,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,15 uF,26.5,11,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,15 uF,31.5,9,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,0.1 uF A,10,2.5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,0.1 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,0.15 uF A,10,2.5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,0.15 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,0.22 uF A,10,3,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,0.22 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,0.33 uF A,10,4,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,0.33 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,0.47 uF A,10,4,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,0.47 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,0.68 uF A,10.3,5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,0.68 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,1.0 uF A,10.3,5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,1.0 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,1.5 uF A,10.3,5.7,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,1.5 uF B,13,5,10,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,2.2 uF A,13,5,10,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,2.2 uF B,18,6,15,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,3.3 uF A,13,6,10,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,3.3 uF B,18,7,15,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,4.7 uF A,18,7,15,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,4.7 uF B,26.5,6,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,6.8 uF A,18,8,15,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,6.8 uF B,26.5,7,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,10 uF A,26.5,8.5,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,10 uF B,31.5,9,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,15 uF A,26.5,11,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,15 uF B,31.5,9,27.5,#FF6666,#A03140,#000000 WIMA MKS-4,63 V,18 uF,31.5,9,27.5,#FF6666,#A03140,#000000 WIMA MKS-4,63 V,22 uF,31.5,11,27.5,#FF6666,#A03140,#000000 WIMA MKS-4,63 V,27 uF,31.5,11,27.5,#FF6666,#A03140,#000000 WIMA MKS-4,63 V,33 uF,31.5,13,27.5,#FF6666,#A03140,#000000 WIMA MKS-4,63 V,39 uF,31.5,15,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,47 uF,31.5,15,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,47 uF,41.5,13,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,56 uF,31.5,17,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,56 uF,41.5,15,37.6,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,68 uF,31.5,17,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,68 uF,41.5,15,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,82 uF,31.5,17,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,82 uF,41.5,17,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,100 uF,31.5,20,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,100 uF,41.5,19,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,47 uF A,31.5,15,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,47 uF B,41.5,13,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,56 uF A,31.5,17,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,56 uF B,41.5,15,37.6,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,68 uF A,31.5,17,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,68 uF B,41.5,15,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,82 uF A,31.5,17,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,82 uF B,41.5,17,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,100 uF A,31.5,20,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,100 uF B,41.5,19,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,63 V,120 uF,41.5,20,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,63 V,150 uF,41.5,20,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,180 uF,41.5,24,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,180 uF,41.5,28,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,220 uF,41.5,31,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,220 uF,57,25,52.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,270 uF,41.5,31,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,270 uF,57,25,52.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,330 uF,41.5,35,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,330 uF,57,30,52.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,390 uF,41.5,40,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,63 V,390 uF,57,30,52.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,180 uF A,41.5,24,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,180 uF B,41.5,28,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,220 uF A,41.5,31,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,220 uF B,57,25,52.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,270 uF A,41.5,31,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,270 uF B,57,25,52.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,330 uF A,41.5,35,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,330 uF B,57,30,52.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,390 uF A,41.5,40,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,63 V,390 uF B,57,30,52.5,#FF6666,#A03140,#000000 WIMA MKS-4,63 V,470 uF,57,35,52.5,#FF6666,#A03140,#000000 WIMA MKS-4,63 V,560 uF,57,45,52.5,#FF6666,#A03140,#000000 WIMA MKS-4,63 V,680 uF,57,45,52.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.01 uF,10,2.5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.01 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.015 uF,10,2.5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.015 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.022 uF,10,2.5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.022 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.033 uF,10,2.5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.033 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.047 uF,10,2.5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.047 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.068 uF,10,2.5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.068 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.1 uF,10,2.5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.1 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.15 uF,10,3,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.15 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.22 uF,10,3,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.22 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.33 uF,10,4,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.33 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.47 uF,10.3,4.5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.47 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.68 uF,10.3,5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,0.68 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,1.0 uF,10.3,5.7,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,1.0 uF,13,5,10,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,1.5 uF,13,6,10,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,1.5 uF,18,7,15,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,2.2 uF,18,8,15,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,2.2 uF,26.5,6,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,3.3 uF,18,9,15,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,3.3 uF,26.5,7,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,4.7 uF,26.5,10.5,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,4.7 uF,31.5,9,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,6.8 uF,26.5,10.5,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,6.8 uF,31.5,11,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.01 uF A,10,2.5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.01 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.015 uF A,10,2.5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.015 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.022 uF A,10,2.5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.022 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.033 uF A,10,2.5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.033 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.047 uF A,10,2.5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.047 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.068 uF A,10,2.5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.068 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.1 uF A,10,2.5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.1 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.15 uF A,10,3,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.15 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.22 uF A,10,3,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.22 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.33 uF A,10,4,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.33 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.47 uF A,10.3,4.5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.47 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.68 uF A,10.3,5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,0.68 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,1.0 uF A,10.3,5.7,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,1.0 uF B,13,5,10,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,1.5 uF A,13,6,10,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,1.5 uF B,18,7,15,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,2.2 uF A,18,8,15,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,2.2 uF B,26.5,6,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,3.3 uF A,18,9,15,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,3.3 uF B,26.5,7,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,4.7 uF A,26.5,10.5,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,4.7 uF B,31.5,9,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,6.8 uF A,26.5,10.5,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,6.8 uF B,31.5,11,27.5,#FF6666,#A03140,#000000 WIMA MKS-4,100 V,10 uF,31.5,9,27.5,#FF6666,#A03140,#000000 WIMA MKS-4,100 V,15 uF,31.5,11,27.5,#FF6666,#A03140,#000000 WIMA MKS-4,100 V,18 uF,31.5,11,27.5,#FF6666,#A03140,#000000 WIMA MKS-4,100 V,22 uF,31.5,13,27.5,#FF6666,#A03140,#000000 WIMA MKS-4,100 V,27 uF,31.5,15,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,33 uF,31.5,15,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,33 uF,41.5,13,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,39 uF,31.5,17,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,39 uF,41.5,15,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,47 uF,31.5,17,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,47 uF,41.5,17,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,56 uF,31.5,20,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,56 uF,41.5,17,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,68 uF,31.5,20,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,68 uF,41.5,19,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,33 uF A,31.5,15,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,33 uF B,41.5,13,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,39 uF A,31.5,17,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,39 uF B,41.5,15,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,47 uF A,31.5,17,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,47 uF B,41.5,17,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,56 uF A,31.5,20,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,56 uF B,41.5,17,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,68 uF A,31.5,20,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,68 uF B,41.5,19,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,100 V,82 uF,41.5,20,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,100 V,100 uF,41.5,20,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,100 V,120 uF,41.5,24,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,100 V,150 uF,41.5,31,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,180 uF,41.5,31,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,180 uF,57,25,52.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,220 uF,41.5,35,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,220 uF,57,30,52.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,270 uF,41.5,40,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,100 V,270 uF,57,35,52.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,180 uF A,41.5,31,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,180 uF B,57,25,52.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,220 uF A,41.5,35,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,220 uF B,57,30,52.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,270 uF A,41.5,40,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,100 V,270 uF B,57,35,52.5,#FF6666,#A03140,#000000 WIMA MKS-4,100 V,330 uF,57,45,52.5,#FF6666,#A03140,#000000 WIMA MKS-4,100 V,390 uF,57,45,52.5,#FF6666,#A03140,#000000 WIMA MKS-4,100 V,470 uF,57,45,52.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.01 uF,10,3,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.01 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.015 uF,10,2.5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.015 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.022 uF,10,2.5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.022 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.033 uF,10,2.5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.033 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.047 uF,10,3,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.047 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.068 uF,10,4,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.068 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.1 uF,10,4,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.1 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.15 uF,10.3,5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.15 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.22 uF,10.3,5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.22 uF,13,5,10,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.33 uF,10.3,5.7,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.33 uF,13,5,10,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.47 uF,13,6,10,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,0.47 uF,18,6,15,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.01 uF A,10,3,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.01 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.015 uF A,10,2.5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.015 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.022 uF A,10,2.5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.022 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.033 uF A,10,2.5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.033 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.047 uF A,10,3,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.047 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.068 uF A,10,4,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.068 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.1 uF A,10,4,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.1 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.15 uF A,10.3,5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.15 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.22 uF A,10.3,5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.22 uF B,13,5,10,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.33 uF A,10.3,5.7,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.33 uF B,13,5,10,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.47 uF A,13,6,10,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,0.47 uF B,18,6,15,#FF6666,#A03140,#000000 WIMA MKS-4,250 V,0.68 uF,18,7,15,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,1.0 uF,18,8,15,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,1.0 uF,26.5,6,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,1.5 uF,18,9,15,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,1.5 uF,26.5,7,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,2.2 uF,26.5,10.5,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,2.2 uF,31.5,9,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,3.3 uF,26.5,11,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,3.3 uF,31.5,11,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,1.0 uF A,18,8,15,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,1.0 uF B,26.5,6,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,1.5 uF A,18,9,15,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,1.5 uF B,26.5,7,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,2.2 uF A,26.5,10.5,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,2.2 uF B,31.5,9,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,3.3 uF A,26.5,11,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,3.3 uF B,31.5,11,27.5,#FF6666,#A03140,#000000 WIMA MKS-4,250 V,4.7 uF,31.5,11,27.5,#FF6666,#A03140,#000000 WIMA MKS-4,250 V,6.8 uF,31.5,13,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,10 uF,31.5,17,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,10 uF,41.5,15,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,15 uF,31.5,17,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,15 uF,41.5,17,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,18 uF,31.5,20,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,18 uF,41.5,19,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,10 uF A,31.5,17,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,10 uF B,41.5,15,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,15 uF A,31.5,17,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,15 uF B,41.5,17,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,18 uF A,31.5,20,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,18 uF B,41.5,19,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,250 V,22 uF,41.5,20,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,250 V,27 uF,41.5,20,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,250 V,33 uF,41.5,24,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,250 V,39 uF,41.5,24,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,250 V,47 uF,41.5,31,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,56 uF,41.5,35,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,56 uF,57,25,52.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,68 uF,41.5,35,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,68 uF,57,30,52.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,82 uF,41.5,40,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,82 uF,57,35,52.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,100 uF,57,45,52.5,#FF6666,#A03140,#000000 -WIMA MKS-4,250 V,120 uF,57,45,52.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,56 uF A,41.5,35,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,56 uF B,57,25,52.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,68 uF A,41.5,35,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,68 uF B,57,30,52.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,82 uF A,41.5,40,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,82 uF B,57,35,52.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,100 uF A,57,45,52.5,#FF6666,#A03140,#000000 +WIMA MKS-4,250 V,120 uF B,57,45,52.5,#FF6666,#A03140,#000000 WIMA MKS-4,250 V,150 uF,57,45,52.5,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,0.01µF,10,3,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,0.01µF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,0.015 uF,10,3,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,0.015 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,0.022 uF,10,4,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,0.022 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,0.033 uF,10,4,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,0.033 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,0.047 uF,10.3,5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,0.047 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,0.068 uF,10.3,5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,0.068 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,0.1 uF,10.3,5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,0.1 uF,13,5,10,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,0.15 uF,10.3,5.7,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,0.15 uF,13,6,10,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,0.22 uF,13,6,10,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,0.22 uF,18,6,15,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,0.01µF A,10,3,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,0.01µF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,0.015 uF A,10,3,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,0.015 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,0.022 uF A,10,4,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,0.022 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,0.033 uF A,10,4,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,0.033 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,0.047 uF A,10.3,5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,0.047 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,0.068 uF A,10.3,5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,0.068 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,0.1 uF A,10.3,5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,0.1 uF B,13,5,10,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,0.15 uF A,10.3,5.7,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,0.15 uF B,13,6,10,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,0.22 uF A,13,6,10,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,0.22 uF B,18,6,15,#FF6666,#A03140,#000000 WIMA MKS-4,400 V,0.33 uF,18,8,15,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,0.47 uF,18,8,15,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,0.47 uF,26.5,6,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,0.47 uF A,18,8,15,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,0.47 uF B,26.5,6,22.5,#FF6666,#A03140,#000000 WIMA MKS-4,400 V,0.68 uF,26.5,7,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,1.0 uF,26.5,10.5,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,1.0 uF,31.5,11,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,1.5 uF,26.5,11,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,1.5 uF,31.5,11,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,1.0 uF A,26.5,10.5,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,1.0 uF B,31.5,11,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,1.5 uF A,26.5,11,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,1.5 uF B,31.5,11,27.5,#FF6666,#A03140,#000000 WIMA MKS-4,400 V,2.2 uF,31.5,11,27.5,#FF6666,#A03140,#000000 WIMA MKS-4,400 V,3.3 uF,31.5,13,27.5,#FF6666,#A03140,#000000 WIMA MKS-4,400 V,4.7 uF,31.5,17,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,6.8 uF,31.5,17,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,400 V,6.8 uF,41.5,15,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,6.8 uF A,31.5,17,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,400 V,6.8 uF B,41.5,15,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,400 V,10 uF,41.5,19,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,400 V,15 uF,41.5,20,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,400 V,18 uF,41.5,31,37.5,#FF6666,#A03140,#000000 @@ -1279,79 +1279,79 @@ WIMA MKS-4,400 V,39 uF,57,35,52.5,#FF6666,#A03140,#000000 WIMA MKS-4,400 V,47 uF,57,35,52.5,#FF6666,#A03140,#000000 WIMA MKS-4,400 V,56 uF,57,45,52.5,#FF6666,#A03140,#000000 WIMA MKS-4,400 V,68 uF,57,45,52.5,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.01 uF,10,3,7.5 *,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.01 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.015 uF,10,4,7.5 *,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.015 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.022 uF,10.3,4.5,7.5 *,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.022 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.033 uF,10.3,5,7.5 *,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.033 uF,13,5,10,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.047 uF,10.3,5.7,7.5 *,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.047 uF,13,6,10,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.068 uF,13,6,10,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.068 uF,18,5,15,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.1 uF,18,6,15,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.1 uF,26.5,6,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.15 uF,18,7,15,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.15 uF,26.5,6,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.22 uF,18,8,15,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.22 uF,26.5,6,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.33 uF,26.5,7,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.33 uF,31.5,9,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.47 uF,26.5,10.5,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.47 uF,31.5,9,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.68 uF,26.5,11,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,0.68 uF,31.5,11,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.01 uF A,10,3,7.58,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.01 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.015 uF A,10,4,7.58,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.015 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.022 uF A,10.3,4.5,7.58,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.022 uF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.033 uF A,10.3,5,7.58,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.033 uF B,13,5,10,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.047 uF A,10.3,5.7,7.58,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.047 uF B,13,6,10,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.068 uF A,13,6,10,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.068 uF B,18,5,15,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.1 uF A,18,6,15,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.1 uF B,26.5,6,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.15 uF A,18,7,15,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.15 uF B,26.5,6,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.22 uF A,18,8,15,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.22 uF B,26.5,6,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.33 uF A,26.5,7,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.33 uF B,31.5,9,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.47 uF A,26.5,10.5,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.47 uF B,31.5,9,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.68 uF A,26.5,11,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,0.68 uF B,31.5,11,27.5,#FF6666,#A03140,#000000 WIMA MKS-4,630 V,1.0 uF,31.5,11,27.5,#FF6666,#A03140,#000000 WIMA MKS-4,630 V,1.5 uF,31.5,15,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,2.2 uF,31.5,17,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,2.2 uF,41.5,15,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,3.3 uF,31.5,20,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,630 V,3.3 uF,41.5,19,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,2.2 uF A,31.5,17,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,2.2 uF B,41.5,15,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,3.3 uF A,31.5,20,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,630 V,3.3 uF B,41.5,19,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,630 V,4.7 uF,41.5,20,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,630 V,6.8 uF,41.5,24,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,630 V,10 uF,41.5,35,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,630 V,15 uF,41.5,40,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,630 V,18 uF,57,45,52.5,#FF6666,#A03140,#000000 WIMA MKS-4,630 V,22 uF,57,45,52.5,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,1000pF,10,3,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,1000pF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,1500 uF,10,3,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,1500 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,2200 uF,10,3,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,2200 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,3300 uF,10,4,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,3300 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,4700 uF,10,4,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,4700 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,6800 uF,10.3,4.5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,6800 uF,13,4,10,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,0.01 uF,10.3,5,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,0.01 uF,13,5,10,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,0.015 uF,10.3,5.7,7.5,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,0.015 uF,13,6,10,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,1000 pF A,10,3,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,1000 pF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,1500 pF A,10,3,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,1500 pF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,2200 pF A,10,3,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,2200 pF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,3300 pF A,10,4,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,3300 pF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,4700 pF A,10,4,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,4700 pF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,6800 pF A,10.3,4.5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,6800 pF B,13,4,10,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,0.01 uF A,10.3,5,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,0.01 uF B,13,5,10,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,0.015 uF A,10.3,5.7,7.5,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,0.015 uF B,13,6,10,#FF6666,#A03140,#000000 WIMA MKS-4,1000 V,0.022 uF,18,5,15,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,0.033 uF,18,6,15,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,0.033 uF,26.5,6,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,0.047 uF,18,7,15,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,0.047 uF,26.5,6,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,0.068 uF,18,8,15,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,0.068 uF,26.5,6,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,0.1 uF,18,9,15,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,0.1 uF,26.5,7,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,0.033 uF A,18,6,15,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,0.033 uF B,26.5,6,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,0.047 uF A,18,7,15,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,0.047 uF B,26.5,6,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,0.068 uF A,18,8,15,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,0.068 uF B,26.5,6,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,0.1 uF A,18,9,15,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,0.1 uF B,26.5,7,22.5,#FF6666,#A03140,#000000 WIMA MKS-4,1000 V,0.15 uF,26.5,8.5,22.5,#FF6666,#A03140,#000000 WIMA MKS-4,1000 V,0.22 uF,26.5,10.5,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,0.33 uF,26.5,11,22.5,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,0.33 uF,31.5,11,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,0.33 uF A,26.5,11,22.5,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,0.33 uF B,31.5,11,27.5,#FF6666,#A03140,#000000 WIMA MKS-4,1000 V,0.47 uF,31.5,13,27.5,#FF6666,#A03140,#000000 WIMA MKS-4,1000 V,0.68 uF,31.5,15,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,1.0 uF,31.5,17,27.5,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,1.0 uF,41.5,17,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,1.0 uF A,31.5,17,27.5,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,1.0 uF B,41.5,17,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,1000 V,1.5 uF,41.5,19,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,1000 V,2.2 uF,41.5,20,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,1000 V,3.3 uF,41.5,24,37.5,#FF6666,#A03140,#000000 WIMA MKS-4,1000 V,4.7 uF,41.5,35,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,6.8 uF,41.5,40,37.5,#FF6666,#A03140,#000000 -WIMA MKS-4,1000 V,6.8 uF,57,35,52.5,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,6.8 uF A,41.5,40,37.5,#FF6666,#A03140,#000000 +WIMA MKS-4,1000 V,6.8 uF B,57,35,52.5,#FF6666,#A03140,#000000 WIMA MKS-4,1000 V,10 uF,57,45,52.5,#FF6666,#A03140,#000000 diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java index ad8fd9d1..6567d02d 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java @@ -41,9 +41,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.EnumSet; import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; -import java.util.stream.Stream; import javax.swing.AbstractAction; import javax.swing.JMenu; import javax.swing.JMenuItem; @@ -52,8 +49,6 @@ import javax.swing.JScrollBar; import javax.swing.JScrollPane; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; -import javax.swing.event.MenuEvent; -import javax.swing.event.MenuListener; import org.apache.log4j.Logger; import org.diylc.appframework.miscutils.IConfigListener; import org.diylc.appframework.miscutils.IConfigurationManager; @@ -77,6 +72,7 @@ import org.diylc.swing.gui.TranslatedMenu; import org.diylc.swing.gui.TranslatedPopupMenu; import org.diylc.swing.images.IconLoader; import org.diylc.swing.plugins.file.ProjectDrawingProvider; +import org.diylc.swing.plugins.toolbox.ComponentButtonFactory; import org.diylc.swingframework.ruler.IRulerListener; import org.diylc.swingframework.ruler.Ruler.InchSubdivision; import org.diylc.swingframework.ruler.RulerScrollPane; @@ -729,88 +725,14 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner { } applyMenu.setEnabled(true); - List datasheetItems = createDatasheetItems(plugInPort, componentType, new ArrayList()); + List datasheetItems = ComponentButtonFactory.createDatasheetItems(plugInPort, componentType, new ArrayList(), model -> { + LOG.info("Applying datasheet model " + String.join(", ", model)); + plugInPort.applyModelToSelection(model); + }); for (Component item : datasheetItems) { applyMenu.add(item); } } - - private List createDatasheetItems(final IPlugInPort plugInPort, - final ComponentType componentType, List path) { - int depth = path.size(); - List datasheet = componentType.getDatasheet(); - if (datasheet == null) { - return null; - } - Stream stream = datasheet.stream(); - for (int i = 0; i < depth; i++) { - final int finalI = i; - stream = stream.filter(line -> line[finalI].equals(path.get(finalI))); - } - List filteredDatasheet = stream.collect(Collectors.toList()); - - return filteredDatasheet.stream().map(x -> x[depth]).distinct().map(value -> { - - if (depth < componentType.getDatasheetCreationStepCount() - 1) { - final JMenu submenu = new JMenu(value) { - - private static final long serialVersionUID = 1L; - - // Customize item size to fit the delete button - public java.awt.Dimension getPreferredSize() { - Dimension d = super.getPreferredSize(); - return new Dimension(d.width + 32, d.height); - } - }; - - submenu.add(new JMenuItem("Loading...")); - - submenu.addMenuListener(new MenuListener() { - - @Override - public void menuSelected(MenuEvent e) { - submenu.removeAll(); - List newPath = new ArrayList(path); - newPath.add(value); - List childItems = createDatasheetItems(plugInPort, componentType, newPath); - for (Component childItem : childItems) { - submenu.add(childItem); - } - } - - @Override - public void menuDeselected(MenuEvent e) {} - - @Override - public void menuCanceled(MenuEvent e) {} - }); - - return (Component) submenu; - } - - JMenuItem item = new JMenuItem(value); - - item.addActionListener(new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - Optional findFirst = - filteredDatasheet.stream().filter(line -> line[depth].equals(value)).findFirst(); - - if (findFirst.isPresent()) { - String[] model = findFirst.get(); - LOG.info("Applying datasheet model " + String.join(", ", model)); - - plugInPort.applyModelToSelection(model); - } else { - LOG.error("Could not find datasheet item for: " + value); - } - } - }); - - return (Component) item; - }).collect(Collectors.toList()); - } public ActionFactory.CutAction getCutAction() { if (cutAction == null) { diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java index 4e615a85..3418ad53 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java @@ -30,6 +30,7 @@ import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.List; import java.util.Optional; +import java.util.function.Consumer; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -56,6 +57,7 @@ import org.diylc.core.IDIYComponent; import org.diylc.core.Template; import org.diylc.swing.images.IconLoader; import org.diylc.swingframework.openide.DropDownButtonFactory; +import com.google.common.collect.Lists; /** * Factory that creates {@link JButton}s which display component type icons and instantiates the @@ -65,6 +67,8 @@ import org.diylc.swingframework.openide.DropDownButtonFactory; */ public class ComponentButtonFactory { + private static final int MAX_MENU_ITEMS = 30; + private static final Logger LOG = Logger.getLogger(ComponentButtonFactory.class); public static int MARGIN = 3; @@ -208,7 +212,7 @@ public class ComponentButtonFactory { } public static List createDatasheetItems(final IPlugInPort plugInPort, - final ComponentType componentType, List path) { + final ComponentType componentType, List path, Consumer modelConsumer) { int depth = path.size(); List datasheet = componentType.getDatasheet(); if (datasheet == null) { @@ -224,16 +228,7 @@ public class ComponentButtonFactory { return filteredDatasheet.stream().map(x -> x[depth]).distinct().map(value -> { if (depth < componentType.getDatasheetCreationStepCount() - 1) { - final JMenu submenu = new JMenu(value) { - - private static final long serialVersionUID = 1L; - - // Customize item size to fit the delete button - public java.awt.Dimension getPreferredSize() { - Dimension d = super.getPreferredSize(); - return new Dimension(d.width + 32, d.height); - } - }; + final JMenu submenu = new JMenu(value); submenu.add(new JMenuItem("Loading...")); @@ -244,9 +239,33 @@ public class ComponentButtonFactory { submenu.removeAll(); List newPath = new ArrayList(path); newPath.add(value); - List childItems = createDatasheetItems(plugInPort, componentType, newPath); - for (Component childItem : childItems) { - submenu.add(childItem); + List childItems = createDatasheetItems(plugInPort, componentType, newPath, modelConsumer); + if (childItems.size() > MAX_MENU_ITEMS) { + List> partitions = Lists.partition(childItems, MAX_MENU_ITEMS); + for (List partition : partitions) { + String label = null; + Component first = partition.get(0); + if (first instanceof JMenu) { + label = ((JMenu) first).getText(); + if (partition.size() > 1) { + label += " - " + ((JMenu) partition.get(partition.size() - 1)).getText(); + } + } else if (first instanceof JMenuItem) { + label = ((JMenuItem) first).getText(); + if (partition.size() > 1) { + label += " - " + ((JMenuItem) partition.get(partition.size() - 1)).getText(); + } + } + JMenu partitionMenu = new JMenu(label); + for (Component childItem : partition) { + partitionMenu.add(childItem); + } + submenu.add(partitionMenu); + } + } else { + for (Component childItem : childItems) { + submenu.add(childItem); + } } } @@ -267,12 +286,10 @@ public class ComponentButtonFactory { @Override public void actionPerformed(ActionEvent e) { Optional findFirst = - filteredDatasheet.stream().filter(line -> line[depth].equals(value)).findFirst(); - + filteredDatasheet.stream().filter(line -> line[depth].equals(value)).findFirst(); + if (findFirst.isPresent()) { - LOG.info("Creating datasheet model " + String.join(", ", findFirst.get())); - plugInPort.setNewComponentTypeSlot(componentType, null, findFirst.get(), - false); + modelConsumer.accept(findFirst.get()); } else { LOG.error("Could not find datasheet item for: " + value); } diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/TreePanel.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/TreePanel.java index a57907e8..0dfab2cd 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/TreePanel.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/TreePanel.java @@ -357,7 +357,10 @@ public class TreePanel extends JPanel { popup.add(new JSeparator()); if (componentType.getDatasheet() != null) { - List items = ComponentButtonFactory.createDatasheetItems(plugInPort, componentType, new ArrayList()); + List items = ComponentButtonFactory.createDatasheetItems(plugInPort, componentType, new ArrayList(), model -> { + LOG.info("Creating datasheet model " + String.join(", ", model)); + plugInPort.setNewComponentTypeSlot(componentType, null, model, false); + }); for (Component item : items) { popup.add(item); }