opensim-org · aymanhab · Dec 17, 2024 · Mar 3, 2025 · Mar 14, 2025 · Mar 19, 2025
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -42,9 +42,16 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: 8
-
+
+    - name: Cache Netbeans
+      id: cache-netbeans
+      uses: actions/cache@v3
+      with:
+        path: .\Apache-NetBeans-12.3-bin-windows-x64.exe
+        key: netbeans-12.3
+
     - name: Install Netbeans 12.3
-      # Make sure the NetBeans installer is not corrupted.
+      #if: steps.cache-netbeans.outputs.cache-hit != 'true'
       run: |
         (New-Object System.Net.WebClient).DownloadFile("https://archive.apache.org/dist/netbeans/netbeans/12.3/Apache-NetBeans-12.3-bin-windows-x64.exe", "Apache-NetBeans-12.3-bin-windows-x64.exe")
         $expectedHash = "0695d87d9c72dcf3738672ba83eb273dda02066fa5eee80896cb6ccf79175840367a13d22ab3cb9838dffaa9a219dd1f73aee0e27c085e5310da2e3bbbc92b2c"
@@ -150,7 +157,7 @@ jobs:
         path: OpenSim-${{ steps.build-gui.outputs.version }}-win64.exe
 
   mac:
-    name: Mac13
+    name: Mac
 
     runs-on: macos-13
 
@@ -172,7 +179,7 @@ jobs:
 
     - name: Install packages
       run: |
-        brew pin cmake
+        brew uninstall cmake
         brew install cmake pkgconfig autoconf libtool automake wget pcre doxygen llvm
         brew reinstall gcc
         pip3 install numpy==1.25

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,8 @@ cmake_policy(SET CMP0048 NEW)
 
 project(OpenSimApp VERSION 4.6)
 
-cmake_minimum_required(VERSION 3.15)
+
+cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 

diff --git a/Gui/opensim/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/Gui/opensim/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
@@ -1,10 +1,10 @@
-currentVersion=OpenSim 4.5
+currentVersion=OpenSim 4.6
 SPLASH_HEIGHT=472
 SPLASH_WIDTH=380
 SplashProgressBarBounds=0,466,380,6
 SplashProgressBarColor=0xD1E27F
 SplashRunningTextBounds=8,455,163,8
 SplashRunningTextColor=0xFFFFFF
 SplashRunningTextFontSize=15
-LBL_splash_window_title=Starting OpenSim 4.5
+LBL_splash_window_title=Starting OpenSim 4.6
 SplashShowProgressBar=true
diff --git a/...modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/...modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
@@ -1,3 +1,3 @@
-CTL_MainWindow_Title=OpenSim 4.5
-CTL_MainWindow_Title_No_Project=OpenSim 4.5
+CTL_MainWindow_Title=OpenSim 4.6
+CTL_MainWindow_Title_No_Project=OpenSim 4.6
 
diff --git a/Gui/opensim/build.xml b/Gui/opensim/build.xml
@@ -260,6 +260,7 @@
         <!-- Following chmods are needed so that the application                  is recognized as such by osx and shows in launchpad,                 these match local/dev environment --> 
         <chmod file="${mac.dist.inner.dir}/etc/OpenSim.conf" perm="744"/>
         <chmod file="dist/OpenSim.app/Contents/Info.plist" perm="644"/>
+        <chmod file="dist/OpenSim.app/Contents/Resources/opensim/opensim-viewer" perm="777"/>
 
       <copy todir="dist/OpenSim.app/Contents/Resources/"
             file="installer_files/OSX/OpenSimDocument.icns" />

diff --git a/Gui/opensim/coordinateViewer/nbproject/genfiles.properties b/Gui/opensim/coordinateViewer/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=76249938
+build.xml.data.CRC32=a1fef0d5
 build.xml.script.CRC32=bee0e0f9
-build.xml.stylesheet.CRC32=[email protected]
+build.xml.stylesheet.CRC32=[email protected]
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=76249938
+nbproject/build-impl.xml.data.CRC32=a1fef0d5
 nbproject/build-impl.xml.script.CRC32=b2dad851
-nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
+nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
diff --git a/Gui/opensim/helpUtils/nbproject/genfiles.properties b/Gui/opensim/helpUtils/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=f3513f57
+build.xml.data.CRC32=bfe3d449
 build.xml.script.CRC32=dcc24d0e
-build.xml.stylesheet.CRC32=[email protected]
+build.xml.stylesheet.CRC32=[email protected]
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=f3513f57
+nbproject/build-impl.xml.data.CRC32=bfe3d449
 nbproject/build-impl.xml.script.CRC32=efc6910f
-nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
+nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
diff --git a/Gui/opensim/jcommon/nbproject/genfiles.properties b/Gui/opensim/jcommon/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
 build.xml.data.CRC32=4bc5b5f7
 build.xml.script.CRC32=6eba97c2
-build.xml.stylesheet.CRC32=[email protected]
+build.xml.stylesheet.CRC32=[email protected]
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=4bc5b5f7
 nbproject/build-impl.xml.script.CRC32=28dc506e
-nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
+nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
diff --git a/Gui/opensim/jfreechart/nbproject/genfiles.properties b/Gui/opensim/jfreechart/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
 build.xml.data.CRC32=3e774552
 build.xml.script.CRC32=92f4ebaf
-build.xml.stylesheet.CRC32=[email protected]
+build.xml.stylesheet.CRC32=[email protected]
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=3e774552
 nbproject/build-impl.xml.script.CRC32=55ab7b37
-nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
+nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
diff --git a/Gui/opensim/modeling/nbproject/genfiles.properties b/Gui/opensim/modeling/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
 build.xml.data.CRC32=bc5a83bd
 build.xml.script.CRC32=e1f11c18
-build.xml.stylesheet.CRC32=[email protected]
+build.xml.stylesheet.CRC32=[email protected]
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=bc5a83bd
 nbproject/build-impl.xml.script.CRC32=da890f68
-nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
+nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
diff --git a/Gui/opensim/modeling/nbproject/private/private.xml b/Gui/opensim/modeling/nbproject/private/private.xml
@@ -4,22 +4,8 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/E:/src/opensim-gui/Gui/opensim/modeling/src/org/opensim/modeling/C3DFileAdapter.java</file>
-            <file>file:/E:/src/opensim-gui/Gui/opensim/modeling/src/org/opensim/modeling/SetBodies.java</file>
-            <file>file:/E:/src/opensim-gui/Gui/opensim/modeling/src/org/opensim/modeling/BodyList.java</file>
-            <file>file:/E:/src/opensim-gui/Gui/opensim/modeling/src/org/opensim/modeling/opensimSimulationJNI.java</file>
-            <file>file:/E:/src/opensim-gui/Gui/opensim/modeling/src/org/opensim/modeling/SetModelComponents.java</file>
-            <file>file:/E:/src/opensim-gui/Gui/opensim/modeling/src/org/opensim/modeling/MarkersReference.java</file>
-            <file>file:/E:/src/opensim-gui/Gui/opensim/modeling/src/org/opensim/modeling/BodySet.java</file>
-            <file>file:/E:/src/opensim-gui/Gui/opensim/modeling/src/org/opensim/modeling/OpenSimObject.java</file>
-            <file>file:/E:/src/opensim-gui/Gui/opensim/modeling/src/org/opensim/modeling/ModelComponentSetModelComponent.java</file>
-            <file>file:/E:/src/opensim-gui/Gui/opensim/modeling/src/org/opensim/modeling/opensimSimbodyJNI.java</file>
-            <file>file:/E:/src/opensim-gui/Gui/opensim/modeling/src/org/opensim/modeling/opensimExampleComponentsJNI.java</file>
-            <file>file:/E:/src/opensim-gui/Gui/opensim/modeling/src/org/opensim/modeling/ModelComponentSetBodies.java</file>
-            <file>file:/E:/src/opensim-gui/Gui/opensim/modeling/src/org/opensim/modeling/ComponentSet.java</file>
-            <file>file:/E:/src/opensim-gui/Gui/opensim/modeling/src/org/opensim/modeling/MarkerSet.java</file>
-            <file>file:/E:/src/opensim-gui/Gui/opensim/modeling/src/org/opensim/modeling/opensimCommonJNI.java</file>
-            <file>file:/E:/src/opensim-gui/Gui/opensim/modeling/src/org/opensim/modeling/opensimActuatorsAnalysesToolsJNI.java</file>
+            <file>file:/D:/dev/src/opensim-gui/Gui/opensim/modeling/src/org/opensim/modeling/Manager.java</file>
+            <file>file:/D:/dev/src/opensim-gui/Gui/opensim/modeling/src/org/opensim/modeling/ForwardTool.java</file>
         </group>
     </open-files>
 </project-private>
diff --git a/Gui/opensim/modeling/src/org/opensim/modeling/BoolLike.java b/Gui/opensim/modeling/src/org/opensim/modeling/BoolLike.java
@@ -0,0 +1,55 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.2.0
+ *
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.opensim.modeling;
+
+public class BoolLike {
+  private transient long swigCPtr;
+  protected transient boolean swigCMemOwn;
+
+  public BoolLike(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  public static long getCPtr(BoolLike obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  public static long swigRelease(BoolLike obj) {
+    long ptr = 0;
+    if (obj != null) {
+      if (!obj.swigCMemOwn)
+        throw new RuntimeException("Cannot release ownership as memory is not owned");
+      ptr = obj.swigCPtr;
+      obj.swigCMemOwn = false;
+      obj.delete();
+    }
+    return ptr;
+  }
+
+  @SuppressWarnings({"deprecation", "removal"})
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        opensimCommonJNI.delete_BoolLike(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public BoolLike(boolean value_) {
+    this(opensimCommonJNI.new_BoolLike(value_), true);
+  }
+
+}
diff --git a/Gui/opensim/modeling/src/org/opensim/modeling/ForwardTool.java b/Gui/opensim/modeling/src/org/opensim/modeling/ForwardTool.java
@@ -120,14 +120,6 @@ public void setStatesFileName(String aFileName) {
     opensimActuatorsAnalysesToolsJNI.ForwardTool_setStatesFileName(swigCPtr, this, aFileName);
   }
 
-  public boolean getUseSpecifiedDt() {
-    return opensimActuatorsAnalysesToolsJNI.ForwardTool_getUseSpecifiedDt(swigCPtr, this);
-  }
-
-  public void setUseSpecifiedDt(boolean aUseSpecifiedDt) {
-    opensimActuatorsAnalysesToolsJNI.ForwardTool_setUseSpecifiedDt(swigCPtr, this, aUseSpecifiedDt);
-  }
-
   public void setPrintResultFiles(boolean aToWrite) {
     opensimActuatorsAnalysesToolsJNI.ForwardTool_setPrintResultFiles(swigCPtr, this, aToWrite);
   }