Commit 042e8ac4 authored by Patrik Tomov's avatar Patrik Tomov
Browse files

Added reset computed distances after registration

parent a3b2a2b7

frontend/src/components/task-view/analysis/batch/distance/BatchDistancePanel.tsx

+4 −1
Original line number Diff line number Diff line
@@ -73,7 +73,10 @@ const BatchDistancePanel = () => { 
						sx={{ minWidth: 230, ml: 2 }}

						name="similarityMethod"

						size="small"

						value={batchDistanceTaskDto.similarityMethod}

						value={

							batchDistanceTaskDto.similarityMethod ||

							SimilarityMethod.IndirectDistance

						}

						onChange={e => {

							setBatchDistanceTaskDto({

								...batchDistanceTaskDto,

frontend/src/hooks/useBatchTaskManagement.tsx

+22 −14
Original line number Diff line number Diff line
@@ -264,23 +264,27 @@ const useBatchTaskManagement = () => { 
		);

	};



	const saveParametersForDistance = (distances: BatchDistancesDto) => {

	const saveParametersForDistance = (distances: BatchDistancesDto | null) => {

		if (!task || !selectedFileDistance) {

			return;

		}



		const distanceMatrix = distances.faceDistances.map(

			face => face.faceDistances

		);

		const deviationMatrix = distances.faceDistances.map(

			face => face.faceDeviations

		);



		const taskParametersForDistance: TaskParametersDistanceUpdateDto = {

		const taskParametersForDistance: TaskParametersDistanceUpdateDto = distances

			? {

					templateFaceForDistance: selectedFileDistance.name,

					similarityMethod: batchDistanceTaskDto.similarityMethod,

			deviations: JSON.stringify(distanceMatrix),

			distances: JSON.stringify(deviationMatrix)

					deviations: JSON.stringify(

						distances.faceDistances.map(face => face.faceDistances)

					),

					distances: JSON.stringify(

						distances.faceDistances.map(face => face.faceDeviations)

					)

			  }

			: {

					templateFaceForDistance: null,

					similarityMethod: null,

					deviations: null,

					distances: null

			  };



		TaskParametersService.updateTaskParametersForDistance(
@@ -382,6 +386,7 @@ const useBatchTaskManagement = () => { 
			);



			if (results.humanFace !== null && results.completedSuccessfully) {

				setBatchDistancesDto(null);

				setFace(results.humanFace, null, task?.id);

				setAverageFace(results.humanFace);

				getTaskFiles();
@@ -392,7 +397,9 @@ const useBatchTaskManagement = () => { 
					autoClose: 5000

				});

				saveParametersForRegistration();

				saveParametersForDistance(null);

			} else if (results.humanFace === null && results.completedSuccessfully) {

				setBatchDistancesDto(null);

				getTaskFiles();

				toast.update(toastId, {

					render: 'Calculation completed successfully',
@@ -401,6 +408,7 @@ const useBatchTaskManagement = () => { 
					autoClose: 5000

				});

				saveParametersForRegistration();

				saveParametersForDistance(null);

			} else {

				toast.update(toastId, {

					render: 'Calculation interrupted',

frontend/src/hooks/visualization/useHeatmapManagement.ts

+2 −0
Original line number Diff line number Diff line
@@ -175,6 +175,8 @@ const useHeatmapManagement = () => { 
	useEffect(() => {

		if (batchDistancesDto !== null) {

			handlePrepareHeatmapData(batchDistancesDto);

		} else {

			setHeatmapRows([]);

		}

	}, [batchDistancesDto]);

frontend/src/providers/BatchProcessingTaskContextProvider.tsx

+2 −0
Original line number Diff line number Diff line
@@ -202,6 +202,8 @@ export const BatchProcessingTaskContextProvider: FC<Props> = ({ children }) => { 
				taskId: task.id,

				linkageStrategy: LinkageStrategy.AVERAGE

			});

		} else {

			setBatchDistancesDto(null);

		}

	};

frontend/src/types/TaskParametersTypes.ts

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ export type TaskParametersRegistrationUpdateDto = { 
};



export type TaskParametersDistanceUpdateDto = {

	templateFaceForDistance: string;

	similarityMethod: SimilarityMethod;

	templateFaceForDistance: string | null;

	similarityMethod: SimilarityMethod | null;

	deviations: string | null;

	distances: string | null;

};