Index: vhUnitTest/APPS/VisiDot/TestVHoss.cls.xml
===================================================================
diff -u -r1755 -r1765
--- vhUnitTest/APPS/VisiDot/TestVHoss.cls.xml	(.../TestVHoss.cls.xml)	(revision 1755)
+++ vhUnitTest/APPS/VisiDot/TestVHoss.cls.xml	(.../TestVHoss.cls.xml)	(revision 1765)
@@ -25,7 +25,7 @@
 	Set QueueBuilder = ##class(vhUnitTest.APPS.VisiDot.impl.BuildQueue).%New()
 	Do QueueBuilder.Initialize()
 	Set BatchID=QueueBuilder.BuildBatch()
-	Set ..VHossBuilder = ##class(vhUnitTest.APPS.VisiDot.impl.BuildCapture).%New(BatchID)
+	Set ..VHossBuilder = ##class(vhUnitTest.APPS.VisiDot.impl.BuildVHossCapture).%New(BatchID)
 	Set ..WebService = ##class(WS.VisiDot.OperatorServer).%New()
 ]]></Implementation>
 </Method>
@@ -45,6 +45,7 @@
 <Implementation><![CDATA[
 	Do ..Init()
 	Set Capture=..VHossBuilder.CorrectVHoss(1,1)
+	;d Capture.XMLExport(,"literal,indent") r k
 	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
 
 	Set ErrorCode=..Finish(ProcessedData)	
@@ -59,7 +60,7 @@
 	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
 
 	Set ErrorCode=..Finish(ProcessedData)	
-	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossNoInfo(),"Capture bevat een extra lade (teveel)")
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossLadeFoutief(),"Capture bevat een extra lade (teveel)")
 ]]></Implementation>
 </Method>
 
@@ -70,7 +71,7 @@
 	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
 
 	Set ErrorCode=..Finish(ProcessedData)	
-	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossOntbrekend(),"Capture bevat een ontbrekende lade")
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossLadeOntbrekend(),"Capture bevat een ontbrekende lade")
 ]]></Implementation>
 </Method>
 
