beremiz

make attribute CFLAGS and LDFLAGS optional and add default empty value

2016-04-18, Andrey Skvortsov
69fe0b81e951
make attribute CFLAGS and LDFLAGS optional and add default empty value

Actually CFLAGS and LDFLAGS are not required and can be empty.
Without default empty value if target platform in project settings was
set to "Linux" CFLAGS and LDFLAGS was initialized with NoneType.
The result was broken build and it wasn't to save/load project with
such settings.

Traceback (most recent call last):
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 956, in _Build
if not builder.build() :
File "/home/developer/WorkData/PLC/beremiz/beremiz/targets/toolchain_gcc.py", line 96, in build
Builder_CFLAGS = ' '.join(self.getBuilderCFLAGS())
TypeError: sequence item 0: expected string, NoneType found
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#This library is free software; you can redistribute it and/or
#modify it under the terms of the GNU General Public
#License as published by the Free Software Foundation; either
#version 2.1 of the License, or (at your option) any later version.
#
#This library is distributed in the hope that it will be useful,
#but WITHOUT ANY WARRANTY; without even the implied warranty of
#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
#General Public License for more details.
#
#You should have received a copy of the GNU General Public
#License along with this library; if not, write to the Free Software
#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import wx
import wx.lib.agw.customtreectrl as CT
from util.BitmapLibrary import GetBitmap
# Customize CustomTreeItem for adding icon on item left
CT.GenericTreeItem._ExtraImage = None
def SetExtraImage(self, image):
self._type = (1 if image is not None else 0)
self._ExtraImage = image
CT.GenericTreeItem.SetExtraImage = SetExtraImage
_DefaultGetCurrentCheckedImage = CT.GenericTreeItem.GetCurrentCheckedImage
def GetCurrentCheckedImage(self):
if self._ExtraImage is not None:
return self._ExtraImage
return _DefaultGetCurrentCheckedImage(self)
CT.GenericTreeItem.GetCurrentCheckedImage = GetCurrentCheckedImage
class CustomTree(CT.CustomTreeCtrl):
def __init__(self, *args, **kwargs):
CT.CustomTreeCtrl.__init__(self, *args, **kwargs)
self.BackgroundBitmap = None
self.BackgroundAlign = wx.ALIGN_LEFT|wx.ALIGN_TOP
self.AddMenu = None
self.Enabled = False
self.Bind(wx.EVT_SCROLLWIN, self.OnScroll)
self.Bind(wx.EVT_LEFT_UP, self.OnLeftUp)
def SetBackgroundBitmap(self, bitmap, align):
self.BackgroundBitmap = bitmap
self.BackgroundAlign = align
def SetImageListCheck(self, sizex, sizey, imglist=None):
CT.CustomTreeCtrl.SetImageListCheck(self, sizex, sizey, imglist=None)
self.ExtraImages = {}
for image in ["function", "functionBlock", "program"]:
self.ExtraImages[image] = self._imageListCheck.Add(GetBitmap(image.upper()))
def SetItemExtraImage(self, item, bitmap):
dc = wx.ClientDC(self)
image = self.ExtraImages.get(bitmap)
if image is not None:
item.SetExtraImage(image)
else:
item.SetExtraImage(None)
self.CalculateSize(item, dc)
self.RefreshLine(item)
def SetAddMenu(self, add_menu):
self.AddMenu = add_menu
def Enable(self, enabled):
self.Enabled = enabled
def GetBitmapRect(self):
client_size = self.GetClientSize()
bitmap_size = self.BackgroundBitmap.GetSize()
if self.BackgroundAlign & wx.ALIGN_RIGHT:
x = client_size[0] - bitmap_size[0]
elif self.BackgroundAlign & wx.ALIGN_CENTER_HORIZONTAL:
x = (client_size[0] - bitmap_size[0]) / 2
else:
x = 0
if self.BackgroundAlign & wx.ALIGN_BOTTOM:
y = client_size[1] - bitmap_size[1]
elif self.BackgroundAlign & wx.ALIGN_CENTER_VERTICAL:
y = (client_size[1] - bitmap_size[1]) / 2
else:
y = 0
return wx.Rect(x, y, bitmap_size[0], bitmap_size[1])
def OnLeftUp(self, event):
if self.Enabled:
pos = event.GetPosition()
item, flags = self.HitTest(pos)
bitmap_rect = self.GetBitmapRect()
if (bitmap_rect.InsideXY(pos.x, pos.y) or
flags & wx.TREE_HITTEST_NOWHERE) and self.AddMenu is not None:
wx.CallAfter(self.PopupMenuXY, self.AddMenu, pos.x, pos.y)
event.Skip()
def OnEraseBackground(self, event):
dc = event.GetDC()
if not dc:
dc = wx.ClientDC(self)
rect = self.GetUpdateRegion().GetBox()
dc.SetClippingRect(rect)
dc.Clear()
bitmap_rect = self.GetBitmapRect()
dc.DrawBitmap(self.BackgroundBitmap, bitmap_rect.x, bitmap_rect.y)
def OnScroll(self, event):
wx.CallAfter(self.Refresh)
event.Skip()
def OnSize(self, event):
CT.CustomTreeCtrl.OnSize(self, event)
self.Refresh()