解决打开文件时可能造成的野指针问题

.gitignore

@@ -1,7 +1,7 @@
 .vs/
-node-editor/x64/
+nn-editor/x64/
 x64/
-node-editor/imgui.ini
+nn-editor/imgui.ini
 build
 cmake-build-debug
 cmake-build-release

CMakeLists.txt

@@ -12,7 +12,11 @@ if (NOT DEFINED CMAKE_INSTALL_PREFIX)
 endif()
 
 # project name
-project(node-editor)
+project(nn-editor)
+
+option(NETEDIT_LOADER_CCCC "support cccc model loader" ON)
+option(NETEDIT_LOADER_NCNN "support ncnn model loader" ON)
+option(NETEDIT_LOADER_YAML_YOLO "support yaml yolo model loader" ON)
 
 # import IMGUI
 include(${CMAKE_SOURCE_DIR}/cmake/imgui.cmake)
@@ -23,7 +27,29 @@ add_executable(${PROJECT_NAME})
 set_target_properties (${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS NDEBUG)
 set_target_properties (${PROJECT_NAME} PROPERTIES CXX_STANDARD 17)
 
+
 # collect the source files
+list (APPEND NODE_EDITOR_SRCS nn-editor/nn_editor.cpp)
+list (APPEND NODE_EDITOR_SRCS nn-editor/loader.cpp)
+
+# cccc is always loaded. qing zhi chi cccc.
+list (APPEND NODE_EDITOR_SRCS nn-editor/ccccloader.cpp)
+add_definitions(-DNETEDIT_LOADER_CCCC)
+
+if(NETEDIT_LOADER_NCNN)
+    list (APPEND NODE_EDITOR_SRCS nn-editor/ncnnloader.cpp)
+    add_definitions(-DNETEDIT_LOADER_NCNN)
+endif()
+
+if(NETEDIT_LOADER_YAML_YOLO)
+    list (APPEND NODE_EDITOR_SRCS nn-editor/yamlyololoader.cpp)
+    add_definitions(-DNETEDIT_LOADER_YAML_YOLO)
+
+    find_package(YAML-CPP)
+    target_include_directories(${PROJECT_NAME} PRIVATE ${YAML_CPP_INCLUDE_DIRS})
+    target_link_libraries(${PROJECT_NAME} PRIVATE ${YAML_CPP_LIBRARIES})
+endif()
+
 if(APPLE)
     set(CMAKE_OSX_ARCHITECTURES ${CMAKE_SYSTEM_PROCESSOR})
     enable_language(OBJC)
@@ -65,7 +91,7 @@ target_include_directories (${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/3rdparty
 
 target_link_libraries (${PROJECT_NAME} PRIVATE IMGUI)
 find_package(SDL2)
-target_include_directories(${PROJECT_NAME} PRIVATE ${SDL2_INCLUDE_DIRS})
+target_include_directories(${PROJECT_NAME} PRIVATE ${SDL2_INCLUDE_DIR})
 target_link_libraries(${PROJECT_NAME} PRIVATE ${SDL2_LIBRARIES})
 
 if (UNIX)

INSTALL.md

@@ -1,6 +1,6 @@
-# How to Build in the Linux
+# Build on Linux
 
-Install required build dependecies:
+Install build dependencies:
 
 - git
 - cmake
@@ -11,15 +11,15 @@ Install required build dependecies:
 - OpenGL
 - [yaml-cpp](https://github.com/jbeder/yaml-cpp)
 
-**Git clone the node-editor repo with submodule**
+**Git clone the nn-editor repo with submodule**
 
 ```
-git clone https://github.com/scarsty/node-editor
-cd node-editor
+git clone https://github.com/scarsty/nn-editor
+cd nn-editor
 git submodule update --init 
 ```
 
-**And you can use this to build this repo**
+**And you can use these to build this repo**
 
 Please modify the **CMakeLists.txt**
 
@@ -49,7 +49,7 @@ cmake -G "Xcode"
 
 **SDL2 install**
 
-- `download the source from the offcial website:http://www.libsdl.org/`
+- `download the source from offcial website:http://www.libsdl.org/`
 
 ```
 wget https://www.libsdl.org/release/SDL2-2.0.18.zip

README.md

@@ -1,13 +1,19 @@
-## node-editor
+# nn-editor
 
-<img src='https://raw.githubusercontent.com/scarsty/node-editor/master/logo.jpg'/>
+<div align="right">
+
+<img src="assets/logo.png" width="100px">
+
+</div>
 
 基于 [imnodes](https://github.com/Nelarius/imnodes) 的流程图编辑工具。
 
 目前的主要功能是用于神经网络结构的简单编辑，或者某些特殊流程图的编辑。
 
 目标是老妪能训。
 
+QQ 群: 822911263
+
 ### 操作
 
 * 按住中键，或者Alt+左键可以拖动整个图。
@@ -23,9 +29,20 @@
 * ini范例
 * [ncnn](https://github.com/Tencent/ncnn/wiki/param-and-model-file-structure)
 * [pnnx](https://github.com/pnnx/pnnx) 该格式与ncnn基本一致，故可以直接支持，实际因为参数列表较长体验有些问题
+* yolo的简化格式（YAML）
 
 请大佬们pr支持新格式！
 
-<img src='https://raw.githubusercontent.com/scarsty/node-editor/master/images/lenet.png'/>
-<img src='https://raw.githubusercontent.com/scarsty/node-editor/master/images/ncnn.png'/>
-<img src='https://raw.githubusercontent.com/scarsty/node-editor/master/images/ncnn2.png'/>
+<div align="center">
+
+<img src="assets/lenet.png">
+<img src="assets/ncnn.png">
+<img src="assets/ncnn2.png">
+
+</div>
+
+## 授权
+
+```bash
+以 BSD 3-Clause License 授权发布。若将其商业应用，我们建议您提交一张书法照到官方 QQ 群。
+```

cmake/imgui.cmake

@@ -143,6 +143,11 @@ endif()
 if(NOT IMGUI_RENDERER)
     CHECK_PACKAGES()
 
+    # (penguinliong) SDL2 platform MUST match SDL2 renderer.
+    if (IMGUI_PLATFORM MATCHES SDL2)
+        set (IMGUI_RENDERER SDL2)
+    endif()
+
     if (Vulkan_FOUND AND (NOT IMGUI_RENDERER))
         set (IMGUI_RENDERER VULKAN)
     endif()
@@ -207,6 +212,8 @@ target_sources (IMGUI INTERFACE ${IMGUI_BASE_DIR}/misc/cpp/imgui_stdlib.cpp)
 
 # judge platform
 if (IMGUI_PLATFORM)
+    message("-- ImGui platform is " ${IMGUI_PLATFORM})
+
     if     (IMGUI_PLATFORM MATCHES WIN32)
         target_sources (IMGUI INTERFACE ${IMGUI_BASE_DIR}/backends/imgui_impl_win32.cpp)
     elseif (IMGUI_PLATFORM MATCHES SDL2)
@@ -226,6 +233,8 @@ endif ()
 
 # judge renderer
 if (IMGUI_RENDERER)
+    message("-- ImGui renderer is " ${IMGUI_RENDERER})
+
     if     (IMGUI_RENDERER MATCHES VULKAN)
         target_sources (IMGUI INTERFACE ${IMGUI_BASE_DIR}/backends/imgui_impl_vulkan.cpp)
     elseif (IMGUI_RENDERER MATCHES SDL2)
@@ -261,6 +270,8 @@ endif()
 if     (IMGUI_PLATFORM MATCHES WIN32)
     # TODO: link what?
 elseif (IMGUI_PLATFORM MATCHES SDL2)
+    # TODO: (penguinliong) Remember to copy the SDL dynamic library to the
+    # binary dir in a future update.
     target_link_libraries (IMGUI INTERFACE SDL2::SDL2)
 elseif (IMGUI_PLATFORM MATCHES GLFW)
     # TODO: link what? header where?
@@ -272,7 +283,8 @@ endif()
 
 # for renderer
 if     (IMGUI_RENDERER MATCHES VULKAN)
-    target_link_libraries (IMGUI INTERFACE vulkan)
+    target_include_directories(IMGUI INTERFACE ${Vulkan_INCLUDE_DIR})
+    target_link_libraries (IMGUI INTERFACE ${Vulkan_LIBRARY})
 elseif (IMGUI_RENDERER MATCHES SDL2)
     # TODO: this part may not work
     #target_link_libraries (IMGUI INTERFACE SDL2main)

imnodes2/imnodes.cpp

@@ -1056,6 +1056,14 @@ void ClickInteractionUpdate(ImNodesEditorContext& editor)
         }
     }
     case ImNodesClickInteractionType_None:
+    {
+        const bool dragging = GImNodes->AltMouseDragging;
+
+        if (dragging)
+        {
+            editor.Panning += ImGui::GetIO().MouseDelta;
+        }
+    }
         break;
     default:
         assert(!"Unreachable code!");
@@ -1923,7 +1931,7 @@ ImNodesIO::LinkDetachWithModifierClick::LinkDetachWithModifierClick() : Modifier
 
 ImNodesIO::ImNodesIO()
     : EmulateThreeButtonMouse(), LinkDetachWithModifierClick(),
-      AltMouseButton(ImGuiMouseButton_Middle), AutoPanningSpeed(1000.0f)
+      AltMouseButton(ImGuiMouseButton_Right), AutoPanningSpeed(1000.0f)
 {
 }
 
@@ -2018,6 +2026,11 @@ void StyleColorsDark()
     GImNodes->Style.Colors[ImNodesCol_Link] = IM_COL32(61, 133, 224, 200);
     GImNodes->Style.Colors[ImNodesCol_LinkHovered] = IM_COL32(66, 150, 250, 255);
     GImNodes->Style.Colors[ImNodesCol_LinkSelected] = IM_COL32(66, 150, 250, 255);
+
+    GImNodes->Style.Colors[ImNodesCol_Link] = IM_COL32(66, 150, 250, 100);
+    GImNodes->Style.Colors[ImNodesCol_LinkHovered] = IM_COL32(99, 200, 250, 224);
+    GImNodes->Style.Colors[ImNodesCol_LinkSelected] = IM_COL32(255, 69, 91, 224);
+
     // pin colors match ImGui's button colors
     GImNodes->Style.Colors[ImNodesCol_Pin] = IM_COL32(53, 150, 250, 180);
     GImNodes->Style.Colors[ImNodesCol_PinHovered] = IM_COL32(53, 150, 250, 255);
@@ -2093,8 +2106,8 @@ void StyleColorsLight()
     // original imgui values: 66, 150, 250
     GImNodes->Style.Colors[ImNodesCol_Link] = IM_COL32(66, 150, 250, 100);
     // original imgui values: 117, 138, 204
-    GImNodes->Style.Colors[ImNodesCol_LinkHovered] = IM_COL32(66, 150, 250, 242);
-    GImNodes->Style.Colors[ImNodesCol_LinkSelected] = IM_COL32(66, 150, 250, 242);
+    GImNodes->Style.Colors[ImNodesCol_LinkHovered] = IM_COL32(66, 150, 250, 224);
+    GImNodes->Style.Colors[ImNodesCol_LinkSelected] = IM_COL32(255, 69, 91, 224);
     // original imgui values: 66, 150, 250
     GImNodes->Style.Colors[ImNodesCol_Pin] = IM_COL32(66, 150, 250, 160);
     GImNodes->Style.Colors[ImNodesCol_PinHovered] = IM_COL32(66, 150, 250, 255);

node-editor.sln → nn-editor.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31912.275
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "node-editor", "node-editor\node-editor.vcxproj", "{6A66CF82-B67C-456F-BD0E-3C7E2944B6F2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nn-editor", "nn-editor\nn-editor.vcxproj", "{6A66CF82-B67C-456F-BD0E-3C7E2944B6F2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

nn-editor/ccccloader.cpp

@@ -10,10 +10,6 @@ void ccccLoader::fileToNodes(const std::string& filename, std::deque<Node>& node
 
     std::string prefix = "layer_";
     auto sections = ini.getAllSections();
-    std::sort(sections.begin(), sections.end(), [&](const std::string& l, const std::string& r)
-    {
-        return ini.getSectionNo(l) < ini.getSectionNo(r);
-    });
 
     int x = -1;
     int y = -1;