Commit Graph

14 Commits

Author SHA1 Message Date
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