kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge branch 'master' into bugfix/path-length

Browse Source
This commit is contained in:
mlampert
2020-01-17 20:03:03 -08:00
committed by GitHub
parent d6c47715f3 486de650ad
commit 4ef0f3da1d
6 changed files with 61 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Mod/Fem/femtest/app/test_ccxtools.py
View File

@@ -549,10 +549,24 @@ class TestCcxTools(unittest.TestCase):
def test_6_contact_shell_shell(
self
):
test_name = "contact shell shell analysis test"
base_name = "contact_shell_shell"
test_dir = "FEM_ccx_contact_shell_shell"
# set up the example
from femexamples import contact_shell_shell as shellcontact
shellcontact.setup(self.active_doc, "ccxtools")
# test input file writing
self.input_file_writing_test(
test_name="contact shell shell analysis test",
base_name="contact_shell_shell",
test_dir="FEM_ccx_contact_shell_shell",
)
# ********************************************************************************************
def input_file_writing_test(
self,
test_name,
base_name,
test_dir
):
fcc_print(
"\n--------------- "
"Start of FEM ccxtools {}"
@@ -560,13 +574,6 @@ class TestCcxTools(unittest.TestCase):
.format(test_name)
)
# set up the example
from femexamples import contact_shell_shell as shellcontact
shellcontact.setup(self.active_doc, "ccxtools")
# code from here is independent, TODO put in separate def
# adding more inp file tests would be very simple ...
# set up analysis
analysis = self.active_doc.Analysis
solver_object = self.active_doc.CalculiXccxTools
analysis_dir = testtools.get_unit_test_tmp_dir(

15
src/Mod/Import/App/AppImportPy.cpp
View File

@@ -163,7 +163,6 @@ private:
Handle(XCAFApp_Application) hApp = XCAFApp_Application::GetApplication();
Handle(TDocStd_Document) hDoc;
hApp->NewDocument(TCollection_ExtendedString("MDTV-CAF"), hDoc);
ImportOCAFExt ocaf(hDoc, pcDoc, file.fileNamePure());
if (file.hasExtension("stp") || file.hasExtension("step")) {
try {
@@ -230,15 +229,19 @@ private:
}
#if 1
if(merge!=Py_None)
ImportOCAFExt ocaf(hDoc, pcDoc, file.fileNamePure());
if (merge != Py_None)
ocaf.setMerge(PyObject_IsTrue(merge));
if(importHidden!=Py_None)
if (importHidden != Py_None)
ocaf.setImportHiddenObject(PyObject_IsTrue(importHidden));
if(useLinkGroup!=Py_None)
if (useLinkGroup != Py_None)
ocaf.setUseLinkGroup(PyObject_IsTrue(useLinkGroup));
if(mode>=0)
if (mode >= 0)
ocaf.setMode(mode);
ocaf.loadShapes();
#elif 1
Import::ImportOCAFCmd ocaf(hDoc, pcDoc, file.fileNamePure());
ocaf.loadShapes();
#else
Import::ImportXCAF xcaf(hDoc, pcDoc, file.fileNamePure());
xcaf.loadShapes();
@@ -246,7 +249,7 @@ private:
#endif
hApp->Close(hDoc);
if (!ocaf.partColors.size()) {
if (!ocaf.partColors.empty()) {
Py::List list;
for (auto &it : ocaf.partColors) {
Py::Tuple tuple(2);