Diffusion ShoulderDB_ImportSegmentMeasureAnalyze 99922bd71ad2

Merge last conflicts
99922bd71ad2
Actions

Authored by aterrier on Jun 28 2019, 22:44.

Description

Merge last conflicts

Details

Committed

aterrier

Jun 28 2019, 22:44

Pushed

aterrier

Jun 28 2019, 22:45

Parents

R8218:3b90fac6ca44: Remove tic in ImportSCase/importSCase.m
R8218:7a41906b8b6f: log file removed

Branches

Unknown

Tags

Unknown

Event Timeline

aterrier committed R8218:99922bd71ad2: Merge last conflicts (authored by aterrier).Jun 28 2019, 22:44

Merged Changes

	Commit			Author	Details	Committed
	7a41906b8b6f			aterrier	log file removed	May 14 2019
	2dca0c2cbf76			aterrier	Add test for landmarks validity	May 14 2019

Changes (33)

		Path
A		ImportSCase/tempInfo.mat
A		ShoulderCase/._Scapula.m
A	(dir)	anatomy/Generated_Amira_TCL_Scripts/
A	(dir)	anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P320.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P321.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P322.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P323.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P325.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P327.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P331.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P332.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P333.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P339.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P343.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P344.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P347.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P348.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P349.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P444.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P456.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P460.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P463.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P467.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P471.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P530.tcl
A		anatomy/Generated_Amira_TCL_Scripts/HumerusSphereScripts/SphereScript_P542.tcl
A		config.txt
A		log/dicominfoSCase.log
A		log/listSCase.log
A		log/measureSCase.log
A		log/plotSCase.log
D		log/segmentScapula.log