Skip to content

Commit da9bf9d

Browse files
birmbirm
authored
Merge pull request #543 from camicroscope/develop
For 3.9.6
2 parents 93a02ef + 3001df5 commit da9bf9d

File tree

18 files changed

+1914
-1255
lines changed

18 files changed

+1914
-1255
lines changed

‎HISTORY.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2727
### caMicroscope [Unreleased](https://github.com/camicroscope/camicroscope/compare/v3.9.4...camicroscope:develop)
2828
###### TBD
2929

30+
### caMicroscope [3.9.6](https://github.com/camicroscope/camicroscope/compare/v3.9.4...camicroscope:v3.9.6)
31+
###### 2021-08-05
32+
* Some integration with the "Smartpen" concept [#526](https://github.com/camicroscope/caMicroscope/pull/526), [#532](https://github.com/camicroscope/caMicroscope/pull/532)
33+
* Preset label bugfix
34+
3035
### caMicroscope [3.9.4](https://github.com/camicroscope/camicroscope/compare/v3.9.3...camicroscope:v3.9.4)
3136
###### 2021-06-16
3237
* Github action for ci testing [#514](https://github.com/camicroscope/caMicroscope/pull/514)

‎apps/batchloader/batchLoader.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,6 @@ function finishUpload(token, filename, i) {
395395
}});
396396
regReq.then((x)=>x.json()).then((a)=>{
397397
// changeStatus('UPLOAD | Finished', a, reset); reset = false;
398-
console.log(a);
399398
if (typeof a === 'object' && a.error) {
400399
finishUploadSuccess = false;
401400
// $('#check_btn').hide();

‎apps/heatmap/heatmap.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,12 @@
155155
<script src="https://unpkg.com/@popperjs/core@2"></script>
156156
<script src="https://unpkg.com/tippy.js@6"></script>
157157

158+
<!-- Smartpen -->
159+
<script type="text/javascript" src="../../common/enhance.js"></script>
160+
<script type="text/javascript" src="../../common/smartpen/autoalign.js"></script>
161+
<link rel="stylesheet" type="text/css" media="all" href="../../common/smartpen/autoalign.css"/>
162+
<!-- Smartpen end -->
163+
158164
</head>
159165
<body>
160166
<!-- message-->

‎apps/labeling/labeling.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,13 @@
8484
<!-- Popper & tippy -->
8585
<script src="https://unpkg.com/@popperjs/core@2"></script>
8686
<script src="https://unpkg.com/tippy.js@6"></script>
87+
88+
<!-- Smartpen -->
89+
<script type="text/javascript" src="../../common/enhance.js"></script>
90+
<script type="text/javascript" src="../../common/smartpen/autoalign.js"></script>
91+
<link rel="stylesheet" type="text/css" media="all" href="../../common/smartpen/autoalign.css"/>
92+
<!-- Smartpen end -->
93+
8794
</head>
8895
<body>
8996
<!-- message-->

‎apps/model/model.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,13 @@
151151
<!-- Popper & tippy -->
152152
<script src="https://unpkg.com/@popperjs/core@2"></script>
153153
<script src="https://unpkg.com/tippy.js@6"></script>
154+
155+
<!-- Smartpen -->
156+
<script type="text/javascript" src="../../common/enhance.js"></script>
157+
<script type="text/javascript" src="../../common/smartpen/autoalign.js"></script>
158+
<link rel="stylesheet" type="text/css" media="all" href="../../common/smartpen/autoalign.css"/>
159+
<!-- Smartpen end -->
160+
154161
<!--
155162
<script src='../viewer/uicallbacks.js'></script>
156163
<script src='../viewer/dataloaders.js'></script>

‎apps/segment/segment.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,13 @@
163163
<!-- Popper & tippy -->
164164
<script src="https://unpkg.com/@popperjs/core@2"></script>
165165
<script src="https://unpkg.com/tippy.js@6"></script>
166-
166+
167+
<!-- Smartpen -->
168+
<script type="text/javascript" src="../../common/enhance.js"></script>
169+
<script type="text/javascript" src="../../common/smartpen/autoalign.js"></script>
170+
<link rel="stylesheet" type="text/css" media="all" href="../../common/smartpen/autoalign.css"/>
171+
<!-- Smartpen end -->
172+
167173
<!-- segment css -->
168174
<link rel="stylesheet" type='text/css' href='./segment.css'>
169175

‎apps/viewer/enhance.js

Lines changed: 0 additions & 246 deletions
This file was deleted.

0 commit comments

Comments
 (0)