Skip to content

Add test case to exercise ScaleTool as in GUI operation. #1903

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

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 11 additions & 2 deletions Bindings/Java/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,16 @@ macro(OpenSimAddJavaTest TESTNAME)
file(COPY "${OPENSIM_SHARED_TEST_FILES_DIR}/gait10dof18musc_subject01.osim"
DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/TestVisualization")
file(COPY "${OPENSIM_SHARED_TEST_FILES_DIR}/gait10dof18musc_subject01.osim"
DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/TestEditProperties")
file(COPY "${OPENSIM_SHARED_TEST_FILES_DIR}/gait10dof18musc_subject01.osim"
DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/TestEditProperties") file(COPY "${OPENSIM_SHARED_TEST_FILES_DIR}/gait10dof18musc_subject01.osim"
DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/TestEditMarkers")
file(COPY "${OPENSIM_SHARED_TEST_FILES_DIR}/gait2354_simbody.osim"
DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/TestModelScaling")
file(COPY "${OPENSIM_SHARED_TEST_FILES_DIR}/gait2354_Scale_MarkerSet.xml"
DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/TestModelScaling")
file(COPY "${OPENSIM_SHARED_TEST_FILES_DIR}/subject01_Setup_Scale.xml"
DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/TestModelScaling")
file(COPY "${OPENSIM_SHARED_TEST_FILES_DIR}/subject01_static.trc"
DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/TestModelScaling")
if(WIN32)
# On Windows, CMake cannot use RPATH to hard code the location of libraries
# in the binary directory (DLL's don't have RPATH), so we must set PATH to
Expand Down Expand Up @@ -135,6 +142,8 @@ OpenSimAddJavaTest(TestEditProperties)
OpenSimAddJavaTest(TestTables)
OpenSimAddJavaTest(TestModelBuilding)
OpenSimAddJavaTest(TestEditMarkers)
OpenSimAddJavaTest(TestModelScaling)

if(WITH_BTK)
OpenSimAddJavaTest(TestC3DFileAdapter)
endif()
Expand Down
46 changes: 46 additions & 0 deletions Bindings/Java/tests/TestModelScaling.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import org.opensim.modeling.*;
import java.io.IOException;

class TestModelScaling {
public static void main(String[] args) {

try {
ScaleTool scaleTool = null;
// Live current model in GUI would be used for unscaledModel
Model unscaledModel = new Model("gait2354_simbody.osim");
// Exercise "loadsettings" from file"
try {
scaleTool = new ScaleTool("subject01_Setup_Scale.xml");
} catch (IOException ex) {
System.exit(-1);
}
System.out.println("ScaleTool created!");
// Populate the tabs of Scale factors and measurements
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment does not describe what is happening below.

MarkerSet extraMarkerSet = new MarkerSet(unscaledModel, "gait2354_Scale_MarkerSet.xml");
System.out.println("Extra MarkerSet created!");
unscaledModel.updateMarkerSet(extraMarkerSet);
System.out.println("Extra MarkerSet added to model!");
OpenSimContext context = new OpenSimContext(unscaledModel.initSystem(), unscaledModel);
MeasurementSet measurementSet = scaleTool.getModelScaler().getMeasurementSet();
System.out.println("MeasurementSet created!");
MarkerData measurementTrial = new MarkerData("subject01_static.trc");
System.out.println("MarkerData for static trial loaded!");
double scaleFactor = context.computeMeasurementScaleFactor(scaleTool.getModelScaler(), unscaledModel,
measurementTrial, measurementSet.get(0));
System.out.println("Measurement computed !");
// When we run the tool we create a copy of the unscaled model and scale in place using the
// calls below which exercise the "run" button
Model processedModel = new Model(unscaledModel);
processedModel.setName(scaleTool.getName());
OpenSimContext processedContext = new OpenSimContext(processedModel.initSystem(), processedModel);
processedContext.processModelScale(scaleTool.getModelScaler(),
processedModel, "", scaleTool.getSubjectMass());
processedContext.processModelMarkerPlacer(scaleTool.getMarkerPlacer(), processedModel, "");
System.out.println("Test finished!");
}
catch (IOException ex){
System.exit(-1);
}
System.gc();
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove Model::replaceMarkerSet() (see #1780) and deleteUnusedMarkers() since they appear to be unused by the GUI?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MarkerPlacer::processModel uses deleteUnusedMarkers(), it's not used by the GUI directly. replaceMarkerSet is not called by the GUI anymore and can be removed.

Loading