Permalink
Browse files
Merge pull request #12 from Kudo3D/fixes-pr
Integration Fixes for Web Based Controllers
Showing
with
3 additions
and
3 deletions.
-
+3
−3
js/main.js
|
@@ -681,7 +681,7 @@ function updateBuildVolumeSettings() { |
|
});
|
|
});
|
|
|
|
|
|
viewer3d.setBuildVolume(settings.get('buildVolume'));
|
|
viewer3d.setBuildVolume(settings.get('buildVolume'));
|
|
- viewer3d.dropObject(slicer.mesh);
|
|
+ slicer.mesh && viewer3d.dropObject(slicer.mesh);
|
|
viewer3d.render();
|
|
viewer3d.render();
|
|
|
|
|
|
size && updateMeshInfoUI();
|
|
size && updateMeshInfoUI();
|
|
@@ -1064,8 +1064,8 @@ var stl = 'stl/StressTest.stl'; |
|
//var stl = 'stl/SLAcer.stl';
|
|
//var stl = 'stl/SLAcer.stl';
|
|
|
|
|
|
// File url
|
|
// File url
|
|
-var url = 'http://' + window.location.hostname + window.location.pathname + stl;
|
|
+// var url = 'http://' + window.location.hostname + window.location.pathname + stl;
|
|
-
|
|
+var url = window.location.href + stl;
|
|
// Create http request object
|
|
// Create http request object
|
|
var xmlhttp = new XMLHttpRequest();
|
|
var xmlhttp = new XMLHttpRequest();
|
|
|
|
|
|
|
0 comments on commit
be2a5ff