修复node内存

nn-editor/nn_editor.cpp

@@ -319,6 +319,7 @@ class ColorNodeEditor
         if(n){
             filePathName =n;
         }
+        delete n;
         return filePathName;
 #else
         std::string filePathName;
@@ -360,8 +361,9 @@ class ColorNodeEditor
 
         // The node editor window
         std::string window_title = u8"Neural Net Editor";
-        ImGui::SetWindowSize(window_title.c_str(), ImGui::GetIO().DisplaySize);
         ImGui::Begin(window_title.c_str(), NULL, flags);
+        ImGui::SetWindowSize(window_title.c_str(), ImGui::GetIO().DisplaySize);
+        window_title.clear();
 
         //if (ImGui::)   //close window
         if (ImGui::BeginMenuBar())
@@ -475,6 +477,7 @@ class ColorNodeEditor
         //        emulate_three_button_mouse ? &ImGui::GetIO().KeyAlt : NULL;
         //}
         //ImGui::Columns(1);
+        ImNodes::BeginNodeEditor();
 
         {
             select_id_ = -1;
@@ -485,8 +488,6 @@ class ColorNodeEditor
             erase_select_ = 0;
         }
 
-        ImNodes::BeginNodeEditor();
-
         // Handle new nodes
         // These are driven by the user, so we place this code before rendering the nodes
         {
@@ -763,7 +764,6 @@ class ColorNodeEditor
             }
         }
         ImNodes::MiniMap(0.5f, minimap_location_);
-        ImNodes::EndNodeEditor();
 
         // Handle new links
         // These are driven by Imnodes, so we place the code after EndNodeEditor().
@@ -878,7 +878,16 @@ class ColorNodeEditor
             //std::string file = "squeezenet_v1.1.param";
             if (!file.empty())
             {
-                nodes_.clear();
+                if (nodes_.size()>0)
+                {
+                    for(auto node : nodes_){
+                        node.in.clear();
+                        node.out.clear();
+                        node.prevs.clear();
+                        node.nexts.clear();
+                    }
+                    nodes_.clear();
+                }
                 delete loader_;
                 loader_ = create_loader(file);    //此处有内存泄漏,不管了
                 loader_->fileToNodes(file, nodes_);
@@ -924,7 +933,8 @@ class ColorNodeEditor
         }
 
         //refresh_pos_link();
-
+
+        ImNodes::EndNodeEditor();
         ImGui::End();
         first_run_ = 0;
     }