Merge remote-tracking branch 'upstream/master'

Author: Pedro Crespo

services/dy-3dvis/simcoreparaviewweb/Dockerfile

@@ -52,14 +52,18 @@ LABEL simcore.service.bootsettings='[{"name": "entry_point", "type": "string", "
 # copy start script
 ARG PORT
 ENV SERVER_PORT=$PORT
-
 COPY scripts/boot.sh scripts/boot.sh
 RUN chmod +x scripts/boot.sh
+# copy apache config changer script
 COPY config/apache.conf config/apache.conf
 COPY scripts/apachePatch.sh scripts/apachePatch.sh
 RUN chmod +x scripts/apachePatch.sh
 RUN mkdir /home/root/trigger && \
     chmod 777 /home/root/trigger
+# copy paraview launcher modifier script
+COPY scripts/visualizer_launcher_patch.sh scripts/visualizer_launcher_patch.sh
+RUN chmod +x scripts/visualizer_launcher_patch.sh
+COPY config/visualizer_config.json config/visualizer_config.json
 #------------------------------------------
 FROM common as development
 ENV CREATE_DUMMY_TABLE 1

services/dy-3dvis/simcoreparaviewweb/README.md

@@ -10,7 +10,7 @@ It brings the paraview visualizer application as an example of how easy one can
 2. execute `make build-devel`, this will build the service as "development" code together with a local minio S3 storage and a postgres DB
 3. execute `make up-devel`, this will run the service locally
 4. open a terminal (preferably bash)
-5. execute `curl -i -X POST localhost:8777/setport -d "port=8777"` in the terminal (this will start the paraviewweb visualizer app)
+5. Not necessary in dev mode anymore: execute `curl -i -X POST localhost:8777/setport -d "port=8777"` in the terminal (this will start the paraviewweb visualizer app)
 6. execute `curl -i -X POST localhost:8777/retrieve` in the terminal (this will make the simcore paraviewweb download the data from the local S3 storage)
 7. open browser at [localhost:8777/visualizer](localhost:8777/visualizer)
 

services/dy-3dvis/simcoreparaviewweb/config/visualizer_config.json

@@ -0,0 +1,45 @@
+{
+  "sources": [],
+
+  "filters": [
+      { "name": "Slice" }
+  ],
+
+  "readers": [
+      { "name": "LegacyVTKReader", "extensions": [ "vtk" ], "method": "FileNames" },
+      { "name": "Xdmf3ReaderS", "extensions": [ "xmf", "xdmf" ] }
+  ],
+
+  "sources_all": [
+    { "name": "AnnotateTime", "label": "Annotate Time" },
+    { "name": "Cone" },
+    { "name": "Sphere" },
+    { "name": "Text" },
+    { "name": "Wavelet" }
+  ],
+
+  "filters_all": [
+    { "name": "Calculator" },
+    { "name": "CellDatatoPointData", "label": "Cell Data To Point Data" },
+    { "name": "Clip" },
+    { "name": "Contour" },
+    { "name": "D3" },
+    { "name": "ExtractCTHParts", "label": "Extract CTH Parts" },
+    { "name": "ProcessIdScalars", "label": "Process ID Scalars" },
+    { "name": "Reflect" },
+    { "name": "Slice" },
+    { "name": "StreamTracer", "label": "Stream Tracer" },
+    { "name": "Threshold" },
+    { "name": "Transform" },
+    { "name": "Tube" },
+    { "name": "Ribbon" },
+    { "name": "WarpByScalar", "label": "Warp By Scalar" },
+    { "name": "WarpByVector", "label": "Warp By Vector" },
+    { "name": "ExtractBlock", "label": "Extract Blocks" }
+  ],
+
+  "readers_all": [
+    { "name": "LegacyVTKReader", "extensions": [ "vtk" ], "method": "FileNames" },
+    { "name": "Xdmf3ReaderS", "extensions": [ "xmf", "xdmf" ] }
+  ]
+}

services/dy-3dvis/simcoreparaviewweb/scripts/boot.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 echo "current directory is ${PWD}"
 
+
+
 if [[ -v CREATE_DUMMY_TABLE ]];
 then
     # in dev mode, data located in mounted volume /test-data are uploaded to the S3 server
@@ -11,9 +13,9 @@ then
     # the fake SIMCORE_NODE_UUID is exported to be available to the service
     export SIMCORE_NODE_UUID="$result";
     # TODO: host name shall be defined dynamically instead of stupidely hard-coded
-    host_name="localhost"
+    host_name="localhost"    
 else
-    host_name="osparc01.speag.com"
+    host_name="osparc01.speag.com"    
 fi
 
 echo "modifying apache configuration..."
@@ -22,12 +24,21 @@ echo "modifying apache configuration..."
 echo "restarting the apache service..."
 service apache2 restart
 
+# echo "modifying wslink launcher configuration"
+. scripts/visualizer_launcher_patch.sh
+
+if [[ -v CREATE_DUMMY_TABLE ]];
+then
+    # in dev mode we know already what the port is
+    server_port=${SERVER_PORT}
+else
+    # the service waits until the calling client transfers the service externally published port
+    # this is currently necessary due to some unknown reason with regard to how paraviewweb 
+    # visualizer is started (see below)
+    echo "Waiting for server port to be defined"
+    server_port="$(python3 src/getport.py)";
+fi
 
-# the service waits until the calling client transfers the service externally published port
-# this is currently necessary due to some unknown reason with regard to how paraviewweb 
-# visualizer is started (see below)
-echo "Waiting for server port to be defined"
-server_port="$(python3 src/getport.py)";
 
 # to start the paraviewweb visualizer it needs as parameter something to do with the way
 # its websockets are setup "ws://HOSTNAME:PORT" hostname and port must be the hostname and port

services/dy-3dvis/simcoreparaviewweb/scripts/visualizer_launcher_patch.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sed -i -e '/"--authKey", "${secret}",/a "--proxies", "/home/root/config/visualizer_config.json",' /opt/wslink-launcher/launcher-template.json