Quick and dirty display critical from Julia

Author: Lecrapouille

data/imgui.ini

@@ -102,8 +102,8 @@ Size=1100,749
 Collapsed=0
 
 [Window][Critical Cycle]
-Pos=809,289
-Size=301,428
+Pos=809,386
+Size=16,35
 Collapsed=0
 
 [Window][Choose the Petri file to save before creating new document##ChooseFileDlgKey]
@@ -208,6 +208,16 @@ Pos=750,271
 Size=224,71
 Collapsed=0
 
+[Window][Critical Circuit]
+Pos=401,259
+Size=16,35
+Collapsed=0
+
+[Window][Critical circuit analysis]
+Pos=261,154
+Size=424,325
+Collapsed=0
+
 [Table][0x90C2C115,4]
 RefScale=13
 Column 0  Sort=0v
@@ -680,6 +690,14 @@ Column 0  Sort=0v
 RefScale=13
 Column 0  Sort=0v
 
+[Table][0x9B24456E,4]
+RefScale=13
+Column 0  Sort=0v
+
+[Table][0xBDA44527,4]
+RefScale=13
+Column 0  Sort=0v
+
 [Docking][Data]
 DockSpace                                                                                                             ID=0x08BD597D Window=0x1BBC0F80 Pos=0,19 Size=1100,749 Split=Y
   DockNode                                                                                                            ID=0x00000005 Parent=0x08BD597D SizeRef=1100,867 Split=X

src/Editor/Editor.cpp

@@ -316,10 +316,18 @@ void Editor::setSavePath(std::string const& filepath)
 }
 
 //------------------------------------------------------------------------------
-void Editor::run(Net const& net_to_load)
+void Editor::run(Net const& net_to_load, bool show_critical_cycle)
 {
     this->net() = net_to_load;
 
+    if (show_critical_cycle)
+    {
+        m_states.do_find_critical_circuit = true;
+        CriticalCycleResult const cc = findCriticalCycle(this->net());
+        if (cc.success)
+            m_marked_arcs = cc.arcs;
+    }
+
     // Start the infinite loop
     Application::run();
 }

src/Editor/Editor.hpp

@@ -70,7 +70,7 @@ class Editor: public Application
     //! string if you do not want to load a Petri net file.
     //-------------------------------------------------------------------------
     void run(std::string const& petri_file);
-    void run(Net const& net);
+    void run(Net const& net, bool show_critical_cycle = false);
 
     //-------------------------------------------------------------------------
     //! \brief Save a screenshot after the next rendered frame.

src/julia/Julia.cpp

@@ -101,7 +101,8 @@ bool petri_is_empty(int64_t const pn, bool* empty)
 // Equivalent to the main() but separated to allow to export function and create
 // shared library.
 // -----------------------------------------------------------------------------
-bool petri_editor(int64_t const pn, char const* screenshot_path)
+bool petri_editor(int64_t const pn, char const* screenshot_path,
+                  bool show_critical_cycle)
 {
     CHECK_VALID_PETRI_HANDLE(pn, false);
 
@@ -112,7 +113,7 @@ bool petri_editor(int64_t const pn, char const* screenshot_path)
 
     try
     {
-        editor.run(*g_petri_nets[size_t(pn)]);
+        editor.run(*g_petri_nets[size_t(pn)], show_critical_cycle);
         *g_petri_nets[size_t(pn)] = editor.net();
     }
     catch (std::string const& msg)

src/julia/Julia.hpp

@@ -95,10 +95,13 @@ extern "C" bool petri_is_empty(int64_t const pn, bool* empty);
 //! \param[in] pn: the handle of the petri net created by create_petri_net().
 //! \param[in] screenshot_path: optional PNG path saved after the first frame.
 //! Pass nullptr to skip.
+//! \param[in] show_critical_cycle: if true, highlight the critical cycle and
+//! open the analysis dialog on startup (as in ScicosLab show_cr_graph).
 //! \return false if the handle is invalid or the GUI cannot be started else
 //! return true.
 // ****************************************************************************
-extern "C" bool petri_editor(int64_t const pn, char const* screenshot_path);
+extern "C" bool petri_editor(int64_t const pn, char const* screenshot_path,
+                             bool show_critical_cycle);
 
 // ****************************************************************************
 //! \brief Open the editor, save a PNG screenshot after the first frame, then

src/julia/TimedPetriNetEditor.jl

@@ -207,9 +207,11 @@ julia> places(pn)
  Place(607.0, 266.0, 0)
 ```
 """
-function petri_editor!(pn::PetriNet; screenshot::Union{Nothing,String}=nothing)
+function petri_editor!(pn::PetriNet; screenshot::Union{Nothing,String}=nothing,
+                       critical_cycle::Bool=false)
     sc = screenshot === nothing ? C_NULL : screenshot
-    ccall((:petri_editor, libtpne), Bool, (Clonglong, Cstring), pn.handle, sc) || throw_error()
+    ccall((:petri_editor, libtpne), Bool, (Clonglong, Cstring, Bool),
+          pn.handle, sc, critical_cycle) || throw_error()
 end
 
 """
@@ -241,9 +243,10 @@ Once presed ESCAPE key, the editor will quit and modifications applied on the du
 while the original net is not modified.
 Throw an exception if the Petri net handle is invalid.
 """
-function petri_editor(pn::PetriNet)
+function petri_editor(pn::PetriNet; critical_cycle::Bool=false)
     pn1 = petri_net(pn)
-    ccall((:petri_editor, libtpne), Bool, (Clonglong, Cstring), pn1.handle, C_NULL) || throw_error()
+    ccall((:petri_editor, libtpne), Bool, (Clonglong, Cstring, Bool),
+          pn1.handle, C_NULL, critical_cycle) || throw_error()
     return pn1
 end