Browse Source

Fix usage of multiple slicemaps per time frame

Felix Schultze 9 years ago
parent
commit
bf61123aa3

+ 1 - 3
static/js/threeJsHelper/dist/threeJsHelper.js

@@ -45,8 +45,6 @@ IPE.app = {
                 currentVolumeDimension.ymax = textureInfo.originalSize.sizey;
                 currentVolumeDimension.zmin = imgInfo.imgMin;
                 currentVolumeDimension.zmax = imgInfo.imgMax;
-                console.log(currentVolumeDimension.getZStretchFactor());
-
 
                 // downloading first image and starting
                 helper.downloadImage(spriteUrl + textureInfo.sprites[0][0].$oid, 0, 0, true);
@@ -290,7 +288,7 @@ function initTextures(imgInfo, imageParams, whileInit) {
     if(imageParams.spriteIndex < imgInfo.numberOfSprites - 1) {
         nextSpriteIndex = imageParams.spriteIndex + 1;
         nextSpriteId = textureInfo.sprites[imageParams.textureIndex][nextSpriteIndex].$oid
-        helper.downloadImage(spriteUrl + nextSpriteId, imageParams.textureIndex, nextSpriteIndex, false);
+        helper.downloadImage(spriteUrl + nextSpriteId, imageParams.textureIndex, nextSpriteIndex, whileInit);
         return;
     }
 

File diff suppressed because it is too large
+ 0 - 0
static/js/threeJsHelper/dist/threeJsHelper.min.js


+ 1 - 3
static/js/threeJsHelper/src/Application.js

@@ -45,8 +45,6 @@ IPE.app = {
                 currentVolumeDimension.ymax = textureInfo.originalSize.sizey;
                 currentVolumeDimension.zmin = imgInfo.imgMin;
                 currentVolumeDimension.zmax = imgInfo.imgMax;
-                console.log(currentVolumeDimension.getZStretchFactor());
-
 
                 // downloading first image and starting
                 helper.downloadImage(spriteUrl + textureInfo.sprites[0][0].$oid, 0, 0, true);
@@ -290,7 +288,7 @@ function initTextures(imgInfo, imageParams, whileInit) {
     if(imageParams.spriteIndex < imgInfo.numberOfSprites - 1) {
         nextSpriteIndex = imageParams.spriteIndex + 1;
         nextSpriteId = textureInfo.sprites[imageParams.textureIndex][nextSpriteIndex].$oid
-        helper.downloadImage(spriteUrl + nextSpriteId, imageParams.textureIndex, nextSpriteIndex, false);
+        helper.downloadImage(spriteUrl + nextSpriteId, imageParams.textureIndex, nextSpriteIndex, whileInit);
         return;
     }
 

+ 1 - 1
visualization/settings.py

@@ -36,7 +36,7 @@ DEFAULT_IMPORT_PATH = globalConfiguration['default-import-path']
 MAX_NUMBER_SLICES_PER_MAP = 700.0
 
 # defaul: True
-Z_DOWNSCALING_ACTIVATED = True
+Z_DOWNSCALING_ACTIVATED = False
 
 # default: False
 REDUCE_HARDDISK_ACCESS_FOR_DEV = globalConfiguration['reduce-harddisk-access']

Some files were not shown because too many files changed in this diff