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

Merge branch 'StefanSchippers:master' into master

This commit is contained in:
Rafmag Cabrera 2023-01-22 00:52:50 +00:00 committed by GitHub
parent 4814d10a67 d7ddb17a50
commit e6a6b0d1b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 657 additions and 657 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XSchemWin/XSchemWin_cairo.vcxproj
View File

@ -223,6 +223,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\actions.c" />
<ClCompile Include="..\src\cairo_jpg.c" />
<ClCompile Include="..\src\callback.c" />
<ClCompile Include="..\src\check.c" />
<ClCompile Include="..\src\clip.c" />
@ -257,6 +258,7 @@
<ClCompile Include="parselabel.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\cairo_jpg.h" />
<ClInclude Include="..\src\xschem.h" />
<ClInclude Include="config.h" />
<ClInclude Include="expandlabel.h" />

1266
src/cairo_jpg.c
View File

File diff suppressed because it is too large Load Diff

7
src/xinit.c
View File

@ -1703,8 +1703,7 @@ int new_schematic(const char *what, const char *win_path, const char *fname)
void change_linewidth(double w)
{
int i, changed = 0, linew;
double oldw = xctx->lw;
int i, linew;
/* choose line width automatically based on zoom */
if(w<0. || xctx->lw == -1.0) {
@ -1718,10 +1717,6 @@ void change_linewidth(double w)
} else {
xctx->lw=w;
}
if(xctx->lw != oldw) {
changed = 1;
}
if(!changed) return;
if(has_x) {
linew = INT_WIDTH(xctx->lw);
dbg(1, "Line width = %d\n", linew);

18
xschem_library/examples/mos_power_ampli.sch
View File

File diff suppressed because one or more lines are too long

12
xschem_library/rom8k/rom2_ctrl.sch
View File

@ -1,4 +1,5 @@
v {xschem version=3.0.0 file_version=1.2 }
v {xschem version=3.1.0 file_version=1.2
}
G {}
K {}
V {}
@ -18,7 +19,8 @@ xctrl.ldprechref"
color="12 11"
digital=0
ypos1=-0.0691204
ypos2=0.68559}
ypos2=0.68559
jpeg_quality=30}
B 2 580 -280 1200 -140 {flags=graph
y1 = 0
y2 = 1.6
@ -33,7 +35,8 @@ xctrl.ldcpb"
color="12 11"
digital=0
ypos1=0.071147
ypos2=1.0465}
ypos2=1.0465
jpeg_quality=30}
B 2 580 -400 1200 -280 {flags=graph
y1 = 0
y2 = 1.6
@ -50,7 +53,8 @@ xctrl.ldoutib"
color="12 5 11 8"
digital=1
ypos1=0.1572
ypos2=0.829851}
ypos2=0.829851
jpeg_quality=30}
N 360 -670 500 -670 {lab=LDCPB}
N 240 -760 250 -760 {lab=LDCPB}
N 240 -760 240 -670 {lab=LDCPB}

9
xschem_library/rom8k/rom2_sa.sch
View File

@ -15,7 +15,8 @@ divx=8
node="tcleval($\{path\}ldqi
$\{path\}ldqib
$\{path\}ldsali)"
color="9 6 7"}
color="9 6 7"
jpeg_quality=30}
B 2 380 -940 1060 -830 {flags=graph
y1 = 0
y2 = 2
@ -25,7 +26,8 @@ x2=3.4e-07
divx=8
node="v(ldcp)
v(ldprech)"
color="12 10"}
color="12 10"
jpeg_quality=30}
B 2 380 -650 1060 -510 {flags=graph
y1 = 0
y2 = 2
@ -36,7 +38,8 @@ divx=8
node="tcleval($\{path\}ldqiii
$\{path\}ldqii
$\{path\}ldsali)"
color="6 8 7"}
color="6 8 7"
jpeg_quality=30}
T {Was:
60/24} 1420 -310 0 0 0.4 0.4 {}
T {was: LDCP_B} 510 -410 0 0 0.4 0.4 {}