From 67cfc8b2c23177f036eda97f3423d062ba0c3e90 Mon Sep 17 00:00:00 2001
From: XaviDCR92 <xavi.dcr@gmail.com>
Date: Fri, 29 Dec 2017 23:19:43 +0100
Subject: * RWY_DIR and AIRCRAFT_DIRECTION have been joint into a single enum.
 * Game.c: new prototypes GameGetParkingDirection() and
 GameGetRunwayDirection(). * Slight optimizations into GameRenderLevel(). *
 Added some comment headers into Gfx.c.

---
 Source/MapEditor/MapEditor.pro.user |  2 +-
 Source/MapEditor/mainwindow.cpp     | 30 ++++++++++++++++-----
 Source/MapEditor/mainwindow.h       |  1 +
 Source/MapEditor/mainwindow.ui      | 52 +++++++++++++++++++++++--------------
 Source/MapEditor/settings.ini       |  2 +-
 5 files changed, 60 insertions(+), 27 deletions(-)

(limited to 'Source/MapEditor')

diff --git a/Source/MapEditor/MapEditor.pro.user b/Source/MapEditor/MapEditor.pro.user
index 5f8e915..91bb581 100644
--- a/Source/MapEditor/MapEditor.pro.user
+++ b/Source/MapEditor/MapEditor.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.3, 2017-12-29T02:58:01. -->
+<!-- Written by QtCreator 4.0.3, 2017-12-29T17:58:10. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/Source/MapEditor/mainwindow.cpp b/Source/MapEditor/mainwindow.cpp
index 89687eb..ed0bdc9 100644
--- a/Source/MapEditor/mainwindow.cpp
+++ b/Source/MapEditor/mainwindow.cpp
@@ -12,12 +12,16 @@ MainWindow::MainWindow(QWidget *parent) :
 {
     ui->setupUi(this);
 
-    connect(ui->LoadMap_Btn,        SIGNAL(released()),                 this,   SLOT(onLoadMap()));
-    connect(ui->CreateMap_Btn,      SIGNAL(released()),                 this,   SLOT(onCreateMap()));
-    connect(ui->saveMap_Btn,        SIGNAL(released()),                 this,   SLOT(onSaveMap(void)));
-    connect(gscene,                 SIGNAL(positionClicked(QPointF)),   this,   SLOT(onMapItemClicked(QPointF)));
-    connect(gscene,                 SIGNAL(noItemSelected(void)),       this,   SLOT(onNoItemSelected(void)));
-    connect(gscene,                 SIGNAL(updateSelectedItem(void)),   this,   SLOT(onListItemSelected(void)));
+    ui->centralWidget->setWindowTitle("Airport Map Editor");
+
+    connect(ui->LoadMap_Btn,            SIGNAL(released()),                 this,   SLOT(onLoadMap()));
+    connect(ui->CreateMap_Btn,          SIGNAL(released()),                 this,   SLOT(onCreateMap()));
+    connect(ui->saveMap_Btn,            SIGNAL(released()),                 this,   SLOT(onSaveMap(void)));
+    connect(ui->showNumbers_Checkbox,   SIGNAL(stateChanged(int)),          this,   SLOT(onShowNumbers(int)));
+
+    connect(gscene,                     SIGNAL(positionClicked(QPointF)),   this,   SLOT(onMapItemClicked(QPointF)));
+    connect(gscene,                     SIGNAL(noItemSelected(void)),       this,   SLOT(onNoItemSelected(void)));
+    connect(gscene,                     SIGNAL(updateSelectedItem(void)),   this,   SLOT(onListItemSelected(void)));
 
     appSettings();
     loadTilesetData();
@@ -29,6 +33,11 @@ MainWindow::~MainWindow()
     delete gscene;
 }
 
+void MainWindow::onShowNumbers(int)
+{
+    onProcessMapFile(map_buffer);
+}
+
 void MainWindow::onMapItemClicked(QPointF pos)
 {
     QPoint realPos;
@@ -314,6 +323,15 @@ void MainWindow::onProcessMapFile(QByteArray data)
 
             it->setX(x);
             it->setY(y);
+
+            if (ui->showNumbers_Checkbox->isChecked() == true)
+            {
+                QGraphicsTextItem* io = new QGraphicsTextItem();
+                io->setPos(x + (TILE_SIZE / 4), y);
+                io->setPlainText(QString::number(i + (j * level_size)));
+
+                gscene->addItem(io);
+            }
         }
     }
 
diff --git a/Source/MapEditor/mainwindow.h b/Source/MapEditor/mainwindow.h
index 52bb957..4926772 100644
--- a/Source/MapEditor/mainwindow.h
+++ b/Source/MapEditor/mainwindow.h
@@ -46,6 +46,7 @@ protected slots:
     void onNoItemSelected(void);
     void onListItemSelected(void);
     void onSaveMap(void);
+    void onShowNumbers(int);
 };
 
 #endif // MAINWINDOW_H
diff --git a/Source/MapEditor/mainwindow.ui b/Source/MapEditor/mainwindow.ui
index 54bcbb4..098a9f8 100644
--- a/Source/MapEditor/mainwindow.ui
+++ b/Source/MapEditor/mainwindow.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>920</width>
-    <height>582</height>
+    <height>605</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -24,7 +24,38 @@
     <bool>true</bool>
    </property>
    <layout class="QGridLayout" name="gridLayout">
-    <item row="3" column="0">
+    <item row="1" column="0">
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <widget class="QCheckBox" name="showNumbers_Checkbox">
+        <property name="text">
+         <string>Show numbers on map</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="mirror_CheckBox">
+        <property name="text">
+         <string>Mirror tile</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+    <item row="0" column="2">
+     <widget class="QGraphicsView" name="graphicsView">
+      <property name="minimumSize">
+       <size>
+        <width>640</width>
+        <height>480</height>
+       </size>
+      </property>
+     </widget>
+    </item>
+    <item row="4" column="0">
      <layout class="QHBoxLayout" name="horizontalLayout">
       <item>
        <widget class="QPushButton" name="CreateMap_Btn">
@@ -49,16 +80,6 @@
       </item>
      </layout>
     </item>
-    <item row="0" column="2">
-     <widget class="QGraphicsView" name="graphicsView">
-      <property name="minimumSize">
-       <size>
-        <width>640</width>
-        <height>480</height>
-       </size>
-      </property>
-     </widget>
-    </item>
     <item row="0" column="0">
      <widget class="QListWidget" name="listWidget">
       <property name="maximumSize">
@@ -69,13 +90,6 @@
       </property>
      </widget>
     </item>
-    <item row="1" column="0">
-     <widget class="QCheckBox" name="mirror_CheckBox">
-      <property name="text">
-       <string>Mirror tile</string>
-      </property>
-     </widget>
-    </item>
    </layout>
   </widget>
   <widget class="QMenuBar" name="menuBar">
diff --git a/Source/MapEditor/settings.ini b/Source/MapEditor/settings.ini
index af1583e..dc943fa 100644
--- a/Source/MapEditor/settings.ini
+++ b/Source/MapEditor/settings.ini
@@ -1,2 +1,2 @@
 [app_settings]
-last_dir=C:/cygwin/home/Xavier/Airport/Levels/LEVEL2.LVL
+last_dir=C:/cygwin/home/Xavier/Airport/Levels/LEVEL2_.LVL
-- 
cgit v1.2.3