PM4 Pull request #48

kostapsimoulis · 2018-04-20T01:43:54Z

This is the final pull request for PM4. A couple of things might be added later:

Support/Test other versions of Kinect. Right now we have only tested 1414
Finalize and test docker configuration

…omcat

Maven and Docker

…ng enable and disable mix flag paths to api.

Rest api

smokhov · 2018-04-28T16:49:19Z

There are conflicts in here to be resolved... did you sync the branches and my master, @kostapsimoulis ?

smokhov

Why bin/libfreenect2/ was checked in with all the unneeded READMEs?

smokhov · 2018-04-28T16:59:23Z

bin/libfreenect2/depends/INSTALL-windows.txt

@@ -0,0 +1,49 @@
+Source code: https://github.com/OpenKinect/libfreenect2
+API reference: http://openkinect.github.io/libfreenect2
+


I don't believe this file is needed.

The following files/directories were accidentally added by Eclipse users. Then someone noticed that and added them to .gitignore but they didn't clean up before. I just cleaned up the following files/folders and it should solve this issue:

bin
.classpath
.settings
.project

smokhov · 2018-04-28T17:04:52Z

src/api/c/examples/ogl/SimpleFragmentShader.fragmentshader

@@ -1,12 +1,12 @@
-#version 330 core
-


why this required a change in the context of your project?

smokhov · 2018-04-28T17:07:23Z

src/api/java/openiss/Kinect.java

-import java.nio.ShortBuffer;
-import java.nio.FloatBuffer;
-
+import java.nio.*;


It is proper to expand java.nio.* to what modules are actually used instead of bulk import of everything.

smokhov · 2018-04-28T17:09:38Z

src/api/java/openiss/ws/soap/client/OpenISSSOAPClient.java

