diff --git a/isis/src/control/apps/pointreg/assets/images/discardIgnoredAndUnmeasuredGui.jpg b/isis/src/control/apps/pointreg/assets/images/discardIgnoredAndUnmeasuredGui.jpg deleted file mode 100644 index 2dbf0065fc..0000000000 Binary files a/isis/src/control/apps/pointreg/assets/images/discardIgnoredAndUnmeasuredGui.jpg and /dev/null differ diff --git a/isis/src/control/apps/pointreg/assets/images/discardIgnoredAndUnmeasuredRegIgnoreGui.jpg b/isis/src/control/apps/pointreg/assets/images/discardIgnoredAndUnmeasuredRegIgnoreGui.jpg deleted file mode 100644 index c41a451dae..0000000000 Binary files a/isis/src/control/apps/pointreg/assets/images/discardIgnoredAndUnmeasuredRegIgnoreGui.jpg and /dev/null differ diff --git a/isis/src/control/apps/pointreg/assets/images/ex1outputIgnoredAndUnmeasuredGui.png b/isis/src/control/apps/pointreg/assets/images/ex1outputIgnoredAndUnmeasuredGui.png new file mode 100644 index 0000000000..5a89708635 Binary files /dev/null and b/isis/src/control/apps/pointreg/assets/images/ex1outputIgnoredAndUnmeasuredGui.png differ diff --git a/isis/src/control/apps/pointreg/assets/images/ex2outputIgnoredAndUnmeasuredRegIgnoreGui.png b/isis/src/control/apps/pointreg/assets/images/ex2outputIgnoredAndUnmeasuredRegIgnoreGui.png new file mode 100644 index 0000000000..12ad97ba05 Binary files /dev/null and b/isis/src/control/apps/pointreg/assets/images/ex2outputIgnoredAndUnmeasuredRegIgnoreGui.png differ diff --git a/isis/src/control/apps/pointreg/assets/images/ex3discardIgnoredAndUnmeasuredGui.png b/isis/src/control/apps/pointreg/assets/images/ex3discardIgnoredAndUnmeasuredGui.png new file mode 100644 index 0000000000..fb27b7a458 Binary files /dev/null and b/isis/src/control/apps/pointreg/assets/images/ex3discardIgnoredAndUnmeasuredGui.png differ diff --git a/isis/src/control/apps/pointreg/assets/images/ex4discardIgnoredAndUnmeasuredRegIgnoreGui.png b/isis/src/control/apps/pointreg/assets/images/ex4discardIgnoredAndUnmeasuredRegIgnoreGui.png new file mode 100644 index 0000000000..09d9998f26 Binary files /dev/null and b/isis/src/control/apps/pointreg/assets/images/ex4discardIgnoredAndUnmeasuredRegIgnoreGui.png differ diff --git a/isis/src/control/apps/pointreg/assets/images/ex5registerNewOnly.png b/isis/src/control/apps/pointreg/assets/images/ex5registerNewOnly.png new file mode 100644 index 0000000000..3c2c9e8ff7 Binary files /dev/null and b/isis/src/control/apps/pointreg/assets/images/ex5registerNewOnly.png differ diff --git a/isis/src/control/apps/pointreg/assets/images/outputIgnoredAndUnmeasuredGui.jpg b/isis/src/control/apps/pointreg/assets/images/outputIgnoredAndUnmeasuredGui.jpg deleted file mode 100644 index 3a3f9b4ae5..0000000000 Binary files a/isis/src/control/apps/pointreg/assets/images/outputIgnoredAndUnmeasuredGui.jpg and /dev/null differ diff --git a/isis/src/control/apps/pointreg/assets/images/outputIgnoredAndUnmeasuredRegIgnoreGui.jpg b/isis/src/control/apps/pointreg/assets/images/outputIgnoredAndUnmeasuredRegIgnoreGui.jpg deleted file mode 100644 index 420aecef07..0000000000 Binary files a/isis/src/control/apps/pointreg/assets/images/outputIgnoredAndUnmeasuredRegIgnoreGui.jpg and /dev/null differ diff --git a/isis/src/control/apps/pointreg/assets/images/outputIgnoredGui.jpg b/isis/src/control/apps/pointreg/assets/images/outputIgnoredGui.jpg deleted file mode 100644 index 88aa4822e1..0000000000 Binary files a/isis/src/control/apps/pointreg/assets/images/outputIgnoredGui.jpg and /dev/null differ diff --git a/isis/src/control/apps/pointreg/assets/images/outputIgnoredRegIgnoreGui.jpg b/isis/src/control/apps/pointreg/assets/images/outputIgnoredRegIgnoreGui.jpg deleted file mode 100644 index cb56fbed79..0000000000 Binary files a/isis/src/control/apps/pointreg/assets/images/outputIgnoredRegIgnoreGui.jpg and /dev/null differ diff --git a/isis/src/control/apps/pointreg/assets/images/outputUnmeasuredGui.jpg b/isis/src/control/apps/pointreg/assets/images/outputUnmeasuredGui.jpg deleted file mode 100644 index b964df8ea9..0000000000 Binary files a/isis/src/control/apps/pointreg/assets/images/outputUnmeasuredGui.jpg and /dev/null differ diff --git a/isis/src/control/apps/pointreg/assets/images/outputUnmeasuredRegIgnoreGui.jpg b/isis/src/control/apps/pointreg/assets/images/outputUnmeasuredRegIgnoreGui.jpg deleted file mode 100644 index ed1f00a393..0000000000 Binary files a/isis/src/control/apps/pointreg/assets/images/outputUnmeasuredRegIgnoreGui.jpg and /dev/null differ diff --git a/isis/src/control/apps/pointreg/assets/images/registerNewOnlyGui.jpg b/isis/src/control/apps/pointreg/assets/images/registerNewOnlyGui.jpg deleted file mode 100644 index 81bb714026..0000000000 Binary files a/isis/src/control/apps/pointreg/assets/images/registerNewOnlyGui.jpg and /dev/null differ diff --git a/isis/src/control/apps/pointreg/assets/thumbs/discardIgnoredAndUnmeasuredGuiThumb.jpg b/isis/src/control/apps/pointreg/assets/thumbs/discardIgnoredAndUnmeasuredGuiThumb.jpg deleted file mode 100644 index 68ef41176f..0000000000 Binary files a/isis/src/control/apps/pointreg/assets/thumbs/discardIgnoredAndUnmeasuredGuiThumb.jpg and /dev/null differ diff --git a/isis/src/control/apps/pointreg/assets/thumbs/discardIgnoredAndUnmeasuredRegIgnoreGuiThumb.jpg b/isis/src/control/apps/pointreg/assets/thumbs/discardIgnoredAndUnmeasuredRegIgnoreGuiThumb.jpg deleted file mode 100644 index bcc3a321dc..0000000000 Binary files a/isis/src/control/apps/pointreg/assets/thumbs/discardIgnoredAndUnmeasuredRegIgnoreGuiThumb.jpg and /dev/null differ diff --git a/isis/src/control/apps/pointreg/assets/thumbs/ex1outputIgnoredAndUnmeasuredGuiThumb.png b/isis/src/control/apps/pointreg/assets/thumbs/ex1outputIgnoredAndUnmeasuredGuiThumb.png new file mode 100644 index 0000000000..8256b727e3 Binary files /dev/null and b/isis/src/control/apps/pointreg/assets/thumbs/ex1outputIgnoredAndUnmeasuredGuiThumb.png differ diff --git a/isis/src/control/apps/pointreg/assets/thumbs/ex2outputIgnoredAndUnmeasuredRegIgnoreGuiThumb.png b/isis/src/control/apps/pointreg/assets/thumbs/ex2outputIgnoredAndUnmeasuredRegIgnoreGuiThumb.png new file mode 100644 index 0000000000..145073944c Binary files /dev/null and b/isis/src/control/apps/pointreg/assets/thumbs/ex2outputIgnoredAndUnmeasuredRegIgnoreGuiThumb.png differ diff --git a/isis/src/control/apps/pointreg/assets/thumbs/ex3discardIgnoredAndUnmeasuredGuiThumb.png b/isis/src/control/apps/pointreg/assets/thumbs/ex3discardIgnoredAndUnmeasuredGuiThumb.png new file mode 100644 index 0000000000..755a25f7e6 Binary files /dev/null and b/isis/src/control/apps/pointreg/assets/thumbs/ex3discardIgnoredAndUnmeasuredGuiThumb.png differ diff --git a/isis/src/control/apps/pointreg/assets/thumbs/ex4discardIgnoredAndUnmeasuredRegIgnoreGuiThumb.png b/isis/src/control/apps/pointreg/assets/thumbs/ex4discardIgnoredAndUnmeasuredRegIgnoreGuiThumb.png new file mode 100644 index 0000000000..9b496abe93 Binary files /dev/null and b/isis/src/control/apps/pointreg/assets/thumbs/ex4discardIgnoredAndUnmeasuredRegIgnoreGuiThumb.png differ diff --git a/isis/src/control/apps/pointreg/assets/thumbs/ex5registerNewOnlyThumb.png b/isis/src/control/apps/pointreg/assets/thumbs/ex5registerNewOnlyThumb.png new file mode 100644 index 0000000000..561b04e124 Binary files /dev/null and b/isis/src/control/apps/pointreg/assets/thumbs/ex5registerNewOnlyThumb.png differ diff --git a/isis/src/control/apps/pointreg/assets/thumbs/outputIgnoredAndUnmeasuredGuiThumb.jpg b/isis/src/control/apps/pointreg/assets/thumbs/outputIgnoredAndUnmeasuredGuiThumb.jpg deleted file mode 100644 index 916d948066..0000000000 Binary files a/isis/src/control/apps/pointreg/assets/thumbs/outputIgnoredAndUnmeasuredGuiThumb.jpg and /dev/null differ diff --git a/isis/src/control/apps/pointreg/assets/thumbs/outputIgnoredAndUnmeasuredRegIgnoreGuiThumb.jpg b/isis/src/control/apps/pointreg/assets/thumbs/outputIgnoredAndUnmeasuredRegIgnoreGuiThumb.jpg deleted file mode 100644 index 4f3ea8d1f4..0000000000 Binary files a/isis/src/control/apps/pointreg/assets/thumbs/outputIgnoredAndUnmeasuredRegIgnoreGuiThumb.jpg and /dev/null differ diff --git a/isis/src/control/apps/pointreg/assets/thumbs/outputIgnoredGuiThumb.jpg b/isis/src/control/apps/pointreg/assets/thumbs/outputIgnoredGuiThumb.jpg deleted file mode 100644 index 87ae2fd410..0000000000 Binary files a/isis/src/control/apps/pointreg/assets/thumbs/outputIgnoredGuiThumb.jpg and /dev/null differ diff --git a/isis/src/control/apps/pointreg/assets/thumbs/outputIgnoredRegIgnoreGuiThumb.jpg b/isis/src/control/apps/pointreg/assets/thumbs/outputIgnoredRegIgnoreGuiThumb.jpg deleted file mode 100644 index e826525a34..0000000000 Binary files a/isis/src/control/apps/pointreg/assets/thumbs/outputIgnoredRegIgnoreGuiThumb.jpg and /dev/null differ diff --git a/isis/src/control/apps/pointreg/assets/thumbs/outputUnmeasuredGuiThumb.jpg b/isis/src/control/apps/pointreg/assets/thumbs/outputUnmeasuredGuiThumb.jpg deleted file mode 100644 index 219cbb1e42..0000000000 Binary files a/isis/src/control/apps/pointreg/assets/thumbs/outputUnmeasuredGuiThumb.jpg and /dev/null differ diff --git a/isis/src/control/apps/pointreg/assets/thumbs/outputUnmeasuredRegIgnoreGuiThumb.jpg b/isis/src/control/apps/pointreg/assets/thumbs/outputUnmeasuredRegIgnoreGuiThumb.jpg deleted file mode 100644 index 746c158e79..0000000000 Binary files a/isis/src/control/apps/pointreg/assets/thumbs/outputUnmeasuredRegIgnoreGuiThumb.jpg and /dev/null differ diff --git a/isis/src/control/apps/pointreg/assets/thumbs/registerNewOnlyThumb.jpg b/isis/src/control/apps/pointreg/assets/thumbs/registerNewOnlyThumb.jpg deleted file mode 100644 index 4a7c03c7aa..0000000000 Binary files a/isis/src/control/apps/pointreg/assets/thumbs/registerNewOnlyThumb.jpg and /dev/null differ diff --git a/isis/src/control/apps/pointreg/pointreg.xml b/isis/src/control/apps/pointreg/pointreg.xml index 728d1f85bb..12a1d3871c 100644 --- a/isis/src/control/apps/pointreg/pointreg.xml +++ b/isis/src/control/apps/pointreg/pointreg.xml @@ -56,8 +56,8 @@

