Merge pull request #18 from rbp28668/point_z

Point z

.gitignore

@@ -66,3 +66,4 @@ AEROFOIL/x86/*
 *.suo  
 *.tlog  # build log
 /.vs/Aerofoil/v16
+/Test/coords.txt

Aerofoil.rc

@@ -1214,8 +1214,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 7,0,0,0
- PRODUCTVERSION 7,0,0,0
+ FILEVERSION 7,0,0,1
+ PRODUCTVERSION 7,0,0,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1232,12 +1232,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "Aerofoil Plotting Program"
             VALUE "FileDescription", "Aerofoil MFC Application"
-            VALUE "FileVersion", "7.0.0.0"
+            VALUE "FileVersion", "7.0.0.1"
             VALUE "InternalName", "Aerofoil"
             VALUE "LegalCopyright", "Copyright (C) Bruce Porteous 2002-2020"
             VALUE "OriginalFilename", "Aerofoil.EXE"
             VALUE "ProductName", "Aerofoil Application"
-            VALUE "ProductVersion", "7.0.0.0"
+            VALUE "ProductVersion", "7.0.0.1"
         END
     END
     BLOCK "VarFileInfo"

Cutter/Cutter.rc

@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 7,0,0,0
- PRODUCTVERSION 7,0,0,0
+ FILEVERSION 7,0,0,1
+ PRODUCTVERSION 7,0,0,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -42,12 +42,12 @@ BEGIN
         BLOCK "080904b0"
         BEGIN
             VALUE "FileDescription", "Cutter MFC Application"
-            VALUE "FileVersion", "7.0.0.0"
+            VALUE "FileVersion", "7.0.0.1"
             VALUE "InternalName", "Cutter"
             VALUE "LegalCopyright", "Copyright (C) 2002"
             VALUE "OriginalFilename", "Cutter.EXE"
             VALUE "ProductName", "Cutter Application"
-            VALUE "ProductVersion", "7.0.0.0"
+            VALUE "ProductVersion", "7.0.0.1"
         END
     END
     BLOCK "VarFileInfo"

FeedRateDialog.cpp

@@ -154,7 +154,7 @@ void FeedRateDialog::OnOK()
 		pConfig->sendEnableControls = sendEnableControls == TRUE;
 		pConfig->sendMirror = sendMirror == TRUE;
 		pConfig->sendWorkshifts = sendWorkshifts == TRUE;
-		pConfig->preCorrectGeometry = useCutterGeometry = TRUE;
+		pConfig->preCorrectGeometry = useCutterGeometry == TRUE;
 
 	}
 

Kernel/BlockCorrectionOutputDevice.cpp

@@ -4,7 +4,9 @@
 
 BlockCorrectionOutputDevice::BlockCorrectionOutputDevice(COutputDevice* delegate, const Bounds& bounds)
 	: delegate(delegate),
-	bounds(bounds)
+	bounds(bounds),
+	hasLeft(false),
+	hasRight(false)
 {
 	// Set geometry so that a virtual block with the same width as the effective span of the cut
 	// defines the nominal edges of the block.
@@ -37,8 +39,10 @@ void BlockCorrectionOutputDevice::transformCaptured() {
 	geometry.blockToAxes(axes, left.fz - bounds.getMinz(), right.fz - bounds.getMinz());
 	left.fx = axes.x;
 	left.fy = axes.y;
+	left.fz = 0;
 	right.fx = axes.u;
 	right.fy = axes.v;
+	right.fz = bounds.depth();
 }
 
 void BlockCorrectionOutputDevice::MoveTo(int iStream, const PointT& pt)

Kernel/Cut.cpp

@@ -73,26 +73,25 @@ void Cut::cut(COutputDevice & pdev, const CutStructure::Context& context)
 
 	// Create proxy output device to perform correction to edges of virtual block
 	BlockCorrectionOutputDevice proxy(&pdev, bounds);
-	pdev = proxy;
 
 	try {
-		pdev.startPlot();
+		proxy.startPlot();
 
 		std::ostringstream os;
 		os << "(--EFFECTIVE_SPAN=" << bounds.depth() << ")";
-		pdev.passthrough(os.str().c_str());
+		proxy.passthrough(os.str().c_str());
 
 		for (CutIterator iter = cut_structures.begin();
 			iter != cut_structures.end();
 			++iter)
 		{
 			CutStructure* pcs = *iter;
-			pdev.startObject(pcs->getDescriptiveText().c_str());
-			pcs->cut(&pdev, context);
-			pdev.endObject(pcs->getDescriptiveText().c_str());
+			proxy.startObject(pcs->getDescriptiveText().c_str());
+			pcs->cut(&proxy, context);
+			proxy.endObject(pcs->getDescriptiveText().c_str());
 		}
-		pdev.Flush();
-		pdev.endPlot();
+		proxy.Flush();
+		proxy.endPlot();
 	}
 	catch (COutputDevice::OutputException& /*ex*/) {
 		// NOP for the time being.

Stories/TODO.txt

@@ -36,7 +36,7 @@ Adaptive step size in cutter for G-code output- start large and reduce step in U
 Plan view of cutter when width and block position defined DONE
 
 
-Rotate tapered wing to make TE parallel to edge of block
+Rotate tapered wing to make TE parallel to edge of block DONE
 
 Make ellipse tool offset aware.