diff --git a/backend/TE/AppDB.php b/backend/TE/AppDB.php index f442d5e6d7eeb00eb8d967dec95fa6b564482a5c..5e43fbf469210c22c3fc95b92546b0f7e5d7a666 100644 --- a/backend/TE/AppDB.php +++ b/backend/TE/AppDB.php @@ -661,6 +661,45 @@ class AppDB_TE extends AppDB return $imageID; } + + public function addMinutiaExtractor($imageID){ + // insert db entry for image to be extracted. + file_put_contents('debug.txt', "Start extractor"); + $trtoken = $this->beginTransactionIf(); + $queryString = "INSERT INTO minutiaextraction(imageid) VALUES ( + " . ( int ) $imageID . " + ) RETURNING id;"; + file_put_contents('debug.txt', $queryString); + $res = $this->query( $queryString ); + $extractorId = ( int ) $res[ 0 ][ 'id' ]; + $this->commitTransactionIf( $trtoken ); + file_put_contents('debug.txt', "COMPLETE extractor, id: " . $extractorId); + return $extractorId; + + } + + public function addMinutiaLocation($minutieData){ + // insert db entry for minutia location + $trtoken = $this->beginTransactionIf(); + $res = $this->query( "INSERT INTO minutiaextractionlocation(x,y,theta,type,reliability_score,imageid,extractorid) VALUES ( + " . (int) $minutieData[0] . ", + " . (int) $minutieData[1] . ", + " . (int) $minutieData[2] . ", + " . (int) $minutieData[3] . ", + " . (float) $minutieData[4] . ", + " . (int) $minutieData[5] . ", + " . (int) $minutieData[6] . " + ) RETURNING id;" ); + $locationId = ( int ) $res[ 0 ][ 'id' ]; + + $this->commitTransactionIf( $trtoken ); + return $locationId; + + } + + public function updateMinutiaExtractor(){ + + } public function deleteUnusedImages() { @@ -746,6 +785,41 @@ class AppDB_TE extends AppDB if( count( $res ) != 1 ) throw new Exception( "Access denied" ); $aid = ( int ) $res[ 0 ][ 'id' ]; + // copy minutia extraction to new assignment annotation here, using $aid + return $aid; + $res = $this->query("SELECT exercise.mark, exercise.print FROM exercise WHERE exercise.id = " . ( int ) $id . ";"); + + if(count($res) > 0){ + + $mark = $res[0]['mark']; + // TODO build an array similar to saveResultsExampleArgs.txt file that can have contents sent to saveResults() function for + // saving initial detected/extracted minutiae + $resultArr = array(); + $resultArr[0] = $aid; + $resultArr[1] = "CURRENT"; + $resultArr[2] = "ANALYSIS"; + $resultArr[3] = array(); + + $imageRes = $this->query("SELECT * from image WHERE image.id = " . ( int ) $mark . ";"); + if( count( $imageRes ) > 0){ + $imageWidth = $imageRes[0]["width"]; + $imageHeight = $imageRes[0]["height"]; + $imageName = $imageRes[0]["name"]; + $minExtractRes = $this->query("SELECT * FROM minutiaextraction WHERE minutiaextraction.imageid = " . ( int ) $mark . ";"); + if(count($minExtractRes) > 0){ + file_put_contents('debug.txt', "Start mark copy"); + + $extractorId = $minExtractRes[0]['id']; + $locationRes = $this->query("SELECT * FROM minutiaextractionlocation WHERE minutiaextractionlocation.extractorid = " . ( int ) $extractorId . ";"); + foreach ($locationRes as $location) { + // Need ids?? + } + } + + } + + } + } return $aid; } @@ -1266,6 +1340,8 @@ class AppDB_TE extends AppDB } public function saveResults( $aid, $type, $step, $mark = NULL, $print = NULL, $observations = NULL ) { + $debugArray = [$aid,$type,$step, $mark, $print, $observations]; + file_put_contents("debug.txt", print_r( $debugArray, true ) ); $rtypes = $this->getResultTypes(); $rsteps = $this->getResultSteps(); diff --git a/backend/TE/Images.php b/backend/TE/Images.php index 0add04e7cdc6cc058a9ff2c6b30909a274a6625e..422a8a1a767b0c9d7e62a97130f221680c177073 100644 --- a/backend/TE/Images.php +++ b/backend/TE/Images.php @@ -1,4 +1,5 @@ getDB()->addImage( $imageType, $imageName, $mimetype, '', $resolution, $width, $height, $buffer ); + $data = extractMinutiaeFromImage($imageID, $imageName, $buffer); + if( $imageID ) { if( $usedDefaultResolution ) @@ -229,9 +232,78 @@ function processImageUploads2( $type = NULL, $defaultDPI = NULL ) } } +function extractMinutiaeFromImage($imageID, $imageName, $imageData) +{ + //TODO implement minutiae extraction + // 1. create temp image file for exectable to reference: DONE + // 2. call executable to extract minutiae: DONE + // 3. read output (min) file, parse data and return DONE + // 4. loop through minutiae data and add to database DONE + // 5. delete temp image file and min output file + + // call executable to extract minutiae + + $exec_command = 'backend/minutiae_extractor/mindtct backend/minutiae_extractor/temp_img/'.$imageID . '_temp.jpeg backend/minutiae_extractor/'.$imageID. '/output'; + //shell_exec($exec_command); + + $filename = 'backend/minutiae_extractor/output/output.min'; + importMinutiaeValues($filename, $imageID); + + //TODO IN ASSIGNMENT LOAD FUNCTION: + // 1. copy minutiae extraction data from table into annotation (type 1) + // 2. copy coordinates, type into minutiae table, reference assignment id (on load, user will see the minutiae data in the image annotation) + +} + +function importMinutiaeValues($filename,$imageID){ + $exec_command = 'backend/minutiae_extractor/output/import-test.sh 2>&1'; + $result = exec($exec_command, $output); + $jsonArr = json_decode($result, true); + + + + $newMinutiae = array(); + // create reference for extraction and get id + + $extractorId = Application::instance()->getDB()->addMinutiaExtractor( $imageID); + + foreach($jsonArr as $minutiaeLine){ + $stringArr = explode(":", $minutiaeLine); + $minutiaeData = array(); + + $coords = explode(",", $stringArr[1]); + $x = trim($coords[0]); + $y = trim($coords[1]); + $angle = trim($stringArr[2]); + $relScore = trim($stringArr[3]); + $type = trim($stringArr[4]); + if($type == "BIF"){ + $type = 1; + }else if($type == "RIG"){ + $type = 2; + } + + array_push($minutiaeData, $x); + array_push($minutiaeData, $y); + array_push($minutiaeData, $angle); + array_push($minutiaeData, $type); + array_push($minutiaeData, $relScore); + array_push($minutiaeData, $imageID); + array_push($minutiaeData, $extractorId); + + $locationID = Application::instance()->getDB()->addMinutiaLocation($minutiaeData); + + + + array_push($newMinutiae,$minutiaeData); + + } +} + + function processImageUploads( $allowMultiple, $type = NULL, $defaultDPI = NULL ) { - // throw new Exception("GET=\n".var_dump_str($_GET)."\nPOST=\n".var_dump_str($_POST)); + throw new Exception("GET=\n".var_dump_str($_GET)."\nPOST=\n".var_dump_str($_POST)); $insertedImages = array (); if( isset( $_FILES[ 'images' ] ) ) diff --git a/backend/minutiae_extractor/README.md b/backend/minutiae_extractor/README.md new file mode 100644 index 0000000000000000000000000000000000000000..4eeba08a0ce059a92d33856af70569295565d354 --- /dev/null +++ b/backend/minutiae_extractor/README.md @@ -0,0 +1,10 @@ +# MINDTCT Minutiae Detector Integration +- Included in this folder is an unix executable for the minutiae detector (mindtct). This exectuable is compiled from the [nbis repository](https://github.com/lessandro/nbis) +- The extractor will output several files, the relavant one is extention ".min". This file can be read by import-test.sh to convert coordinates, angle and reliability score to json format and there is logic in the php to save to the database +## Issues as of 8/21/2024 +- Able to run extractor using php exec() calls and collect detected minutiae using a shell script to convert the values to json format, and add to standalone database tables. +- Ran into issues copying the extraction data from the extraction tables into the pianos system, as there are several connected functions and fragile code regarding the saveResults() process in AppDB.php. +- Either need to rewrite logic and code for saving annotations and minutiae based off x, y, angle and type data, or replicate the current client-to-server json format and branch off existing logic. +- Somehow, the front-end generates an unique database id for each new minutiae placed before being sent back to server in json format when clicking "Save", need to figure out how this occurs. No extra requests appear to go out before saving, it is unclear where the code for this is. Reccomend that Marco De Donno takes this on. +## For future devs: +- It could be possible to reuse saveResults() function in AppDB.php to save initial extracted minutiae values. This work is started in getOrCreateAssignment() function in AppDB.php. diff --git a/backend/minutiae_extractor/mindtct b/backend/minutiae_extractor/mindtct new file mode 100755 index 0000000000000000000000000000000000000000..9f890e42a6a862b88523264e9ea35690a451abe4 Binary files /dev/null and b/backend/minutiae_extractor/mindtct differ diff --git a/backend/minutiae_extractor/mindtct.1 b/backend/minutiae_extractor/mindtct.1 new file mode 100755 index 0000000000000000000000000000000000000000..374a634dc60f02a9e681ab6bf60e9f132d57d6e6 --- /dev/null +++ b/backend/minutiae_extractor/mindtct.1 @@ -0,0 +1,240 @@ +.\" @(#)mindtct.1 2008/10/02 NIST +.\" I Image Group +.\" Michael D. Garris +.\" +.TH MINDTCT 1C "02 October 2008" "NIST" "NBIS Reference Manual" +.SH NAME +mindtct \- detects minutiae from a fingerprint image that is either +an ANSI/NIST 2007 formatted file or a WSQ compressed file. +.SH SYNOPSIS +.B mindtct +.I [-b] +.I [-m1] +.I +.I +.SH DESCRIPTION +.B Mindtct +takes either a WSQ compressed image file or parses a standard +compliant ANSI/NIST-ITL 1-2007 file searching for the first +occurrence of a grayscale fingerprint image record. The fingerprint +image is processed and minutiae are automatically detected. + +If the input file was in ANSI/NIST 2007 format the minutiae results +are formatted and stored using the NIST fields 5-12 in a Type-9 record. +Upon successful completion, the input ANSI/NIST record sequence is +augmented with two new records, the Type-9 minutiae record and a +tagged field image record containing the results of image binarization. +This augmented record sequence is then written to the output file +.mdt. The minutiae values are also written to a text file +.xyt in "x y theta quality" format. This .xyt file +is the format used by the bozorth3 matcher. + +If the input image is a WSQ compressed file the minutiae are only written +to the text file .xyt. In addition a file called .brw +is created which is a raw pixel file of the binarized image +created by mindtct when detecting the minutiae points. + +The default is minutiae points computed based on the pixel origin being +at the bottom left of the image and directions are pointing out and away +from the ridge ending or bifurcation valley. + +.B Mindtct +also generates the following text files in the current +working directory: \fI.dm\fR, \fI.hcm\fR, \fI.lcm\fR, +\fI.lfm\fR, \fI.qm\fR, and \fI.min\fR. +These files are described below. + +.SH OPTIONS +.TP +.I [-b] +perform image enhancement on low contrast images. Only affects low +contrast images, others are unchanged. +.TP +.I [-m1] +write the minutiae points (in files .{mdt,xyt,min}) according to +ANSI INCITS 378-2004. This format has the pixel origin at the top left of the +image and directions are pointing up the ridge ending or bifurcation valley. +The default for \fBmindtct\fR has the pixel origin at the bottom left of +the image and directions are pointing out and away from the ridge ending +or bifurcation valley. NOTE: If this flag is used when extracting the +mintuiae points it must also be used with the \fBbozorth3\fR matcher. + +.TP +.I +the fingerprint file to be processed +.TP +.I +the root name for the output files (.???) +.TP +\fB-version +\fRPrint ANSI/NIST stardand and NBIS software version. + +.SH TEXT OUTPUT FILES +.TP +.I .dm +The \fIDirection Map\fR represents the direction of ridge flow within +the fingerprint image. The map contains a grid of integer directions, +where each cell in the grid represents an 8x8 pixel neighborhood +in the image. Ridge flow angles are quantized into 16 integer +bi-directional units equally spaced on a semicircle. Starting with +vertical direction 0, direction units increase clockwise and +represent incremental jumps of 11.25 degrees, stopping at direction +15 which is 11.25 degrees shy of vertical. Using this scheme, direction +8 is horizontal. A value of -1 in this map represents a neighborhood +where no valid ridge flow was determined. +.TP +.I .hcm +The \fIHigh-Curvature Map\fR represents areas in the image having +high-curvature ridge flow. This is especially true of core and delta +regions in the fingerprint image, but high-curvature is not limited +to just these cases. This is a bi-level map with same dimension as +the Direction Map. Cell values of 1 represent 8x8 pixel +neighborhoods in the fingerprint image that are located within +a high-curvature region, otherwise cell values are set to 0. +.TP +.I .lcm +The \fILow-Contrast Map\fR represents areas in the image having +low-contrast. The regions of low contrast most commonly represent +the background in the fingerprint image. This is a bi-level map with +same dimension as the Direction Map. Cell values of 1 +represent 8x8 pixel neighborhoods in the fingerprint image that are +located within a low-contrast region, otherwise cell values are set to 0. +.TP +.I .lfm +The \fILow-Flow Map\fR represents areas in the image having +non-determinable ridge flow. Ridge flow is determined using a set +of discrete cosine wave forms computed for a predetermined range +of frequencies. These wave forms are applied at 16 incremental +orientations. At times none of the wave forms at none of the +orientations resonate sufficiently high within the region in the +image to satisfactorily determine a dominant directional frequency. +This is a bi-level map with same dimension as the Direction Map. +Cell values of 1 represent 8x8 pixel neighborhoods in the fingerprint +image that are located within a region where a dominant directional +frequency could \fInot\fR be determined, otherwise cell values are set to 0. +The Direction Map also records cells with non-determinable ridge +flow. The difference is that the Low-Flow Map records \fIall\fR cells +with non-determinable ridge flow, while the Direction Map records +only those that remain non-determinable after extensive \fIinterpolation\fR +and \fIsmoothing\fR of neighboring ridge flow directions. +.TP +.I .qm +The \fIQuality Map\fR represents regions in the image having varying +levels of quality. The maps above are combined heuristically to form +5 discrete levels of quality. This map has the same dimension as the +Direction Map, with each value in the map representing an 8x8 pixel +neighborhood in the fingerprint image. A cell value of 4 represents +highest quality, while a cell value of 0 represent lowest possible +quality. +.TP +.I .xyt +This text file reports the minutiae detection results. +This reports only the x,y coordinates, theta, and quality of the +minutie points for the image. Each line in this file contains +the space delimited information for one minutiae point. The +.xyt is the minutiae format used by the \fBbozorth3\fR +matching algorithm. +.TP +.I .min +This text file reports the minutiae detection results. +The majority of the results listed in this text file are also encoded +and stored in a Type-9 record in the output ANSI/NIST file. The +first non-empty line in the text file lists the number of minutiae +that were detected in the fingerprint image. Following this, +the attributes associated with each detected minutia are recorded, +one line of text per minutia. Each minutia line has the same format. +Fields are separated by a ':', subfields are separated by a ';', +and items within subfields are separated by a ','. A minutia line +may be represented as: + +.RE 2 +.RS 2 +\fIMN\fR : \fIMX\fR, \fIMY\fR : \fIDIR\fR : \fIREL\fR : \fITYP\fR : \fIFTYP\fR : \fIFN\fR : \fINX1\fR, \fINY1\fR; \fIRC1\fR : ... +.PP +.RE +.RS +.RS +.RS +where: +.TP +.I MN +is the integer identifier of the detected minutia. +.TP +.I MX +is the x-pixel coordinate of the detected minutia. +.TP +.I MY +is the y-pixel coordinate of the detected minutia. +.TP +.I DIR +is the direction of the detected minutia. Minutia direction is +represented similar to ridge flow direction, only minutia direction +is uni-directional starting at vertical pointing up with unit 0 and +increasing clockwise in increments of 11.25 degrees completing a +full circle. Using this scheme, the angle of a detected minutia is +quantized into the range 0 to 31 with 8 representing horizontal to the +right, 16 representing vertical pointing down, and 24 representing +horizontal to the left. +.TP +.I REL +is the reliability measure assigned to the detected minutia. This +measure is computed by looking up the quality level +associated with the position of the minutia from the Quality Map. +The quality level is then heuristically combined with simple +neighborhood pixel statistics surrounding the minutia point. +The results is a floating point value in the range 0.0 to 1.0, +with 0.0 representing lowest minutia quality and 1.0 representing +highest minutia quality. +.TP +.I TYP +is the type of the detected minutia. +.RS +bifurcation = "BIF" +.br +ridge ending = "RIG" +.RE +.TP +.I FTYP +is the type of feature detected. +.RS +appearing = "APP" +.br +disappearing = "DIS" +.br +(This attribute is primarily useful for +purposes internal to the minutia detection algorithm.) +.RE +.TP +.I FN +is the integer identifier of the type of feature detected. +(This attribute is primarily useful for +purposes internal to the minutia detection algorithm.) +.TP +.I NX1 +is the x-pixel coordinate of the first neighboring minutia. +.TP +.I NY1 +is the y-pixel coordinate of the first neighboring minutia. +.TP +.I RC1 +is the ridge count calculated between the detected minutia and its +first neighbor. +.TP +.I ... +for each additional neighbor ridge count computed, the pixel +coordinate of the neighbor and the ridge count to that neighbor +are reported. + +.SH EXAMPLES +From \fItest/mindtct/execs/mindtct/mindtct.src\fR: +.PP +.RS +.B % mindtct ../../data/g001t2u.eft g001t2u +.SH SEE ALSO +.BR an2k2txt (1F), +.BR an2ktool (1F), +.BR dpyan2k (1F), +.BR bozorth3 (1E) + +.SH AUTHOR +NIST/ITL/DIV894/Image Group diff --git a/backend/minutiae_extractor/output/import-test.sh b/backend/minutiae_extractor/output/import-test.sh new file mode 100755 index 0000000000000000000000000000000000000000..0a555fd9b1de77aa7bcdac996bdc2aece3efc898 --- /dev/null +++ b/backend/minutiae_extractor/output/import-test.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# Path to the input file +input_file="backend/minutiae_extractor/output/output_test.min" + +# Read the contents of the file starting from the 5th line +lines=$(tail -n +5 "$input_file") + +# Build the JSON array +json_array="[" +while IFS= read -r line; do + json_array+="\"$line\", " +done <<< "$lines" +json_array="${json_array%, }]" # Remove the trailing comma and space + +# Print the JSON array +printf "$json_array" \ No newline at end of file diff --git a/backend/minutiae_extractor/output/output_test.min b/backend/minutiae_extractor/output/output_test.min new file mode 100644 index 0000000000000000000000000000000000000000..3c5c5028a6cae37759028975abcbdab368aa889e --- /dev/null +++ b/backend/minutiae_extractor/output/output_test.min @@ -0,0 +1,70 @@ +Image (w,h) 886 1291 + +66 Minutiae Detected + + 0 : 43, 893 : 31 : 0.067 :RIG : DIS : 1 : 109, 777; 1 : 185, 729; 5 : 281, 824; 5 : 205, 932; 4 : 278, 961; 6 + 1 : 109, 777 : 18 : 0.066 :RIG : APP : 0 : 185, 729; 3 : 274, 750; 6 : 263, 758; 9 : 271, 767; 7 : 281, 824; 8 + 2 : 174, 417 : 19 : 0.061 :BIF : DIS : 2 : 294, 333; 2 : 320, 390; 3 : 291, 423; 3 : 207, 428; 0 : 316, 562; 4 + 3 : 185, 729 : 1 : 0.063 :BIF : DIS : 2 : 299, 739; 4 : 274, 750; 1 : 263, 758; 2 : 303, 774; 3 : 271, 767; 1 + 4 : 193, 1106 : 17 : 0.132 :RIG : APP : 0 : 273,1090; 4 : 263,1114; 3 : 261,1151; 3 : 255,1176; 2 : 220,1166; 1 + 5 : 205, 932 : 21 : 0.060 :RIG : DIS : 1 : 297, 902; 2 : 278, 961; 3 : 277, 988; 1 : 290,1002; 4 : 280, 995; 3 + 6 : 207, 428 : 19 : 0.144 :RIG : APP : 0 : 329, 280; 3 : 294, 333; 1 : 320, 390; 3 : 291, 423; 2 : 316, 562; 5 + 7 : 220, 1166 : 5 : 0.061 :RIG : APP : 0 : 263,1114; 1 : 261,1151; 1 : 273,1169; 2 : 255,1176; 0 : 278,1213; 1 + 8 : 255, 1176 : 24 : 0.060 :RIG : DIS : 1 : 261,1151; 1 : 285,1127; 1 : 273,1169; 1 : 289,1202; 1 : 278,1213; 2 + 9 : 261, 1151 : 1 : 0.061 :BIF : DIS : 2 : 263,1114; 1 : 273,1090; 1 : 285,1127; 1 : 273,1169; 1 : 289,1202; 3 + 10 : 263, 758 : 16 : 0.066 :BIF : APP : 3 : 274, 750; 0 : 299, 739; 2 : 303, 774; 0 : 271, 767; 0 : 281, 824; 2 + 11 : 263, 1114 : 1 : 0.061 :BIF : DIS : 2 : 274,1053; 0 : 294,1036; 3 : 273,1090; 0 : 285,1127; 2 : 273,1169; 1 + 12 : 271, 767 : 24 : 0.066 :BIF : DIS : 2 : 274, 750; 0 : 299, 739; 1 : 303, 774; 0 : 291, 844; 4 : 281, 824; 1 + 13 : 273, 1090 : 1 : 0.062 :BIF : DIS : 2 : 274,1053; 0 : 286,1014; 2 : 294,1036; 2 : 285,1127; 2 : 273,1169; 2 + 14 : 273, 1169 : 6 : 0.149 :BIF : APP : 3 : 274,1053; 2 : 285,1127; 0 : 330,1174; 0 : 289,1202; 1 : 278,1213; 2 + 15 : 274, 750 : 5 : 0.063 :RIG : APP : 0 : 299, 739; 1 : 409, 785; 6 : 303, 774; 2 : 291, 844; 4 : 281, 824; 2 + 16 : 274, 1053 : 16 : 0.057 :RIG : APP : 0 : 277, 988; 2 : 280, 995; 2 : 286,1014; 2 : 290,1002; 3 : 294,1036; 2 + 17 : 277, 988 : 3 : 0.060 :RIG : DIS : 1 : 278, 961; 0 : 290,1002; 2 : 280, 995; 1 : 294,1036; 4 : 286,1014; 3 + 18 : 278, 961 : 4 : 0.060 :RIG : DIS : 1 : 297, 902; 3 : 290,1002; 3 : 294,1036; 5 : 286,1014; 4 : 280, 995; 2 + 19 : 278, 1213 : 24 : 0.061 :RIG : DIS : 1 : 285,1127; 7 : 289,1202; 1 : 330,1174; 3 : 396,1178; 3 : 345,1279; 2 + 20 : 280, 995 : 5 : 0.133 :BIF : APP : 3 : 297, 902; 4 : 290,1002; 1 : 294,1036; 2 : 286,1014; 1 : 285,1127; 7 + 21 : 281, 824 : 3 : 0.144 :RIG : DIS : 1 : 299, 739; 4 : 303, 774; 0 : 409, 785; 4 : 291, 844; 2 : 297, 902; 4 + 22 : 285, 1127 : 8 : 0.059 :BIF : DIS : 2 : 286,1014; 6 : 294,1036; 3 : 396,1178; 3 : 330,1174; 3 : 289,1202; 4 + 23 : 286, 1014 : 6 : 0.120 :BIF : APP : 3 : 297, 902; 6 : 290,1002; 0 : 418, 933; 4 : 294,1036; 0 : 330,1174; 7 + 24 : 289, 1202 : 26 : 0.138 :RIG : DIS : 1 : 294,1036; 11 : 330,1174; 2 : 396,1178; 2 : 480,1213; 3 : 345,1279; 2 + 25 : 290, 1002 : 23 : 0.057 :BIF : DIS : 2 : 291, 844; 7 : 297, 902; 5 : 418, 933; 3 : 330,1174; 6 : 294,1036; 2 + 26 : 291, 423 : 19 : 0.141 :RIG : APP : 0 : 294, 333; 2 : 320, 390; 2 : 427, 434; 6 : 407, 508; 5 : 316, 562; 3 + 27 : 291, 844 : 22 : 0.060 :RIG : DIS : 1 : 299, 739; 7 : 303, 774; 2 : 409, 785; 3 : 422, 809; 1 : 297, 902; 2 + 28 : 294, 333 : 18 : 0.061 :BIF : APP : 3 : 328, 278; 1 : 329, 280; 0 : 436, 330; 5 : 427, 434; 3 : 320, 390; 1 + 29 : 294, 1036 : 23 : 0.061 :RIG : APP : 0 : 297, 902; 8 : 435, 883; 3 : 418, 933; 1 : 396,1178; 1 : 330,1174; 5 + 30 : 297, 902 : 4 : 0.064 :RIG : DIS : 1 : 303, 774; 3 : 409, 785; 1 : 422, 809; 2 : 435, 883; 4 : 418, 933; 2 + 31 : 299, 739 : 4 : 0.065 :BIF : DIS : 2 : 406, 657; 1 : 426, 663; 2 : 409, 785; 3 : 422, 809; 3 : 303, 774; 2 + 32 : 303, 774 : 22 : 0.140 :RIG : APP : 0 : 406, 657; 3 : 426, 663; 3 : 409, 785; 5 : 422, 809; 4 : 435, 883; 6 + 33 : 316, 562 : 6 : 0.062 :BIF : APP : 3 : 407, 508; 2 : 429, 500; 3 : 418, 558; 2 : 426, 663; 3 : 406, 657; 1 + 34 : 320, 390 : 2 : 0.062 :RIG : DIS : 1 : 328, 278; 2 : 329, 280; 1 : 436, 330; 0 : 427, 434; 3 : 407, 508; 4 + 35 : 328, 278 : 3 : 0.060 :BIF : DIS : 2 : 436, 330; 1 : 427, 434; 3 : 329, 280; 0 : 429, 500; 0 : 407, 508; 2 + 36 : 329, 280 : 3 : 0.060 :RIG : APP : 0 : 436, 330; 1 : 427, 434; 3 : 429, 500; 0 : 407, 508; 2 : 418, 558; 3 + 37 : 330, 1174 : 8 : 0.150 :RIG : APP : 0 : 418, 933; 5 : 396,1178; 1 : 480,1213; 2 : 481,1283; 0 : 345,1279; 3 + 38 : 345, 1279 : 9 : 0.059 :BIF : APP : 3 : 418, 933; 3 : 435, 883; 5 : 396,1178; 0 : 480,1213; 1 : 481,1283; 1 + 39 : 396, 1178 : 26 : 0.059 :RIG : DIS : 1 : 422, 809; 9 : 418, 933; 6 : 435, 883; 7 : 480,1213; 1 : 481,1283; 1 + 40 : 406, 657 : 5 : 0.062 :RIG : APP : 0 : 418, 558; 2 : 439, 654; 0 : 546, 657; 2 : 426, 663; 1 : 409, 785; 3 + 41 : 407, 508 : 7 : 0.057 :RIG : APP : 0 : 427, 434; 1 : 429, 500; 0 : 418, 558; 2 : 439, 654; 4 : 426, 663; 3 + 42 : 409, 785 : 20 : 0.058 :RIG : APP : 0 : 426, 663; 2 : 439, 654; 2 : 549, 800; 3 : 422, 809; 1 : 435, 883; 3 + 43 : 418, 558 : 29 : 0.059 :BIF : DIS : 2 : 427, 434; 3 : 429, 500; 2 : 560, 578; 1 : 439, 654; 1 : 426, 663; 2 + 44 : 418, 933 : 7 : 0.059 :BIF : APP : 3 : 422, 809; 1 : 435, 883; 0 : 549, 800; 1 : 555, 802; 1 : 555, 837; 0 + 45 : 422, 809 : 20 : 0.063 :RIG : APP : 0 : 426, 663; 5 : 549, 800; 2 : 555, 802; 2 : 555, 837; 1 : 435, 883; 2 + 46 : 426, 663 : 6 : 0.133 :BIF : APP : 3 : 429, 500; 2 : 439, 654; 0 : 560, 578; 1 : 546, 657; 1 : 549, 800; 3 + 47 : 427, 434 : 5 : 0.057 :RIG : APP : 0 : 436, 330; 3 : 560, 578; 1 : 546, 657; 1 : 439, 654; 4 : 429, 500; 1 + 48 : 429, 500 : 25 : 0.058 :RIG : DIS : 1 : 436, 330; 7 : 560, 578; 1 : 665, 720; 4 : 546, 657; 0 : 439, 654; 3 + 49 : 435, 883 : 3 : 0.059 :RIG : DIS : 1 : 439, 654; 7 : 549, 800; 1 : 555, 802; 1 : 555, 837; 0 : 649, 829; 1 + 50 : 436, 330 : 9 : 0.066 :RIG : APP : 0 : 665, 720; 4 : 560, 578; 6 : 546, 657; 1 : 549, 800; 4 : 439, 654; 14 + 51 : 439, 654 : 24 : 0.061 :RIG : APP : 0 : 560, 578; 1 : 546, 657; 0 : 555, 802; 3 : 549, 800; 1 : 555, 837; 3 + 52 : 480, 1213 : 11 : 0.056 :BIF : APP : 3 : 549, 800; 4 : 555, 802; 3 : 555, 837; 4 : 704, 876; 3 : 481,1283; 0 + 53 : 481, 1283 : 27 : 0.010 :BIF : DIS : 2 : 549, 800; 3 : 555, 802; 2 : 555, 837; 3 : 649, 829; 0 : 704, 876; 4 + 54 : 546, 657 : 5 : 0.065 :BIF : DIS : 2 : 560, 578; 1 : 665, 720; 1 : 658, 767; 1 : 555, 802; 5 : 549, 800; 3 + 55 : 549, 800 : 3 : 0.063 :BIF : DIS : 2 : 652, 783; 2 : 656, 788; 1 : 649, 829; 3 : 555, 802; 0 : 555, 837; 0 + 56 : 555, 802 : 19 : 0.064 :BIF : APP : 3 : 652, 783; 2 : 656, 788; 1 : 661, 806; 3 : 649, 829; 2 : 555, 837; 0 + 57 : 555, 837 : 6 : 0.057 :RIG : APP : 0 : 658, 767; 2 : 652, 783; 2 : 656, 788; 1 : 661, 806; 1 : 649, 829; 1 + 58 : 560, 578 : 23 : 0.072 :BIF : DIS : 2 : 665, 720; 1 : 658, 767; 0 : 656, 788; 3 : 652, 783; 3 : 661, 806; 3 + 59 : 649, 829 : 7 : 0.061 :RIG : APP : 0 : 652, 783; 5 : 658, 767; 5 : 656, 788; 2 : 661, 806; 1 : 704, 876; 0 + 60 : 652, 783 : 6 : 0.057 :BIF : APP : 3 : 665, 720; 0 : 658, 767; 0 : 656, 788; 0 : 704, 876; 2 : 661, 806; 1 + 61 : 656, 788 : 22 : 0.123 :BIF : DIS : 2 : 658, 767; 1 : 665, 720; 2 : 704, 876; 2 : 661, 806; 0 + 62 : 658, 767 : 24 : 0.059 :RIG : DIS : 1 : 665, 720; 1 : 704, 876; 5 : 661, 806; 2 + 63 : 661, 806 : 3 : 0.129 :RIG : DIS : 1 : 665, 720; 3 : 704, 876; 1 + 64 : 665, 720 : 21 : 0.062 :RIG : DIS : 1 : 704, 876; 4 + 65 : 704, 876 : 27 : 0.064 :BIF : DIS : 2 diff --git a/backend/minutiae_extractor/saveResultsExampleArgs.txt b/backend/minutiae_extractor/saveResultsExampleArgs.txt new file mode 100644 index 0000000000000000000000000000000000000000..d28ed5f9b88f3b210009905e1a7caa41704e0f92 --- /dev/null +++ b/backend/minutiae_extractor/saveResultsExampleArgs.txt @@ -0,0 +1,148 @@ +Array +( + [0] => 339 + [1] => CURRENT + [2] => ANALYSIS + [3] => Array + ( + [minutiae] => Array + ( + [3] => Array + ( + [id] => 3 + [type] => bifurcation + [pos] => Array + ( + [0] => 305.84323922734 + [1] => 302.09855590639 + ) + + [angle] => 55.007979801441 + [live] => + [created] => 2024-08-21T13:17:59.587Z + [modified] => 2024-08-21T13:17:59.587Z + [userid] => 19 + ) + + [5] => Array + ( + [id] => 5 + [type] => ridge_ending + [pos] => Array + ( + [0] => 601.25780089153 + [1] => 353.89201801634 + ) + + [angle] => 165.46554491946 + [live] => + [created] => 2024-08-21T13:18:00.959Z + [modified] => 2024-08-21T13:18:00.959Z + [userid] => 19 + ) + + [8] => Array + ( + [id] => 8 + [type] => ridge_ending + [pos] => Array + ( + [0] => 372.98291233284 + [1] => 386.50271638187 + ) + + [angle] => 16.46001481204 + [live] => + [created] => 2024-08-21T13:18:24.543Z + [modified] => 2024-08-21T13:18:24.543Z + [userid] => 19 + ) + + [10] => Array + ( + [id] => 10 + [type] => ridge_ending + [pos] => Array + ( + [0] => 518.77191679049 + [1] => 413.35858562407 + ) + + [angle] => 176.05481377096 + [live] => + [created] => 2024-08-21T13:19:12.072Z + [modified] => 2024-08-21T16:10:46.348Z + [userid] => 19 + ) + + [13] => Array + ( + [id] => 13 + [type] => ridge_ending + [pos] => Array + ( + [0] => 219.52080237741 + [1] => 390.33926913076 + ) + + [angle] => 5.0694201326125 + [live] => + [created] => 2024-08-21T14:04:37.654Z + [modified] => 2024-08-21T14:04:37.654Z + [userid] => 19 + ) + + [15] => Array + ( + [id] => 15 + [type] => ridge_ending + [pos] => Array + ( + [0] => 292.41530460624 + [1] => 415.27686199851 + ) + + [angle] => -1.3322198538697 + [live] => + [created] => 2024-08-21T14:04:40.545Z + [modified] => 2024-08-21T14:04:40.545Z + [userid] => 19 + ) + + ) + + [ridges] => Array + ( + ) + + [areas] => Array + ( + ) + + [comments] => Array + ( + ) + + [GC] => Array + ( + ) + + [image] => Array + ( + [id] => 324 + [href] => ?action=get_image&id=324 + [width] => 886 + [height] => 1291 + [resolution] => 500 + [name] => Comparison-Demo-Mark.jpeg + ) + + ) + + [4] => + [5] => Array + ( + [mark-suitability-approach] => 2 + ) + +) diff --git a/backend/minutiae_extractor/temp_img/Comparison-Demo-Mark.jpeg b/backend/minutiae_extractor/temp_img/Comparison-Demo-Mark.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..edf2c076ef79891276bae22088a60d6772dc4e9a Binary files /dev/null and b/backend/minutiae_extractor/temp_img/Comparison-Demo-Mark.jpeg differ diff --git a/backend/minutiae_extractor/temp_img/ComparisonDemoMark.jpg b/backend/minutiae_extractor/temp_img/ComparisonDemoMark.jpg new file mode 100644 index 0000000000000000000000000000000000000000..679abe4ccdf47038c694058ea49079ad6b61f65d Binary files /dev/null and b/backend/minutiae_extractor/temp_img/ComparisonDemoMark.jpg differ diff --git a/index.php b/index.php index 99ea667cc648ae06b47c93a26e28f2ebcd693379..276ba511c54cf8311b18e129446005928c17e666 100644 --- a/index.php +++ b/index.php @@ -20,7 +20,7 @@ // BEGIN-BUILDSCRIPT-SECTION-1 -define( '_DEBUG', false ); +define( '_DEBUG', true ); require_once ( "backend/Pianos4_TE.php" ); $app = new Pianos4_TE(); diff --git a/install/pianos.sql b/install/pianos.sql index ffb4aacb4f616e7fd73f7b4942712343d3ed95f9..0ebde4674c33cb9e3ee521ff04ba8689cf8ab76d 100644 --- a/install/pianos.sql +++ b/install/pianos.sql @@ -959,3 +959,22 @@ INSERT INTO public.usertracktype ("name") VALUES ('view'); INSERT INTO public.usertracktype ("name") VALUES ('mouse'); +CREATE TABLE public.minutiaextraction ( + id serial4 NOT NULL, + imageid int4 NULL, + process_date date NULL, + success bool NULL, + CONSTRAINT minutiaextraction_pk PRIMARY KEY (id) +); + +CREATE TABLE public.minutiaextractionlocation ( + id serial4 NOT NULL, + x float8 NULL, + y float8 NULL, + theta float8 NULL, + "type" int4 NULL, + reliability_score float8 NULL, + imageid int4 NULL, + extractorid int4 NULL, + CONSTRAINT minutiaextractionlocation_pk PRIMARY KEY (id) +); \ No newline at end of file