Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
befa992
Refactor loading of data files to preview to facilitate reuse
aymanhab May 22, 2026
dc4f78a
Fix handling of trc files when associating through API calls
aymanhab Jun 4, 2026
abb8d92
Select motion node before associating so that associated motions show…
aymanhab Jun 4, 2026
ce66dc1
Potential fix for pull request finding
aymanhab Jun 10, 2026
72a8c62
Potential fix for pull request finding
aymanhab Jun 10, 2026
7afd6ad
minor cleanup per PR review
aymanhab Jun 10, 2026
bfdf6a7
Merge branch 'support_addbiomech' of https://github.com/opensim-org/o…
aymanhab Jun 10, 2026
83a5f12
Undo change made by during merge
aymanhab Jun 10, 2026
b517747
Update browser commit
aymanhab Jun 11, 2026
69e9d93
Merge branch 'main' into support_addbiomech
aymanhab Jun 11, 2026
4edbaf7
Update NBM download links in CI workflow
aymanhab Jun 11, 2026
8689fcc
Update NBM download URLs to latest version
aymanhab Jun 15, 2026
6d2e72b
Fix Windows CI installer step: explicitly copy make_installer.nsi
Copilot Jun 15, 2026
b905a35
update opensim-visualizer commit
aymanhab Jun 15, 2026
3c3665e
Simplify GUI installer build process
aymanhab Jun 15, 2026
a9ce911
backport fix to jdk finding on windows
aymanhab Jun 16, 2026
bbcde78
Merge branch 'main' into support_addbiomech
aymanhab Jun 17, 2026
b3cada5
Log JAR copy operation in CI workflow on osx
aymanhab Jun 17, 2026
b20650a
Update NBM_DIR to point to prebuilt_jxb461 on osx
aymanhab Jun 18, 2026
66659dd
Update jxBrowser jar download URL in build.xml
aymanhab Jun 18, 2026
c1e6a41
Fix download URL for jxBrowser jar in build.xml
aymanhab Jun 18, 2026
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
11 changes: 6 additions & 5 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ jobs:
New-Item -ItemType Directory -Force -Path $nbmDir

# Download the NBM file
Invoke-WebRequest -Uri "https://github.com/opensim-org/opensim-visualizer/releases/download/v4.6.0/org-opensim-javabrowser.nbm" `
Invoke-WebRequest -Uri "https://github.com/opensim-org/opensim-visualizer/releases/download/v4.6.1.dev/org-opensim-javabrowser.nbm" `
-OutFile "$nbmDir\org-opensim-javabrowser.nbm"

# Extract the NBM
Expand Down Expand Up @@ -346,15 +346,15 @@ jobs:
run: |
# Set root and directories
ROOT="$GITHUB_WORKSPACE"
NBM_DIR="$ROOT/prebuilt_jxb"
NBM_DIR="$ROOT/prebuilt_jxb461"
EXTRACT_DIR="$NBM_DIR/extracted"
INSTALLER_CONTENT="$ROOT/Gui/opensim/dist/installer/opensim/opensim"

# Create prebuilt directory
mkdir -p "$NBM_DIR"

# Download the NBM file
curl -L "https://github.com/opensim-org/opensim-visualizer/releases/download/v4.6.0/org-opensim-javabrowser.nbm" \
curl -L "https://github.com/opensim-org/opensim-visualizer/releases/download/v4.6.1.dev/org-opensim-javabrowser.nbm" \
-o "$NBM_DIR/org-opensim-javabrowser.nbm"

# Extract the NBM (nbm is a zip)
Expand All @@ -367,7 +367,8 @@ jobs:

# Copy the main JAR
cp "$EXTRACT_DIR/netbeans/modules/org-opensim-javabrowser.jar" "$INSTALLER_CONTENT/modules/"

echo "++++++++++++++++++++++++++++++++++++++++++++++++++++"
echo "cp " "$EXTRACT_DIR/netbeans/modules/org-opensim-javabrowser.jar" " to " "$INSTALLER_CONTENT/modules/"
# Copy macOS-specific JARs with exact names
cp "$EXTRACT_DIR/netbeans/modules/ext/jxbrowser-7.44.1.jar" "$INSTALLER_CONTENT/modules/ext/"
cp "$EXTRACT_DIR/netbeans/modules/ext/jxbrowser-swing-7.44.1.jar" "$INSTALLER_CONTENT/modules/ext/"
Expand Down Expand Up @@ -517,7 +518,7 @@ jobs:

# Download the NBM file pinned to version v4.6.0
wget -O "$NBM_DIR/org-opensim-javabrowser.nbm" \
"https://github.com/opensim-org/opensim-visualizer/releases/download/v4.6.0/org-opensim-javabrowser.nbm"
"https://github.com/opensim-org/opensim-visualizer/releases/download/v4.6.1.dev/org-opensim-javabrowser.nbm"

# Extract the NBM (nbm is a zip)
mkdir -p "$EXTRACT_DIR"
Expand Down
2 changes: 1 addition & 1 deletion Gui/opensim/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
</copy>
</target>
<target name="copy-jxbrowser-jar" description="Copy prebuilt opensim-visualizer module jar to distro">
<get src="https://sourceforge.net/projects/myosin/files/opensim-gui/jxBrowser7/org-opensim-javabrowser.jar/download"
<get src="https://sourceforge.net/projects/myosin/files/opensim-gui/jxbrowser7-461/org-opensim-javabrowser.jar/download"
dest="${opensim.dist.dir}/OpenSim/modules/org-opensim-javabrowser.jar"
usetimestamp="false"
verbose="true" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ public void loadMotionStorage(Storage newMotion, boolean primary, String filePat
amot.setName(new File(filePath).getName());
amot.setDataRate(markerData.getDataRate());
amot.setCameraRate(markerData.getCameraRate());
amot.setModel(model);
addMotion(model, amot, primaryMot);
} catch (IOException ex) {
Exceptions.printStackTrace(ex);
Expand Down
Loading