Skip to content

Repair issues in 'Reports' generation. #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
henri62 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Repair issues in 'Reports' generation. #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion EDSEditorGUI/Form1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ You should have received a copy of the GNU General Public License
using System.IO;
using libEDSsharp;
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
using System.Diagnostics;

namespace ODEditor
{
Expand Down Expand Up @@ -1038,7 +1039,14 @@ private void documentationToolStripMenuItem_Click(object sender, EventArgs e)
docgenMarkup.genmddoc(temp2, dv.eds);
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo("cmd", $"/c start {temp2}"));
// By using "cmd /c start" you avoid the child process to be attached to the current
// process so the report viewer does not close when leaving the EDS editor.
// {temp2} is quoted too, so spaces in the path do not cause problems.
Process.Start(new ProcessStartInfo {
FileName = "cmd",
Arguments = $"/c start \"\" \"{temp2}\"",
WindowStyle= ProcessWindowStyle.Hidden
});
}
if (IsRunningOnMono())
{
Expand Down
7 changes: 6 additions & 1 deletion EDSEditorGUI/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,9 @@ table tr:hover td {
.receivers
{
width: 90%;
}
}

.error
{
color: red;
}
10 changes: 9 additions & 1 deletion libEDSsharp/NetworkPDOreport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,15 @@ public void gennetpdodoc(string filepath, List<EDSsharp> network)
}
else
{
name = eds.ods[index].Getsubobject(subindex).parameter_name;
ODentry current_sdo = eds.ods[index].Getsubobject(subindex);
if (current_sdo != null)
{
name = current_sdo.parameter_name;
}
else
{
name = string.Format("<p class=\"error\">Error: subindex is missing in SDO!</p>");
}
}


Expand Down