Once "pointreg" has a reference measure for a point, it attempts to -every other measure in the point to that reference location. An - implicit reference will then be made explicit, and if any of the + register every other measure in the point to that reference location. + An implicit reference will then be made explicit, and if any of the registrations succeed, the reference will also be made valid.

@@ -80,6 +80,18 @@ every other measure in the point to that reference location. An measures within a control point are ignored (Ignore=True), then the entire control point is set to ignored (Ignore=True) at the control point level.

+ +

+ Pointreg requires SPICE data and an associated control network, + so you may need to run the following ISIS programs on your images + beforehand. See Bundle Adjustment for more info. +

+ @@ -280,7 +292,8 @@ every other measure in the point to that reference location. An accept set to their default values, or common example values where defaults do not exist. For an in-depth discussion of all the options available to the user in this definition file, please see the Pattern - Matching guide referenced above. + Matching guide referenced above. Sample deffiles can be found in the + ISIS3 git repository under isis/appdata/templates/autoreg. @@ -638,32 +651,33 @@ every other measure in the point to that reference location. An - files=../IN/fileList.lis cnet=../IN/controlNet.net - template=../IN/autoRegTemplate.def - to=../OUT/outputIgnoredAndUnmeasured.net - flatfile=../OUT/outputIgnoredAndUnmeasured.txt + fromlist=fileList.lis + cnet=controlNet.net + deffile=autoRegTemplate.def + onet=outputIgnoredAndUnmeasured.net + flatfile=outputIgnoredAndUnmeasured.txt This example shows the use of pointreg with the OUTPUTIGNORED and - OUTPUTUNMEASURED parameters left with the default values of "True" and - REGISTERIGNOREDONLY with the default value of "False". This implies - that only "non-ignored" points will be registered but all control + OUTPUTFAILED parameters left with the default values of "True" and + POINTS with the default value of "NONIGNORED". This implies + that only non-ignored points will be registered but all control points and control measures will be included in the output. - + Example GUI Screen shot of GUI with parameters filled in to perform point registration that includes ignored control points and unmeasured - control measures in the output but does not register the ignore + control measures in the output but does not register the ignored points. - + @@ -751,28 +765,29 @@ every other measure in the point to that reference location. An unmeasured points in the output control net. - In this example, the pointreg application is used to register "ignore" + In this example, the pointreg application is used to register "ignored" points from two images and output a new control network that includes valid and ignored points and unmeasured control measures. - files=../IN/fileList.lis cnet=../IN/controlNet.net - template=../IN/autoRegTemplate.def - to=../OUT/outputIgnoredAndUnmeasuredRegIgnored.net - flatfile=../OUT/outputIgnoredAndUnmeasuredRegIgnored.txt - registerignoredonly=yes + fromlist=fileList.lis + cnet=controlNet.net + deffile=autoRegTemplate.def + onet=outputIgnoredAndUnmeasuredRegIgnored.net + flatfile=outputIgnoredAndUnmeasuredRegIgnored.txt + points=ignored - This example shows the use of pointreg with the OUTPUTIGNORED, - OUTPUTUNMEASURED and REGISTERIGNOREDONLY parameters as "True". This - implies that only "ignored" points will be registered but all control + This example shows the use of pointreg with the OUTPUTIGNORED, + OUTPUTFAILED parameters as "True", and POINTS set to the "IGNORED" ones. + This implies that only "ignored" points will be registered but all control points and control measures will be included in the output. - + Example GUI @@ -782,7 +797,7 @@ every other measure in the point to that reference location. An unmeasured control measures in the output but does not register the "valid" points. - + @@ -876,22 +891,25 @@ every other measure in the point to that reference location. An - files=../IN/fileList.lis cnet=../IN/controlNet.net - template=../IN/autoRegTemplate.def - to=../OUT/discardIgnoredAndUnmeasured.net - flatfile=../OUT/discardIgnoredAndUnmeasured.txt - outputignored=no outputunmeasured=no + fromlist=fileList.lis + cnet=controlNet.net + deffile=autoRegTemplate.def + onet=discardIgnoredAndUnmeasured.net + flatfile=discardIgnoredAndUnmeasured.txt + outputignored=no + outputfailed=no This example shows the use of pointreg with the OUTPUTIGNORED, - OUTPUTUNMEASURED and REGISTERIGNOREDONLY parameters set to "False". - This implies that only "valid" points will be registered and - included inthe output control network. + and OUTPUTFAILED parameters set to "False", and the POINTS + parameter set to the default "NONIGNORED". This implies that + only "valid" points will be registered and included in the + output control network. - + Example GUI @@ -900,7 +918,7 @@ every other measure in the point to that reference location. An registration that omits ignored control points and unmeasured control measures from the output. - + @@ -984,33 +1002,36 @@ every other measure in the point to that reference location. An - Register "ignored" points in a control network and omit ignored and - unmeasured points in the output control net. + Register "ignored" points in a control network and omit ignored points + and failed measures the output control net. - In this example, the pointreg application is used to register "ignore" + In this example, the pointreg application is used to register "ignored" points from two images and output a new control network that omits ignored control points and unmeasured control measures. - files=../IN/fileList.lis cnet=../IN/controlNet.net - template=../IN/autoRegTemplate.def - to=../OUT/discardIgnoredAndUnmeasuredRegIgnored.net - flatfile=../OUT/discardIgnoredAndUnmeasuredRegIgnored.txt - outputignored=no outputunmeasured=no registerignoredonly=yes + fromlist=fileList.lis + cnet=controlNet.net + deffile=autoRegTemplate.def + onet=discardIgnoredAndUnmeasuredRegIgnored.net + flatfile=discardIgnoredAndUnmeasuredRegIgnored.txt + outputignored=no + outputfailed=no + points=ignored This example shows the use of pointreg with the OUTPUTIGNORED and - OUTPUTUNMEASURED parameters set to "False" and REGISTERIGNOREDONLY - set to "True". This implies that only "ignored" points will be - registered while ignored control points and unmeasured control - measures are omitted from the output. + OUTPUTFAILED parameters set to "False" and POINTS set to "IGNORED". + This implies that only "ignored" points will be registered while + ignored control points and failed control measures are omitted + from the output. - + Example GUI @@ -1019,7 +1040,7 @@ every other measure in the point to that reference location. An point registration that omits ignored control points and unmeasured control measures from the output. - + @@ -1103,32 +1124,33 @@ every other measure in the point to that reference location. An - Register "new" measures in a control network only and leave previously - processed as they are in the output control net. + Register new "candidate" measures in a control network only and leave + previously processed as they are in the output control net. - In this example, the pointreg application is used to register only "new" - measures that have been added to the control net after a prior run in - pointreg. + In this example, the pointreg application is used to register only new + "candidate" measures that have been added to the control net after a + prior run in pointreg. - files=../IN/fileList.lis cnet=../IN/controlNet.net - template=../IN/autoRegTemplate.def - to=../OUT/registerNewOnly.net - flatfile=../OUT/registerNewOnly.txt - registernewonly=yes + fromlist=fileList2.lis + cnet=controlNet2.net + deffile=autoRegTemplate.def + onet=registerNewOnly.net + flatfile=registerNewOnly.txt + measures=candidates - This example shows the use of pointreg with the REGISTERNEWONLY set - to "True". This implies that only "new" measurements will be - registered while measures that have been previously registered are - not reprocessed. + This example shows the use of pointreg with the MEASURES set + to "CANDIDATES". This implies that only new "candidate" + measurements will be registered while measures that have been + previously registered will not be reprocessed. - + Example GUI @@ -1136,7 +1158,7 @@ every other measure in the point to that reference location. An Screen shot of GUI with parameters filled in to perform new measure registration only. - +