mirror of https://github.com/vitalif/openscad
Merge branch 'test3dexport' of github.com:openscad/openscad into test3dexport
Conflicts: tests/regression/export3d_off_test/example001-expected.png tests/regression/export3d_off_test/example002-expected.png tests/regression/export3d_off_test/example003-expected.png tests/regression/export3d_off_test/example004-expected.png tests/regression/export3d_off_test/example005-expected.png tests/regression/export3d_off_test/example009-expected.png tests/regression/export3d_off_test/example010-expected.png tests/regression/export3d_off_test/example011-expected.png tests/regression/export3d_off_test/example014-expected.png tests/regression/export3d_off_test/example016-expected.png tests/regression/export3d_off_test/example019-expected.png tests/regression/export3d_off_test/example020-expected.png tests/regression/export3d_off_test/example023-expected.png tests/regression/export3d_off_test/polyhedron-nonplanar-tests-expected.png tests/regression/export3d_stl_test/example001-expected.png tests/regression/export3d_stl_test/example002-expected.png tests/regression/export3d_stl_test/example003-expected.png tests/regression/export3d_stl_test/example004-expected.png tests/regression/export3d_stl_test/example005-expected.png tests/regression/export3d_stl_test/example009-expected.png tests/regression/export3d_stl_test/example010-expected.png tests/regression/export3d_stl_test/example011-expected.png tests/regression/export3d_stl_test/example014-expected.png tests/regression/export3d_stl_test/example016-expected.png tests/regression/export3d_stl_test/example019-expected.png tests/regression/export3d_stl_test/example020-expected.png tests/regression/export3d_stl_test/example023-expected.png tests/regression/export3d_stl_test/polyhedron-nonplanar-tests-expected.pngtest3dexport
commit
88407ac86f
|
@ -906,8 +906,15 @@ void MainWindow::actionNew()
|
||||||
|
|
||||||
void MainWindow::actionOpen()
|
void MainWindow::actionOpen()
|
||||||
{
|
{
|
||||||
QString new_filename = QFileDialog::getOpenFileName(this, "Open File", "",
|
QSettings settings;
|
||||||
"OpenSCAD Designs (*.scad *.csg)");
|
QString last_dirname = settings.value("editor/lastdirname").toString();
|
||||||
|
QString new_filename = QFileDialog::getOpenFileName(this, "Open File",
|
||||||
|
last_dirname, "OpenSCAD Designs (*.scad *.csg)");
|
||||||
|
if (new_filename!="") {
|
||||||
|
QDir last_dir = QFileInfo( new_filename ).dir();
|
||||||
|
last_dirname = last_dir.path();
|
||||||
|
settings.setValue("editor/lastdirname", last_dirname);
|
||||||
|
}
|
||||||
#ifdef ENABLE_MDI
|
#ifdef ENABLE_MDI
|
||||||
if (!new_filename.isEmpty()) {
|
if (!new_filename.isEmpty()) {
|
||||||
new MainWindow(new_filename);
|
new MainWindow(new_filename);
|
||||||
|
|
|
@ -27,7 +27,8 @@ import shutil
|
||||||
import platform
|
import platform
|
||||||
import string
|
import string
|
||||||
|
|
||||||
_debug_tcct = True
|
#_debug_tcct = True
|
||||||
|
_debug_tcct = False
|
||||||
|
|
||||||
def debug(*args):
|
def debug(*args):
|
||||||
global _debug_tcct
|
global _debug_tcct
|
||||||
|
@ -41,7 +42,7 @@ def initialize_environment():
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def init_expected_filename():
|
def init_expected_filename():
|
||||||
global expecteddir, expectedfilename
|
global expecteddir, expectedfilename # fixme - globals are hard to use
|
||||||
|
|
||||||
expected_testname = options.testname
|
expected_testname = options.testname
|
||||||
|
|
||||||
|
@ -55,7 +56,7 @@ def init_expected_filename():
|
||||||
expectedfilename = os.path.normpath(expectedfilename)
|
expectedfilename = os.path.normpath(expectedfilename)
|
||||||
|
|
||||||
def init_actual_filename():
|
def init_actual_filename():
|
||||||
global actualdir, actualfilename
|
global actualdir, actualfilename # fixme - globals are hard to use
|
||||||
|
|
||||||
cmdname = os.path.split(options.cmd)[1]
|
cmdname = os.path.split(options.cmd)[1]
|
||||||
actualdir = os.path.join(os.getcwd(), options.testname + "-output")
|
actualdir = os.path.join(os.getcwd(), options.testname + "-output")
|
||||||
|
@ -221,17 +222,19 @@ def usage():
|
||||||
# modify the 'actualfilename' so that the first test run will generate a
|
# modify the 'actualfilename' so that the first test run will generate a
|
||||||
# 3d file, like .stl
|
# 3d file, like .stl
|
||||||
def export3d_filename( actualfilename, options ):
|
def export3d_filename( actualfilename, options ):
|
||||||
|
debug('export3d test. modifying actualfilename to generate 3d output')
|
||||||
debug('options cmd',options.cmd)
|
debug('options cmd',options.cmd)
|
||||||
debug('options testname',options.testname)
|
debug('options testname',options.testname)
|
||||||
debug('export3d test. modifying filenames')
|
debug('actualfilename, before: ',actualfilename)
|
||||||
debug('actual, before: ',actualfilename)
|
|
||||||
|
|
||||||
if options.testname[10:13]=='stl':
|
if options.testname[9:12]=='stl':
|
||||||
actualfilename = actualfilename[0:-4] + '.stl'
|
actualfilename = actualfilename[0:-4] + '.stl'
|
||||||
elif options.testname[10:13]=='off':
|
elif options.testname[9:12]=='off':
|
||||||
actualfilename = actualfilename[0:-4] + '.off'
|
actualfilename = actualfilename[0:-4] + '.off'
|
||||||
|
elif options.testname[9:12]=='obj':
|
||||||
|
actualfilename = actualfilename[0:-4] + '.obj'
|
||||||
|
|
||||||
debug('actual, after: ',actualfilename)
|
debug('actualfilename, after: ',actualfilename)
|
||||||
|
|
||||||
return actualfilename
|
return actualfilename
|
||||||
|
|
||||||
|
@ -239,24 +242,23 @@ def export3d_filename( actualfilename, options ):
|
||||||
# to import that 3d file, and then generate a PNG image for comparison.
|
# to import that 3d file, and then generate a PNG image for comparison.
|
||||||
def create_png_for_export3d( actualfilename, options ):
|
def create_png_for_export3d( actualfilename, options ):
|
||||||
scadcode = 'import("'+actualfilename+'");'
|
scadcode = 'import("'+actualfilename+'");'
|
||||||
scadfilename = actualfilename+'.scad'
|
scadfilename = actualfilename+'.import.scad'
|
||||||
f = open(scadfilename,'wb')
|
f = open(scadfilename,'wb')
|
||||||
f.write(scadcode)
|
f.write(scadcode)
|
||||||
f.close()
|
f.close()
|
||||||
|
|
||||||
debug('export/import test.')
|
debug('export3d test. importing generated 3d file and creating png image')
|
||||||
#expectedfilename = expectedfilename[0:-4] + '.png'
|
#expectedfilename = expectedfilename[0:-4] + '.png'
|
||||||
actualfilename = actualfilename[0:-4] + '.png'
|
actualfilename = actualfilename[0:-4] + '.png'
|
||||||
debug('fname:'+expectedfilename)
|
debug('expectedfilename:'+expectedfilename)
|
||||||
debug('opts',options.cmd)
|
debug('actualfilename:'+actualfilename)
|
||||||
|
debug('opts:',options.cmd)
|
||||||
|
|
||||||
verification = verify_test(options.testname, options.cmd)
|
verification = verify_test(options.testname, options.cmd)
|
||||||
if not verification: exit(1)
|
if not verification: exit(1)
|
||||||
|
|
||||||
newargs = [ scadfilename ] + args[2:]
|
newargs = [ scadfilename ] + args[2:]
|
||||||
|
return actualfilename, newargs
|
||||||
resultfile = run_test(options.testname, options.cmd, newargs)
|
|
||||||
return resultfile
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
# Handle command-line arguments
|
# Handle command-line arguments
|
||||||
|
@ -330,7 +332,8 @@ if __name__ == '__main__':
|
||||||
if not resultfile: exit(1)
|
if not resultfile: exit(1)
|
||||||
|
|
||||||
if options.testname[0:8]=='export3d' and not options.generate:
|
if options.testname[0:8]=='export3d' and not options.generate:
|
||||||
resultfile = create_png_for_export3d( actualfilename, options )
|
actualfilename,newargs = create_png_for_export3d( actualfilename, options )
|
||||||
|
resultfile = run_test(options.testname, options.cmd, newargs)
|
||||||
if not resultfile: exit(1)
|
if not resultfile: exit(1)
|
||||||
|
|
||||||
if not compare_with_expected(resultfile): exit(1)
|
if not compare_with_expected(resultfile): exit(1)
|
||||||
|
|
Loading…
Reference in New Issue