From ea89ce1c955937c8915fa4d3e3a937c2dc8f10cb Mon Sep 17 00:00:00 2001 From: Willy Wong Date: Thu, 29 Oct 2020 16:41:53 -0700 Subject: [PATCH] Finished the super pixel re-calculation --- application/controllers/Super_pixel.php | 2 +- application/views/super_pixel/super_pixel_display.php | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/application/controllers/Super_pixel.php b/application/controllers/Super_pixel.php index 4e8cf63..96c4413 100644 --- a/application/controllers/Super_pixel.php +++ b/application/controllers/Super_pixel.php @@ -154,7 +154,7 @@ public function isRunOverlayDone($sp_id) else $base_url = "https://cdeep3m-viewer-stage.crbs.ucsd.edu"; - $url = $base_url."/super_pixel_rest/isGenMasksDone/".$sp_id; + $url = $base_url."/super_pixel_rest/isRunOverlayDone/".$sp_id; $cutil = new CurlUtil(); $response = $cutil->curl_get($url, ""); if(is_null($response)) diff --git a/application/views/super_pixel/super_pixel_display.php b/application/views/super_pixel/super_pixel_display.php index 0fa617a..4041e50 100644 --- a/application/views/super_pixel/super_pixel_display.php +++ b/application/views/super_pixel/super_pixel_display.php @@ -188,11 +188,14 @@
+

-
+
+
+
@@ -227,8 +230,9 @@ function recalculate_sp() function validate_recalculate() { - consoloe.log('validate_recalculate'); - + //consoloe.log('validate_recalculate'); + document.getElementById('recalculate_submit_id').disabled = true; + document.getElementById('recalculate_wait_id').innerHTML = '
Waiting...
'; }