diff --git a/Dockerfile b/Dockerfile index 1ae95ca..f3ace0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get -qq update && apt-get install -qq -y --no-install-recommends \ libxrender1 \ libfontconfig1 \ qt6-base-dev \ - python3 python3-pip \ + python3 python3-pip jq\ && apt-get -qq clean RUN python3 -m pip install matplotlib numpy click svgwrite pyyaml pandas tabulate wheel setuptools tikzplotlib diff --git a/Makefile b/Makefile index 95e4b13..5a82592 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ VERSION=0.1.5+ VERSION_DATE=${VERSION} built on $(shell date) VERSION_HASH=${shell git describe --tags} -TESTS= sar routes sun_sar9b +TESTS= sar routes #- Figure out which platform we're running on ifeq ($(OS),Windows_NT) @@ -39,6 +39,10 @@ OSBIN=darwin GDS3D=GDS3D/mac/GDS3D.app/Contents/MacOS/GDS3D OSID = OSVER = + +#- These test don't work cross platform. Might be a hash table difference between mac and linux +TESTS += sun_sar9b + endif ifeq ($(UNAME_S),Linux) OSNAME=Linux @@ -150,4 +154,4 @@ cirun: docker run --rm -it -v `pwd`:/lcic ${CONT} bash test: - ${foreach f, ${TESTS}, cd tests/${f}; make test; cd ../../;} + ${foreach f, ${TESTS}, cd tests/${f}; make test || exit; cd ../../;} diff --git a/README.md b/README.md index 040f820..88bb986 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,7 @@ Should you find issues, don't hesitate to add an issue on gitub. # Changelog ## v0.1.5 +* Added verticalMultiplyVector to patterntile to simplify analog transistor generation * Route, RouteRing, Guard will be loaded as LayoutCell to fix view problem of cuts. * Fixed issue rotateAngle in LayoutRotateCell. Seems like QJsonValue is no longer automatically casted to QString. diff --git a/cic-core/src/cells/sar.cpp b/cic-core/src/cells/sar.cpp index 42ecafe..f409787 100644 --- a/cic-core/src/cells/sar.cpp +++ b/cic-core/src/cells/sar.cpp @@ -121,7 +121,7 @@ namespace cIcCells{ //Get routing height QList graphs = this->getNodeGraphs("CN<|D<|CP<"); - + int yc = y + msw*2; diff --git a/cic-core/src/core/patterntile.cpp b/cic-core/src/core/patterntile.cpp index 204d0d4..82d72fe 100644 --- a/cic-core/src/core/patterntile.cpp +++ b/cic-core/src/core/patterntile.cpp @@ -60,9 +60,6 @@ namespace cIcCore { y2 += verticalMultiplyVectorSum(ymax_)*(double)yspace_; - // int y2 = translateY(ymax_) + (float)heightoffset_*(float)yspace_; - //int y2 = ((float)ymax_ + (float)heightoffset_)*(float)yspace_; - //qDebug() << "Bounding pattern" << x1 << y1 << x2 << y2 << ymax_ << verticalMultiplyVector_.count(); Rect r; @@ -83,7 +80,7 @@ namespace cIcCore { } double PatternTile::verticalMultiplyVectorSum(int y){ - int sum = 0; + double sum = 0; if(y >= 0 && verticalMultiplyVector_.count() >= y){ for(int i=0;iheight = verticalMultiplyVectorSum(ymax_+1); @@ -742,11 +737,6 @@ namespace cIcCore { } } - - - - - QJsonArray encl = ar[2].toArray(); foreach(QJsonValue enc, encl){