diff --git a/chameleon-client/src/views/SettingsViewes/Cameras.vue b/chameleon-client/src/views/SettingsViewes/Cameras.vue index ec8ae53ae..8fb6fd241 100644 --- a/chameleon-client/src/views/SettingsViewes/Cameras.vue +++ b/chameleon-client/src/views/SettingsViewes/Cameras.vue @@ -48,9 +48,21 @@ Snapshot Amount: {{snapshotAmount}} +
+ +
+ + + + +
+
- - Calibration Failed + + {{snackbar.text}} @@ -58,12 +70,14 @@ diff --git a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/impl/Calibrate3dPipeline.java b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/impl/Calibrate3dPipeline.java index f6e898145..69403df67 100644 --- a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/impl/Calibrate3dPipeline.java +++ b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/impl/Calibrate3dPipeline.java @@ -38,6 +38,7 @@ public class Calibrate3dPipeline extends CVPipeline tvecs = new ArrayList<>(); try { - Calib3d.calibrateCamera(objpoints, imgpoints, imageSize, cameraMatrix, distortionCoeffs, rvecs, tvecs); + calibrationAccuracy = Calib3d.calibrateCamera(objpoints, imgpoints, imageSize, cameraMatrix, distortionCoeffs, rvecs, tvecs); } catch(Exception e) { System.err.println("Camera calibration failed!"); initPipeline(cameraCapture); @@ -162,4 +163,8 @@ public class Calibrate3dPipeline extends CVPipeline tmp = new HashMap(); + tmp.put("accuracy", pipeManager.calib3dPipe.getCalibrationAccuracy()); + ctx.json(tmp); ctx.status(200); } else { System.err.println("CALFAIL"); @@ -181,7 +184,7 @@ public class RequestHandler { } } pipeManager.setCalibrationMode(false); - ctx.status(200); + ctx.status(201); } public static void onPnpModel(Context ctx) throws JsonProcessingException { @@ -202,7 +205,7 @@ public class RequestHandler { var settings = (StandardCVPipelineSettings) VisionManager.getCurrentUIVisionProcess().pipelineManager.getCurrentPipeline().settings; settings.targetCornerMat.fromList(pointsList); } - } catch (Exception e){ + } catch (Exception e) { ctx.status(500); } }