Commit fecdfd35 authored by Tao Zhong's avatar Tao Zhong

Merge branch "develop" into branch "master"

parents e4b0abb3 fed7ab74
Pipeline #19188 failed with stages
in 1 second
build/
backup*
cmake-build-debug/
.DS_Store
.idea
examples/
bin/
tests/
.vscode
# C++ objects and libs
*.slo
*.lo
*.o
*.a
*.la
*.lai
*.so
*.dll
*.dylib
# Qt-es
object_script.*.Release
object_script.*.Debug
*_plugin_import.cpp
/.qmake.cache
/.qmake.stash
*.pro.user
*.pro.user.*
*.qbs.user
*.qbs.user.*
*.moc
moc_*.cpp
moc_*.h
qrc_*.cpp
ui_*.h
*.qmlc
*.jsc
Makefile*
*build-*
# Qt unit tests
target_wrapper.*
# QtCreator
*.autosave
# QtCreator Qml
*.qmlproject.user
*.qmlproject.user.*
# QtCreator CMake
CMakeLists.txt.user*
# Prerequisites
*.d
# Compiled Object files
*.slo
*.lo
*.o
*.obj
# Precompiled Headers
*.gch
*.pch
# Compiled Dynamic libraries
*.so
*.dylib
*.dll
# Fortran module files
*.mod
*.smod
# Compiled Static libraries
*.lai
*.la
*.a
*.lib
# Executables
*.exe
*.out
*.app
# Change Log
All notable changes to this project will be documented in this file.
## v0.8.7 [08.03.2019]
### Added
- Add line snapping options #102
- Add backuping with lines #101
- Add layers controlling #90
### Changed
- Change warning for Hline #117
- Show operations message on statusBar #113
- Redesign Inifile widget Layout #112
### Bugs fixed
- Fix keyshorts conflict #120
- Fix segmentation fault #121
- Fix error by inputing coordinates #116
## v0.8.6 [08.01.2019]
## Added
### Added
- Add zoom extents option #64
- Add zoom Windows option #64
- Add wirte ini-files feature #27
## Changed
### Changed
- Improve statbility #105
- Use panning mode by middle button
## Bugs fixed
### Bugs fixed
- Fix shortcut for "Del"
## v0.8.5 [02.11.2018]
## Added
### Added
- Add Auto Saving function #67
- Better Panning Mode #100
## Changed
### Changed
- Update Shortcuts #92
- Design new origin and axis #99
## Bugs fixed
### Bugs fixed
- Esc doesn't work while drawing #98
- SegFault: Delete all Rooms #91
## v0.8.4 [05.10.2018]
## Added
### Added
- In menu bar, under "Edit" you will find "Clear Rooms and Doors button" to clear all defined rooms and doors. #54
- Define points of a line using keyboard on status bar. #61 #63
## Changed
### Changed
- A new tidily icons are added. #88
## Bugs fixed
### Bugs fixed
- Fixed a crash when deleting rooms. #42
- Fixed a problem when width of lines change after highlighting. #50
......
......@@ -36,9 +36,9 @@ set(README_FILE "${CMAKE_SOURCE_DIR}/README.md")
set(CMAKE_COLOR_MAKEFILE ON)
set(JPSEDITOR_MAJOR_VERSION 0)
set(JPSEDITOR_MINOR_VERSION 8)
set(JPSEDITOR_PATCH_VERSION 4)
set(JPSEDITOR_PATCH_VERSION 7)
set(JPSEDITOR_VERSION
${JPSEDITOR_MAJOR_VERSION}.${JPSEDITOR_MINOR_VERSION}.${JPSEDITOR_PATCH_VERSION})
${JPSEDITOR_MAJOR_VERSION}.${JPSEDITOR_MINOR_VERSION}.${JPSEDITOR_PATCH_VERSION})
if("${CMAKE_BUILD_TYPE}" STREQUAL "")
set(CMAKE_BUILD_TYPE Release)
......@@ -46,7 +46,8 @@ endif()
message( STATUS "Generating ................................... ${PROJECT_NAME} (${JPSEDITOR_VERSION}) -- ${CMAKE_BUILD_TYPE}")
if(APPLE )
set(CMAKE_INSTALL_PREFIX "/tmp")
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}")
......@@ -112,15 +113,22 @@ set( SRCS
src/widgetlandmark.cpp
src/widgetsettings.cpp
src/jpsconnection.cpp
src/jpsregion.cpp
src/jpsregion.cpp
src/settingdialog.cpp
src/inifilewidget.cpp
src/snappingoptions.cpp
dxflib/src/dl_writer_ascii.cpp
dxflib/src/dl_dxf.cpp
src/UndoFramework/action.cpp
src/UndoFramework/actionstack.cpp
src/UndoFramework/lineaction.cpp
src/AutomaticRoomIdentification/roomdefinition.cpp
src/AutomaticRoomIdentification/roomdefinition.cpp
src/AutomaticRoomIdentification/roomidentification.cpp
src/settingdialog.cpp
src/tinyxml/tinystr.cpp
src/tinyxml/tinyxml.cpp
src/tinyxml/tinyxmlerror.cpp
src/tinyxml/tinyxmlparser.cpp
)
# all header files that should be treated with moc
set( HDR
......@@ -139,7 +147,12 @@ set( HDR
src/widgetlandmark.h
src/widgetsettings.h
src/jpsconnection.h
src/jpsregion.h
src/jpsregion.h
src/dtrace.h
src/settingdialog.h
src/inifilewidget.h
src/snappingoptions.h
dxflib/src/dl_writer_ascii.h
dxflib/src/dl_writer.h
dxflib/src/dl_global.h
......@@ -151,15 +164,15 @@ set( HDR
dxflib/src/dl_creationadapter.h
dxflib/src/dl_codes.h
dxflib/src/dl_attributes.h
src/UndoFramework/action.h
src/UndoFramework/actionstack.h
src/UndoFramework/lineaction.h
src/AutomaticRoomIdentification/roomID.h
src/AutomaticRoomIdentification/roomID.h
src/AutomaticRoomIdentification/roomdefinition.h
src/AutomaticRoomIdentification/roomidentification.h
src/dtrace.h
src/settingdialog.h
src/tinyxml/tinystr.h
src/tinyxml/tinyxml.h
)
# *.ui files
......@@ -169,6 +182,8 @@ set( UIS
forms/widgetlandmark.ui
forms/widgetsettings.ui
forms/settingdialog.ui
forms/inifilewidget.ui
forms/snappingoptions.ui
)
# and finally a resource file
......
......@@ -195,9 +195,6 @@ Here are some hints to configure your editor in order to use the *stroustrup* st
Read also
[How to change indentation width in eclipse?](https://superuser.com/questions/462221/how-do-i-reliably-change-the-indentation-width-in-eclipse)
- **Clion**
<!-- TODO -->
## Writing Documentation
......
<?xml version="1.0" ?><svg id="Layer_1_1_" style="enable-background:new 0 0 16 16;" version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><polygon points="0,5 0,13 8,16 16,13 16,5 8,8 "/><polygon points="0,4 8,7 16,4 8,1 "/></svg>
\ No newline at end of file
......@@ -58,5 +58,7 @@
<file>Icons/plus.svg</file>
<file>Icons/landmark.svg</file>
<file>Icons/moved_hand.svg</file>
<file>Icons/attribute.svg</file>
<file>Icons/breaking.png</file>
</qresource>
</RCC>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<geometry version="0.5" caption="corner" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://xsd.jupedsim.org/jps_geometry.xsd" unit="m">
<rooms>
<room id="0" caption="hall">
<subroom id="0" caption="Room 1 (right side)" class="subroom">
<polygon caption="wall">
<vertex px="4.15" py="6.68"/>
<vertex px="9.15" py="6.68"/>
</polygon>
<polygon caption="wall">
<vertex px="9.15" py="6.68"/>
<vertex px="9.15" py="1.68"/>
</polygon>
<polygon caption="wall">
<vertex px="9.15" py="1.68"/>
<vertex px="4.15" py="1.68"/>
</polygon>
<polygon caption="wall">
<vertex px="4.15" py="1.68"/>
<vertex px="4.15" py="3.18"/>
</polygon>
<polygon caption="wall">
<vertex px="4.15" py="6.68"/>
<vertex px="4.15" py="5.18"/>
</polygon>
</subroom>
<subroom id="1" caption="Room 2 (left side)" class="subroom">
<polygon caption="wall">
<vertex px="4.15" py="5.18"/>
<vertex px="-0.85" py="5.18"/>
</polygon>
<polygon caption="wall">
<vertex px="4.15" py="3.18"/>
<vertex px="-0.85" py="3.18"/>
</polygon>
</subroom>
<crossings>
<crossing id="0" subroom1_id="0" subroom2_id="1">
<vertex px="4.15" py="5.18"/>
<vertex px="4.15" py="3.18"/>
</crossing>
</crossings>
</room>
</rooms>
<transitions>
<transition id="0" caption="NaN" type="NaN" room1_id="0" subroom1_id="1" room2_id="-1" subroom2_id="-1">
<vertex px="-0.85" py="5.18"/>
<vertex px="-0.85" py="3.18"/>
</transition>
</transitions>
</geometry>
This diff is collapsed.
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<geometry version="0.8" caption="corner" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://xsd.jupedsim.org/jps_geometry.xsd" unit="m">
<rooms>
<room id="0" caption="hall">
<subroom id="0" caption="Room 0" class="Not specified" A_x="0" B_y="0" C_z="0">
<polygon caption="wall">
<vertex px="0" py="-0.45"/>
<vertex px="-2.4" py="-0.45"/>
</polygon>
<polygon caption="wall">
<vertex px="0" py="-1.65"/>
<vertex px="0" py="-0.45"/>
</polygon>
<polygon caption="wall">
<vertex px="0" py="-1.65"/>
<vertex px="0" py="-2.28895"/>
</polygon>
<polygon caption="wall">
<vertex px="-2.4" py="0.45"/>
<vertex px="0" py="0.45"/>
</polygon>
<polygon caption="wall">
<vertex px="0" py="0.45"/>
<vertex px="0" py="1.65"/>
</polygon>
<polygon caption="wall">
<vertex px="0" py="-2.28895"/>
<vertex px="-6.41136" py="-2.28895"/>
</polygon>
<polygon caption="wall">
<vertex px="-6.41136" py="-2.28895"/>
<vertex px="-6.42" py="7"/>
</polygon>
<polygon caption="wall">
<vertex px="-6.42" py="7"/>
<vertex px="0" py="7"/>
</polygon>
</subroom>
<subroom id="1" caption="Room 1" class="Not specified" A_x="0" B_y="0" C_z="0">
<polygon caption="wall">
<vertex px="0" py="-1.65"/>
<vertex px="0" py="-0.45"/>
</polygon>
<polygon caption="wall">
<vertex px="0" py="0.45"/>
<vertex px="0" py="1.65"/>
</polygon>
<polygon caption="wall">
<vertex px="0" py="-0.45"/>
<vertex px="-2.4" py="-0.45"/>
</polygon>
<polygon caption="wall">
<vertex px="7.2" py="-1.65"/>
<vertex px="0" py="-1.65"/>
</polygon>
<polygon caption="wall">
<vertex px="-2.4" py="0.45"/>
<vertex px="0" py="0.45"/>
</polygon>
<polygon caption="wall">
<vertex px="0" py="1.65"/>
<vertex px="7.2" py="1.65"/>
</polygon>
</subroom>
<subroom id="2" caption="Room 2" class="Not specified" A_x="0" B_y="0" C_z="0">
<polygon caption="wall">
<vertex px="15" py="3.16"/>
<vertex px="15" py="-3.16"/>
</polygon>
<polygon caption="wall">
<vertex px="12.75" py="3.16"/>
<vertex px="15" py="3.16"/>
</polygon>
<polygon caption="wall">
<vertex px="7.2" py="-3.16"/>
<vertex px="7.2" py="-1.65"/>
</polygon>
<polygon caption="wall">
<vertex px="15" py="-3.16"/>
<vertex px="7.2" py="-3.16"/>
</polygon>
<polygon caption="wall">
<vertex px="7.2" py="3.16"/>
<vertex px="12.75" py="3.16"/>
</polygon>
<polygon caption="wall">
<vertex px="7.2" py="3.16"/>
<vertex px="7.2" py="1.65"/>
</polygon>
</subroom>
<subroom id="3" caption="Room 3" class="Not specified" A_x="0" B_y="0" C_z="0">
<polygon caption="wall">
<vertex px="0" py="1.65"/>
<vertex px="7.2" py="1.65"/>
</polygon>
<polygon caption="wall">
<vertex px="7.2" py="3.16"/>
<vertex px="12.75" py="3.16"/>
</polygon>
<polygon caption="wall">
<vertex px="0" py="7"/>
<vertex px="12.75" py="7"/>
</polygon>
<polygon caption="wall">
<vertex px="7.2" py="3.16"/>
<vertex px="7.2" py="1.65"/>
</polygon>
</subroom>
<crossings>
<crossing id="0" subroom1_id="0" subroom2_id="1">
<vertex px="-2.4" py="-0.45"/>
<vertex px="-2.4" py="0.45"/>
</crossing>
<crossing id="1" subroom1_id="0" subroom2_id="3">
<vertex px="0" py="1.65"/>
<vertex px="0" py="7"/>
</crossing>
<crossing id="2" subroom1_id="1" subroom2_id="2">
<vertex px="7.2" py="1.65"/>
<vertex px="7.2" py="-1.65"/>
</crossing>
</crossings>
</room>
</rooms>
<transitions>
<transition id="0" caption="NaN" type="NaN" room1_id="0" subroom1_id="3" room2_id="-1" subroom2_id="-1">
<vertex px="12.75" py="7"/>
<vertex px="12.75" py="3.16"/>
</transition>
</transitions>
</geometry>
......@@ -9,8 +9,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1171</width>
<height>495</height>
<width>1233</width>
<height>500</height>
</rect>
</property>
<property name="windowTitle">
......@@ -22,10 +22,10 @@
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>50</y>
<width>1151</width>
<height>421</height>
<x>20</x>
<y>80</y>
<width>1200</width>
<height>371</height>
</rect>
</property>
<property name="toolTip">
......@@ -35,7 +35,7 @@
<string notr="true"/>
</property>
<property name="currentIndex">
<number>13</number>
<number>14</number>
</property>
<widget class="QWidget" name="tab_general">
<attribute name="title">
......@@ -748,54 +748,6 @@
</property>
</item>
</widget>
<widget class="QLabel" name="label_groups_2">
<property name="geometry">
<rect>
<x>250</x>
<y>50</y>
<width>91</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Operation model</string>
</property>
</widget>
<widget class="QComboBox" name="comboBox_groups_1">
<property name="geometry">
<rect>
<x>350</x>
<y>50</y>
<width>111</width>
<height>21</height>
</rect>
</property>
<item>
<property name="text">
<string>Gcfm</string>
</property>
</item>
<item>
<property name="text">
<string>Gompertz</string>
</property>
</item>
<item>
<property name="text">
<string>Tordeux</string>
</property>
</item>
<item>
<property name="text">
<string>Gradnav</string>
</property>
</item>
<item>
<property name="text">
<string>Krausz</string>
</property>
</item>
</widget>
</widget>
<widget class="QWidget" name="tab_model_gcfm">
<attribute name="title">
......@@ -4628,32 +4580,6 @@
</widget>
</widget>
</widget>
<widget class="QPushButton" name="pushButton_write">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>131</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>Create Ini File</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_read">
<property name="geometry">
<rect>
<x>160</x>
<y>10</y>
<width>131</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>Read Ini File</string>
</property>
</widget>
<widget class="QLabel" name="label_warning">
<property name="geometry">
<rect>
......@@ -4673,6 +4599,83 @@
<string/>
</property>
</widget>
<widget class="QWidget" name="">
<property name="geometry">
<rect>
<x>21</x>
<y>11</y>
<width>244</width>
<height>31</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="pushButton_write">
<property name="text">
<string>Create Ini File</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_read">
<property name="text">
<string>Read Ini File</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="">
<property name="geometry">
<rect>
<x>30</x>
<y>43</y>
<width>244</width>
<height>31</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_groups_2">
<property name="text">
<string>Operation model</string>
</property>
<property name="buddy">
<cstring>comboBox_groups_1</cstring>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_groups_1">
<item>
<property name="text">
<string>Gcfm</string>
</property>
</item>
<item>
<property name="text">
<string>Gompertz</string>
</property>
</item>
<item>
<property name="text">
<string>Tordeux</string>
</property>
</item>
<item>
<property name="text">
<string>Gradnav</string>
</property>
</item>
<item>
<property name="text">
<string>Krausz</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</widget>
<tabstops>
<tabstop>pushButton_write</tabstop>
......
......@@ -159,6 +159,9 @@
<property name="toolTip">
<string>Save as XML</string>
</property>
<property name="shortcut">
<string>Ctrl+S</string>
</property>
<property name="iconVisibleInMenu">
<bool>true</bool>
</property>
......@@ -190,6 +193,9 @@
</property>
</action>
<action name="actiongridmode">
<property name="checkable">
<bool>true</bool>
</property>
<property name="enabled">
<bool>true</bool>
</property>
......@@ -232,6 +238,9 @@
</property>
</action>
<action name="actionObjectsnap">
<property name="checkable">
<bool>true</bool>
</property>
<property name="enabled">
<bool>true</bool>
</property>
......@@ -279,7 +288,7 @@
<string>Delete selected lines</string>
</property>
<property name="shortcut">
<string>Ctrl+Backspace</string>
<string>Backspace</string>
</property>
<property name="iconVisibleInMenu">
<bool>true</bool>
......@@ -331,15 +340,12 @@
</property>
</action>
<action name="actionRoom">
<property name="checkable">
<bool>true</bool>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../Resources/resources.qrc">
<normaloff>:/inAppIcons/Icons/rooms.png</normaloff>:/inAppIcons/Icons/rooms.png</iconset>
<normaloff>:/inAppIcons/Icons/attribute.svg</normaloff>:/inAppIcons/Icons/attribute.svg</iconset>
</property>
<property name="text">
<string>Define Rooms</string>
......@@ -691,21 +697,6 @@
<string>Online Help</string>
</property>
</action>
<action name="actionPanning_Mode">
<property name="icon">
<iconset resource="../Resources/resources.qrc">
<normaloff>:/inAppIcons/Icons/moved_hand.svg</normaloff>:/inAppIcons/Icons/moved_hand.svg</iconset>
</property>
<property name="text">
<string>Panning Mode</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+P</string>
</property>
<property name="iconVisibleInMenu">
<bool>true</bool>
</property>
</action>
<action name="actionNew_Inifile">
<property name="text">
<string>New Inifile</string>
......@@ -733,7 +724,7 @@
<string>Zoom Windows</string>
</property>
<property name="shortcut">
<string>Meta+W</string>
<string>Meta+Shift+W</string>
</property>
</action>
<action name="actionZoom_Extents">
...