Intensity to height converter with better artistic style (#699)

* intensity to height image converter * wave converter better artistic style * lowered maximum wave intensity, centered wave on original line, added comments to explain variables. --------- Co-authored-by: Dan Royer <[email protected]>
MarginallyClever · Sep 5, 2023 · a40e1ff · a40e1ff
1 parent 9dbcd43
commit a40e1ff
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>com.marginallyclever</groupId>
 	<artifactId>Makelangelo</artifactId>
-	<version>7.41.0</version>
+	<version>7.41.3</version>
 	<name>Makelangelo</name>
 		<description>Makelangelo Software is a Java program that prepares art for CNC plotters.  It is especially designed for the Makelangelo Robot.
 It pairs really well with Marlin-polargraph, the code in the brain of the robot that receives instructions and moves the motors.</description>

diff --git a/.../com/marginallyclever/makelangelo/makeart/imageconverter/Converter_IntensityToHeight.java b/.../com/marginallyclever/makelangelo/makeart/imageconverter/Converter_IntensityToHeight.java
@@ -15,33 +15,36 @@
  * @since 7.40.3
  */
 public class Converter_IntensityToHeight extends ImageConverter {
+	// vertical distance between lines
 	private static int spacing = 2;
-	private static int maxHeight = 10;
+	// horizontal distance between samples.  more samples = more detail.
 	private static int sampleRate = 5;
+	// max height of the wave will be +/-(waveIntensity/2)
+	private static int waveIntensity = 30;
 
 	public Converter_IntensityToHeight() {
 		super();
 
 		SelectSlider selectSize = new SelectSlider("size",Translator.get("Converter_IntensityToHeight.spacing"), 20,1,getSpacing());
-		SelectSlider selectMaxHeight = new SelectSlider("maxHeight",Translator.get("Converter_IntensityToHeight.maxHeight"),20,1,getMaxHeight());
 		SelectSlider selectSampleRate = new SelectSlider("sampleRate",Translator.get("Converter_IntensityToHeight.sampleRate"),20,1,getSampleRate());
+		SelectSlider selectWaveIntensity = new SelectSlider("waveIntensity",Translator.get("Converter_IntensityToHeight.waveIntensity"),50,-50,getWaveIntensity());
 
 		add(selectSize);
-		add(selectMaxHeight);
 		add(selectSampleRate);
+		add(selectWaveIntensity);
 
 		selectSize.addPropertyChangeListener(evt->{
 			setSpacing((int) evt.getNewValue());
 			fireRestart();
 		});
-		selectMaxHeight.addPropertyChangeListener(evt->{
-			setMaxHeight((int) evt.getNewValue());
-			fireRestart();
-		});
 		selectSampleRate.addPropertyChangeListener(evt->{
 			setSampleRate((int) evt.getNewValue());
 			fireRestart();
 		});
+		selectWaveIntensity.addPropertyChangeListener(evt->{
+			setWaveIntensity((int) evt.getNewValue());
+			fireRestart();
+		});
 	}
 
 	@Override
@@ -63,11 +66,11 @@ public void setSampleRate(int value) {
 		sampleRate = Math.max(1,value);
 	}
 
-	public int getMaxHeight() {
-		return maxHeight;
+	public int getWaveIntensity(){
+		return waveIntensity;
 	}
-	public void setMaxHeight(int value) {
-		maxHeight = Math.max(1,value);
+	public void setWaveIntensity(int value){
+		waveIntensity = value;
 	}
 
 	protected void convertLine(TransformedImage img, double sampleSpacing, double halfStep, Point2D a, Point2D b) {
@@ -83,11 +86,10 @@ protected void convertLine(TransformedImage img, double sampleSpacing, double ha
 			// read a block of the image and find the average intensity in this block
 			double z = img.sample( x - sampleSpacing, y - halfStep, x + sampleSpacing, y + halfStep);
 			// scale the intensity value
-			double scale_z = z / 255.0f;
-			scale_z = (scale_z-0.5)*2.0;
+			double scale_z = 1 - z / 255.0f;
 			//scale_z *= scale_z;  // quadratic curve
-			double pulseSize = halfStep * scale_z;
-			double py=y + pulseSize;
+			double pulseSize = waveIntensity * scale_z;
+			double py=y + pulseSize - waveIntensity/2.0f;
 			if(first) {
 				turtle.jumpTo(x, py);
 				first = false;
@@ -128,7 +130,7 @@ public void start(Paper paper, TransformedImage image) {
 				a.set(xRight,y);
 				b.set(xLeft,y);
 			}
-			convertLine(img,sampleRate,maxHeight,a,b);
+			convertLine(img,sampleRate,sampleRate/2.0,a,b);
 		}
 
 		fireConversionFinished();

diff --git a/src/main/resources/languages/english.xml b/src/main/resources/languages/english.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE language>
 <language>
 
-    <!--
+	<!--
         To facilitate the validation and avoid duplicated or empty key  (//language/string/key) ,
         please try to get language_no_dup_key.xsd from https://github.com/MarginallyClever/Makelangelo-software/blob/b1f418fc63d70f24288d490dccadc97d97a775e9/src/test/resources/translator/language_no_dup_key.xsd
             and change the begining of the file with :
-    
+
     <?xml version="1.0" encoding="UTF-8"?>
     <language xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="language_no_dup_key.xsd" >
-    
+
     -->
-    <meta>
-        <name>English</name>
-        <author>Dan Royer ([email protected])</author>
-    </meta>	
-    
-    <string><key>BorderName</key><value>Outline paper</value></string>
+	<meta>
+		<name>English</name>
+		<author>Dan Royer ([email protected])</author>
+	</meta>
+
+	<string><key>BorderName</key><value>Outline paper</value></string>
 	<string><key>Generator_TruchetTiles.Name</key><value>Truchet Tiles</value></string>
 	<string><key>Generator_TruchetTiles.LineSpacing</key><value>Space between lines (mm)</value></string>
 	<string><key>Generator_TruchetTiles.LinesPerTile</key><value>Lines per tile</value></string>
@@ -261,9 +261,9 @@
 
 	<string><key>TurtleGenerators.LearnMore.Link.Text</key><value>Learn more</value></string>
 	<string><key>LoadScratch3.foreverNotAllowed</key><value>Forever loops are forever forbidden.</value></string>
-    <string><key>SaveGCode.splitGCodeTitle</key><value>Many colors detected</value></string>
+	<string><key>SaveGCode.splitGCodeTitle</key><value>Many colors detected</value></string>
 
-    <string><key>Converter_CMYK_Circles.name</key><value>CMYK circles</value></string>
+	<string><key>Converter_CMYK_Circles.name</key><value>CMYK circles</value></string>
 	<string><key>Converter_CMYK_Circles.maxCircleSize</key><value>max circle size</value></string>
 
 	<string><key>Converter_EdgeDetection.name</key><value>Edge detection</value></string>
@@ -387,6 +387,6 @@
 
 	<string><key>Converter_IntensityToHeight.name</key><value>Intensity to height</value></string>
 	<string><key>Converter_IntensityToHeight.spacing</key><value>Wave spacing</value></string>
-	<string><key>Converter_IntensityToHeight.maxHeight</key><value>Wave height</value></string>
 	<string><key>Converter_IntensityToHeight.sampleRate</key><value>Sample rate</value></string>
-</language>
+	<string><key>Converter_IntensityToHeight.waveIntensity</key><value>Wave intensity</value></string>
+</language>