Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Features/provex #364

Merged
merged 24 commits into from
Nov 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a74eb82
sync
haraldsteinlechner May 26, 2023
23e6847
renamed notebooks to provex
haraldsteinlechner May 26, 2023
447f4b2
Merge branch 'features/provenanceNew' into features/provex
haraldsteinlechner May 31, 2023
0fa8284
[Concept] added Query API sketch
haraldsteinlechner May 31, 2023
56fe6ad
Merge remote-tracking branch 'remotes/origin/develop' into features/p…
haraldsteinlechner Jul 12, 2023
cfd7cd1
first sketch of "importAnnotations" api endpoint
haraldsteinlechner Jul 12, 2023
40932ec
RemoteApi: when importing annotations from snapshots, conflicting nam…
haraldsteinlechner Jul 12, 2023
9f9fa17
added entry point for applying state of internal provenance nodes (P …
haraldsteinlechner Aug 3, 2023
b37ba39
RemoteAPI added importAnnotationsFromGraph from graph entrypoint
haraldsteinlechner Aug 3, 2023
bd6189a
switched dashboard to provenance for testing
haraldsteinlechner Aug 3, 2023
914e0fb
Update ws endpoints
sophie-sudoku Aug 22, 2023
5ec3dac
Merge remote-tracking branch 'remotes/origin/features/queries' into f…
haraldsteinlechner Sep 21, 2023
1abb071
polished query demo
haraldsteinlechner Sep 21, 2023
5dab89e
moved CutoutDemo.ipynb
haraldsteinlechner Sep 21, 2023
7e7e1a5
udpated notebook
haraldsteinlechner Sep 21, 2023
3ef993c
sync
haraldsteinlechner Sep 25, 2023
49fca6c
Disable other websocket connections
sophie-sudoku Oct 5, 2023
0ab67c6
fixed build script
haraldsteinlechner Nov 6, 2023
d7bfd66
provenance graph formatting
haraldsteinlechner Nov 6, 2023
efb7ae3
release notes and version bump for provex release
haraldsteinlechner Nov 6, 2023
654937c
added docs
haraldsteinlechner Nov 6, 2023
1aba1f1
Merge remote-tracking branch 'remotes/origin/develop' into features/p…
haraldsteinlechner Nov 6, 2023
7a30c16
Update ProvenanceTracking.md
haraldsteinlechner Nov 6, 2023
4eb01aa
disabled provenace dockconfig as default, added provex profile for PR…
haraldsteinlechner Nov 7, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Build.fs
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
let url = sprintf "https://www.nuget.org/api/v2/package/Aardium-Win32-x64/%s" aardiumVersion
printf "url: %s" url
let tempFile = Path.GetTempFileName()
use c = new System.Net.WebClient()

Check warning on line 243 in Build.fs

View workflow job for this annotation

GitHub Actions / build

This construct is deprecated. WebRequest, HttpWebRequest, ServicePoint, and WebClient are obsolete. Use HttpClient instead.

Check warning on line 243 in Build.fs

View workflow job for this annotation

GitHub Actions / build

This construct is deprecated. WebRequest, HttpWebRequest, ServicePoint, and WebClient are obsolete. Use HttpClient instead.
c.DownloadFile(url, tempFile)
use a = new ZipArchive(File.OpenRead tempFile)
let t = Path.GetTempPath()
Expand Down Expand Up @@ -411,7 +411,7 @@
// 1. publish exe
"src/PRo3D.Viewer/PRo3D.Viewer.fsproj" |> DotNet.publish (fun o ->
{ o with
Framework = Some "net5.0"
Framework = Some "net6.0"
Runtime = Some "win10-x64" //-p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true
Common = { o.Common with CustomParams = Some "-p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -p:InPublish=True -p:DebugType=None -p:DebugSymbols=false -p:BuildInParallel=false" }
//SelfContained = Some true // https://github.com/dotnet/sdk/issues/10566#issuecomment-602111314
Expand All @@ -424,7 +424,7 @@
// 1. publish exe
"src/PRo3D.Viewer/PRo3D.Viewer.fsproj" |> DotNet.publish (fun o ->
{ o with
Framework = Some "net5.0"
Framework = Some "net6.0"
Runtime = Some "osx-x64"
Common = { o.Common with CustomParams = Some "-p:InPublish=True -p:DebugType=None -p:DebugSymbols=false -p:BuildInParallel=false" }
//SelfContained = Some true // https://github.com/dotnet/sdk/issues/10566#issuecomment-602111314
Expand Down Expand Up @@ -458,7 +458,7 @@
let url = sprintf "https://www.nuget.org/api/v2/package/Aardium-Win32-x64/%s" aardiumVersion
printf "url: %s" url
let tempFile = Path.GetTempFileName()
use c = new System.Net.WebClient()

Check warning on line 461 in Build.fs

View workflow job for this annotation

GitHub Actions / build

This construct is deprecated. WebRequest, HttpWebRequest, ServicePoint, and WebClient are obsolete. Use HttpClient instead.

Check warning on line 461 in Build.fs

View workflow job for this annotation

GitHub Actions / build

This construct is deprecated. WebRequest, HttpWebRequest, ServicePoint, and WebClient are obsolete. Use HttpClient instead.
c.DownloadFile(url, tempFile)
use a = new ZipArchive(File.OpenRead tempFile)
let t = Path.GetTempPath()
Expand Down
302 changes: 151 additions & 151 deletions CREDITS.MD

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions PRODUCT_RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 4.20.0-prerelease1
- provex and multitexturing

## 4.12.0-prerelease10
- new trafo version
- distance filter for surface
Expand Down
10 changes: 10 additions & 0 deletions docs/ProvenanceTracking.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Provenance tracking in PRo3D

PRo3D has several features for manual, semi-automatic and automatic provenace tracking which have been developed in the *PROVEX* project.
The features need to be enabled by command-line-arguments as such:
```--disableCors --port 4321 --remoteApi --enableProvenance```

DisableCors is required when running PRo3D UI from the PROVEX web app. For communication with the webapp the `remoteApi` needs to be enabled.
To enable provenace features from within PRo3D `--enable-Provenance``is needed.

More about this stream of features was presented at ASTRA2023 and in the provex specific documentation: https://github.com/pro3d-space/PRo3D/tree/features/provex/provex
Binary file modified lib/JR.Wrappers.dll
Binary file not shown.
Loading
Loading