Merge pull request #364 from pro3d-space/features/provex

Features/provex
pro3d-space · Nov 7, 2023 · 69ccb2f · 69ccb2f
2 parents f22ae0a + 4eb01aa
commit 69ccb2f
Show file tree

Hide file tree

Showing 27 changed files with 224,127 additions and 64,707 deletions.
diff --git a/Build.fs b/Build.fs
@@ -411,7 +411,7 @@ Target.create "Publish" (fun _ ->
     // 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
@@ -424,7 +424,7 @@ Target.create "Publish" (fun _ ->
     // 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

diff --git a/CREDITS.MD b/CREDITS.MD
diff --git a/PRODUCT_RELEASE_NOTES.md b/PRODUCT_RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+## 4.20.0-prerelease1
+- provex and multitexturing
+
 ## 4.12.0-prerelease10
 - new trafo version
 - distance filter for surface

diff --git a/docs/ProvenanceTracking.md b/docs/ProvenanceTracking.md
@@ -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
diff --git a/lib/JR.Wrappers.dll b/lib/JR.Wrappers.dll
diff --git a/...titude_interactive_plotting_example.ipynb → ...titude_interactive_plotting_example.ipynb b/...titude_interactive_plotting_example.ipynb → ...titude_interactive_plotting_example.ipynb