Browse Source

Corrections apres essai en salle de TP

Sébastien DI MERCURIO 5 years ago
parent
commit
11ad235552

+ 2
- 1
software/monitor/monitor/MonitorUI.cs View File

@@ -46,7 +46,7 @@ public partial class MainWindow : Gtk.Window
46 46
     /// <summary>
47 47
     /// Position used for displaying position
48 48
     /// </summary>
49
-    private DestijlCommandManager.Position position=new DestijlCommandManager.Position();
49
+    //private DestijlCommandManager.Position position=new DestijlCommandManager.Position();
50 50
 
51 51
     /// <summary>
52 52
     /// List of availble state for the application
@@ -662,6 +662,7 @@ public partial class MainWindow : Gtk.Window
662 662
     /// </summary>
663 663
     /// <param name="sender">Sender object</param>
664 664
     /// <param name="e">Event</param>
665
+    /// 
665 666
     protected void OnButtonAskArenaClicked(object sender, EventArgs e)
666 667
     {
667 668
         // Send command to server for arean rendering

+ 83
- 85
software/monitor/monitor/gtk-gui/MainWindow.cs View File

@@ -530,92 +530,91 @@ public partial class MainWindow
530 530
 		this.table4.ColumnSpacing = ((uint)(6));
531 531
 		// Container child table4.Gtk.Table+TableChild
532 532
 		this.buttonDown = new global::Gtk.Button();
533
-		global::Gtk.Tooltips w40 = new Gtk.Tooltips();
534
-		w40.SetTip(this.buttonDown, "Move robot backward", "Move robot backward");
533
+		this.buttonDown.TooltipMarkup = "Move robot backward";
535 534
 		this.buttonDown.CanFocus = true;
536 535
 		this.buttonDown.Name = "buttonDown";
537 536
 		this.buttonDown.UseUnderline = true;
538
-		global::Gtk.Image w41 = new global::Gtk.Image();
539
-		w41.Pixbuf = global::Gdk.Pixbuf.LoadFromResource("monitor.ressources.pan-down-symbolic.symbolic.png");
540
-		this.buttonDown.Image = w41;
537
+		global::Gtk.Image w40 = new global::Gtk.Image();
538
+		w40.Pixbuf = global::Gdk.Pixbuf.LoadFromResource("monitor.ressources.pan-down-symbolic.symbolic.png");
539
+		this.buttonDown.Image = w40;
541 540
 		this.table4.Add(this.buttonDown);
542
-		global::Gtk.Table.TableChild w42 = ((global::Gtk.Table.TableChild)(this.table4[this.buttonDown]));
543
-		w42.TopAttach = ((uint)(2));
544
-		w42.BottomAttach = ((uint)(3));
545
-		w42.LeftAttach = ((uint)(1));
546
-		w42.RightAttach = ((uint)(2));
547
-		w42.XOptions = ((global::Gtk.AttachOptions)(4));
548
-		w42.YOptions = ((global::Gtk.AttachOptions)(4));
541
+		global::Gtk.Table.TableChild w41 = ((global::Gtk.Table.TableChild)(this.table4[this.buttonDown]));
542
+		w41.TopAttach = ((uint)(2));
543
+		w41.BottomAttach = ((uint)(3));
544
+		w41.LeftAttach = ((uint)(1));
545
+		w41.RightAttach = ((uint)(2));
546
+		w41.XOptions = ((global::Gtk.AttachOptions)(4));
547
+		w41.YOptions = ((global::Gtk.AttachOptions)(4));
549 548
 		// Container child table4.Gtk.Table+TableChild
550 549
 		this.buttonForward = new global::Gtk.Button();
551
-		w40.SetTip(this.buttonForward, "Move robot forward", "Move robot forward");
550
+		this.buttonForward.TooltipMarkup = "Move robot forward";
552 551
 		this.buttonForward.CanFocus = true;
553 552
 		this.buttonForward.Name = "buttonForward";
554 553
 		this.buttonForward.UseUnderline = true;
555
-		global::Gtk.Image w43 = new global::Gtk.Image();
556
-		w43.Pixbuf = global::Gdk.Pixbuf.LoadFromResource("monitor.ressources.pan-up-symbolic.symbolic.png");
557
-		this.buttonForward.Image = w43;
554
+		global::Gtk.Image w42 = new global::Gtk.Image();
555
+		w42.Pixbuf = global::Gdk.Pixbuf.LoadFromResource("monitor.ressources.pan-up-symbolic.symbolic.png");
556
+		this.buttonForward.Image = w42;
558 557
 		this.table4.Add(this.buttonForward);
559
-		global::Gtk.Table.TableChild w44 = ((global::Gtk.Table.TableChild)(this.table4[this.buttonForward]));
560
-		w44.LeftAttach = ((uint)(1));
561
-		w44.RightAttach = ((uint)(2));
562
-		w44.XOptions = ((global::Gtk.AttachOptions)(4));
563
-		w44.YOptions = ((global::Gtk.AttachOptions)(4));
558
+		global::Gtk.Table.TableChild w43 = ((global::Gtk.Table.TableChild)(this.table4[this.buttonForward]));
559
+		w43.LeftAttach = ((uint)(1));
560
+		w43.RightAttach = ((uint)(2));
561
+		w43.XOptions = ((global::Gtk.AttachOptions)(4));
562
+		w43.YOptions = ((global::Gtk.AttachOptions)(4));
564 563
 		// Container child table4.Gtk.Table+TableChild
565 564
 		this.buttonLeft = new global::Gtk.Button();
566
-		w40.SetTip(this.buttonLeft, "Turn robot to the left", "Turn robot to the left");
565
+		this.buttonLeft.TooltipMarkup = "Turn robot to the left";
567 566
 		this.buttonLeft.CanFocus = true;
568 567
 		this.buttonLeft.Name = "buttonLeft";
569 568
 		this.buttonLeft.UseUnderline = true;
570
-		global::Gtk.Image w45 = new global::Gtk.Image();
571
-		w45.Pixbuf = global::Gdk.Pixbuf.LoadFromResource("monitor.ressources.pan-start-symbolic.symbolic.png");
572
-		this.buttonLeft.Image = w45;
569
+		global::Gtk.Image w44 = new global::Gtk.Image();
570
+		w44.Pixbuf = global::Gdk.Pixbuf.LoadFromResource("monitor.ressources.pan-start-symbolic.symbolic.png");
571
+		this.buttonLeft.Image = w44;
573 572
 		this.table4.Add(this.buttonLeft);
574
-		global::Gtk.Table.TableChild w46 = ((global::Gtk.Table.TableChild)(this.table4[this.buttonLeft]));
575
-		w46.TopAttach = ((uint)(1));
576
-		w46.BottomAttach = ((uint)(2));
577
-		w46.XOptions = ((global::Gtk.AttachOptions)(4));
578
-		w46.YOptions = ((global::Gtk.AttachOptions)(4));
573
+		global::Gtk.Table.TableChild w45 = ((global::Gtk.Table.TableChild)(this.table4[this.buttonLeft]));
574
+		w45.TopAttach = ((uint)(1));
575
+		w45.BottomAttach = ((uint)(2));
576
+		w45.XOptions = ((global::Gtk.AttachOptions)(4));
577
+		w45.YOptions = ((global::Gtk.AttachOptions)(4));
579 578
 		// Container child table4.Gtk.Table+TableChild
580 579
 		this.buttonRight = new global::Gtk.Button();
581
-		w40.SetTip(this.buttonRight, "Turn robot to the right", "Turn robot to the right");
580
+		this.buttonRight.TooltipMarkup = "Turn robot to the right";
582 581
 		this.buttonRight.CanFocus = true;
583 582
 		this.buttonRight.Name = "buttonRight";
584 583
 		this.buttonRight.UseUnderline = true;
585
-		global::Gtk.Image w47 = new global::Gtk.Image();
586
-		w47.Pixbuf = global::Gdk.Pixbuf.LoadFromResource("monitor.ressources.pan-end-symbolic.symbolic.png");
587
-		this.buttonRight.Image = w47;
584
+		global::Gtk.Image w46 = new global::Gtk.Image();
585
+		w46.Pixbuf = global::Gdk.Pixbuf.LoadFromResource("monitor.ressources.pan-end-symbolic.symbolic.png");
586
+		this.buttonRight.Image = w46;
588 587
 		this.table4.Add(this.buttonRight);
589
-		global::Gtk.Table.TableChild w48 = ((global::Gtk.Table.TableChild)(this.table4[this.buttonRight]));
590
-		w48.TopAttach = ((uint)(1));
591
-		w48.BottomAttach = ((uint)(2));
592
-		w48.LeftAttach = ((uint)(2));
593
-		w48.RightAttach = ((uint)(3));
594
-		w48.XOptions = ((global::Gtk.AttachOptions)(4));
595
-		w48.YOptions = ((global::Gtk.AttachOptions)(4));
588
+		global::Gtk.Table.TableChild w47 = ((global::Gtk.Table.TableChild)(this.table4[this.buttonRight]));
589
+		w47.TopAttach = ((uint)(1));
590
+		w47.BottomAttach = ((uint)(2));
591
+		w47.LeftAttach = ((uint)(2));
592
+		w47.RightAttach = ((uint)(3));
593
+		w47.XOptions = ((global::Gtk.AttachOptions)(4));
594
+		w47.YOptions = ((global::Gtk.AttachOptions)(4));
596 595
 		// Container child table4.Gtk.Table+TableChild
597 596
 		this.buttonStop = new global::Gtk.Button();
598
-		w40.SetTip(this.buttonStop, "Stop robot movements", "Stop robot movements");
597
+		this.buttonStop.TooltipMarkup = "Stop robot movements";
599 598
 		this.buttonStop.CanFocus = true;
600 599
 		this.buttonStop.Name = "buttonStop";
601 600
 		this.buttonStop.UseUnderline = true;
602
-		global::Gtk.Image w49 = new global::Gtk.Image();
603
-		w49.Pixbuf = global::Gdk.Pixbuf.LoadFromResource("monitor.ressources.hand-filled-32.png");
604
-		this.buttonStop.Image = w49;
601
+		global::Gtk.Image w48 = new global::Gtk.Image();
602
+		w48.Pixbuf = global::Gdk.Pixbuf.LoadFromResource("monitor.ressources.hand-filled-32.png");
603
+		this.buttonStop.Image = w48;
605 604
 		this.table4.Add(this.buttonStop);
606
-		global::Gtk.Table.TableChild w50 = ((global::Gtk.Table.TableChild)(this.table4[this.buttonStop]));
607
-		w50.TopAttach = ((uint)(1));
608
-		w50.BottomAttach = ((uint)(2));
609
-		w50.LeftAttach = ((uint)(1));
610
-		w50.RightAttach = ((uint)(2));
611
-		w50.XOptions = ((global::Gtk.AttachOptions)(4));
612
-		w50.YOptions = ((global::Gtk.AttachOptions)(4));
605
+		global::Gtk.Table.TableChild w49 = ((global::Gtk.Table.TableChild)(this.table4[this.buttonStop]));
606
+		w49.TopAttach = ((uint)(1));
607
+		w49.BottomAttach = ((uint)(2));
608
+		w49.LeftAttach = ((uint)(1));
609
+		w49.RightAttach = ((uint)(2));
610
+		w49.XOptions = ((global::Gtk.AttachOptions)(4));
611
+		w49.YOptions = ((global::Gtk.AttachOptions)(4));
613 612
 		this.alignment8.Add(this.table4);
614 613
 		this.vbox9.Add(this.alignment8);
615
-		global::Gtk.Box.BoxChild w52 = ((global::Gtk.Box.BoxChild)(this.vbox9[this.alignment8]));
616
-		w52.Position = 0;
617
-		w52.Expand = false;
618
-		w52.Fill = false;
614
+		global::Gtk.Box.BoxChild w51 = ((global::Gtk.Box.BoxChild)(this.vbox9[this.alignment8]));
615
+		w51.Position = 0;
616
+		w51.Expand = false;
617
+		w51.Fill = false;
619 618
 		// Container child vbox9.Gtk.Box+BoxChild
620 619
 		this.table3 = new global::Gtk.Table(((uint)(1)), ((uint)(2)), false);
621 620
 		this.table3.Name = "table3";
@@ -628,10 +627,10 @@ public partial class MainWindow
628 627
 		this.label3.LabelProp = global::Mono.Unix.Catalog.GetString("Battery level:");
629 628
 		this.label3.Justify = ((global::Gtk.Justification)(1));
630 629
 		this.table3.Add(this.label3);
631
-		global::Gtk.Table.TableChild w53 = ((global::Gtk.Table.TableChild)(this.table3[this.label3]));
632
-		w53.YPadding = ((uint)(10));
633
-		w53.XOptions = ((global::Gtk.AttachOptions)(4));
634
-		w53.YOptions = ((global::Gtk.AttachOptions)(4));
630
+		global::Gtk.Table.TableChild w52 = ((global::Gtk.Table.TableChild)(this.table3[this.label3]));
631
+		w52.YPadding = ((uint)(10));
632
+		w52.XOptions = ((global::Gtk.AttachOptions)(4));
633
+		w52.YOptions = ((global::Gtk.AttachOptions)(4));
635 634
 		// Container child table3.Gtk.Table+TableChild
636 635
 		this.labelBatteryLevel = new global::Gtk.Label();
637 636
 		this.labelBatteryLevel.Name = "labelBatteryLevel";
@@ -639,49 +638,48 @@ public partial class MainWindow
639 638
 		this.labelBatteryLevel.Xalign = 0F;
640 639
 		this.labelBatteryLevel.LabelProp = global::Mono.Unix.Catalog.GetString("Unknown");
641 640
 		this.table3.Add(this.labelBatteryLevel);
642
-		global::Gtk.Table.TableChild w54 = ((global::Gtk.Table.TableChild)(this.table3[this.labelBatteryLevel]));
643
-		w54.LeftAttach = ((uint)(1));
644
-		w54.RightAttach = ((uint)(2));
645
-		w54.YOptions = ((global::Gtk.AttachOptions)(4));
641
+		global::Gtk.Table.TableChild w53 = ((global::Gtk.Table.TableChild)(this.table3[this.labelBatteryLevel]));
642
+		w53.LeftAttach = ((uint)(1));
643
+		w53.RightAttach = ((uint)(2));
644
+		w53.YOptions = ((global::Gtk.AttachOptions)(4));
646 645
 		this.vbox9.Add(this.table3);
647
-		global::Gtk.Box.BoxChild w55 = ((global::Gtk.Box.BoxChild)(this.vbox9[this.table3]));
648
-		w55.Position = 2;
649
-		w55.Expand = false;
650
-		w55.Fill = false;
646
+		global::Gtk.Box.BoxChild w54 = ((global::Gtk.Box.BoxChild)(this.vbox9[this.table3]));
647
+		w54.Position = 2;
648
+		w54.Expand = false;
649
+		w54.Fill = false;
651 650
 		// Container child vbox9.Gtk.Box+BoxChild
652 651
 		this.checkButtonGetBattery = new global::Gtk.CheckButton();
653 652
 		this.checkButtonGetBattery.CanFocus = true;
654 653
 		this.checkButtonGetBattery.Name = "checkButtonGetBattery";
655 654
 		this.checkButtonGetBattery.Label = global::Mono.Unix.Catalog.GetString("Get battery level");
656
-		this.checkButtonGetBattery.Active = true;
657 655
 		this.checkButtonGetBattery.DrawIndicator = true;
658 656
 		this.checkButtonGetBattery.UseUnderline = true;
659 657
 		this.vbox9.Add(this.checkButtonGetBattery);
660
-		global::Gtk.Box.BoxChild w56 = ((global::Gtk.Box.BoxChild)(this.vbox9[this.checkButtonGetBattery]));
661
-		w56.Position = 3;
662
-		w56.Expand = false;
663
-		w56.Fill = false;
658
+		global::Gtk.Box.BoxChild w55 = ((global::Gtk.Box.BoxChild)(this.vbox9[this.checkButtonGetBattery]));
659
+		w55.Position = 3;
660
+		w55.Expand = false;
661
+		w55.Fill = false;
664 662
 		this.gtkAlignmentRobotControl.Add(this.vbox9);
665 663
 		this.vbox12.Add(this.gtkAlignmentRobotControl);
666
-		global::Gtk.Box.BoxChild w58 = ((global::Gtk.Box.BoxChild)(this.vbox12[this.gtkAlignmentRobotControl]));
667
-		w58.Position = 1;
664
+		global::Gtk.Box.BoxChild w57 = ((global::Gtk.Box.BoxChild)(this.vbox12[this.gtkAlignmentRobotControl]));
665
+		w57.Position = 1;
668 666
 		this.vbox5.Add(this.vbox12);
669
-		global::Gtk.Box.BoxChild w59 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.vbox12]));
670
-		w59.Position = 4;
667
+		global::Gtk.Box.BoxChild w58 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.vbox12]));
668
+		w58.Position = 4;
671 669
 		this.alignment3.Add(this.vbox5);
