Merge pull request #17 from wilbur-shi/master

Deliverables 17 (final one)!
Kudo3D · Aug 24, 2016 · 1fb1c78 · 1fb1c78
2 parents 7ac86ae + 74abfd5
commit 1fb1c78
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 51 deletions.
diff --git a/host/resourcesnew/cwh/js/printJobs.js b/host/resourcesnew/cwh/js/printJobs.js
@@ -13,8 +13,6 @@
 		this.currentBuildVideo = {width: 100, height: 100, url: null};
 		this.currentBuildLiveStream = {url: null, clientId: Math.random()}
 
-		this.loading = false;
-
 		function refreshSelectedPrintJob(printJobList) {
         	var foundPrintJob = false;
 
@@ -65,18 +63,18 @@
 	        		})
 	    }
 		this.stopPrintJob = function stopPrintJob() {
-			controller.loading = true;
+			$('#stop-btn').attr('class', 'fa fa-refresh fa-spin');
 			var printJobId = encodeURIComponent(controller.currentPrintJob.id);
 	        $http.post("/services/printJobs/stopJob/" + printJobId).success(function (data) {
 	        			if (data.response) {
 		        			controller.refreshPrintJobs();
 	        			} else {
 		        			$scope.$emit("MachineResponse", {machineResponse: data, successFunction:null, afterErrorFunction:null});
 	        			}
-	        			controller.loading = false;
+	        			$('#stop-btn').attr('class', 'fa fa-stop');
 	        		}).error(function (data, status, headers, config, statusText) {
  	        			$scope.$emit("HTTPError", {status:status, statusText:data});
- 	        			controller.loading = false;
+ 	        			$('#stop-btn').attr('class', 'fa fa-stop');
 	        		})
 	    }
 		this.changeCurrentPrintJob = function changeCurrentPrintJob(newPrintJob) {

diff --git a/host/resourcesnew/cwh/js/printables.js b/host/resourcesnew/cwh/js/printables.js
@@ -13,11 +13,10 @@
 		this.errorMsg = "";
 
 		this.projectImage = false;
-		// this.loading = false;
 
 		this.handlePreviewError = function handlePreviewError() {
 			var printableName = encodeURIComponent(controller.currentPrintable.name);
-			var printableExtension = encodeURIComponent(controller.currentPrintable.extension);				
+			var printableExtension = encodeURIComponent(controller.currentPrintable.extension);		
 			$http.get("/services/customizers/renderFirstSliceImage/" + printableName + "." + printableExtension + "?projectImage=" + controller.projectImage).success(
 				function (data) {
 
@@ -70,8 +69,7 @@
 					function (data) {
 						controller.currentPreviewImg = "/services/customizers/renderFirstSliceImage/" + printableName + "." + printableExtension + "?projectImage=" + controller.projectImage;
 						var jsonString = JSON.stringify(parameter.affineTransformSettings).replace(/\"/g, "");
-						controller.currentPreviewImg += '?decache=' + encodeURIComponent(jsonString);
-						// controller.loading = false;
+						controller.currentPreviewImg += '&decache=' + encodeURIComponent(jsonString);
 						// console.log("reached success while rendering first slice image, browser side");
 					}).error(
 	    				function (data, status, headers, config, statusText) {

diff --git a/host/resourcesnew/cwh/js/printers.js b/host/resourcesnew/cwh/js/printers.js
@@ -10,8 +10,6 @@
 		this.loadingProfilesMessage = "--- Loading slicing profiles from server ---"
 		this.loadingMachineConfigMessage = "--- Loading machine configurations from server ---"
 		this.autodirect = $location.search().autodirect;
-		this.startLoading = false;
-		this.stopLoading = false;
 		function refreshSelectedPrinter(printerList) {
         	var foundPrinter = false;
         	if (printerList.length == 1 && printerList[0].started && controller.autodirect != 'disabled') {
@@ -59,38 +57,26 @@
 			}
 			var printerName = encodeURIComponent(targetPrinter.configuration.name);
 			if (postTargetPrinter) {
-		        $http.post(service, targetPrinter).success(
-		        		function (data) {
-		        			$scope.$emit("MachineResponse", {machineResponse: data, successFunction:refreshPrinters, afterErrorFunction:null});
-		        			controller.startLoading = false;
-		        			controller.stopLoading = false;
-		        		}).error(
-	    				function (data, status, headers, config, statusText) {
-	 	        			$scope.$emit("HTTPError", {status:status, statusText:data});
-	 	        			controller.startLoading = false;
-	 	        			controller.stopLoading = false;
-		        		})
+			   $http.post(service, targetPrinter).then(
+	       			function(response) {
+	       			}, 
+	       			function(response) {
+ 	        			$scope.$emit("HTTPError", {status:response.status, statusText:response.data});
+	       		}).then(function() {
+	       			    $('#start-btn').attr('class', 'fa fa-play');
+	        			$('#stop-btn').attr('class', 'fa fa-stop');
+	       		});
 		    } else {
-		        $http.get(service + printerName).success(
-		        		function (data) {
-		        			$scope.$emit("MachineResponse", {machineResponse: data, successFunction:refreshPrinters, afterErrorFunction:null});
-		        			controller.startLoading = false;
-		        			controller.stopLoading = false;
-		        		}).error(
-	    				function (data, status, headers, config, statusText) {
-	 	        			$scope.$emit("HTTPError", {status:status, statusText:data});
-		        			controller.startLoading = false;
-		        			controller.stopLoading = false;		        			
-		        		});
-		       // $http.get(service + printerName).then(
-		       // 		function(response) {
-		       //  		$scope.$emit("MachineResponse", {machineResponse: response.data, successFunction:refreshPrinters, afterErrorFunction:null});
-		       // 		}, 
-		       // 		function(response) {
-	 	      //   		$scope.$emit("HTTPError", {status:response.status, statusText:response.data});
-		       // 		}).then(function() {
-		       // 			controller.loading = false;
-		       // 		});
+		       $http.get(service + printerName).then(
+		       		function(response) {
+		        		$scope.$emit("MachineResponse", {machineResponse: response.data, successFunction:refreshPrinters, afterErrorFunction:null});
+		       		}, 
+		       		function(response) {
+	 	        		$scope.$emit("HTTPError", {status:response.status, statusText:response.data});
+		       		}).then(function() {
+		       			    $('#start-btn').attr('class', 'fa fa-play');
+		        			$('#stop-btn').attr('class', 'fa fa-stop');
+		       		});
 			}
 		}
 
@@ -176,12 +162,12 @@
 		}
 
 		this.startCurrentPrinter = function startCurrentPrinter() {
-			controller.startLoading = true;
+			$('#start-btn').attr('class', 'fa fa-refresh fa-spin');
 			executeActionAndRefreshPrinters("Start Printer", "No printer selected to start.", '/services/printers/start/', controller.currentPrinter, false);
 		}
 
 		this.stopCurrentPrinter = function stopCurrentPrinter() {
-			controller.stopLoading = true;
+			$('#stop-btn').attr('class', 'fa fa-refresh fa-spin');			
 			executeActionAndRefreshPrinters("Stop Printer", "No printer selected to Stop.", '/services/printers/stop/', controller.currentPrinter, false);
 		}
 

diff --git a/host/resourcesnew/printJobs.html b/host/resourcesnew/printJobs.html
@@ -19,8 +19,7 @@ <h3 class="panel-title pull-left">Print Jobs</h3>
 									<span>Continue</span>
 								</a>
 								<a class="btn btn-danger" ng-show="printJobsController.currentPrintJob.printInProgress" ng-click="printJobsController.stopPrintJob()">
-									<i ng-show="!printJobsController.loading" class="fa fa-stop"></i> 
-									<i ng-show="printJobsController.loading" class='fa fa-refresh fa-spin'></i> 
+									<i id="stop-btn" class="fa fa-stop"></i> 
 									<span>Stop</span>
 								</a>
 						    </div>

diff --git a/host/resourcesnew/printer.html b/host/resourcesnew/printer.html
@@ -3,13 +3,11 @@
 		<h3 class="panel-title pull-left">Basic Printer Setup</h3>
 	    <div class="btn-group pull-right">
 			<button class="btn btn-success" ng-disabled="printersController.currentPrinter.started" ng-click="printersController.startCurrentPrinter()">
-				<i ng-show="!printersController.startLoading" class="fa fa-play"></i> 
-				<i ng-show="printersController.startLoading" class='fa fa-refresh fa-spin'></i> 
+				<i id="start-btn" class="fa fa-play"></i> 
 				<span>Start</span>
 			</button>
 			<button class="btn btn-danger" ng-disabled="!printersController.currentPrinter.started" ng-click="printersController.stopCurrentPrinter()">
-				<i ng-show="!printersController.stopLoading" class="fa fa-stop"></i> 
-				<i ng-show="printersController.stopLoading" class='fa fa-refresh fa-spin'></i> 				
+				<i id="stop-btn" class="fa fa-stop"></i> 
 				<span>Stop</span>
 			</button>
 			<button class="btn btn-primary" ng-disabled="!printersController.currentPrinter.started" ng-click="printersController.gotoPrinterControls()" >

diff --git a/host/resourcesnew/slacer b/host/resourcesnew/slacer