report list fixed

This commit is contained in:
easyw
2020-02-22 23:36:01 +01:00
parent 9621ddd40a
commit 007862f371

View File

@ -367,62 +367,62 @@ def calculate_AR():
else: else:
PassCN = PassCN+1 PassCN = PassCN+1
#if FailCV >0: #if FailCV >0:
#writeTxt('\n') #writeTxt('\n')
msg = "TH PADS that Pass = "+repr(PassC)+"; Fails = "+repr(FailC) msg = "TH PADS that Pass = "+repr(PassC)+"; Fails = "+repr(FailC)
if FailC >0: if FailC >0:
rt.BeginBold() rt.BeginBold()
writeTxt("TH PADS that Pass = "+repr(PassC)+"; ") writeTxt("TH PADS that Pass = "+repr(PassC)+"; ")
if FailC >0: if FailC >0:
rt.BeginTextColour('red') rt.BeginTextColour('red')
writeTxt("Fails = "+repr(FailC)+'\n') writeTxt("Fails = "+repr(FailC)+'\n')
if FailC >0: if FailC >0:
rt.EndTextColour() rt.EndTextColour()
rt.EndBold() rt.EndBold()
print(msg) print(msg)
LogMsg+=msg+'\n' LogMsg+=msg+'\n'
msg="NPTH PADS that Pass = "+repr(PassCN)+"; Fails = "+repr(FailCN) msg="NPTH PADS that Pass = "+repr(PassCN)+"; Fails = "+repr(FailCN)
#writeTxt('\n') #writeTxt('\n')
if FailCN >0: if FailCN >0:
rt.BeginBold() rt.BeginBold()
writeTxt("NPTH PADS that Pass = "+repr(PassCN)+"; ") writeTxt("NPTH PADS that Pass = "+repr(PassCN)+"; ")
if FailCN >0: if FailCN >0:
rt.BeginTextColour('red') rt.BeginTextColour('red')
writeTxt("Fails = "+repr(FailCN)+'\n') writeTxt("Fails = "+repr(FailCN)+'\n')
if FailC >0: if FailC >0:
rt.EndTextColour() rt.EndTextColour()
rt.EndBold() rt.EndBold()
print(msg) print(msg)
LogMsg+=msg+'\n' LogMsg+=msg+'\n'
pcbName = (os.path.splitext(GetBoard().GetFileName())[0]) #filename no ext pcbName = (os.path.splitext(GetBoard().GetFileName())[0]) #filename no ext
#wx.LogMessage(pcbName)#LogMsg) #wx.LogMessage(pcbName)#LogMsg)
##wx.LogMessage(LogMsg) ##wx.LogMessage(LogMsg)
FC=r"C:\FreeCAD\bin\freecad.exe" FC=r"C:\FreeCAD\bin\freecad.exe"
kSU=r"C:\Cad\Progetti_K\3D-FreeCad-tools\kicad-StepUp-tools.FCMacro" kSU=r"C:\Cad\Progetti_K\3D-FreeCad-tools\kicad-StepUp-tools.FCMacro"
#subprocess.check_call([FC, kSU, pcbName]) #subprocess.check_call([FC, kSU, pcbName])
##p = subprocess.Popen([FC, kSU, pcbName]) ##p = subprocess.Popen([FC, kSU, pcbName])
#found_violations=False #found_violations=False
if (FailC+FailCN+FailCV)>0: if (FailC+FailCN+FailCV)>0:
found_violations=True found_violations=True
if found_violations: if found_violations:
#frame.m_staticTitle = wx.StaticText(frame, label=" Check result: (Violations found)") #frame.m_staticTitle = wx.StaticText(frame, label=" Check result: (Violations found)")
aResult.m_staticTitle.SetLabel(" Check result: (Violations found)") aResult.m_staticTitle.SetLabel(" Check result: (Violations found)")
#self.title.SetForegroundColour('#FF0000') #self.title.SetForegroundColour('#FF0000')
aResult.m_staticTitle.SetBackgroundColour('#FF0000') aResult.m_staticTitle.SetBackgroundColour('#FF0000')
font = wx.Font(wx.DEFAULT, wx.DECORATIVE, wx.ITALIC, wx.BOLD) font = wx.Font(wx.DEFAULT, wx.DECORATIVE, wx.ITALIC, wx.BOLD)
aResult.m_staticTitle.SetFont(font) aResult.m_staticTitle.SetFont(font)
else: else:
#frame.m_staticTitle = wx.StaticText(frame, label=" Annular Check result: OK") #frame.m_staticTitle = wx.StaticText(frame, label=" Annular Check result: OK")
aResult.m_staticTitle.SetLabel(" Annular Check result: OK") aResult.m_staticTitle.SetLabel(" Annular Check result: OK")
aResult.m_staticTitle.SetBackgroundColour('#00FF00') aResult.m_staticTitle.SetBackgroundColour('#00FF00')
font = wx.Font(wx.DEFAULT, wx.DECORATIVE, wx.ITALIC, wx.BOLD) font = wx.Font(wx.DEFAULT, wx.DECORATIVE, wx.ITALIC, wx.BOLD)
aResult.m_staticTitle.SetFont(font) aResult.m_staticTitle.SetFont(font)
aResult.Show() aResult.Show()
modal_result = aResult.ShowModal() modal_result = aResult.ShowModal()
if modal_result == wx.ID_OK: if modal_result == wx.ID_OK: