Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 7 files changed
  • 0 commit comments
  • 1 contributor
Commits on Jun 22, 2012
Cameron Finucane fix bugs to make compatible with wx2.9 6458004
Cameron Finucane fix typo in viconPose default values 3ac684e
View
2  src/etc/wxglade/configEditor.wxg
@@ -589,7 +589,7 @@
<option>1</option>
<object class="wxFlexGridSizer" name="sizer_9" base="EditFlexGridSizer">
<hgap>7</hgap>
- <rows>1</rows>
+ <rows>0</rows>
<growable_cols>1</growable_cols>
<cols>3</cols>
<vgap>2</vgap>
View
4 src/lib/configEditor.py
@@ -792,7 +792,7 @@ def __do_layout(self):
# begin wxGlade: addRobotDialog.__do_layout
sizer_5 = wx.BoxSizer(wx.VERTICAL)
sizer_11 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_9 = wx.FlexGridSizer(1, 3, 2, 7)
+ sizer_9 = wx.FlexGridSizer(0, 3, 2, 7)
sizer_8 = wx.BoxSizer(wx.HORIZONTAL)
sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
sizer_7.Add(self.label_3, 0, wx.ALL, 5)
@@ -895,7 +895,7 @@ def onClickOK(self, event): # wxGlade: addRobotDialog.<event_handler>
event.Skip()
def onChooseRobot(self, event): # wxGlade: addRobotDialog.<event_handler>
- self.robot = deepcopy([r for r in self.proj.hsub.robots if r.type == event.GetString()][0])
+ self.robot = deepcopy(self.proj.hsub.getRobotByType(event.GetEventObject().GetValue()))
self._robot2dialog(self.robot)
event.Skip()
View
2  src/lib/execute.py
@@ -163,7 +163,7 @@ def main(argv):
# Create a subprocess
print "Starting GUI window and listen thread..."
- p_gui = subprocess.Popen(["python",os.path.join(proj.ltlmop_root, "lib", "simGUI.py")], stderr=subprocess.PIPE, stdin=subprocess.PIPE)
+ p_gui = subprocess.Popen(["python","-u",os.path.join(proj.ltlmop_root, "lib", "simGUI.py")])
# Create new thread to communicate with subwindow
View
2  src/lib/handlers/pose/viconPose.py
@@ -17,7 +17,7 @@ def __init__(self, proj, shared_data,host,port,x_VICON_name,y_VICON_name,theta_V
host (string): The ip address of VICON system (default="10.0.0.102")
port (int): The port of VICON system (default=800)
x_VICON_name (string): The name of the stream for x pose of the robot in VICON system (default="SubjectName:SegmentName <t-X>")
- y_VICON_name (string): The name of the stream for y pose of the robot in VICON system (default="SubjectName:SegmentName <t-X>")
+ y_VICON_name (string): The name of the stream for y pose of the robot in VICON system (default="SubjectName:SegmentName <t-Y>")
theta_VICON_name (string): The name of the stream for orintation of the robot in VICON system (default="SubjectName:SegmentName <a-Z>")
"""
View
5 src/lib/mapRenderer.py
@@ -158,10 +158,9 @@ def drawMap(target, rfi, scaleToFit=True, drawLabels=True, highlightList=[], dee
dc = wx.GCDC(pdc)
except:
dc = pdc
- else:
- target.PrepareDC(pdc)
- target.PrepareDC(dc)
+ if isinstance(target, wx.ScrolledWindow):
+ target.PrepareDC(dc)
dc.BeginDrawing()
View
5 src/lib/simGUI.py
@@ -51,7 +51,7 @@ def __init__(self, *args, **kwds):
self.window_1_pane_1.SetBackgroundStyle(wx.BG_STYLE_CUSTOM)
self.mapBitmap = None
- self.Bind(wx.EVT_PAINT, self.onPaint)
+ self.window_1_pane_1.Bind(wx.EVT_PAINT, self.onPaint)
self.Bind(wx.EVT_ERASE_BACKGROUND, self.onEraseBG)
# Make status bar at bottom.
@@ -236,10 +236,7 @@ def onPaint(self, event=None):
dc = wx.GCDC(pdc)
except:
dc = pdc
- else:
- self.window_1_pane_1.PrepareDC(pdc)
- self.window_1_pane_1.PrepareDC(dc)
dc.BeginDrawing()
# Draw background
View
4 src/specEditor.py
@@ -311,11 +311,11 @@ def __init__(self, *args, **kwds):
self.text_ctrl_spec.Bind(wx.stc.EVT_STC_STYLENEEDED, self.onStyleNeeded)
self.text_ctrl_spec.StyleSetFont(wx.stc.STC_P_DEFAULT, wx.Font(12, wx.SWISS, wx.NORMAL, wx.NORMAL, False, u'Consolas'))
self.text_ctrl_spec.StyleSetFont(wx.stc.STC_P_COMMENTLINE, wx.Font(12, wx.SWISS, wx.NORMAL, wx.BOLD, False, u'Consolas'))
- self.text_ctrl_spec.StyleSetForeground(wx.stc.STC_P_COMMENTLINE, wx.Color(0, 200, 0))
+ self.text_ctrl_spec.StyleSetForeground(wx.stc.STC_P_COMMENTLINE, wx.Colour(0, 200, 0))
self.text_ctrl_spec.StyleSetFont(wx.stc.STC_P_WORD, wx.Font(12, wx.SWISS, wx.NORMAL, wx.BOLD, False, u'Consolas'))
self.text_ctrl_spec.StyleSetForeground(wx.stc.STC_P_WORD, wx.BLUE)
self.text_ctrl_spec.StyleSetFont(wx.stc.STC_P_STRING, wx.Font(12, wx.SWISS, wx.NORMAL, wx.BOLD, False, u'Consolas'))
- self.text_ctrl_spec.StyleSetForeground(wx.stc.STC_P_STRING, wx.Color(200, 200, 0))
+ self.text_ctrl_spec.StyleSetForeground(wx.stc.STC_P_STRING, wx.Colour(200, 200, 0))
self.text_ctrl_spec.SetWrapMode(wx.stc.STC_WRAP_WORD)

No commit comments for this range

Something went wrong with that request. Please try again.