templates
/
KiBot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drill report now uses %i='drill_report' %x='txt'

This commit is contained in:
Salvador E. Tropea 2020-07-12 16:27:46 -03:00
parent bc52d932b0
commit b6347d8992
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kiplot/out_any_drill.py
View File

@ -22,7 +22,7 @@ class DrillReport(Optionable):
super().__init__()
with document:
self.filename = ''
""" name of the drill report. Not generated unless a name is specified. (%i='drill' %x='txt') """ # pragma: no cover
""" name of the drill report. Not generated unless a name is specified. (%i='drill_report' %x='txt') """ # pragma: no cover
self._unkown_is_error = True
@ -80,6 +80,6 @@ class AnyDrill(BaseOptions):
drill_writer.CreateDrillandMapFilesSet(output_dir, True, gen_map)
if self.report:
drill_report_file = self.expand_filename(output_dir, self.report, 'drill', 'txt')
drill_report_file = self.expand_filename(output_dir, self.report, 'drill_report', 'txt')
logger.debug("Generating drill report: "+drill_report_file)
drill_writer.GenDrillReportFile(drill_report_file)

8
tests/test_plot/test_drill.py
View File

@ -23,11 +23,11 @@ DRILL_DIR = 'Drill'
positions = {'R1': (105, 35, 'top'), 'R2': (110, 35, 'bottom'), 'R3': (110, 45, 'top')}
def do_3Rs(conf, dir):
def do_3Rs(conf, dir, report):
ctx = context.TestContext(dir, '3Rs', conf, DRILL_DIR)
ctx.run()
# Check all outputs are there
ctx.expect_out_file(os.path.join(DRILL_DIR, 'report.rpt'))
ctx.expect_out_file(os.path.join(DRILL_DIR, report))
pth_drl = ctx.get_pth_drl_filename()
ctx.expect_out_file(pth_drl)
npth_drl = ctx.get_npth_drl_filename()
@ -52,8 +52,8 @@ def do_3Rs(conf, dir):
def test_drill_3Rs():
do_3Rs('drill', 'Drill_3Rs')
do_3Rs('drill', 'Drill_3Rs', 'report.rpt')
def test_drill_legacy_3Rs():
do_3Rs('drill_legacy', 'DrillLegacy_3Rs')
do_3Rs('drill_legacy', 'DrillLegacy_3Rs', '3Rs-drill_report.txt')

2
tests/yaml_samples/drill_legacy.kiplot.yaml
View File

@ -15,7 +15,7 @@ outputs:
minimal_header: false
mirror_y_axis: false
report:
filename: 'report.rpt'
filename: '%f-%i.%x'
map:
type: 'pdf'