Port fixes from release-0.2

- Cuda installation has been fixed (#71) - Updated documentation for v0.2.0 (#63) - Player navigation has been fixed if window was scrolled (#66)
cvat-ai · Sep 20, 2018 · df15090 · df15090
2 parents 2d0079f + f5d7316
commit df15090
Show file tree

Hide file tree

Showing 86 changed files with 322 additions and 120 deletions.
diff --git a/cvat/apps/documentation/static/documentation/images/gif005.gif b/cvat/apps/documentation/static/documentation/images/gif005.gif
diff --git a/cvat/apps/documentation/static/documentation/images/image001.jpg b/cvat/apps/documentation/static/documentation/images/image001.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image002.jpg b/cvat/apps/documentation/static/documentation/images/image002.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image003.jpg b/cvat/apps/documentation/static/documentation/images/image003.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image004.jpg b/cvat/apps/documentation/static/documentation/images/image004.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image005.jpg b/cvat/apps/documentation/static/documentation/images/image005.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image006.jpg b/cvat/apps/documentation/static/documentation/images/image006.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image007.jpg b/cvat/apps/documentation/static/documentation/images/image007.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image008.jpg b/cvat/apps/documentation/static/documentation/images/image008.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image009.jpg b/cvat/apps/documentation/static/documentation/images/image009.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image010.jpg b/cvat/apps/documentation/static/documentation/images/image010.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image011.jpg b/cvat/apps/documentation/static/documentation/images/image011.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image012.jpg b/cvat/apps/documentation/static/documentation/images/image012.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image013.jpg b/cvat/apps/documentation/static/documentation/images/image013.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image014.jpg b/cvat/apps/documentation/static/documentation/images/image014.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image015.jpg b/cvat/apps/documentation/static/documentation/images/image015.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image016.jpg b/cvat/apps/documentation/static/documentation/images/image016.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image017.jpg b/cvat/apps/documentation/static/documentation/images/image017.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image018.jpg b/cvat/apps/documentation/static/documentation/images/image018.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image019.jpg b/cvat/apps/documentation/static/documentation/images/image019.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image020.jpg b/cvat/apps/documentation/static/documentation/images/image020.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image021.jpg b/cvat/apps/documentation/static/documentation/images/image021.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image022.jpg b/cvat/apps/documentation/static/documentation/images/image022.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image023.jpg b/cvat/apps/documentation/static/documentation/images/image023.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image024.jpg b/cvat/apps/documentation/static/documentation/images/image024.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image025.jpg b/cvat/apps/documentation/static/documentation/images/image025.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image026.jpg b/cvat/apps/documentation/static/documentation/images/image026.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image027.jpg b/cvat/apps/documentation/static/documentation/images/image027.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image028.jpg b/cvat/apps/documentation/static/documentation/images/image028.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image029.jpg b/cvat/apps/documentation/static/documentation/images/image029.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image030.jpg b/cvat/apps/documentation/static/documentation/images/image030.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image031.jpg b/cvat/apps/documentation/static/documentation/images/image031.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image032.jpg b/cvat/apps/documentation/static/documentation/images/image032.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image033.jpg b/cvat/apps/documentation/static/documentation/images/image033.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image034.jpg b/cvat/apps/documentation/static/documentation/images/image034.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image035.jpg b/cvat/apps/documentation/static/documentation/images/image035.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image036.jpg b/cvat/apps/documentation/static/documentation/images/image036.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image037.jpg b/cvat/apps/documentation/static/documentation/images/image037.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image038.jpg b/cvat/apps/documentation/static/documentation/images/image038.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image039.jpg b/cvat/apps/documentation/static/documentation/images/image039.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image040.jpg b/cvat/apps/documentation/static/documentation/images/image040.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image041.jpg b/cvat/apps/documentation/static/documentation/images/image041.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image042.jpg b/cvat/apps/documentation/static/documentation/images/image042.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image043.jpg b/cvat/apps/documentation/static/documentation/images/image043.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image044.jpg b/cvat/apps/documentation/static/documentation/images/image044.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image045.jpg b/cvat/apps/documentation/static/documentation/images/image045.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image046.jpg b/cvat/apps/documentation/static/documentation/images/image046.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image047.jpg b/cvat/apps/documentation/static/documentation/images/image047.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image048.jpg b/cvat/apps/documentation/static/documentation/images/image048.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image052.jpg b/cvat/apps/documentation/static/documentation/images/image052.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image053.jpg b/cvat/apps/documentation/static/documentation/images/image053.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image054.jpg b/cvat/apps/documentation/static/documentation/images/image054.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image055.jpg b/cvat/apps/documentation/static/documentation/images/image055.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image056.jpg b/cvat/apps/documentation/static/documentation/images/image056.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image057.jpg b/cvat/apps/documentation/static/documentation/images/image057.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image058.jpg b/cvat/apps/documentation/static/documentation/images/image058.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image059.jpg b/cvat/apps/documentation/static/documentation/images/image059.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image060.jpg b/cvat/apps/documentation/static/documentation/images/image060.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image061.jpg b/cvat/apps/documentation/static/documentation/images/image061.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image062.jpg b/cvat/apps/documentation/static/documentation/images/image062.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image063.jpg b/cvat/apps/documentation/static/documentation/images/image063.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image064.jpg b/cvat/apps/documentation/static/documentation/images/image064.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image065.jpg b/cvat/apps/documentation/static/documentation/images/image065.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image066.jpg b/cvat/apps/documentation/static/documentation/images/image066.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image067.jpg b/cvat/apps/documentation/static/documentation/images/image067.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image068.jpg b/cvat/apps/documentation/static/documentation/images/image068.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image069.jpg b/cvat/apps/documentation/static/documentation/images/image069.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image070.jpg b/cvat/apps/documentation/static/documentation/images/image070.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image071.jpg b/cvat/apps/documentation/static/documentation/images/image071.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image072.jpg b/cvat/apps/documentation/static/documentation/images/image072.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image073.jpg b/cvat/apps/documentation/static/documentation/images/image073.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image074.jpg b/cvat/apps/documentation/static/documentation/images/image074.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image075.jpg b/cvat/apps/documentation/static/documentation/images/image075.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image076.jpg b/cvat/apps/documentation/static/documentation/images/image076.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image077.jpg b/cvat/apps/documentation/static/documentation/images/image077.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image078.jpg b/cvat/apps/documentation/static/documentation/images/image078.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image080.jpg b/cvat/apps/documentation/static/documentation/images/image080.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image081.jpg b/cvat/apps/documentation/static/documentation/images/image081.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image082.jpg b/cvat/apps/documentation/static/documentation/images/image082.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image083.jpg b/cvat/apps/documentation/static/documentation/images/image083.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image084.jpg b/cvat/apps/documentation/static/documentation/images/image084.jpg
diff --git a/cvat/apps/documentation/static/documentation/images/image085.jpg b/cvat/apps/documentation/static/documentation/images/image085.jpg
diff --git a/cvat/apps/documentation/user_guide.md b/cvat/apps/documentation/user_guide.md
diff --git a/cvat/apps/engine/static/engine/js/player.js b/cvat/apps/engine/static/engine/js/player.js
@@ -549,7 +549,7 @@ class PlayerController {
 
             let frames = this._model.frames;
             let progressWidth = e.target.clientWidth;
-            let x = e.clientX - e.target.offsetLeft;
+            let x = e.clientX + window.pageXOffset - e.target.offsetLeft;
             let percent = x / progressWidth;
             let targetFrame = Math.round((frames.stop - frames.start) * percent);
             this._model.pause();

diff --git a/cvat/apps/engine/static/engine/js/shapeFilter.js b/cvat/apps/engine/static/engine/js/shapeFilter.js
@@ -119,7 +119,6 @@ class FilterView {
         this._filterString.on('keypress keydown keyup', (e) => e.stopPropagation());
         this._filterString.on('change', (e) => {
             let value = $.trim(e.target.value);
-
             if (this._controller.updateFilter(value, false)) {
                 this._filterString.css('color', 'green');
                 setURISearchParameter('filter', value || null);

diff --git a/cvat/apps/tf_annotation/docker_setup_tf_annotation.sh b/cvat/apps/tf_annotation/docker_setup_tf_annotation.sh
@@ -21,7 +21,7 @@ CUDA_PKG_VERSION="9-0=${CUDA_VERSION}-1"
 echo "export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:${PATH}" >> ${HOME}/.bashrc
 echo "export LD_LIBRARY_PATH=/usr/local/nvidia/lib:/usr/local/nvidia/lib64:${LD_LIBRARY_PATH}" >> ${HOME}/.bashrc
 
-apt-get update && apt-get install -y --no-install-recommends \
+apt-get update && apt-get install -y --no-install-recommends --allow-unauthenticated \
     libprotobuf-dev \
     libprotoc-dev \
     protobuf-compiler \
@@ -31,7 +31,7 @@ apt-get update && apt-get install -y --no-install-recommends \
     libcudnn7=$CUDNN_VERSION-1+cuda9.0 && \
     ln -s cuda-9.0 /usr/local/cuda && \
 rm -rf /var/lib/apt/lists/* \
-    /etc/apt/sources.list.d/nvidia-ml.list
+    /etc/apt/sources.list.d/nvidia-ml.list /etc/apt/sources.list.d/cuda.list
 
 pip3 install --no-cache-dir -r "$(cd `dirname $0` && pwd)/requirements.txt"