From f5e93e81ee1833cb9dae749e3f42d5ba12461d41 Mon Sep 17 00:00:00 2001 From: peterdell Date: Mon, 23 Sep 2019 00:16:03 +0200 Subject: [PATCH] Fix (probably obsolete) image aspect field storage in converter parameters --- .../converter/ConverterCommonParameters.java | 2 +- .../CharSet1x1-Hires/Charset-256.chr.png.cnv | 68 ++++++++++++++++--- .../Charset2x1-Hires/Charset-256.chr.png.cnv | 4 +- 3 files changed, 62 insertions(+), 12 deletions(-) diff --git a/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/converter/ConverterCommonParameters.java b/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/converter/ConverterCommonParameters.java index 17334083..d8fd015a 100644 --- a/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/converter/ConverterCommonParameters.java +++ b/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/converter/ConverterCommonParameters.java @@ -209,7 +209,7 @@ public abstract class ConverterCommonParameters { setConverterId(ownSerializer.readString(Attributes.CONVERTER_ID, Defaults.CONVERTER_ID)); - imageAspect = ownSerializer.readXYFactor(Attributes.DISPLAY_ASPECT, Defaults.IMAGE_ASPECT); + imageAspect = ownSerializer.readXYFactor(Attributes.IMAGE_ASPECT, Defaults.IMAGE_ASPECT); displayAspect = ownSerializer.readXYFactor(Attributes.DISPLAY_ASPECT, Defaults.DISPLAY_ASPECT); displayShrinkToFit = ownSerializer .readBoolean(Attributes.DISPLAY_SHRINK_TO_FIT, Defaults.DISPLAY_SHRINK_TO_FIT); diff --git a/com.wudsn.ide.ref/GFX/Generic/ImageToFiles/CharSet1x1-Hires/Charset-256.chr.png.cnv b/com.wudsn.ide.ref/GFX/Generic/ImageToFiles/CharSet1x1-Hires/Charset-256.chr.png.cnv index 1294cc42..3e5c894e 100644 --- a/com.wudsn.ide.ref/GFX/Generic/ImageToFiles/CharSet1x1-Hires/Charset-256.chr.png.cnv +++ b/com.wudsn.ide.ref/GFX/Generic/ImageToFiles/CharSet1x1-Hires/Charset-256.chr.png.cnv @@ -1,14 +1,16 @@ #WUDSN IDE Converter Parameters -#Sat Aug 31 12:05:35 CEST 2019 -converterDirection=IMAGE_TO_FILES -filesConverterParameters.converterId= -filesConverterParameters.imageAspect.factorX=1 +#Tue Sep 17 01:09:19 CEST 2019 +converterDirection=FILES_TO_IMAGE +filesConverterParameters.converterId=com.wudsn.ide.gfx.converter.atari8bit.LinearBitMapGraphics9Converter +filesConverterParameters.imageAspect.factorX=2 filesConverterParameters.imageAspect.factorY=1 filesConverterParameters.displayAspect.factorX=1 filesConverterParameters.displayAspect.factorY=1 filesConverterParameters.displayShrinkToFit=false filesConverterParameters.displayZoomToFit=true -filesConverterParameters.sourceFiles=0 +filesConverterParameters.sourceFiles=1 +filesConverterParameters.sourceFiles.0.path= +filesConverterParameters.sourceFiles.0.offset=0 filesConverterParameters.imageFilePath= filesConverterParameters.columns=40 filesConverterParameters.rows=24 @@ -18,14 +20,62 @@ filesConverterParameters.spacingColor.blue=128 filesConverterParameters.spacingWidth=0 filesConverterParameters.palette=HIRES_1 filesConverterParameters.paletteType=ATARI_DEFAULT -filesConverterParameters.paletteRGBs=0 +filesConverterParameters.paletteRGBs=16 +filesConverterParameters.paletteRGBs.0.red=0 +filesConverterParameters.paletteRGBs.0.green=0 +filesConverterParameters.paletteRGBs.0.blue=0 +filesConverterParameters.paletteRGBs.1.red=51 +filesConverterParameters.paletteRGBs.1.green=51 +filesConverterParameters.paletteRGBs.1.blue=51 +filesConverterParameters.paletteRGBs.2.red=102 +filesConverterParameters.paletteRGBs.2.green=102 +filesConverterParameters.paletteRGBs.2.blue=102 +filesConverterParameters.paletteRGBs.3.red=153 +filesConverterParameters.paletteRGBs.3.green=153 +filesConverterParameters.paletteRGBs.3.blue=153 +filesConverterParameters.paletteRGBs.4.red=204 +filesConverterParameters.paletteRGBs.4.green=204 +filesConverterParameters.paletteRGBs.4.blue=204 +filesConverterParameters.paletteRGBs.5.red=255 +filesConverterParameters.paletteRGBs.5.green=255 +filesConverterParameters.paletteRGBs.5.blue=255 +filesConverterParameters.paletteRGBs.6.red=0 +filesConverterParameters.paletteRGBs.6.green=0 +filesConverterParameters.paletteRGBs.6.blue=0 +filesConverterParameters.paletteRGBs.7.red=0 +filesConverterParameters.paletteRGBs.7.green=0 +filesConverterParameters.paletteRGBs.7.blue=0 +filesConverterParameters.paletteRGBs.8.red=0 +filesConverterParameters.paletteRGBs.8.green=0 +filesConverterParameters.paletteRGBs.8.blue=0 +filesConverterParameters.paletteRGBs.9.red=0 +filesConverterParameters.paletteRGBs.9.green=0 +filesConverterParameters.paletteRGBs.9.blue=0 +filesConverterParameters.paletteRGBs.10.red=0 +filesConverterParameters.paletteRGBs.10.green=0 +filesConverterParameters.paletteRGBs.10.blue=0 +filesConverterParameters.paletteRGBs.11.red=0 +filesConverterParameters.paletteRGBs.11.green=0 +filesConverterParameters.paletteRGBs.11.blue=0 +filesConverterParameters.paletteRGBs.12.red=0 +filesConverterParameters.paletteRGBs.12.green=0 +filesConverterParameters.paletteRGBs.12.blue=0 +filesConverterParameters.paletteRGBs.13.red=0 +filesConverterParameters.paletteRGBs.13.green=0 +filesConverterParameters.paletteRGBs.13.blue=0 +filesConverterParameters.paletteRGBs.14.red=0 +filesConverterParameters.paletteRGBs.14.green=0 +filesConverterParameters.paletteRGBs.14.blue=0 +filesConverterParameters.paletteRGBs.15.red=0 +filesConverterParameters.paletteRGBs.15.green=0 +filesConverterParameters.paletteRGBs.15.blue=0 imageConverterParameters.converterId=com.wudsn.ide.gfx.converter.generic.CharSet1x1HiresConverter imageConverterParameters.imageAspect.factorX=1 imageConverterParameters.imageAspect.factorY=1 imageConverterParameters.displayAspect.factorX=1 -imageConverterParameters.displayAspect.factorY=1 -imageConverterParameters.displayShrinkToFit=false -imageConverterParameters.displayZoomToFit=true +imageConverterParameters.displayAspect.factorY=2 +imageConverterParameters.displayShrinkToFit=true +imageConverterParameters.displayZoomToFit=false imageConverterParameters.imageFilePath=Charset-256.chr.png imageConverterParameters.targetFiles=10 imageConverterParameters.targetFiles.0.path= diff --git a/com.wudsn.ide.ref/GFX/Generic/ImageToFiles/Charset2x1-Hires/Charset-256.chr.png.cnv b/com.wudsn.ide.ref/GFX/Generic/ImageToFiles/Charset2x1-Hires/Charset-256.chr.png.cnv index ebed65af..27440216 100644 --- a/com.wudsn.ide.ref/GFX/Generic/ImageToFiles/Charset2x1-Hires/Charset-256.chr.png.cnv +++ b/com.wudsn.ide.ref/GFX/Generic/ImageToFiles/Charset2x1-Hires/Charset-256.chr.png.cnv @@ -1,6 +1,6 @@ #WUDSN IDE Converter Parameters -#Tue Jun 10 22:37:36 CEST 2014 -converterDirection=IMAGE_TO_FILES +#Mon Sep 16 11:37:16 CEST 2019 +converterDirection=FILES_TO_IMAGE filesConverterParameters.converterId= filesConverterParameters.imageAspect.factorX=1 filesConverterParameters.imageAspect.factorY=1