luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct background color for monochrome svg exports, close stdin if xschem started with -b to avoid blocking when spawning ngspice batch tasks

This commit is contained in:
Stefan Frederik 2022-05-12 23:32:57 +02:00
parent b81a7cf020
commit f2097bac0b
6 changed files with 1925 additions and 1903 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
XSchemWin/README_WIN
View File

@ -21,12 +21,12 @@ SUBDIRECTORIES
XSchemWin: Windows specific files (e.g. xschem.tcl, xschemrc, config.h)
INSTRUCTIONS TO ADD XSCHEM TO VISUAL STUDIO 2019
INSTRUCTIONS TO ADD XSCHEM TO VISUAL STUDIO 2022
1. requirements
- Microsoft Visual Studio 2019
- Wix Toolset Visual Studio 2019 Extension (Download through Microsoft Extensions on VS 2019)
- Microsoft Visual Studio 2022
- Wix Toolset Visual Studio 2022 Extension (Download through Microsoft Extensions on VS 2022)
- Wix Toolset Build Tools v3.11 (Download online from wixtoolset)
(WiX Toolset requires the .NET Framework 3.5.1 Windows feature to be enabled.)
Turn Windows features on or off
@ -43,9 +43,9 @@ INSTRUCTIONS TO ADD XSCHEM TO VISUAL STUDIO 2019
Update xschemrc to set variable to_pdf and to_png
Add directory of gswin64.exe to PATH if installer didn't do it
2. Create new XSchemWin project on Visual Studio 2019
2. Create new XSchemWin project on Visual Studio 2022
a. Open VS2019
a. Open VS2022
b. Create a new project
c. Select Empty Project
d. Project Name: XSchemWin

3788
XSchemWin/XSchemWix/heat_xschem_library.wxs
View File

File diff suppressed because it is too large Load Diff

4
XSchemWin/XSchemWix/xschem_library.wxs
View File

@ -117,6 +117,9 @@
<Component Id="cmp5D1B53EF03CED2ECD99EBC6A0CCAD220" Guid="{CE8A06EF-A155-43E9-B2FC-5D480E5525F3}">
<File Id="fil5C8CCACC8F766C8B1C25F254B9B15FD9" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\devices\delay_line.sym" />
</Component>
<Component Id="cmp0807E8DF92B47E7D7D181592637972C3" Guid="{10330799-0BED-438A-B2C7-34CF5099C205}">
<File Id="fil4C46D71388ACA0A6DB1F611D8E9F541C" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\devices\device_param_probe.sym" />
</Component>
<Component Id="cmpBAFA0738FE02E2420BF33F5994C1928B" Guid="{8AF35819-D1C9-4C55-B53A-F2AD03364553}">
<File Id="filC8FE8887649E529D347B7103C3864C67" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\devices\diode.sym" />
</Component>
@ -5450,6 +5453,7 @@
<ComponentRef Id="cmp55400BD632178B862701F2D46A9E6B05" />
<ComponentRef Id="cmp9859F3EA1CCF502FB2F8FD4B2CED8589" />
<ComponentRef Id="cmp5D1B53EF03CED2ECD99EBC6A0CCAD220" />
<ComponentRef Id="cmp0807E8DF92B47E7D7D181592637972C3" />
<ComponentRef Id="cmpBAFA0738FE02E2420BF33F5994C1928B" />
<ComponentRef Id="cmp115668CD383D0AA174DCCB4DA505B13F" />
<ComponentRef Id="cmp611EC17997E3C9AFEFC1A1647A44BE0F" />

1
src/main.c
View File

@ -103,6 +103,7 @@ int main(int argc, char **argv)
if(detach && has_x) {
fclose(stdin);
Tcl_FindExecutable(argv[0]); /* tcl stores executable name for its internal usage */
interp = Tcl_CreateInterp(); /* create the tcl interpreter */
Tcl_AppInit(interp); /* execute our init function */

1
src/scheduler.c
View File

@ -2705,6 +2705,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
cmd_found = 1;
if( set_netlist_dir(0, NULL) ) {
tcleval("simulate");
Tcl_ResetResult(interp);
}
}

24
src/svgdraw.c
View File

@ -598,13 +598,25 @@ static void fill_svg_colors()
svg_colors[i].green = (c & 0x00ff00) >> 8;
svg_colors[i].blue = (c & 0x0000ff);
} else if(tclgetboolvar("dark_colorscheme")) {
svg_colors[i].red = 255;
svg_colors[i].green = 255;
svg_colors[i].blue = 255;
if(i == 0) {
svg_colors[i].red = 0;
svg_colors[i].green = 0;
svg_colors[i].blue = 0;
} else {
svg_colors[i].red = 255;
svg_colors[i].green = 255;
svg_colors[i].blue = 255;
}
} else {
svg_colors[i].red = 0;
svg_colors[i].green = 0;
svg_colors[i].blue = 0;
if(i == 0) {
svg_colors[i].red = 255;
svg_colors[i].green = 255;
svg_colors[i].blue = 255;
} else {
svg_colors[i].red = 0;
svg_colors[i].green = 0;
svg_colors[i].blue = 0;
}
}
if(debug_var>=1) {
fprintf(errfp, "svg_colors: %d %d %d\n", svg_colors[i].red, svg_colors[i].green, svg_colors[i].blue);