Skip to content

Commit

Permalink
Merge branch 'dev' into pat732
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick7321 committed Oct 31, 2019
2 parents 408e428 + 344b5ff commit c31eb28
Show file tree
Hide file tree
Showing 386 changed files with 21 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Server/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<html>
<head>
<meta charset='utf-8'>
<title>Mosaic</title>
<title>MBv2</title>
<link rel='stylesheet' type='text/css' href='/resources/css/index.css'>
<link rel='stylesheet' href='https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css' integrity='sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm' crossorigin='anonymous'>
</head>
Expand All @@ -33,7 +33,7 @@
<img src='/resources/imgs/spinner.gif' alt='spinner' class='spinner'/>
</div>
<div class='container'>
<h1>M.O.S.A.I.C</h1>
<h1>MBv2</h1>
<div id='alert-container'></div>
<div class='row'>
<div class='col-6 text-center'>
Expand Down
6 changes: 3 additions & 3 deletions Server/templates/stitched_single.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. -->

<!DOCTYPE html>
<!DOCTYPE html>
<html>
<head>
<meta charset='utf-8'>
<title>Mosaic</title>
<title>MBv2</title>
<link rel='stylesheet' type='text/css' href='/resources/css/stitched.css'>
<link rel="stylesheet" type="text/css" href="/resources/css/imageviewer.css"/>
<link rel='stylesheet' href='https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css' integrity='sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm' crossorigin='anonymous'>
Expand All @@ -34,7 +34,7 @@
<img src='/resources/imgs/spinner.gif' alt='spinner' class='spinner'/>
</div>
<div class='container'>
<h1>M.O.S.A.I.C</h1>
<h1>MBv2</h1>
<h3>{{statusString}}</h3>
<div class='row mb-3'>
<div class='col-12 text-center'>
Expand Down
4 changes: 3 additions & 1 deletion lib/counting.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,9 @@ def getCrushedBeads(self, image):
gray = cv2.cvtColor(color, cv2.COLOR_BGR2GRAY)
blur = cv2.GaussianBlur(gray, (31, 31), 0)
thresh = cv2.threshold(blur, 225, 255, cv2.THRESH_BINARY_INV)[1]
imgOutput, contours, hierarchy = cv2.findContours(thresh, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE)
kernel = np.ones((5,5),np.uint8)
erosion = cv2.erode(thresh,kernel,iterations = 1)
imgOutput, contours, hierarchy = cv2.findContours(erosion, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE)
cl = colorLabeler.ColorLabeler()

for c in contours:
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[20180910_ARD_ReactiveBlue_1-2.jpg]
backuphash=54455
[20180910_ARD_ReactiveBlue_1-14.jpg]
backuphash=5556
rotate=rotate(3)
moddate=0000a6aee2d80000
filters=autolight=1;finetune2=1,0.140351,0.081404,0.025263,00000000,0.000000;finetune2=1,0.087719,0.047719,0.036491,00000000,0.000000;
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[20180910_ARD_ReactiveBlue_1-2.JPG]
filters=autolight=1;finetune2=1,0.128655,0.008421,0.067368,00000000,0.000000;
moddate=000080eae2d8e122
width=5184
height=3456
textactive=0
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit c31eb28

Please sign in to comment.