@@ -100,7 +101,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="TestZijkantZonderLadeMetBatchID">
+<Method name="TestZijkantZonderLadeMetBatch">
 <Implementation><![CDATA[
 	Do ..Init()
 	Set Capture=..VHossBuilder.CorrectVHoss(99,1)
FishEye: Tag 1765 refers to a dead (removed) revision in file `vhUnitTest/APPS/VisiDot/impl/BuildCapture.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhUnitTest/APPS/VisiDot/impl/BuildVHossCapture.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/VisiDot/impl/BuildVHossCapture.cls.xml	(revision 0)
+++ vhUnitTest/APPS/VisiDot/impl/BuildVHossCapture.cls.xml	(revision 1765)
@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.APPS.VisiDot.impl.BuildVHossCapture">
+<IncludeCode>BL.PPS.TBX.Common</IncludeCode>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="QueueList">
+<Description>
+format PRNr;Aantal;VHOSS.Zijkant</Description>
+<Default>418581;3;1.1\418582;2;1.1\418588;4;1.1\418589;4;1.1\418609;5;1.1\418703;2;1.1\418704;1;1.1\418715;4;1.1\427384;5;2.1\427390;20;2.1\427394;1;2.1\427470;14;2.2\427478;2;2.2\460765;2;2.2</Default>
+</Parameter>
+
+<Property name="BatchID">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="VHossID">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="SlotLabel">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="SequenceNr">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="VHoss">
+<Type>%String</Type>
+<MultiDimensional>1</MultiDimensional>
+</Property>
+
+<Property name="BatchService">
+<Type>APPS.Halux.common.BatchService</Type>
+</Property>
+
+<Property name="Capture">
+<Type>APPS.VisiDot.dto.CaptureInfo</Type>
+</Property>
+
+<Property name="CaptureHelper">
+<Type>APPS.VisiDot.impl.CaptureHelper</Type>
+</Property>
+
+<Property name="Sequence">
+<Type>APPS.VisiDot.dto.Sequence</Type>
+</Property>
+
+<Property name="ProductionHelper">
+<Type>APPS.VisiDot.impl.ProductionHelper</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>BatchID</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..ProductionHelper=##class(APPS.VisiDot.impl.VHossProductionHelper).%New()
+	Set ..BatchService=##class(APPS.Halux.common.BatchService).%New()
+	Set ..BatchID=BatchID
+
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Empty">
+<FormalSpec>VHossNr,Zijkant</FormalSpec>
+<Implementation><![CDATA[
+	Do ..BuildCapture()
+	Quit ..Capture
+]]></Implementation>
+</Method>
+
+<Method name="CorrectVHoss">
+<FormalSpec>VHossNr,Zijkant</FormalSpec>
+<Implementation><![CDATA[
+	Do ..BuildVHoss(VHossNr,Zijkant)
+	Do ..AddEmptySlots()
+	
+	Quit ..Capture
+]]></Implementation>
+</Method>
+
+<Method name="CorrectVHossPlusOne">
+<FormalSpec>VHossNr,Zijkant</FormalSpec>
+<Implementation><![CDATA[
+	Do ..BuildVHoss(VHossNr, Zijkant)
+	Set Detection=..BuildExtraDetection(VHossNr+1, 1)
+	Do ..AddDetection2Capture(Detection,30)
+	;do ..Capture.XMLExport(,"literal,indent") r k
+	Do ..AddEmptySlots()
+	Quit ..Capture
+]]></Implementation>
+</Method>
+
+<Method name="CorrectVHossMinusOne">
+<FormalSpec>VHossNr,Zijkant</FormalSpec>
+<Implementation><![CDATA[
+	Do ..BuildVHoss(VHossNr, Zijkant)
+	Do ..DeleteOneLadeDetection()
+	Do ..AddEmptySlots()
+	Quit ..Capture
+]]></Implementation>
+</Method>
+
+<Method name="BuildVHoss">
+<FormalSpec>VHossNr,Zijkant</FormalSpec>
+<Implementation><![CDATA[
+	Do ..BuildCapture()
+	Do ..AddCamera() ; Bovenste
+	Do ..AddCamera() ; Onderste
+	
+	Set QueueIterator=..BatchService.GeefQueueIterator(..BatchID)
+
+	Set Detection=..BuildFrameDetection($S(VHossNr=1:77,1:99),Zijkant)
+	Do ..AddDetection2Capture(Detection,0)
+	
+	While QueueIterator.HasNext()
+	{
+		Set Queue=QueueIterator.Next()
+		Continue:(Queue.WPVerpak.UnitNr'=VHossNr)||(Queue.WPVerpak.SubNr'=Zijkant)
+		Set Detection=..BuildDetectionFromQueue(Queue)
+		Do ..AddDetection2Capture(Detection,Queue.WPVerpak.SlotNr)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ZetBatchID">
+<Implementation><![CDATA[	Do ..CaptureHelper.ZetDirectorSleutelWaarde("OrderID",..BatchID)
+]]></Implementation>
+</Method>
+
+<Method name="BuildCapture">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set ..Capture=##class(APPS.VisiDot.dto.CaptureInfo).%New()
+	Set VRRead=##class(APPS.VisiDot.dto.VRRead).%New()
+	Do ..Capture.VRRead.Insert(VRRead)
+	Set Reader=##class(APPS.VisiDot.dto.Reader).%New()
+	Do VRRead.Reader.Insert(Reader)
+	Set ..Sequence=##class(APPS.VisiDot.dto.Sequence).%New()
+	Do Reader.Sequence.Insert(..Sequence)
+	Set ..CaptureHelper=##class(APPS.VisiDot.impl.VHossCaptureHelper).%New(..Capture,##class(APPS.VisiDot.impl.VHossProductionHelper).%New())
+]]></Implementation>
+</Method>
+
+<Method name="AddCamera">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set Camera=##class(APPS.VisiDot.dto.Camera).%New()
+	Do ..Sequence.Camera.Insert(Camera)
+	Set Photo=##class(APPS.VisiDot.dto.Photo).%New()
+	Do Camera.Photo.Insert(Photo)
+]]></Implementation>
+</Method>
+
+<Method name="BuildFrameDetection">
+<FormalSpec>VHossID,ZijkantNr</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set Detection=##class(APPS.VisiDot.dto.Detection).%New()
+	Set Detection.Id=..ProductionHelper.BuildVHossID(VHossID,ZijkantNr)
+	Set Detection.Selected=##class(APPS.VisiDot.enu.DetectionTypes).Frame()
+	; Director
+	;Set Director=##class(APPS.VisiDot.dto.Director).%New()
+	;Set Director.AssetType="VHossFrame"
+	;Do Detection.Director.Insert(Director)
+	;Write !,Director.AssetType,*9,Detection.Id,!
+	Quit Detection
+]]></Implementation>
+</Method>
+
+<Method name="BuildDetectionFromQueue">
+<FormalSpec>Queue</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set Detection=##class(APPS.VisiDot.dto.Detection).%New()
+	Set Detection.Id=..ProductionHelper.BuildLadeID(Queue.BatchID, Queue.WPVerpak.UnitNr, Queue.WPVerpak.SubNr, Queue.ProductGetObjectId())
+	Set Detection.Selected=##class(APPS.VisiDot.enu.DetectionTypes).Lade()
+
+	;Set Director=..BuildDirectorFromQueue(Queue)
+	;Do Detection.Director.Insert(Director)
+	Set Dual=..BuildDual(Queue.WPVerpak.SlotNr)
+	Do Detection.DUAL.Insert(Dual)
+	;w Director.AssetType,*9,Detection.Id,*9,Director.AssetID,!
+	Quit Detection
+]]></Implementation>
+</Method>
+
+<Method name="BuildDirectorFromQueue">
+<FormalSpec>Queue</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	;XML <Director Production_Date="25-FEB-09" Type_Level="PRODUCT" Asset_Type="166141" Asset_ID="41843"/>
+	Set Director=##class(APPS.VisiDot.dto.Director).%New()
+	Set Director.AssetID=Queue.WPVerpak.SlotNr
+	Set Director.AssetType="VHossSlot"
+	Quit Director
+]]></Implementation>
+</Method>
+
+<Method name="BuildDual">
+<FormalSpec>SlotNr</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set Dual=##class(APPS.VisiDot.dto.DUAL).%New()
+	Set Dual.RowInPallet=(SlotNr-1)\10+1
+	Set Dual.ColInPallet=(SlotNr-1#10)+1
+	Quit Dual
+]]></Implementation>
+</Method>
+
+<Method name="AddDetection2Capture">
+<FormalSpec>Detection,SlotNr</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set Camera=..Sequence.Camera.GetAt($S(SlotNr>10:1,1:2))
+	Set Photo=Camera.Photo.GetAt(1)
+	Do Photo.Detection.Insert(Detection)
+	If (SlotNr>10) && (SlotNr<21) && (Detection.Selected=##class(APPS.VisiDot.enu.DetectionTypes).Lade()) ; dubbel
+	{	
+		Set DubbelDetection=Detection.%ConstructClone(1)
+		Set DubbelDetection.Selected=##class(APPS.VisiDot.enu.DetectionTypes).Dubbel()
+		Set Camera=..Sequence.Camera.GetAt(2)
+		Set Photo=Camera.Photo.GetAt(1)
+		Do Photo.Detection.Insert(DubbelDetection)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="DeleteOneLadeDetection">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set Camera=..Sequence.Camera.GetAt(1)
+	Set Photo=Camera.Photo.GetAt(1)
+	If Photo.Detection.Count()>0
+	{
+		Do Photo.Detection.RemoveAt(Photo.Detection.Count())
+	}
+]]></Implementation>
+</Method>
+
+<Method name="BuildLegeDetection">
+<FormalSpec>SlotNr</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set Detection=##class(APPS.VisiDot.dto.Detection).%New()
+	Set Detection.Id=""
+	Set Detection.Selected=##class(APPS.VisiDot.enu.DetectionTypes).Leeg()
+	Set Dual=..BuildDual(SlotNr)
+	Do Detection.DUAL.Insert(Dual)
+	Quit Detection
+]]></Implementation>
+</Method>
+
+<Method name="BuildExtraDetection">
+<FormalSpec>VHossNr,Zijkant</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set Detection=##class(APPS.VisiDot.dto.Detection).%New()
+	Set Detection.Id=""
+	Set Detection.Id=..ProductionHelper.BuildLadeID(..BatchID, VHossNr, Zijkant, 418581) ;willekeurig product
+	Set Detection.Selected=##class(APPS.VisiDot.enu.DetectionTypes).Lade()
+	Set Dual=..BuildDual(30)
+	Do Detection.DUAL.Insert(Dual)
+	;do Detection.XMLExport(,"literal,indent") r k
+	
+	Quit Detection
+]]></Implementation>
+</Method>
+
+<Method name="AddEmptySlots">
+<Implementation><![CDATA[
+	Set it=..CaptureHelper.GeefSlotDetectionIterator()
+	While it.HasNext()
+	{
+		Set DetectionHelper=it.Next()
+		Set lbSlots=$G(lbSlots)_$Lb(DetectionHelper.GeefSlotNr())
+	}
+	For SlotNr=1:1:30
+	{
+		Continue:$LF($G(lbSlots),SlotNr) ; detection bestaat al
+		Set Detection=..BuildLegeDetection(SlotNr)
+		Do ..AddDetection2Capture(Detection,SlotNr)
+	}
+]]></Implementation>
+</Method>
+</Class>
+</Export>