-import javax.xml.ws.Service;
-
-@WebServlet(name = "OpenISSSOAPClient", urlPatterns = {"/OpenISSSOAPClient"})
-public class OpenISSSOAPClient extends HttpServlet {


What happened to OpenISSSOAPClient? Why removed?

smokhov · 2018-04-28T17:15:15Z

Why the entire bin directory was added with all the compiled stuff? It tremendously pollutes this PR.

smokhov · 2018-04-28T17:16:02Z

Tons of binary files added, executables, libraries, all over the place under src/ as well

smokhov · 2018-04-28T17:16:34Z

Unrelated changes to src/api/c/examples/ogl/*... why?

smokhov · 2018-04-28T17:18:43Z

Permissions on files 0 src/scripts/build.sh 100755 → 100644
src/scripts/dependencies/el6.sh 100755 → 100644
tools/ci/docker_run_tests.sh 100755 → 100644
tools/ci/docker_setup_tests.sh 100755 → 100644

Changed? Why? They should remain executable.

smokhov · 2018-04-28T17:23:18Z

please confirm SOAP client and server are still intact and fully functional @kostapsimoulis

smokhov

The commit 4027819 does the exact opposite of what it says. It adds all of bin/.

This reverts commit 4027819.

kostapsimoulis · 2018-04-29T21:46:44Z

Conflicts have been fixed by syncing with upstream as requested.
bin directory, unrelated changes and bad permissions were all part of an accidental commit that has been reverted. The accidental commit was done in order to clean up some files that were added by Eclipse and they were pushed by accident as well. Those files were later added to .gitignore but that was done after being pushed and it created a bit of a confusion. The request has been cleaned up now from 311 files down to 79 files changed. Accidental commit: kpsimoulis@4027819
src/api/java/openiss/ws/soap/client/OpenISSSOAPClient.java was never implemented properly, it never worked and it was creating issues to keep it there. It had to be removed in order to clean up everything before merging. The SOAP Client has been written successfully and tested in Node.js in the javascript directory
Soap client and server have been tested several times and they are still intact. Please refer to test cases for soap in our documentation for more details about testing.

laihaotao · 2018-05-23T19:13:48Z

src/api/js/app.js

+const express = require('express');
+let serviceLibrary = process.env.NODE_WEB_SERVICE || 'rest.js';
+const service = require('./lib/'+serviceLibrary);
+var morgan = require('morgan');


should avoid using var keyword, use let instead.

Extracted into issue #53

jashanj0tsingh

A very few hard coded paths for instance Class- Test2 variables inputFile/outputFile and PORT variable in itself can be a part of global config params and can be appended to the url constants. Otherwise, it is okay to merge this pr.

smokhov · 2018-05-24T02:41:27Z

Put @jashanj0tsingh's comment to review in issue #54

smokhov and others added 30 commits March 6, 2018 18:20

Merge commit 'ad79b04219cf2ddb1c81ba33ef7a1728e47f34d3'

4e74dc1

[LFS] apply LFS settings for binary files

052db5a

fixed depth view (added PGM function)

427d717

integrate mixFrame options to view index

d1e0c0d

offset and frame rate changes

594ce77

Adding maven and jersey support for Rest services

2ad403d

Fixing original path

ebf1ceb

Fixing dependenceis

d268677

Refactoring and fixing issues

2adf240

More refactoring

615f665

adding rest api images

bd2b621

Adding docker support and updating documentation

0e3d592

Adding target to ignore

02e4569

updating nodejs client port to 3000 in order to avoid conflict with t…

99e8fab

…omcat

Fixing Mimetype issues on browsers other than Chrome

10d7c38

Merge pull request #9 from kpsimoulis/maven

42dd8e6

Maven and Docker

Small intellij updates

5aaf6b8

restoring default soap configuration back to filesystem

8bc24e6

Refactoring core functions to util

848b93d

Adding PATCH annotation and related readme content

1618a1a

Adding flags for mix, canny, countour. Fixing path for getImage. Addi…

178ea20

…ng enable and disable mix flag paths to api.

Adding opencv flag enabling and disabling

2f1e3f2

Adding messages for DELETE and PATCH responses

b629255

Fix path color to rgb

4a4273f

Merge remote-tracking branch 'origin/depth_fix' into rest_api

a878c5b

Merge pull request #10 from kpsimoulis/rest_api

6f9acff

Rest api

Merge remote-tracking branch 'origin/team10' into team11

30e24dd

fix path in view

1d253e1

freenect/fakenect support for Image driver

e1a32f8

Adding fakenect/freenect support to REST api and processing of images

a2b8870

smokhov added Java web services OpenISS as a service labels Apr 27, 2018

smokhov reviewed Apr 28, 2018

View reviewed changes

kostapsimoulis added 3 commits April 29, 2018 16:09

removing ignored folder

7dfdda1

removing ignored files

1da658c

Revert "Remove ignored files"

2ed60d3

This reverts commit 4027819.

kostapsimoulis changed the base branch from team10 to master April 29, 2018 21:25

Merge branch 'master_remote' into team10

5055e56

kostapsimoulis changed the base branch from master to team10 April 29, 2018 21:44

laihaotao reviewed May 23, 2018

View reviewed changes

jashanj0tsingh reviewed May 23, 2018

View reviewed changes

This was referenced May 24, 2018

Java: WS: add proper src/api/java/openiss/ws/soap/client/OpenISSSOAPClient.java #50

Closed

Java: WS: test 1473 #52

Closed

JS: WS: review var vs. let issues in .js code #53

Closed

Java: WS: review hardcoded paths #54

Closed

smokhov merged commit 1d0c066 into OpenISS:team10 May 24, 2018

smokhov mentioned this pull request May 24, 2018

WS: re-test merged #55

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PM4 Pull request #48

PM4 Pull request #48

kostapsimoulis commented Apr 20, 2018

smokhov commented Apr 28, 2018 •

edited

smokhov left a comment

smokhov Apr 28, 2018

kostapsimoulis Apr 29, 2018

smokhov Apr 28, 2018

smokhov Apr 28, 2018

smokhov Apr 28, 2018

smokhov commented Apr 28, 2018 •

edited

smokhov commented Apr 28, 2018 •

edited

smokhov commented Apr 28, 2018 •

edited

smokhov commented Apr 28, 2018 •

edited

smokhov commented Apr 28, 2018 •

edited

smokhov left a comment

kostapsimoulis commented Apr 29, 2018 •

edited

laihaotao May 23, 2018

smokhov May 24, 2018

jashanj0tsingh left a comment

smokhov commented May 24, 2018

		@@ -0,0 +1,49 @@
		Source code: https://github.com/OpenKinect/libfreenect2
		API reference: http://openkinect.github.io/libfreenect2

PM4 Pull request #48

PM4 Pull request #48

Conversation

kostapsimoulis commented Apr 20, 2018

smokhov commented Apr 28, 2018 • edited

smokhov left a comment

Choose a reason for hiding this comment

smokhov Apr 28, 2018

Choose a reason for hiding this comment

kostapsimoulis Apr 29, 2018

Choose a reason for hiding this comment

smokhov Apr 28, 2018

Choose a reason for hiding this comment

smokhov Apr 28, 2018

Choose a reason for hiding this comment

smokhov Apr 28, 2018

Choose a reason for hiding this comment

smokhov commented Apr 28, 2018 • edited

smokhov commented Apr 28, 2018 • edited

smokhov commented Apr 28, 2018 • edited

smokhov commented Apr 28, 2018 • edited

smokhov commented Apr 28, 2018 • edited

smokhov left a comment

Choose a reason for hiding this comment

kostapsimoulis commented Apr 29, 2018 • edited

laihaotao May 23, 2018

Choose a reason for hiding this comment

smokhov May 24, 2018

Choose a reason for hiding this comment

jashanj0tsingh left a comment

Choose a reason for hiding this comment

smokhov commented May 24, 2018

smokhov commented Apr 28, 2018 •

edited

smokhov commented Apr 28, 2018 •

edited

smokhov commented Apr 28, 2018 •

edited

smokhov commented Apr 28, 2018 •

edited

smokhov commented Apr 28, 2018 •

edited

smokhov commented Apr 28, 2018 •

edited

kostapsimoulis commented Apr 29, 2018 •

edited