Project

General

Profile

Revision c492be62

IDc492be629f06e3cf71fdf832ce2cd5ac1ec779f8
Parent cc558a8d
Child b00761a0

Added by Alex Zirbel over 12 years ago

Updated the licensing information in many files.

This is a broken commit because I decided to do this at a bad time. Sorry! The build will be working after next commit, I promise (and I won't push till then). This commit reflects the licensing in the files after I used my auto-add/remove script.

View differences:

scout/scoutsim/src/scoutsim.cpp
1
/*
2
 * This package was developed by the CMU Robotics Club project using code
3
 * from Willow Garage, Inc.  Please see licensing.txt for details.
1
/**
2
 * The code in this package was developed using the structure of Willow
3
 * Garage's turtlesim package.  It was modified by the CMU Robotics Club
4
 * to be used as a simulator for the Colony Scout robot.
4 5
 *
6
 * All redistribution of this code is limited to the terms of Willow Garage's
7
 * licensing terms, as well as under permission from the CMU Robotics Club.
8
 * 
9
 * Copyright (c) 2011 Colony Project
10
 * 
11
 * Permission is hereby granted, free of charge, to any person
12
 * obtaining a copy of this software and associated documentation
13
 * files (the "Software"), to deal in the Software without
14
 * restriction, including without limitation the rights to use,
15
 * copy, modify, merge, publish, distribute, sublicense, and/or sell
16
 * copies of the Software, and to permit persons to whom the
17
 * Software is furnished to do so, subject to the following
18
 * conditions:
19
 * 
20
 * The above copyright notice and this permission notice shall be
21
 * included in all copies or substantial portions of the Software.
22
 * 
23
 * Copyright (c) 2009, Willow Garage, Inc.
5 24
 * All rights reserved.
6
 *
7
 * @brief Runs the simulator, keeping track of all the scout robots.
8
 * @file scoutsim.cpp
9
 * @author Colony Project, CMU Robotics Club
10
 * @author Alex Zirbel
25
 * 
26
 * Redistribution and use in source and binary forms, with or without
27
 * modification, are permitted provided that the following conditions are met:
28
 * 
29
 *    Redistributions of source code must retain the above copyright
30
 *       notice, this list of conditions and the following disclaimer.
31
 *    Redistributions in binary form must reproduce the above copyright
32
 *       notice, this list of conditions and the following disclaimer in the
33
 *       documentation and/or other materials provided with the distribution.
34
 *    Neither the name of the Willow Garage, Inc. nor the names of its
35
 *       contributors may be used to endorse or promote products derived from
36
 *       this software without specific prior written permission.
37
 * 
38
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
39
 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
40
 * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
41
 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
42
 * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
43
 * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
44
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
45
 * OTHER DEALINGS IN THE SOFTWARE.
11 46
 */
12 47

  
13 48
#include <wx/app.h>
......
25 60

  
26 61
class ScoutApp : public wxApp
27 62
{
28
public:
29
  char** local_argv;
30
  ros::NodeHandlePtr nh;
63
    public:
64
        char** local_argv;
65
        ros::NodeHandlePtr nh;
31 66

  
32
  ScoutApp()
33
  {
34
  }
67
        ScoutApp()
68
        {
69
        }
35 70

  
36
  bool OnInit()
37
  {
71
        bool OnInit()
72
        {
38 73
#ifdef __WXMAC__
39
    ProcessSerialNumber PSN;
40
    GetCurrentProcess(&PSN);
41
    TransformProcessType(&PSN,kProcessTransformToForegroundApplication);
42
    SetFrontProcess(&PSN);
74
            ProcessSerialNumber PSN;
75
            GetCurrentProcess(&PSN);
76
            TransformProcessType(&PSN,kProcessTransformToForegroundApplication);
77
            SetFrontProcess(&PSN);
43 78
#endif
44 79

  
45
    // create our own copy of argv, with regular char*s.
46
    local_argv =  new char*[ argc ];
47
    for ( int i = 0; i < argc; ++i )
48
    {
49
      local_argv[ i ] = strdup( wxString( argv[ i ] ).mb_str() );
50
    }
80
            // Create our own copy of argv, with regular char*s.
81
            local_argv = new char*[ argc ];
82
            for ( int i = 0; i < argc; ++i )
83
            {
84
                local_argv[ i ] = strdup( wxString( argv[ i ] ).mb_str() );
85
            }
51 86

  
52
    ros::init(argc, local_argv, "scoutsim");
53
    nh.reset(new ros::NodeHandle);
87
            ros::init(argc, local_argv, "scoutsim");
88
            nh.reset(new ros::NodeHandle);
54 89

  
55
    wxInitAllImageHandlers();
90
            wxInitAllImageHandlers();
56 91

  
57
    scoutsim::SimFrame* frame = new scoutsim::SimFrame(NULL);
92
            scoutsim::SimFrame* frame = new scoutsim::SimFrame(NULL);
58 93

  
59
    SetTopWindow(frame);
60
    frame->Show();
94
            SetTopWindow(frame);
95
            frame->Show();
61 96

  
62
    return true;
63
  }
97
            return true;
98
        }
64 99

  
65
  int OnExit()
66
  {
67
    for ( int i = 0; i < argc; ++i )
68
    {
69
      free( local_argv[ i ] );
70
    }
71
    delete [] local_argv;
100
        int OnExit()
101
        {
102
            for ( int i = 0; i < argc; ++i )
103
            {
104
                free( local_argv[ i ] );
105
            }
106
            delete [] local_argv;
72 107

  
73
    return 0;
74
  }
108
            return 0;
109
        }
75 110
};
76 111

  
77 112
DECLARE_APP(ScoutApp);
78 113
IMPLEMENT_APP(ScoutApp);
79

  

Also available in: Unified diff