672 670
 		this.hbox3.Add(this.alignment3);
673
-		global::Gtk.Box.BoxChild w61 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.alignment3]));
671
+		global::Gtk.Box.BoxChild w60 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.alignment3]));
672
+		w60.Position = 1;
673
+		w60.Expand = false;
674
+		w60.Fill = false;
675
+		this.hbox1.Add(this.hbox3);
676
+		global::Gtk.Box.BoxChild w61 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.hbox3]));
674 677
 		w61.Position = 1;
675 678
 		w61.Expand = false;
676 679
 		w61.Fill = false;
677
-		this.hbox1.Add(this.hbox3);
678
-		global::Gtk.Box.BoxChild w62 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.hbox3]));
679
-		w62.Position = 1;
680
-		w62.Expand = false;
681
-		w62.Fill = false;
682 680
 		this.vbox1.Add(this.hbox1);
683
-		global::Gtk.Box.BoxChild w63 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.hbox1]));
684
-		w63.Position = 1;
681
+		global::Gtk.Box.BoxChild w62 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.hbox1]));
682
+		w62.Position = 1;
685 683
 		this.Add(this.vbox1);
686 684
 		if ((this.Child != null))
687 685
 		{

+ 2
- 1
software/monitor/monitor/gtk-gui/gui.stetic View File

@@ -2,10 +2,11 @@
2 2
 <stetic-interface>
3 3
   <configuration>
4 4
     <images-root-path>..</images-root-path>
5
+    <target-gtk-version>2.12</target-gtk-version>
5 6
   </configuration>
6 7
   <import>
7
-    <widget-library name="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
8 8
     <widget-library name="../bin/Debug/monitor.exe" internal="true" />
9
+    <widget-library name="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
9 10
   </import>
10 11
   <widget class="Gtk.Window" id="MainWindow" design-size="1025 686">
11 12
     <action-group name="Default">

BIN
software/monitor/monitor/monitor View File


+ 9
- 19
software/monitor/monitor/monitor.csproj View File

@@ -7,7 +7,7 @@
7 7
     <OutputType>WinExe</OutputType>
8 8
     <RootNamespace>monitor</RootNamespace>
9 9
     <AssemblyName>monitor</AssemblyName>
10
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
10
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11 11
   </PropertyGroup>
12 12
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
13 13
     <DebugSymbols>true</DebugSymbols>
@@ -38,26 +38,16 @@
38 38
   </PropertyGroup>
39 39
   <ItemGroup>
40 40
     <Reference Include="System" />
41
-    <Reference Include="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
42
-      <SpecificVersion>False</SpecificVersion>
43
-    </Reference>
44
-    <Reference Include="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
45
-      <SpecificVersion>False</SpecificVersion>
46
-    </Reference>
47
-    <Reference Include="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
48
-      <SpecificVersion>False</SpecificVersion>
49
-    </Reference>
50
-    <Reference Include="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
51
-      <SpecificVersion>False</SpecificVersion>
52
-    </Reference>
53
-    <Reference Include="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
54
-      <SpecificVersion>False</SpecificVersion>
55
-    </Reference>
56
-    <Reference Include="atk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
57
-      <SpecificVersion>False</SpecificVersion>
58
-    </Reference>
59 41
     <Reference Include="Mono.Posix" />
60 42
     <Reference Include="Mono.Cairo" />
43
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
44
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
45
+    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
46
+    <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
47
+    <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
48
+    <Reference Include="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
49
+    <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
50
+    <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
61 51
   </ItemGroup>
62 52
   <ItemGroup>
63 53
     <EmbeddedResource Include="gtk-gui\gui.stetic">

+ 105
- 0
software/pi@10.105.0.11 View File

@@ -0,0 +1,105 @@
1
+#!/bin/bash
2
+
3
+######################################
4
+# INSTALL OPENCV ON UBUNTU OR DEBIAN #
5
+######################################
6
+
7
+# |          THIS SCRIPT IS TESTED CORRECTLY ON          |
8
+# |------------------------------------------------------|
9
+# | OS               | OpenCV       | Test | Last test   |
10
+# |------------------|--------------|------|-------------|
11
+# | Ubuntu 18.04 LTS | OpenCV 3.4.2 | OK   | 18 Jul 2018 |
12
+# | Debian 9.5       | OpenCV 3.4.2 | OK   | 18 Jul 2018 |
13
+# |----------------------------------------------------- |
14
+# | Debian 9.0       | OpenCV 3.2.0 | OK   | 25 Jun 2017 |
15
+# | Debian 8.8       | OpenCV 3.2.0 | OK   | 20 May 2017 |
16
+# | Ubuntu 16.04 LTS | OpenCV 3.2.0 | OK   | 20 May 2017 |
17
+
18
+
19
+# VERSION TO BE INSTALLED
20
+
21
+OPENCV_VERSION='3.4.2'
22
+
23
+mkdir opencv
24
+cd opencv
25
+# 1. KEEP UBUNTU OR DEBIAN UP TO DATE
26
+
27
+sudo apt-get -y update
28
+# sudo apt-get -y upgrade       # Uncomment this line to install the newest versions of all packages currently installed
29
+# sudo apt-get -y dist-upgrade  # Uncomment this line to, in addition to 'upgrade', handles changing dependencies with new versions of packages
30
+# sudo apt-get -y autoremove    # Uncomment this line to remove packages that are now no longer needed
31
+
32
+
33
+# 2. INSTALL THE DEPENDENCIES
34
+
35
+# Build tools:
36
+sudo apt-get install -y build-essential cmake
37
+
38
+# GUI (if you want to use GTK instead of Qt, replace 'qt5-default' with 'libgtkglext1-dev' and remove '-DWITH_QT=ON' option in CMake):
39
+#sudo apt-get install -y qt5-default libvtk6-dev
40
+sudo apt-get install -y libgtkglext1-dev
41
+
42
+# Media I/O:
43
+sudo apt-get install -y zlib1g-dev libjpeg-dev libwebp-dev libpng-dev libtiff5-dev libjasper-dev libopenexr-dev libgdal-dev
44
+
45
+# Video I/O:
46
+sudo apt-get install -y libdc1394-22-dev libavcodec-dev libavformat-dev libswscale-dev libtheora-dev libvorbis-dev libxvidcore-dev libx264-dev yasm libopencore-amrnb-dev libopencore-amrwb-dev libv4l-dev libxine2-dev
47
+
48
+# Parallelism and linear algebra libraries:
49
+sudo apt-get install -y libtbb-dev libeigen3-dev
50
+
51
+# Python:
52
+sudo apt-get install -y python-dev python-tk python-numpy python3-dev python3-tk python3-numpy
53
+
54
+# Java:
55
+sudo apt-get install -y ant default-jdk
56
+
57
+# Documentation:
58
+sudo apt-get install -y doxygen
59
+
60
+
61
+# 3. INSTALL THE LIBRARY
62
+
63
+sudo apt-get install -y unzip wget
64
+wget https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip
65
+
66
+unzip ${OPENCV_VERSION}.zip
67
+rm ${OPENCV_VERSION}.zip
68
+mv opencv-${OPENCV_VERSION} OpenCV
69
+
70
+# 3.5 Add Aruco
71
+# Get opencv_contrib from github
72
+# Copy aruco directory from <opencv_contrib>/modules to <opencv>/modules
73
+wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip
74
+mv ${OPENCV_VERSION}.zip opencv_contrib-${OPENCV_VERSION}.zip
75
+unzip opencv_contrib-${OPENCV_VERSION}.zip
76
+
77
+cd OpenCV
78
+mkdir build
79
+cd build
80
+# cmake -DWITH_QT=ON -DWITH_OPENGL=ON -DFORCE_VTK=ON -DWITH_TBB=ON -DWITH_GDAL=ON -DWITH_XINE=ON -DBUILD_EXAMPLES=ON -DENABLE_PRECOMPILED_HEADERS=OFF ..
81
+cmake -DWITH_OPENGL=ON -DFORCE_VTK=ON -DWITH_TBB=ON -DWITH_GDAL=ON -DWITH_XINE=ON -DBUILD_EXAMPLES=ON -DENABLE_PRECOMPILED_HEADERS=ON -D INSTALL_C_EXAMPLES=ON -D BUILD_JAVA=OFF -D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules -DBUILD_aruco=ON ..
82
+make -j5
83
+sudo make install
84
+sudo ldconfig
85
+
86
+# 4. Compile raspicam
87
+cd ~
88
+cd opencv
89
+
90
+wget https://sourceforge.net/projects/raspicam/files/latest/raspicam.zip
91
+unzip raspicam.zip
92
+cd raspicam-0.1.6
93
+
94
+mkdir build
95
+cd build
96
+cmake ..
97
+
98
+make -j5
99
+sudo make install
100
+sudo ldconfig
101
+
102
+
103
+# 4. EXECUTE SOME OPENCV EXAMPLES AND COMPILE A DEMONSTRATION
104
+
105
+# To complete this step, please visit 'http://milq.github.io/install-opencv-ubuntu-debian'.

+ 0
- 1
software/raspberry/superviseur-robot/.gitignore View File

@@ -4,7 +4,6 @@ cmake-build-debug/
4 4
 futur/
5 5
 CMakeFiles/
6 6
 
7
-Makefile
8 7
 *.cmake
9 8
 CMakeCache.txt
10 9
 

+ 128
- 0
software/raspberry/superviseur-robot/Makefile View File

@@ -0,0 +1,128 @@
1
+#
2
+#  There exist several targets which are by default empty and which can be 
3
+#  used for execution of your targets. These targets are usually executed 
4
+#  before and after some main targets. They are: 
5
+#
6
+#     .build-pre:              called before 'build' target
7
+#     .build-post:             called after 'build' target
8
+#     .clean-pre:              called before 'clean' target
9
+#     .clean-post:             called after 'clean' target
10
+#     .clobber-pre:            called before 'clobber' target
11
+#     .clobber-post:           called after 'clobber' target
12
+#     .all-pre:                called before 'all' target
13
+#     .all-post:               called after 'all' target
14
+#     .help-pre:               called before 'help' target
15
+#     .help-post:              called after 'help' target
16
+#
17
+#  Targets beginning with '.' are not intended to be called on their own.
18
+#
19
+#  Main targets can be executed directly, and they are:
20
+#  
21
+#     build                    build a specific configuration
22
+#     clean                    remove built files from a configuration
23
+#     clobber                  remove all built files
24
+#     all                      build all configurations
25
+#     help                     print help mesage
26
+#  
27
+#  Targets .build-impl, .clean-impl, .clobber-impl, .all-impl, and
28
+#  .help-impl are implemented in nbproject/makefile-impl.mk.
29
+#
30
+#  Available make variables:
31
+#
32
+#     CND_BASEDIR                base directory for relative paths
33
+#     CND_DISTDIR                default top distribution directory (build artifacts)
34
+#     CND_BUILDDIR               default top build directory (object files, ...)
35
+#     CONF                       name of current configuration
36
+#     CND_PLATFORM_${CONF}       platform name (current configuration)
37
+#     CND_ARTIFACT_DIR_${CONF}   directory of build artifact (current configuration)
38
+#     CND_ARTIFACT_NAME_${CONF}  name of build artifact (current configuration)
39
+#     CND_ARTIFACT_PATH_${CONF}  path to build artifact (current configuration)
40
+#     CND_PACKAGE_DIR_${CONF}    directory of package (current configuration)
41
+#     CND_PACKAGE_NAME_${CONF}   name of package (current configuration)
42
+#     CND_PACKAGE_PATH_${CONF}   path to package (current configuration)
43
+#
44
+# NOCDDL
45
+
46
+
47
+# Environment 
48
+MKDIR=mkdir
49
+CP=cp
50
+CCADMIN=CCadmin
51
+
52
+
53
+# build
54
+build: .build-post
55
+
56
+.build-pre:
57
+# Add your pre 'build' code here...
58
+
59
+.build-post: .build-impl
60
+# Add your post 'build' code here...
61
+
62
+
63
+# clean
64
+clean: .clean-post
65
+
66
+.clean-pre:
67
+# Add your pre 'clean' code here...
68
+
69
+.clean-post: .clean-impl
70
+# Add your post 'clean' code here...
71
+
72
+
73
+# clobber
74
+clobber: .clobber-post
75
+
76
+.clobber-pre:
77
+# Add your pre 'clobber' code here...
78
+
79
+.clobber-post: .clobber-impl
80
+# Add your post 'clobber' code here...
81
+
82
+
83
+# all
84
+all: .all-post
85
+
86
+.all-pre:
87
+# Add your pre 'all' code here...
88
+
89
+.all-post: .all-impl
90
+# Add your post 'all' code here...
91
+
92
+
93
+# build tests
94
+build-tests: .build-tests-post
95
+
96
+.build-tests-pre:
97
+# Add your pre 'build-tests' code here...
98
+
99
+.build-tests-post: .build-tests-impl
100
+# Add your post 'build-tests' code here...
101
+
102
+
103
+# run tests
104
+test: .test-post
105
+
106
+.test-pre: build-tests
107
+# Add your pre 'test' code here...
108
+
109
+.test-post: .test-impl
110
+# Add your post 'test' code here...
111
+
112
+
113
+# help
114
+help: .help-post
115
+
116
+.help-pre:
117
+# Add your pre 'help' code here...
118
+
119
+.help-post: .help-impl
120
+# Add your post 'help' code here...
121
+
122
+
123
+
124
+# include project implementation makefile
125
+include nbproject/Makefile-impl.mk
126
+
127
+# include project make variables
128
+include nbproject/Makefile-variables.mk

Loading…
Cancel
Save