Skip to content

Commit

Permalink
fixes to the diffff.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
@joreg
joreg committed Apr 22, 2014
1 parent 5298efe commit 7474245
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 44 deletions.
26 changes: 16 additions & 10 deletions diffff.xml
View file
Expand Up @@ -47,11 +47,15 @@
-->
<CONVVVVERTER>
<PATCH version="0.1.0">
<NODE old="LT (OpenCV Filter, Scalar)" new="LT (CV.Image)"> </NODE>
<NODE old="GT (OpenCV Filter, Scalar)" new="GT (CV.Image)"> </NODE>
<NODE old="EQ (OpenCV Filter, Scalar)" new="EQ (CV.Image)"> </NODE>
<NODE old="AdaptiveThreshold (OpenCV)" new="AdaptiveThreshold (CV.Image)"> </NODE>
<NODE old="AsImage (OpenCV DX11.Texture2D)" new="AsImage (DX11.Texture2D)"> </NODE>
<NODE old="AsImage (OpenCV Raw)" new="AsImage (Raw)"> </NODE>
<NODE old="AsTexture (OpenCV DX11.Texture2D)" new="AsTexture (CV.Image DX11.Texture2D)"> </NODE>
<NODE old="AsTexture (OpenCV EX9.Texture)" new="AsTexture (CV.Image EX9.Texture)"> </NODE>
<NODE old="AsTexture (OpenCV)" new="AsTexture (CV.Image EX9.Texture)"> </NODE>
<NODE old="Average (OpenCV Temporal)" new="Average (CV.Image Temporal)"> </NODE>
<NODE old="AvgSdv (OpenCV Mean)" new="Average (CV.Image)"> </NODE>
<NODE old="BackgroundSubtract (OpenCV)" new="BackgroundSubtract (CV.Image)"> </NODE>
Expand All @@ -71,17 +75,18 @@
<NODE old="ContourDelauney (OpenCV)" new="Delauney (CV.Contour)"> </NODE>
<NODE old="ContourPerimeter (OpenCV Split)" new="Perimeter (CV.Contour Split)"> </NODE>
<NODE old="ConvertScale (OpenCV)" new="ConvertScale (CV.Image)"> </NODE>
<NODE old="Decode (OpenCV StructuredLight)" new="Decode (CV.StructuredLight)"> </NODE>
<NODE old="Decode (Image.StructuredLight)" new="Decode (CV.StructuredLight)"> </NODE>
<NODE old="Delauney (OpenCV Analysis Contour)" new="Delauney (CV.Contour)"> </NODE>
<NODE old="DetectFeatures (OpenCV Analysis Features)" new="DetectFeatures (CV..Image)"> </NODE>
<NODE old="DetectFeatures (OpenCV Analysis Features)" new="DetectFeatures (CV.Image)"> </NODE>
<NODE old="Dilate (OpenCV)" new="Dilate (CV.Image)"> </NODE>
<NODE old="DrawBoardCorners (OpenCV DX9 2D)" new="BoardCorners (DX9)"> </NODE>
<NODE old="Encode (OpenCV StructuredLight)" new="Encode (CV .StructuredLight)"> </NODE>
<NODE old="Encode (Image.StructuredLight)" new="Encode (CV.StructuredLight)"> </NODE>
<NODE old="Erode (OpenCV)" new="Erode (CV.Image)"> </NODE>
<NODE old="Extrinsics (OpenCV Split)" new="Extrinsics (CV.Transform Split)"> </NODE>
<NODE old="FeatureSet (OpenCV Features Split)" new="FeatureSet (CV.Features Split)"> </NODE>
<NODE old="FindBoard (OpenCV)" new="FindBoard (CV.Image)"> </NODE>
<NODE old="FindCommonImages (OpenCV StereoCalibrate)" new="FindCommonImages (CV.Transform)"> </NODE>
<NODE old="FindCommonImages (OpenCV StereoCalibrate)" new="FindCommonImages (CV.Transform StereoCalibrate)"> </NODE>
<NODE old="FindExtrinsics (OpenCV)" new="SolvePnP (CV.Transform)"> </NODE>
<NODE old="FrameDelay (OpenCV)" new="FrameDelay (CV.Image)"> </NODE>
<NODE old="FrameDifference (OpenCV)" new="FrameDifference (CV.Image)"> </NODE>
<NODE old="Framerate (OpenCV)" new="Framerate (CV.Image)"> </NODE>
Expand All @@ -92,7 +97,7 @@
<NODE old="ImageQuad (OpenCV DX11.Layer)" new="GridView (DX11.Layer)"> </NODE>
<NODE old="ImageQuad (OpenCV DX9)" new="GridView (DX9)"> </NODE>
<NODE old="ImageRegion (OpenCV Features Criteria Position)" new="ImageRegion (CV.Features)"> </NODE>
<NODE old="ImageResize (OpenCV)" new="ImageResize (CV.Image)"> </NODE>
<NODE old="ImageResize (OpenCV)" new="Resize (CV.Image)"> </NODE>
<NODE old="Images (OpenCV OpenNI)" new="Images (CV.Image OpenNI)"> </NODE>
<NODE old="ImageToProjection (OpenCV 2D)" new="ImageToProjection (CV 2D)"> </NODE>
<NODE old="Info (OpenCV)" new="Info (CV.Image)"> </NODE>
Expand All @@ -103,25 +108,26 @@
<NODE old="MapNormalisedToCamera (OpenCV 2D)" new="MapNormalisedToCamera (CV.Transform)"> </NODE>
<NODE old="Marker (DX9, 3D)" new="Marker (DX9 3D)"> </NODE>
<NODE old="MatchFeatures (OpenCV Features)" new="MatchFeatures (CV.Features)"> </NODE>
<NODE old="Noise (OpenCV Generator)" new="Noise (CV.Image)"> </NODE>
<NODE old="Noise (OpenCV Source)" new="Noise (CV.Image)"> </NODE>
<NODE old="Not (OpenCV)" new="NOT (CV.Image)"> </NODE>
<NODE old="Not (OpenCV Filter)" new="NOT (CV.Image)"> </NODE>
<NODE old="ObjectTracking (OpenCV)" new="DetectObject (CV.Image)"> </NODE>
<NODE old="OpticalFlowHS (OpenCV)" new="OpticalFlow (CV.Image Horn–Schunck)"> </NODE>
<NODE old="OpticalFlowLK (OpenCV)" new="OpticalFlow (CV.Image Lucas-Kanade)"> </NODE>
<NODE old="Payload (OpenCV StructuredLight)" new="Payload (CV.StructuredLight)"> </NODE>
<NODE old="Payload (Image.StructuredLight)" new="Payload (CV.StructuredLight)"> </NODE>
<NODE old="Perspective (OpenCV Intrinsics Transform)" new="Perspective (CV.Transform)"> </NODE>
<NODE old="Pipet (OpenCV)" new="Pipet (CV.Image)"> </NODE>
<NODE old="ProjectPoints (OpenCV Split)" new="ProjectPoints (CV.Transform)"> </NODE>
<NODE old="Reader (OpenCV Intrinsics)" new="Reader (CV.Transform Intrinsics)"> </NODE>
<NODE old="Renderer (OpenCV)" new="Renderer (CV.Image)"> </NODE>
<NODE old="Rotate (OpenCV)" new="Rotate (CV.Image)"> </NODE>
<NODE old="Rotate (OpenCV Step)" new="Rotate (CV.Image)"> </NODE>
<NODE old="S+H (OpenCV)" new="S+H (CV.Image)"> </NODE>
<NODE old="SelectMinimumArea (OpenCV Contour)" new="SelectMinimumArea (CV.Contour)"> </NODE>
<NODE old="Sobel (OpenCV)" new="Sobel (CV.Image)"> </NODE>
<NODE old="SolvePnP (OpenCV)" new="SolvePnP (CV.Transform)"> </NODE>
<NODE old="Space (OpenCV StructuredLight)" new="Space (CV.StructuredLight)"> </NODE>
<NODE old="Space (Image.StructuredLight)" new="Space (CV.StructuredLight)"> </NODE>
<NODE old="StereoCalibrate (OpenCV)" new="StereoCalibrate (CV.Transform)"> </NODE>
<NODE old="Template (OpenCV)" new="Template (CV.Image)"> </NODE>
<NODE old="Template (OpenCV Filter)" new="Template (CV.Image)"> </NODE>
<NODE old="TimingCircuit (OpenCV StructuredLight)" new="TimingCircuit (CV.StructuredLight)"> </NODE>
<NODE old="Transform (OpenCV)" new="Transform (CV.Image)"> </NODE>
<NODE old="UnsharpMask (OpenCV)" new="UnsharpMask (CV.Image)"> </NODE>
Expand Down
74 changes: 40 additions & 34 deletions girlpower/ImageFilter - Overview.v4p
View file
@@ -1,6 +1,6 @@
<!DOCTYPE PATCH SYSTEM "http://vvvv.org/versions/vvvv45debug31.4.dtd" >
<PATCH nodename="C:\Users\joreg\dev\repos\vvvv\public\vvvv45\packs\VVVV.Packs.Image\girlpower\ImageFilter - Overview.v4p" systemname="ImageFilter - Overview" filename="C:\Users\joreg\dev\repos\vvvv\public\vvvv45\packs\Image\girlpower\ImageFilter - Overview.v4p">
<BOUNDS type="Window" left="0" top="6225" width="21465" height="7845">
<!DOCTYPE PATCH SYSTEM "http://vvvv.org/versions/vvvv45alpha31.9.dtd" >
<PATCH nodename="C:\Users\joreg\Documents\repos\vvvv\public\vvvv45\packs\VVVV.Packs.Image\girlpower\ImageFilter - Overview.v4p" systemname="ImageFilter - Overview" filename="C:\Users\joreg\dev\repos\vvvv\public\vvvv45\packs\Image\girlpower\ImageFilter - Overview.v4p">
<BOUNDS type="Window" left="615" top="6000" width="21465" height="7845">
</BOUNDS>
<NODE systemname="Canny (CV.Image)" filename="%VVVV%\packs\Image\nodes\plugins\VVVV.Nodes.OpenCV.dll" nodename="Canny (OpenCV)" componentmode="Hidden" id="1">
<BOUNDS type="Node" left="4905" top="4335" width="100" height="100">
Expand Down Expand Up @@ -213,7 +213,7 @@
</BOUNDS>
<BOUNDS type="Node" left="165" top="4890" width="0" height="0">
</BOUNDS>
<PIN pinname="Y Input Value" slicecount="1" values="4">
<PIN pinname="Y Input Value" slicecount="1" values="0">
</PIN>
<PIN pinname="Units" slicecount="1" values="||">
</PIN>
Expand Down Expand Up @@ -314,28 +314,6 @@
<BOUNDS type="Box" left="16275" top="4335">
</BOUNDS>
</NODE>
<NODE systemname="OpticalFlow (CV.Image)" filename="%VVVV%\packs\Image\nodes\plugins\VVVV.Nodes.OpenCV.dll" nodename="OpticalFlowHS (OpenCV)" componentmode="Hidden" id="51">
<BOUNDS type="Node" left="17940" top="4335" width="100" height="100">
</BOUNDS>
<PIN pinname="Input" visible="1" slicecount="1" values="||">
</PIN>
<PIN pinname="Output" visible="1">
</PIN>
<PIN pinname="Use Previous Velocity" slicecount="1" values="0">
</PIN>
<BOUNDS type="Box" left="17940" top="4335">
</BOUNDS>
</NODE>
<NODE systemname="OpticalFlow (CV.Image)" filename="%VVVV%\packs\Image\nodes\plugins\VVVV.Nodes.OpenCV.dll" nodename="OpticalFlowLK (OpenCV)" componentmode="Hidden" id="52">
<BOUNDS type="Node" left="19170" top="4335" width="100" height="100">
</BOUNDS>
<PIN pinname="Input" visible="1" slicecount="1" values="||">
</PIN>
<PIN pinname="Output" visible="1">
</PIN>
<BOUNDS type="Box" left="19170" top="4335">
</BOUNDS>
</NODE>
<NODE systemname="BackgroundSubtract (CV.Image)" filename="%VVVV%\packs\Image\nodes\plugins\VVVV.Nodes.OpenCV.dll" nodename="BackgroundSubtract (OpenCV)" componentmode="Hidden" id="53">
<BOUNDS type="Node" left="14550" top="4335" width="100" height="100">
</BOUNDS>
Expand All @@ -354,10 +332,6 @@
</LINK>
<LINK srcnodeid="43" srcpinname="Output" dstnodeid="41" dstpinname="Input 4">
</LINK>
<LINK srcnodeid="51" srcpinname="Output" dstnodeid="41" dstpinname="Input 5">
</LINK>
<LINK srcnodeid="52" srcpinname="Output" dstnodeid="41" dstpinname="Input 6">
</LINK>
<NODE nodename="IOBox (String)" componentmode="InABox" id="55" systemname="IOBox (String)">
<BOUNDS type="Box" left="3945" top="420" width="1980" height="270">
</BOUNDS>
Expand Down Expand Up @@ -763,15 +737,13 @@
</BOUNDS>
<PIN pinname="Height" slicecount="1" values="480">
</PIN>
<PIN pinname="Show Settings" slicecount="1" values="0">
</PIN>
</NODE>
<LINK srcnodeid="37" srcpinname="Y Output Value" dstnodeid="83" dstpinname="Enabled">
</LINK>
<LINK srcnodeid="83" srcpinname="Output" dstnodeid="51" dstpinname="Input">
</LINK>
<LINK srcnodeid="83" srcpinname="Output" dstnodeid="43" dstpinname="Input">
</LINK>
<LINK srcnodeid="83" srcpinname="Output" dstnodeid="52" dstpinname="Input">
</LINK>
<LINK srcnodeid="83" srcpinname="Output" dstnodeid="53" dstpinname="Input">
</LINK>
<LINK srcnodeid="83" srcpinname="Output" dstnodeid="29" dstpinname="Input">
Expand All @@ -782,4 +754,38 @@
</LINK>
<LINK srcnodeid="83" srcpinname="Output" dstnodeid="73" dstpinname="Input">
</LINK>
<NODE systemname="OpticalFlow (CV.Image Horn–Schunck)" filename="%VVVV%\packs\VVVV.Packs.Image\nodes\plugins\VVVV.Nodes.OpenCV.dll" nodename="OpticalFlow (CV.Image Horn–Schunck)" componentmode="Hidden" id="51">
<BOUNDS type="Node" left="17940" top="4335" width="100" height="100">
</BOUNDS>
<PIN pinname="Input" visible="1">
</PIN>
<PIN pinname="Output" visible="1">
</PIN>
<PIN pinname="Use Previous Velocity" slicecount="1" values="0">
</PIN>
<BOUNDS type="Box" left="17940" top="4335">
</BOUNDS>
</NODE>
<LINK srcnodeid="51" srcpinname="Output" dstnodeid="41" dstpinname="Input 5">
</LINK>
<LINK srcnodeid="83" srcpinname="Output" dstnodeid="51" dstpinname="Input">
</LINK>
<NODE systemname="OpticalFlow (CV.Image Lucas-Kanade)" filename="%VVVV%\packs\VVVV.Packs.Image\nodes\plugins\VVVV.Nodes.OpenCV.dll" nodename="OpticalFlow (CV.Image Lucas-Kanade)" componentmode="Hidden" id="52">
<BOUNDS type="Node" left="19170" top="4335" width="100" height="100">
</BOUNDS>
<PIN pinname="Input" visible="1">
</PIN>
<PIN pinname="Output" visible="1">
</PIN>
<BOUNDS type="Box" left="19170" top="4335">
</BOUNDS>
</NODE>
<LINK srcnodeid="52" srcpinname="Output" dstnodeid="41" dstpinname="Input 6">
</LINK>
<LINK srcnodeid="83" srcpinname="Output" dstnodeid="52" dstpinname="Input">
</LINK>
<PACK Name="VVVV.Packs" Version="0.1.0">
</PACK>
<PACK Name="addonpack" Version="31.9.0">
</PACK>
</PATCH>

0 comments on commit 7474245

Please sign in to comment.