Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

For 3.6.0 Release #245

Merged
merged 35 commits into from
Mar 23, 2020
Merged

For 3.6.0 Release #245

Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
3c8485a
draw ok w/o presets
birm Dec 9, 2019
873ffe3
stop draw ok w/o presets
birm Dec 9, 2019
f232ac3
falsy no preset list
birm Dec 10, 2019
3fa90af
apline uid issue
birm Dec 19, 2019
ac59662
corrected spelling of please
animesh-007 Feb 26, 2020
f2f2faf
f added by mistake
animesh-007 Feb 26, 2020
622f943
added border for url
animesh-007 Feb 27, 2020
a8b4353
Fixed spellings
AniketDogra Mar 1, 2020
5a5e65c
Merge pull request #222 from AniketDogra/correct-spellings
birm Mar 2, 2020
1ac99ef
load slide from table page
vikasgola Mar 4, 2020
f4fd8f5
popup for uploading slides
vikasgola Mar 4, 2020
2baa72c
Merge pull request #226 from vikasgola/load-slide
birm Mar 4, 2020
35c01cc
Initial NavBar
Hemansh31 Mar 7, 2020
7a9d5aa
Trial
Hemansh31 Mar 7, 2020
bd6b16d
Nav Bar added
Hemansh31 Mar 7, 2020
015401c
remove model (#223)
chinzhiweiblank Mar 8, 2020
86ac260
Source Code option removed
Hemansh31 Mar 9, 2020
2a1b4ac
Merge remote-tracking branch 'upstream/develop' into nav_bar
Hemansh31 Mar 9, 2020
af0d0b6
Revert "Source Code option removed"
Hemansh31 Mar 9, 2020
fef0cd5
Removed Unnecesaary changes
Hemansh31 Mar 9, 2020
49795b2
Merge pull request #227 from Hemansh31/nav_bar
nanli-emory Mar 9, 2020
c219afb
impoving loader instructions re #226 (#232)
viditvarshney Mar 10, 2020
8652033
landing and table cleanup (#233)
viditvarshney Mar 10, 2020
a92700b
search bar
vikasgola Mar 13, 2020
0e7fff0
sorting
vikasgola Mar 13, 2020
de0df54
fixed sorting
vikasgola Mar 13, 2020
0b3186c
separate arrows
vikasgola Mar 13, 2020
fa56eda
removed debugging edits
vikasgola Mar 13, 2020
dec4135
implementation of pagination
vikasgola Mar 14, 2020
0a70a0c
Merge pull request #236 from vikasgola/filter
nanli-emory Mar 14, 2020
f047436
Fixes Memory Leak (#231)
leoarc Mar 14, 2020
f65f9e4
Landing Page Link and Style Updates (#241)
darkCavalier11 Mar 17, 2020
9bbe0ef
Added Email Validation (#239)
viditvarshney Mar 18, 2020
255d509
Simplify Build and Host (#243)
birm Mar 21, 2020
010e6ec
remove logged upload finish details
birm Mar 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
FROM node:8-alpine
RUN mkdir -p /var/www/html/
RUN npm install -g http-server
RUN npm install -g parcel-bundler
FROM httpd:alpine
EXPOSE 80
COPY ./ /var/www/html/
WORKDIR /var/www/html/
COPY ./ /usr/local/apache2/htdocs/
WORKDIR /usr/local/apache2/htdocs/
RUN rm -rf ./.git/
CMD parcel build package/packages.js; http-server -p 80
3 changes: 3 additions & 0 deletions apps/heatmap/heatmap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,9 @@


<!-- business js -->
<script type='text/javascript' src='../../common/PathdbMods.js'></script>
<script type='text/javascript' src='../../common/LocalStore.js'></script>
<script type='text/javascript' src='../../common/NanoBorbMods.js'></script>
<script type='text/javascript' src='../../common/dynamicLoadScript.js'></script>
<script src='./uicallbacks.js'></script>
<!-- <script src='./dataloaders.js'></script> -->
Expand Down
3 changes: 3 additions & 0 deletions apps/labeling/labeling.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@
<!-- ods js -->
<!-- <script src='./js/uicallbacks.js'></script> -->
<!-- <script src='./js/dataloaders.js'></script> -->
<script type='text/javascript' src='../../common/PathdbMods.js'></script>
<script type='text/javascript' src='../../common/LocalStore.js'></script>
<script type='text/javascript' src='../../common/NanoBorbMods.js'></script>
<script type='text/javascript' src='../../common/dynamicLoadScript.js'></script>
<script type='text/javascript' src='./labeling.js'></script>

Expand Down
6 changes: 3 additions & 3 deletions apps/labeling/labeling.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ function initCore(){
value:'point',
callback:toggleMode
},
// measurment tool
// measurement tool
{
id:'labeling_mode',
icon:'space_bar',
Expand Down Expand Up @@ -158,7 +158,7 @@ function downloadLabel(){
return;
}

// create josn object
// create json object
const data = {
slideId:$D.params.data['_id']['$oid'],
name:$D.params.data['name'],
Expand Down Expand Up @@ -189,7 +189,7 @@ function getPatchsZip(data){
$UI.modalbox.open();
// return;
data.patches.forEach((p,index)=>{
// create somthing
// create something

// get image from iip
if(!p.isPoint) getImage({
Expand Down
Binary file added apps/landing/favicon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 12 additions & 18 deletions apps/landing/landing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,25 @@

<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="./main.css" />
<link rel="shortcut icon" type="image/x-icon" href="favicon.png">
</head>



<body>



<!-- Header -->

<header id="header">

<nav id="nav">

<ul>
<li><a target="_blank" href="https://docs.google.com/forms/d/e/1FAIpQLScL91LxrpAZjU88GBZP9gmcdgdf8__uNUwhws2lzU6Lr4qNwA/viewform">Feedback</a></li>

<header id="header" >
<nav id= "nav" class="navbar navbar-expand-md navbar-dark fixed-top bg-dark" style="position: sticky;">
<button style="display:none;" class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<ul>
<li><a href="landing.html" class="link" style="color: white;">Home</a></li>
<li><a href="../table.html" class="link">Slides</a></li>
<li style="float: right;"><a href="/apps/signup/signup.html" class="link">Signup</a></li>
<li style="float: right;"><a target="_blank" href="https://docs.google.com/forms/d/e/1FAIpQLScL91LxrpAZjU88GBZP9gmcdgdf8__uNUwhws2lzU6Lr4qNwA/viewform" class="link">Feedback</a></li>

</ul>

</nav>
Expand Down Expand Up @@ -60,14 +62,6 @@ <h3>caMicroscope</h3>
<a href="../table.html" class="button">More</a>
</div>
</section>
<section class="post">
<a target="_blank" href="../loader/loader.html" class="image"><img src="./camic.jpg" style="-webkit-filter: hue-rotate(30deg);filter: hue-rotate(30deg);" alt=""/></a>
<div class="content">
<h3>Load an Image</h3>
<p>Load Openslide Compatible Images</p>
<a target="_blank" href="../loader/loader.html" class="button">More</a>
</div>
</section>
<section class="post">
<a target="_blank" href="https://github.com/camicroscope/" class="image"><img src="./code.jpg" alt=""/></a>
<div class="content">
Expand Down
62 changes: 37 additions & 25 deletions apps/landing/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import url(font-awesome.min.css);
@import url('https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/css/all.min.css');
@import url("https://fonts.googleapis.com/css?family=Open+Sans:300italic,700italic,700,300");

/*
Expand Down Expand Up @@ -2304,6 +2304,7 @@
padding-left: 4.5em;
position: relative;
width: 35%;
flex: auto;
-ms-flex: auto;
}

Expand All @@ -2322,6 +2323,7 @@

ul.features li p {
width: 65%;
flex: auto;
-ms-flex: auto;
margin-bottom: 0;
padding-left: 3em;
Expand Down Expand Up @@ -2430,6 +2432,7 @@
display: block;
margin-right: 2em;
width: 40%;
flex: auto;
-ms-flex: auto;
}

Expand All @@ -2440,6 +2443,7 @@

.posts .post .content {
width: 60%;
flex: auto;
-ms-flex: auto;
}

Expand Down Expand Up @@ -3618,6 +3622,7 @@

.wrapper.cta > .inner > * {
padding-left: 1.5em;
flex: auto;
-ms-flex: auto;
width: 50%;
}
Expand Down Expand Up @@ -3829,10 +3834,12 @@
}

#header a {
color: inherit;
color: grey;
text-decoration: none;
}

#header a:hover{
color: white;
}
#header h1 {
text-decoration: none;
color: #ffffff;
Expand Down Expand Up @@ -3872,31 +3879,24 @@
width: 2em;
}

#header nav {
height: inherit;
line-height: inherit;
margin-right: 1.5em;
position: absolute;
right: 0;
top: 0;
}

#header nav ul {
list-style: none;
list-style-type: none;
margin: 0;
padding: 0;
padding-left: 15px;

}

#header nav ul li {
display: inline-block;
margin-left: 1.5em;
float: left;
}

#header nav ul li a {
display: block;
font-weight: 700;
letter-spacing: 0.05em;
text-transform: uppercase;
font-size: 0.9em;

}

#header nav ul li a.submenu {
Expand Down Expand Up @@ -4073,10 +4073,10 @@
/* Banner */

#banner {
background-image: url("images/overlay.png"), -moz-linear-gradient(45deg, rgba(39, 161, 227, 0.65), rgba(231, 35, 42, 0.65)), url("../../images/banner.jpg");
background-image: url("images/overlay.png"), -webkit-linear-gradient(45deg, rgba(39, 161, 227, 0.65), rgba(231, 35, 42, 0.65)), url("../../images/banner.jpg");
background-image: url("images/overlay.png"), -ms-linear-gradient(45deg, rgba(39, 161, 227, 0.65), rgba(231, 35, 42, 0.65)), url("../../images/banner.jpg");
background-image: url("images/overlay.png"), linear-gradient(45deg, rgba(39, 161, 227, 0.65), rgba(231, 35, 42, 0.65)), url("../../images/banner.jpg");
background-image: -moz-linear-gradient(45deg, rgba(39, 161, 227, 0.65), rgba(231, 35, 42, 0.65)), url("./banner1.jpg");
background-image: -webkit-linear-gradient(45deg, rgba(39, 161, 227, 0.65), rgba(231, 35, 42, 0.65)), url("./banner1.jpg");
background-image: -ms-linear-gradient(45deg, rgba(39, 161, 227, 0.65), rgba(231, 35, 42, 0.65)), url("./banner1.jpg");
background-image: linear-gradient(45deg, rgba(39, 161, 227, 0.65), rgba(231, 35, 42, 0.65)), url("./banner1.jpg");
background-position: center center;
/* background-size: auto, cover, cover; */
background-attachment: fixed, fixed, fixed;
Expand Down Expand Up @@ -4301,10 +4301,10 @@
/* Footer */

#footer {
background-image: url("images/overlay.png"), -moz-linear-gradient(45deg, rgba(39, 161, 227, 0.65), rgba(231, 35, 42, 0.65)), url("../../images/banner.jpg");
background-image: url("images/overlay.png"), -webkit-linear-gradient(45deg, rgba(39, 161, 227, 0.65), rgba(231, 35, 42, 0.65)), url("../../images/banner.jpg");
background-image: url("images/overlay.png"), -ms-linear-gradient(45deg, rgba(39, 161, 227, 0.65), rgba(231, 35, 42, 0.65)), url("../../images/banner.jpg");
background-image: url("images/overlay.png"), linear-gradient(45deg, rgba(39, 161, 227, 0.65), rgba(231, 35, 42, 0.65)), url("../../images/banner.jpg");
background-image: -moz-linear-gradient(45deg, rgba(39, 161, 227, 0.65), rgba(231, 35, 42, 0.65)), url("./banner1.jpg");
background-image: -webkit-linear-gradient(45deg, rgba(39, 161, 227, 0.65), rgba(231, 35, 42, 0.65)), url("./banner1.jpg");
background-image: -ms-linear-gradient(45deg, rgba(39, 161, 227, 0.65), rgba(231, 35, 42, 0.65)), url("./banner1.jpg");
background-image: linear-gradient(45deg, rgba(39, 161, 227, 0.65), rgba(231, 35, 42, 0.65)), url("./banner1.jpg");
background-position: center center;
/* background-size: auto, cover, cover; */
background-attachment: fixed, fixed, fixed;
Expand Down Expand Up @@ -4656,7 +4656,6 @@
right: 0;
text-align: right;
top: 0;
vertical-align: middle;
width: 5em;
}

Expand Down Expand Up @@ -4714,3 +4713,16 @@
}

}
.link{
text-transform: uppercase;
font-size: 1em;
font-weight: 600;
color: #5e6875;
text-decoration-line: none;
text-decoration-style: solid;
text-decoration-color: currentcolor;
text-decoration-thickness: auto;
padding-right: 0.7rem;
padding-left: 0.7rem;
font-family: "Open Sans", Helvetica, sans-serif;
}
2 changes: 1 addition & 1 deletion apps/loader/chunked_upload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,12 @@ function continue_upload(token){
}
}
function finish_upload(){

var reset = true
for(var i=0; i<document.getElementById("fileIdRow").cells.length-1;i++){
let token = document.getElementById("token"+i).value
let filename = document.getElementById("filename"+i).value
let body = {filename: filename}
console.log({finish_url, filename, token});
birm marked this conversation as resolved.
Show resolved Hide resolved
changeStatus("UPLOAD", "Finished Reading File, Posting")
let reg_req = fetch(finish_url + token,{method:'POST', body: JSON.stringify(body),headers: {
"Content-Type": "application/json; charset=utf-8"
Expand Down
55 changes: 0 additions & 55 deletions apps/loader/loader.html
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions apps/loader/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ function changeStatus(step, text, reset=true){
if(reset){
table = document.createElement("table")
table.id = "statusTable"
table.setAttribute('border', '1')
table.setAttribute('cellpadding', '10%')
table.style.borderCollapse = "collapse"
table.classList = "table";

//Add table headers:
var tr = table.insertRow(-1)
Expand Down
2 changes: 1 addition & 1 deletion apps/model/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

Clicking the plus icon will allow adding a Keras/tensorflowjs trained model.

Select the desired model from the dropdow.
Select the desired model from the dropdown.

Next, zoom in to an area that you would like to predict and select the required area.

Expand Down
Loading