Skip to content
Snippets Groups Projects
Commit d01abff0 authored by Uwe Woessner's avatar Uwe Woessner
Browse files

removed pcm_definitions and replaced it with

#include "common/globalDefinitions.h"
parent 27104426
No related branches found
No related tags found
No related merge requests found
Showing with 12 additions and 43 deletions
......@@ -50,8 +50,7 @@ set(SOURCES
set(HEADERS
pcm/DataStructuresBase/XmlBaseClass.h
pcm/DataStructuresBase/XmlBaseTypes.h
pcm/PCM_Data/pcm_definitions.h
pcm/PCM_Data/pcm_agent.h
pcm/PCM_Data/pcm_line.h
pcm/PCM_Data/pcm_marks.h
......
/********************************************************************************
* Copyright (c) 2020-2021 ITK Engineering GmbH
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* SPDX-License-Identifier: EPL-2.0
********************************************************************************/
//-----------------------------------------------------------------------------
//! @file pcm_definitions.h
//! @brief This file contains several classes for global purposes
//-----------------------------------------------------------------------------
#pragma once
#include <list>
#include <map>
#include <string>
#include <tuple>
#include <vector>
#include <array>
#include "common/globalDefinitions.h"
//-----------------------------------------------------------------------------
//! Agent type classification
//-----------------------------------------------------------------------------
// already defined in globalDefinitions.h
......@@ -11,7 +11,7 @@
#ifndef PCM_HELPER_H
#define PCM_HELPER_H
#include "pcm_definitions.h"
#include "common/globalDefinitions.h"
#include "pcm_point.h"
#include "vector2d.h"
......
......@@ -21,7 +21,7 @@
#include <QString>
#include "pcm_lineContainer.h"
#include "pcm_definitions.h"
#include "common/globalDefinitions.h"
/*!
* \brief The PCM_Marks class
......
......@@ -10,7 +10,7 @@
#include "pcm_participantData.h"
#include "pcm_definitions.h"
#include "common/globalDefinitions.h"
PCM_ParticipantData::PCM_ParticipantData(QString inTypeCode,
QString inWidth,
......@@ -41,7 +41,7 @@ PCM_ParticipantData::PCM_ParticipantData(QString inTypeCode,
cgfront(inCgfront)
{
// In PCM Database these values are set to not useful values, therefore they´re changed here
type = QString::fromStdString(GetAgentVehicleTypeStr(inTypeCode.toInt()));
type = QString::fromStdString(GetAgentVehicleTypeStr((AgentVehicleType)inTypeCode.toInt()));
if (type == "pedestrian")
{
wheelbase = length;
......
......@@ -20,7 +20,7 @@
#include <QFile>
#include "pcm_data.h"
#include "pcm_definitions.h"
#include "common/globalDefinitions.h"
#include "pcm_helper.h"
#include "pcm_trajectory.h"
......
......@@ -22,7 +22,7 @@
#include <QFile>
#include "../PCM_Data/pcm_data.h"
#include "../PCM_Data/pcm_definitions.h"
#include "common/globalDefinitions.h"
#include "../PCM_Data/pcm_helper.h"
#include "../PCM_Data/pcm_trajectory.h"
......
......@@ -9,7 +9,7 @@
********************************************************************************/
#include "vehicleModelImporter.h"
#include "pcm_definitions.h"
#include "common/globalDefinitions.h"
#include <locale>
bool VehicleModelImporter::Import(const std::string &filename,
......
......@@ -20,7 +20,7 @@
#include "ResultDirItemModel.h"
#include "TrajectoryTableModel.h"
#include "pcm_data.h"
#include "pcm_definitions.h"
#include "common/globalDefinitions.h"
#include "pcm_line.h"
#include "sceneryImporterPCM.h"
......
......@@ -15,7 +15,7 @@
#include <QFile>
#include <QPointF>
#include <QTextStream>
#include "pcm_definitions.h"
#include "common/globalDefinitions.h"
class TrajectoryTableModel : public QAbstractTableModel
{
......
......@@ -15,7 +15,7 @@
#include <QGraphicsLineItem>
#include <QGraphicsScene>
#include "pcm_definitions.h"
#include "common/globalDefinitions.h"
#include "TrajectoryGraphicsItem.h"
class TrafficScene : public QGraphicsScene
......
......@@ -17,7 +17,7 @@
#include <QStringList>
#include <QtSql>
#include "pcm_definitions.h"
#include "common/globalDefinitions.h"
#include "pcm_simulationSet.h"
class DatabaseReader
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment