Commit bb766f78 authored by Tao Zhong's avatar Tao Zhong

Merge branch 'develop' into 'master'

parents 5ad8bfe9 1f07358f
......@@ -26,7 +26,7 @@ cmake_minimum_required(VERSION 3.2)
# ENDIF (POLICY CMP0025)
project(JPSeditor LANGUAGES CXX)
set (CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
......@@ -46,7 +46,7 @@ endif()
message( STATUS "Generating ................................... ${PROJECT_NAME} (${JPSEDITOR_VERSION}) -- ${CMAKE_BUILD_TYPE}")
if(APPLE )
set(CMAKE_INSTALL_PREFIX "/Applications")
set (CMAKE_INSTALL_PREFIX "/Applications")
set (CMAKE_PREFIX_PATH "/Applications/Qt/5.12.0/clang_64")
endif()
message(STATUS "${PROJECT_NAME} will be installed to ${CMAKE_INSTALL_PREFIX}")
......@@ -102,7 +102,7 @@ set( SRCS
src/main.cpp
src/GraphicView.cpp
src/graphicscene.cpp
src/roomwidget.cpp
src/widgets/roomwidget.cpp
src/rooms.cpp
src/datamanager.cpp
src/jpscrossing.cpp
......@@ -110,13 +110,23 @@ set( SRCS
src/jpsexit.cpp
src/jpsobstacle.cpp
src/jpslandmark.cpp
src/widgetlandmark.cpp
src/widgetsettings.cpp
src/widgets/widgetlandmark.cpp
src/widgets/widgetsettings.cpp
src/jpsconnection.cpp
src/jpsregion.cpp
src/settingdialog.cpp
src/inifilewidget.cpp
src/snappingoptions.cpp
src/widgets/settingdialog.cpp
src/widgets/inifilewidget.cpp
src/widgets/snappingoptions.cpp
src/jpssource.cpp
src/widgets/sourcewidget.cpp
src/jpsgoal.cpp
src/widgets/goalwidget.cpp
src/global.cpp
src/models/jpselementlistmodel.cpp
src/models/jpssourcelistmodel.cpp
src/models/jpsgoallistmodel.cpp
src/XML/goalreader.cpp
src/XML/sourcereader.cpp
dxflib/src/dl_writer_ascii.cpp
dxflib/src/dl_dxf.cpp
......@@ -136,7 +146,7 @@ set( HDR
src/mainWindow.h
src/GraphicView.h
src/graphicscene.h
src/roomwidget.h
src/widgets/roomwidget.h
src/rooms.h
src/datamanager.h
src/jpscrossing.h
......@@ -144,14 +154,25 @@ set( HDR
src/jpsexit.h
src/jpsobstacle.h
src/jpslandmark.h
src/widgetlandmark.h
src/widgetsettings.h
src/widgets/widgetlandmark.h
src/widgets/widgetsettings.h
src/jpsconnection.h
src/jpsregion.h
src/dtrace.h
src/settingdialog.h
src/inifilewidget.h
src/snappingoptions.h
src/widgets/settingdialog.h
src/widgets/inifilewidget.h
src/widgets/snappingoptions.h
src/jpssource.h
src/widgets/sourcewidget.h
src/widgets/goalwidget.h
src/elementtype.h
src/global.h
src/models/jpselementlistmodel.h
src/models/jpssourcelistmodel.h
src/jpsgoal.h
src/models/jpsgoallistmodel.h
src/XML/goalreader.h
src/XML/sourcereader.h
dxflib/src/dl_writer_ascii.h
dxflib/src/dl_writer.h
......@@ -184,6 +205,8 @@ set( UIS
forms/settingdialog.ui
forms/inifilewidget.ui
forms/snappingoptions.ui
forms/sourcewidget.ui
forms/goalwidget.ui
)
# and finally a resource file
......@@ -211,7 +234,7 @@ endif()
message(STATUS "Searching for Qt version ...................... " ${DESIRED_QT_VERSION})
# find packages according to qt version
if("${DESIRED_QT_VERSION}" STREQUAL "5")
find_package(Qt5Widgets REQUIRED)
FIND_PACKAGE(Qt5Widgets REQUIRED)
# - these find_packages are not necessary? -----------
FIND_PACKAGE(Qt5Core REQUIRED)
FIND_PACKAGE(Qt5Gui REQUIRED)
......@@ -378,7 +401,7 @@ endif()
IF(APPLE)
# set how it shows up in the Info.plist file
SET(MACOSX_EDIT_ICON jupedsim.icns)
SET(MACOSX_BUNDLE_COPYRIGHT "Copyright (c) 2015-2018 Forschungszentrum Juelich. All rights reserved.")
SET(MACOSX_BUNDLE_COPYRIGHT "Copyright (c) 2015-2019 Forschungszentrum Juelich. All rights reserved.")
SET(MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}")
SET(MACOSX_BUNDLE_BUNDLE_VERSION "${JPSEDITOR_VERSION}")
SET(MACOSX_BUNDLE_LONG_VERSION_STRING "version ${JPSEDITOR_VERSION}")
......@@ -386,7 +409,6 @@ IF(APPLE)
SET(MACOSX_BUNDLE_EDIT_IDENTIFIER "https://www.jupedsim.org")
# set where in the bundle to put the icns file
# set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Info.plist.in)
ENDIF(APPLE)
# To Create a package, one can run "cpack -G DragNDrop CPackConfig.cmake" on Mac OS X
......
......@@ -60,5 +60,8 @@
<file>Icons/moved_hand.svg</file>
<file>Icons/attribute.svg</file>
<file>Icons/breaking.png</file>
<file>Icons/source.png</file>
<file>Icons/goal.png</file>
<file>Icons/edit.png</file>
</qresource>
</RCC>
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>GoalWidget</class>
<widget class="QWidget" name="GoalWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>200</width>
<height>500</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>200</width>
<height>400</height>
</size>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>0</y>
<width>181</width>
<height>491</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="goalLabel">
<property name="text">
<string>Goals:</string>
</property>
</widget>
</item>
<item>
<widget class="QListView" name="goalsListView"/>
</item>
<item>
<widget class="QRadioButton" name="isSaveButton">
<property name="text">
<string>Save in Geometry</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QPushButton" name="deleteSourceButton">
<property name="text">
<string>Delete</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="applyButton">
<property name="text">
<string>Apply</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="IDLabel">
<property name="text">
<string>ID:</string>
</property>
<property name="buddy">
<cstring>IDlineEdit</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="captionLabel">
<property name="text">
<string>Caption:</string>
</property>
<property name="buddy">
<cstring>captionLineEdit</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="finalLabel">
<property name="text">
<string>Final:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="xminLabel">
<property name="text">
<string>X Min</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="xmaxLabel">
<property name="text">
<string>X Max</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="yminLabel">
<property name="text">
<string>Y Min</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="ymaxLabel">
<property name="text">
<string>Y Max</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLineEdit" name="IDlineEdit"/>
</item>
<item>
<widget class="QLineEdit" name="captionLineEdit"/>
</item>
<item>
<widget class="QLineEdit" name="finalLineEdit"/>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_XMin"/>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_XMax"/>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_YMin"/>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_YMax"/>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
<resources/>
<connections/>
</ui>
This diff is collapsed.
......@@ -10,6 +10,12 @@
<height>600</height>
</rect>
</property>
<property name="maximumSize">
<size>
<width>3840</width>
<height>2160</height>
</size>
</property>
<property name="windowTitle">
<string>JPSeditor</string>
</property>
......@@ -95,6 +101,8 @@
<addaction name="actionDoor"/>
<addaction name="actionHLine"/>
<addaction name="actionLandmark"/>
<addaction name="actionSource"/>
<addaction name="actionGoal"/>
</widget>
<addaction name="menuDatei"/>
<addaction name="menuEdit"/>
......@@ -114,15 +122,17 @@
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="actionSelect_Mode"/>
<addaction name="actionUndo"/>
<addaction name="actionRedo"/>
<addaction name="actionDelete_single_line"/>
<addaction name="actionClear_all_Rooms_and_Doors"/>
<addaction name="separator"/>
<addaction name="actionSelect_Mode"/>
<addaction name="actionWall"/>
<addaction name="actionDoor"/>
<addaction name="actionHLine"/>
<addaction name="actionSource"/>
<addaction name="actionGoal"/>
<addaction name="actionLandmark"/>
<addaction name="separator"/>
<addaction name="actiongridmode"/>
......@@ -326,8 +336,8 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset>
<normaloff>:/Exit.png</normaloff>:/Exit.png</iconset>
<iconset resource="../Resources/resources.qrc">
<normaloff>:/inAppIcons/Icons/Exit.png</normaloff>:/inAppIcons/Icons/Exit.png</iconset>
</property>
<property name="text">
<string>Exit</string>
......@@ -348,10 +358,10 @@
<normaloff>:/inAppIcons/Icons/attribute.svg</normaloff>:/inAppIcons/Icons/attribute.svg</iconset>
</property>
<property name="text">
<string>Define Rooms</string>
<string>Define Geometry</string>
</property>
<property name="toolTip">
<string>Define Room</string>
<string>Define Geometry</string>
</property>
<property name="shortcut">
<string>Meta+R</string>
......@@ -735,11 +745,6 @@
<string>Meta+E</string>
</property>
</action>
<action name="actionLayers">
<property name="text">
<string>Layers</string>
</property>
</action>
<action name="actionBreak_Line">
<property name="checkable">
<bool>true</bool>
......@@ -752,6 +757,45 @@
<string>Break Line</string>
</property>
</action>
<action name="actionSource">
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../Resources/resources.qrc">
<normaloff>:/inAppIcons/Icons/source.png</normaloff>:/inAppIcons/Icons/source.png</iconset>
</property>
<property name="text">
<string>Source</string>
</property>
</action>
<action name="actionEditMode">
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../Resources/resources.qrc">
<normaloff>:/inAppIcons/Icons/edit.png</normaloff>:/inAppIcons/Icons/edit.png</iconset>
</property>
<property name="text">
<string>Edit Mode</string>
</property>
<property name="toolTip">
<string>Edit Mode</string>
</property>
</action>
<action name="actionGoal">
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../Resources/resources.qrc">
<normaloff>:/inAppIcons/Icons/goal.png</normaloff>:/inAppIcons/Icons/goal.png</iconset>
</property>
<property name="text">
<string>Goal</string>
</property>
</action>
</widget>
<resources>
<include location="../Resources/resources.qrc"/>
......
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SourceWidget</class>
<widget class="QWidget" name="SourceWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>200</width>
<height>880</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>200</width>
<height>880</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>200</width>
<height>880</height>
</size>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>181</width>
<height>852</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QLabel" name="sourcesLabel">
<property name="text">
<string>Sources:</string>
</property>
</widget>
</item>
<item>
<widget class="QListView" name="sourcesListView"/>
</item>
<item>
<widget class="QRadioButton" name="isSaveButton">
<property name="text">
<string>Save in Geometry</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QPushButton" name="deleteSourceButton">
<property name="text">
<string>Delete</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="applyButton">
<property name="text">
<string>Apply</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="IDLabel">
<property name="text">
<string>ID:</string>
</property>
<property name="buddy">
<cstring>IDlineEdit</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="frequencyLabel">
<property name="text">
<string>Frequency:</string>
</property>
<property name="buddy">
<cstring>frequencyLineEdit</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="N_createLabel">
<property name="text">
<string>N_create:</string>
</property>
<property name="buddy">
<cstring>N_createLineEdit</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="percentLabel">
<property name="text">
<string>Percent:</string>
</property>
<property name="buddy">
<cstring>percentLineEdit</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="rateLabel">
<property name="text">
<string>Rate:</string>
</property>
<property name="buddy">
<cstring>rateLineEdit</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="time_minLabel">
<property name="text">
<string>Time_min:</string>
</property>
<property name="buddy">
<cstring>time_minLineEdit</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="time_maxLabel">
<property name="text">
<string>Time_max:</string>
</property>
<property name="buddy">
<cstring>time_maxLineEdit</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="agents_maxLabel">
<property name="text">
<string>Agents_Max:</string>
</property>
<property name="buddy">
<cstring>agents_maxLineEdit</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="group_IDLabel">
<property name="text">
<string>Group_ID:</string>
</property>
<property name="buddy">
<cstring>group_IDLineEdit</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="greedyLabel">
<property name="text">
<string>Greedy:</string>
</property>
<property name="buddy">
<cstring>greedyLineEdit</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="captionLabel">
<property name="text">
<string>Caption:</string>
</property>
<property name="buddy">
<cstring>captionLineEdit</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="timeLabel">
<property name="text">
<string>Time:</string>
</property>
<property name="buddy">
<cstring>timeLineEdit</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="startXLabel">
<property name="text">
<string>StartX:</string>
</property>
<property name="buddy">
<cstring>startXLineEdit</cstring>
</property>