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

fix missing check for loaded data when user tries a "full" zoom in a graph window (segfault)

This commit is contained in:
Stefan Frederik 2021-12-23 13:01:18 +01:00
parent 62e71a8bbe
commit c30ff852a2
6 changed files with 2020 additions and 2009 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XSchemWin/XSchemWix/Product.wxs
View File

@ -72,7 +72,7 @@
<Shortcut Id="DocumentationStartMenuShortcut"
Name="Xschem Documentation"
Description="Helpful Xschem Documentation"
Target="[DOCFOLDER]/xschem_man/XSCHEM_2.9.2_Manual_Tutorials.pdf" />
Target="[DOCFOLDER]/xschem_man/xschem_manual.pdf" />
<RegistryValue Root="HKCU" Key="Software\CoralEDA\Xschem" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
</Component>
</DirectoryRef>

3
XSchemWin/XSchemWix/XSchemWix.wixproj
View File

@ -54,7 +54,8 @@
</PropertyGroup>
<PropertyGroup>
<PreBuildEvent>C:\"Program Files (x86)"\"WiX Toolset v3.11"\bin\heat.exe dir "..\..\..\..\doc" -dr INSTALLFOLDER -cg doc -gg -sfrag -var "var.docSrcDir" -out $(ProjectDir)heat_doc.wxs
C:\"Program Files (x86)"\"WiX Toolset v3.11"\bin\heat.exe dir "..\..\..\..\xschem_library" -dr INSTALLFOLDER -cg xschem_library -gg -sfrag -var "var.xschemLibrarySrcDir" -out $(ProjectDir)heat_xschem_library.wxs</PreBuildEvent>
C:\"Program Files (x86)"\"WiX Toolset v3.11"\bin\heat.exe dir "..\..\..\..\xschem_library" -dr INSTALLFOLDER -cg xschem_library -gg -sfrag -var "var.xschemLibrarySrcDir" -out $(ProjectDir)heat_xschem_library.wxs
curl.exe --output D:\Projects\XSchem\doc\xschem_man\xschem_manual.pdf --url https://xschem.sourceforge.io/stefan/xschem_man/xschem_man.pdf</PreBuildEvent>
</PropertyGroup>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.

4
XSchemWin/XSchemWix/doc.wxs
View File

@ -771,6 +771,9 @@
<Component Id="cmpD3405252BBE8BE0E89FF98C796E886D2" Guid="{AC48284C-51A8-4CDC-A919-AD6C8F17D00D}">
<File Id="filB83C74655F954E6751386E9C458D6B50" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_man.html" />
</Component>
<Component Id="cmp79D078894A1E9865B1FAA6D6E3A67E41" Guid="{DE08B6F2-D9E0-4DE6-A51F-962DCA8B73CB}">
<File Id="filDBD6D15AFF1AF414C301B4C8A208D722" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_manual.pdf" />
</Component>
<Component Id="cmp32DBC6F4737AABC6CA5CDB21A1BFB39B" Guid="{C5B17A40-96AF-42AD-8C80-16B97C9D05D2}">
<File Id="filFA6A6237EC8CF4CB0F26019613DAEC53" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_new_file.png" />
</Component>
@ -1065,6 +1068,7 @@
<ComponentRef Id="cmpC47D2E68F93BDFE7A1A9A46EF787C84B" />
<ComponentRef Id="cmp09A41567E4D242D52AA78A2EB221CC11" />
<ComponentRef Id="cmpD3405252BBE8BE0E89FF98C796E886D2" />
<ComponentRef Id="cmp79D078894A1E9865B1FAA6D6E3A67E41" />
<ComponentRef Id="cmp32DBC6F4737AABC6CA5CDB21A1BFB39B" />
<ComponentRef Id="cmp364E784B2508A89E6EE1B209FDA34BE8" />
<ComponentRef Id="cmp42E13A00B2A3155255BC2BBF3F4F3663" />

536
XSchemWin/XSchemWix/heat_doc.wxs
View File

File diff suppressed because it is too large Load Diff

3468
XSchemWin/XSchemWix/heat_xschem_library.wxs
View File

File diff suppressed because it is too large Load Diff

16
src/callback.c
View File

@ -259,13 +259,15 @@ static int waves_callback(int event, int mx, int my, KeySym key, int button, int
need_redraw = 1;
}
else if(key == 'f') {
xx1 = 0.0;
xx2 = xctx->values[0][xctx->npoints -1];
my_snprintf(s, S(s), "%g", xx1);
my_strdup(1409, &xctx->rect[c][n].prop_ptr, subst_token(xctx->rect[c][n].prop_ptr, "x1", s));
my_snprintf(s, S(s), "%g", xx2);
my_strdup(1409, &xctx->rect[c][n].prop_ptr, subst_token(xctx->rect[c][n].prop_ptr, "x2", s));
need_redraw = 1;
if(xctx->values) {
xx1 = 0.0;
xx2 = xctx->values[0][xctx->npoints -1];
my_snprintf(s, S(s), "%g", xx1);
my_strdup(1409, &xctx->rect[c][n].prop_ptr, subst_token(xctx->rect[c][n].prop_ptr, "x1", s));
my_snprintf(s, S(s), "%g", xx2);
my_strdup(1409, &xctx->rect[c][n].prop_ptr, subst_token(xctx->rect[c][n].prop_ptr, "x2", s));
need_redraw = 1;
}
}
else if(event == ButtonPress && button == Button1) {
xctx->mx_double_save = xctx->mousex_snap;