Commit Graph

29 Commits

Author SHA1 Message Date
Sravan Balaji
1e8b5c019c Colorbar and Matching Method Runtime Comparison
* Added PIXELS_TO_MM global variable for converting from pixels to mm
* Added colorbar to displacement and strain field plots
* Renamed matching method comparison function
* Made new comparison function to plot runtime of methods
2019-04-28 13:00:42 -04:00
Sravan Balaji
fb033641c0 New Plots and Reorganization
* Changed frame data from dictionary to array
2019-04-28 12:56:27 -04:00
Sravan Balaji
1286e20d7a New Plots and Reorganization
* Made plot of frame data over time
* Moved plots out of Matching Method folder
* Made plot of matching method runtime
2019-04-28 12:55:47 -04:00
Sravan Balaji
19fa2f2a5a Added Colorbar to Comparison Plots
* Added a colorbar to the comparison plots so it is easier to tell what the different colors mean
2019-04-28 10:26:03 -04:00
Sravan Balaji
59eec9704b Template Matching Changes and Small Style Fixes
* Added reference and comparison index variables to ImageData
* Re-worked how template and search window is calculated and specified
* Small code style changes with comments
* Separated plotting from calculation of displacement and strain into separate functions
* Made new function to compare matching methods
* Expanded x and y ranges of grid points
* Saved matching method comparison plots to file, deleted old incorrect plots
2019-04-27 13:49:16 -04:00
Sravan Balaji
f3e501b6a0 Working on Strain Field
* Appear to have fixed displacement tracking
* Strain plotting or strain calculation is incorrect
* Flipped image that is plotted so axis directions of matrix indices line up with axis direction of image
* Changed quiver plotting to use "dot" as units so now the position and displacement is in units of pixels.
* Started putting displacement and strain plots on the same figure so they can be compared side-by-side
* Decreased subset spacing to get more tracking points
2019-04-27 00:17:28 -04:00
Sravan Balaji
82eb35b28d Debugging Displacement Tracking
* Implemented gradient, but not sure if it is correct.
* Debugging displacement tracking
2019-04-26 11:30:55 -04:00
Sravan Balaji
e8c0d1bc71 Working on gradient to calculate strain
In process of figuring out how to get strain calculation with gradient.
2019-04-25 23:17:58 -04:00
Sravan Balaji
5ce0af117d Merge 2019-04-24 20:17:01 -04:00
Sravan Balaji
527be26305 Fixed Displacement Calculation
* Changed displacement calculation to account for the template matching function returning the upper-left corner of the matching window rather than the center.
2019-04-24 19:49:20 -04:00
Kevin Monpara
13bf7cc4a3 Trying to make it show up 2019-04-24 19:43:10 -04:00
Kevin Monpara
3d25006b5d merged 2019-04-24 19:37:47 -04:00
Kevin Monpara
fa036a974a Adding average displacement function 2019-04-24 19:08:41 -04:00
Sravan Balaji
cbb8e954e8 Restrict Search Size
* Added variables to restrict search size for matching pattern.
* Rotated images back to normal that were rotated for some reason
* Created an ImageData class to hold displacements and strains in each image.
2019-04-24 19:04:39 -04:00
Sravan Balaji
3557a5d804 Matching Method Comparison
Used OpenCV to find matching template and draw arrows of displacement.
Made a plot using each template matching method.
SQDIFF and SQDIFF_NORMED appear to be best.
2019-04-23 00:32:28 -04:00
Sravan Balaji
01ac896a5c Spacing and Tab Fixes in __main__.py
Renamed functions to use underscores and lowercase rather than camel case.
Made minor spacing changes.
2019-04-22 22:59:51 -04:00
Kevin Monpara
51781fb3d2 Merged Changes 2019-04-21 16:20:01 -04:00
Kevin Monpara
435ef80fa3 Merge branch 'master' of https://gitlab.eecs.umich.edu/balajsra/eecs-442-dic-project 2019-04-21 16:04:35 -04:00
Kevin Monpara
aaa998609f General structure for project. Using Sift. 2019-04-21 16:03:43 -04:00
Sravan Balaji
ef445f5617 Update .gitignore
* Add pycache files to .gitignore
2019-04-15 20:06:45 -04:00
Sravan Balaji
6ba776c8f0 Reorganize Sift_Distance.py
* Put Shift_Distance code into sift_distance function
* Add import statements for numpy and opencv
2019-04-15 20:05:04 -04:00
Sravan Balaji
462a2df172 Merge branch 'Stress' 2019-04-15 20:02:09 -04:00
Sravan Balaji
b4245b6e33 Move Sift_Distance.py to src folder
* Move Sift_Distance.py to src folder
2019-04-15 20:01:54 -04:00
Sravan Balaji
2a00d65e9f Rename main.py to file_data.py and add new main.py
* Rename old main.py to file_data.py
* Add main.py that calls read_file function in file_data.py
2019-04-15 20:01:06 -04:00
Sravan Balaji
8b163631ca Modify main.py
* Add new class SpecimenDimensions to hold dimensional information.
* Add stress variable to FrameData class.
* rename calc_stress function to read_file
* Add data filepath as input to read_file function
* read_file function now calculates stress from cross-sectional area
  of specimen and load from each frame.
* read_file function now returns dictionary (indexed by frame number)
  of FrameData objects that have load, displacement, and stress data.
  Also returns SpecimenDimensions object that holds width, thickness,
  gauge length, and overall length.
2019-04-15 19:40:58 -04:00
Kevin Monpara
706f55862f Code Snippet: Sift Features, Distances 2019-03-25 16:47:53 -04:00
Sravan Balaji
a062863b1e Add main.py
Created main.py with a function to read in the provided text file.
Gets specimen dimensions, frame number, load, and displacement data into
dictionary of FrameData classes.
2019-03-25 16:44:00 -04:00
Sravan Balaji
5e38adeb04 Added DIC Image and LabView data
Added the DIC image and LabView data that John Laidlaw shared.
2019-03-21 14:48:42 -04:00
Sravan Balaji
9bf1223d47 Initial commit 2019-03-20 09:50:11 -04:00