Added warning for too few columns in patternTile pattern

Makefile

@@ -65,6 +65,11 @@ endif
 
 #- Should support most QT5 and QT6
 DEFQMAKE=QMAKE_6
+QMAKEOPT=
+ifeq (${UNAME_S},Darwin)
+#QMAKEOPT+= QMAKE_DEFAULT_LIBDIRS=${shell xcrun -show-sdk-path}/usr/lib
+endif
+
 QMAKE=qmake6
 ifeq (, $(shell which ${QMAKE}))
 QMAKE=qmake-qt5
@@ -86,7 +91,7 @@ compile:
 	echo "#define CICHASH \""${VERSION_HASH}"\""  >> cic/src/version.h
 	echo "#define CICVERSION \""${VERSION_DATE}"\""  > cic-gui/src/version.h
 	echo "#define CICHASH \""${VERSION_HASH}"\""  >> cic-gui/src/version.h
-	${QMAKE} -o qmake.make DEFINES+="${DEFQMAKE}"  ciccreator.pro ${QTOPT}
+	${QMAKE} -o qmake.make DEFINES+="${DEFQMAKE}" ${QMAKEOPT}  ciccreator.pro ${QTOPT}
 	${MAKE} -f qmake.make
 	test -d release || mkdir release
 	cp release/${CIC} release/cic.${OSBIN}${OSID}${OSVER}_${VERSION}
@@ -104,6 +109,7 @@ clean:
 	-rm cic-core/Makefile
 	-rm cic-gui/Makefile
 	-rm qmake.make
+	-rm -rf .qmake.stash
 	${foreach f, ${TESTS}, cd tests/${f} ; make clean;cd ../../;}
 
 doxygen:

cic-core/src/core/cut.cpp

@@ -281,6 +281,11 @@ namespace cIcCore {
 
     Instance * Cut::getInstance(QString layer1, QString layer2, int horizontal_cuts, int vertical_cuts){
 
+        //-No point in making a cut without layer transition
+        if(layer1 == layer2){
+            return nullptr;
+        }
+
         InstanceCut *instance = 0;
         QString tag1 =   Cut::makeName(layer1,layer2,horizontal_cuts,vertical_cuts);
         QString tag2 = Cut::makeName(layer2,layer1,horizontal_cuts,vertical_cuts);
@@ -292,7 +297,6 @@ namespace cIcCore {
             c = cuts_[tag2];
         }else{
             c = new Cut(layer1,layer2,horizontal_cuts,vertical_cuts);
-
             cuts_[c->name()] = c;
         }
 
@@ -304,6 +308,11 @@ namespace cIcCore {
 
         }
 
+        if(!instance){
+            std::string errorMessage  = "Error: Could not create cut from " + layer1.toStdString() + " to " + layer2.toStdString();
+            throw std::runtime_error(errorMessage);
+        }
+
         return instance;
     }
 

cic-core/src/core/design.cpp

@@ -212,11 +212,16 @@ namespace cIcCore{
             //Run through the array of design cells, and try an match objects
             QJsonArray cellArray  = cells.toArray();
             foreach (const QJsonValue & value, cellArray) {
+                try{
                 QJsonObject c = value.toObject();
                 QJsonValue name = c["name"];
                 _cells[name.toString()] = c;
 
                 this->createCell(c);
+                }catch(const std::exception &exc){
+                    console->error(exc.what());
+                    throw exc;
+                }
             }
 
         }else{

cic-core/src/core/layoutcell.cpp

@@ -379,9 +379,11 @@ namespace cIcCore{
 
         QList<Rect*> rects = this->findAllRectangles(path,startlayer);
 
-        foreach(Rect* r, rects){
+        foreach(Rect* r, rects)
+        {
             if(r == 0) continue;
             Instance * inst= Cut::getInstance(startlayer,stoplayer,hcuts,vcuts);
+
             inst->moveTo(r->x2() + xoffset*inst->width(),r->centerY() + yoffset*inst->height());
 
             Rect * rstop = inst->getRect(stoplayer);

cic-core/src/core/patterntile.cpp

@@ -370,12 +370,24 @@ namespace cIcCore {
                 currentHeight_ = yspace_*vmv;
                 currentHeightDelta_ = currentHeight_ - yspace_;
                 int ys = translateY(y);
-
+
+
+
                 for(int x=0;x <= xmax_;x++){
+
+
                     QString s = strs[strs.length() - y -1];
 
+
+
+
+                    if((s.length()-1) < x){
+                        qDebug() << "Error: To few columns in "  << s;
+                    }
+
                     QChar c = s[x];
 
+
                     if(c == '-'){continue;}
 
                     Rect * rect = new Rect();
@@ -587,7 +599,8 @@ namespace cIcCore {
                     this->paintRect(rect,c,x,y);
 
                 }
-
+
+
             }
         }
 

cic/cic.pro

@@ -22,7 +22,6 @@ CONFIG += static
 TEMPLATE = app
 TARGET = cic
 
-
 HEADERS +=  src/version.h  \
 
 include(../etc/mac_sdk.pro)

cic/src/main.cpp

@@ -122,7 +122,7 @@ int main(int argc, char *argv[])
             throw "Die";
         }
 
-    }catch(...){
+    }catch(const std::exception &exc){
         qWarning() << "Usage: cic <JSON file> <Technology file> [<Output name>]";
         qWarning() << "Example: cic examples/SAR_ESSCIRC16_28N.json examples/tech.json SAR_ESSCIRC16_28N";
         qWarning() << "About: \n\tcIcCreator reads a JSON object definition file, technology rule file\n" <<

ciccreator.pro

@@ -20,7 +20,6 @@
 QMAKE_CFLAGS += $$(CFLAGS)  -g
 QMAKE_CXXFLAGS += $$(CCFLAGS)  -g
 CONFIG += c++11
-#CONFIG += debug
 CONFIG += static
 
 

etc/mac_sdk.pro

@@ -1,12 +1,8 @@
 
 mac {
   #- This needs to point to the SDK usually in /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
-#  mac::QMAKE_MAC_SDK = macosx10.13
-#mac::QMAKE_MAC_SDK = macosx10.14
+  #CONFIG += sdk
+  EXPORT_QMAKE_MAC_SDK = macosx14.2
+  #QT_MAC_SDK_NO_VERSION_CHECK = 1
 
-#mac::QMAKE_MAC_SDK = macosx11.3
-#mac::QMAKE_MAC_SDK = macosx12.1
-#mac::QMAKE_MAC_SDK = macosx12.3
-#mac::QMAKE_MAC_SDK = macosx13.3
-#  mac::QMAKE_MAC_SDK = 
-  }
+}

tests/sun_sar9b/Makefile

@@ -5,6 +5,7 @@ test:
 	cat SAR.cic | jq .cells > sar.json
 	cat ref.cic | jq .cells > ref.json
 	diff sar.json ref.json || exit 1;
+	cicpy svg SAR.cic sky130.tech SAR --x 300 --y 400 --scale 10
 
 clean:
 	rm -f SAR.cic