Merge pull request #543 from camicroscope/develop

For 3.9.6
camicroscope · Aug 5, 2021 · da9bf9d · da9bf9d
2 parents 93a02ef + 3001df5
commit da9bf9d
Show file tree

Hide file tree

Showing 18 changed files with 1,914 additions and 1,255 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -27,6 +27,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### caMicroscope [Unreleased](https://github.com/camicroscope/camicroscope/compare/v3.9.4...camicroscope:develop)
 ###### TBD
 
+### caMicroscope [3.9.6](https://github.com/camicroscope/camicroscope/compare/v3.9.4...camicroscope:v3.9.6)
+###### 2021-08-05
+* Some integration with the "Smartpen" concept [#526](https://github.com/camicroscope/caMicroscope/pull/526), [#532](https://github.com/camicroscope/caMicroscope/pull/532)
+* Preset label bugfix
+
 ### caMicroscope [3.9.4](https://github.com/camicroscope/camicroscope/compare/v3.9.3...camicroscope:v3.9.4)
 ###### 2021-06-16
 * Github action for ci testing [#514](https://github.com/camicroscope/caMicroscope/pull/514)

diff --git a/apps/batchloader/batchLoader.js b/apps/batchloader/batchLoader.js
@@ -395,7 +395,6 @@ function finishUpload(token, filename, i) {
   }});
   regReq.then((x)=>x.json()).then((a)=>{
     // changeStatus('UPLOAD | Finished', a, reset); reset = false;
-    console.log(a);
     if (typeof a === 'object' && a.error) {
       finishUploadSuccess = false;
     //   $('#check_btn').hide();

diff --git a/apps/heatmap/heatmap.html b/apps/heatmap/heatmap.html
@@ -155,6 +155,12 @@
     <script src="https://unpkg.com/@popperjs/core@2"></script>
     <script src="https://unpkg.com/tippy.js@6"></script>
 
+		<!-- Smartpen -->
+	  <script type="text/javascript" src="../../common/enhance.js"></script>
+	  <script type="text/javascript" src="../../common/smartpen/autoalign.js"></script>
+		<link rel="stylesheet" type="text/css" media="all" href="../../common/smartpen/autoalign.css"/>
+		<!-- Smartpen end -->
+
 	</head>
 	<body>
         <!-- message-->

diff --git a/apps/labeling/labeling.html b/apps/labeling/labeling.html
@@ -84,6 +84,13 @@
 		<!-- Popper & tippy -->
     <script src="https://unpkg.com/@popperjs/core@2"></script>
     <script src="https://unpkg.com/tippy.js@6"></script>
+
+		<!-- Smartpen -->
+	  <script type="text/javascript" src="../../common/enhance.js"></script>
+	  <script type="text/javascript" src="../../common/smartpen/autoalign.js"></script>
+		<link rel="stylesheet" type="text/css" media="all" href="../../common/smartpen/autoalign.css"/>
+		<!-- Smartpen end -->
+
 	</head>
 	<body>
 		<!-- message-->

diff --git a/apps/model/model.html b/apps/model/model.html
@@ -151,6 +151,13 @@
   <!-- Popper & tippy -->
   <script src="https://unpkg.com/@popperjs/core@2"></script>
   <script src="https://unpkg.com/tippy.js@6"></script>
+
+  <!-- Smartpen -->
+  <script type="text/javascript" src="../../common/enhance.js"></script>
+  <script type="text/javascript" src="../../common/smartpen/autoalign.js"></script>
+  <link rel="stylesheet" type="text/css" media="all" href="../../common/smartpen/autoalign.css"/>
+  <!-- Smartpen end -->
+
   <!--
   <script src='../viewer/uicallbacks.js'></script>
   <script src='../viewer/dataloaders.js'></script>

diff --git a/apps/segment/segment.html b/apps/segment/segment.html
@@ -163,7 +163,13 @@
   <!-- Popper & tippy -->
   <script src="https://unpkg.com/@popperjs/core@2"></script>
   <script src="https://unpkg.com/tippy.js@6"></script>
-
+
+  <!-- Smartpen -->
+  <script type="text/javascript" src="../../common/enhance.js"></script>
+  <script type="text/javascript" src="../../common/smartpen/autoalign.js"></script>
+  <link rel="stylesheet" type="text/css" media="all" href="../../common/smartpen/autoalign.css"/>
+  <!-- Smartpen end -->
+
   <!-- segment css -->
   <link rel="stylesheet" type='text/css' href='./segment.css'>
 

diff --git a/apps/viewer/enhance.js b/apps/viewer/enhance.js