# HG changeset patch # User Alexis Jeandet # Date 2015-06-08 22:46:34 # Node ID 442ac78a55ba443e124028fba67969496ab8818d # Parent c48b43d9c7fbdbb5986bff7f3242c9a94054bead Some work on PCB parser. diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -1,3 +1,4 @@ syntax: glob *.pro.user *~ +Makefile diff --git a/qilib/Makefile b/qilib/Makefile deleted file mode 100644 --- a/qilib/Makefile +++ /dev/null @@ -1,560 +0,0 @@ -############################################################################# -# Makefile for building: libQIlib.so.1.0.0 -# Generated by qmake (3.0) (Qt 5.2.1) -# Project: QIlib.pro -# Template: lib -# Command: /usr/bin/qmake-qt5 -o Makefile QIlib.pro -############################################################################# - -MAKEFILE = Makefile - -####### Compiler, tools and options - -CC = gcc -CXX = g++ -DEFINES = -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -CFLAGS = -m64 -pipe -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES) -CXXFLAGS = -m64 -pipe -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES) -INCPATH = -I/usr/lib64/qt5/mkspecs/linux-g++-64 -I. -Iparsers -I/usr/include/qt5 -I/usr/include/qt5/QtWidgets -I/usr/include/qt5/QtGui -I/usr/include/qt5/QtCore -Imoc -LINK = g++ -LFLAGS = -m64 -Wl,-O1 -Wl,-z,relro -shared -Wl,-soname,libQIlib.so.1 -LIBS = $(SUBLIBS) -L/usr/X11R6/lib64 -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread -AR = ar cqs -RANLIB = -QMAKE = /usr/bin/qmake-qt5 -TAR = tar -cf -COMPRESS = gzip -9f -COPY = cp -f -SED = sed -COPY_FILE = cp -f -COPY_DIR = cp -f -R -STRIP = -INSTALL_FILE = install -m 644 -p -INSTALL_DIR = $(COPY_DIR) -INSTALL_PROGRAM = install -m 755 -p -DEL_FILE = rm -f -SYMLINK = ln -f -s -DEL_DIR = rmdir -MOVE = mv -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p - -####### Output directory - -OBJECTS_DIR = obj/ - -####### Files - -SOURCES = qicadnetlist.cpp \ - qicadnet.cpp \ - qicadnetlistparser.cpp \ - parsers/lispLike_driver.cpp \ - parsers/lispLike_scanner.cpp lispLike.scanner.cpp \ - lispLike.parser.cpp -OBJECTS = obj/qicadnetlist.o \ - obj/qicadnet.o \ - obj/qicadnetlistparser.o \ - obj/lispLike_driver.o \ - obj/lispLike_scanner.o \ - obj/lispLike.scanner.o \ - obj/lispLike.parser.o -DIST = /usr/lib64/qt5/mkspecs/features/spec_pre.prf \ - /usr/lib64/qt5/mkspecs/common/shell-unix.conf \ - /usr/lib64/qt5/mkspecs/common/unix.conf \ - /usr/lib64/qt5/mkspecs/common/linux.conf \ - /usr/lib64/qt5/mkspecs/common/gcc-base.conf \ - /usr/lib64/qt5/mkspecs/common/gcc-base-unix.conf \ - /usr/lib64/qt5/mkspecs/common/g++-base.conf \ - /usr/lib64/qt5/mkspecs/common/g++-unix.conf \ - /usr/lib64/qt5/mkspecs/qconfig.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_clucene_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_compositor.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_compositor_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_concurrent.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_core.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_core_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_dbus.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_dbus_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_declarative.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_declarative_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_designer.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_designer_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_designercomponents_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_gui.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_gui_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_help.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_help_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_multimedia.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_multimedia_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_network.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_network_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_opengl.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_opengl_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_openglextensions.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_printsupport.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_qml.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_qml_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_qmldevtools_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_qmltest.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_qmltest_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_quick.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_quick_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_quickparticles_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_script.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_script_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_scripttools.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_scripttools_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_sql.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_sql_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_svg.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_svg_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_testlib.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_testlib_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_uitools.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_uitools_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_webkit.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_webkit_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_webkitwidgets.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_widgets.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_widgets_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_x11extras.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_x11extras_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_xml.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_xml_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_xmlpatterns.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_xmlpatterns_private.pri \ - /usr/lib64/qt5/mkspecs/features/qt_functions.prf \ - /usr/lib64/qt5/mkspecs/features/qt_config.prf \ - /usr/lib64/qt5/mkspecs/linux-g++-64/qmake.conf \ - /usr/lib64/qt5/mkspecs/features/spec_post.prf \ - /usr/lib64/qt5/mkspecs/features/exclusive_builds.prf \ - /usr/lib64/qt5/mkspecs/features/default_pre.prf \ - parsers/Flex_Bison_FIles/Flex_Bison_FIles.pri \ - /usr/lib64/qt5/mkspecs/features/resolve_config.prf \ - /usr/lib64/qt5/mkspecs/features/default_post.prf \ - /usr/lib64/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \ - /usr/lib64/qt5/mkspecs/features/warn_on.prf \ - /usr/lib64/qt5/mkspecs/features/qt.prf \ - /usr/lib64/qt5/mkspecs/features/resources.prf \ - /usr/lib64/qt5/mkspecs/features/moc.prf \ - /usr/lib64/qt5/mkspecs/features/unix/opengl.prf \ - /usr/lib64/qt5/mkspecs/features/uic.prf \ - /usr/lib64/qt5/mkspecs/features/unix/thread.prf \ - /usr/lib64/qt5/mkspecs/features/testcase_targets.prf \ - /usr/lib64/qt5/mkspecs/features/exceptions.prf \ - /usr/lib64/qt5/mkspecs/features/yacc.prf \ - /usr/lib64/qt5/mkspecs/features/lex.prf \ - QIlib.pro \ - QIlib.pro -QMAKE_TARGET = QIlib -DESTDIR = #avoid trailing-slash linebreak -TARGET = libQIlib.so.1.0.0 -TARGETA = libQIlib.a -TARGETD = libQIlib.so.1.0.0 -TARGET0 = libQIlib.so -TARGET1 = libQIlib.so.1 -TARGET2 = libQIlib.so.1.0 - - -first: all -####### Implicit rules - -.SUFFIXES: .o .c .cpp .cc .cxx .C - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cc.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cxx.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.C.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.c.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" - -####### Build rules - -all: Makefile $(TARGET) - -$(TARGET): lispLike.parser.cpp $(OBJECTS) $(SUBLIBS) $(OBJCOMP) - -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) $(OBJCOMP) - -ln -s $(TARGET) $(TARGET0) - -ln -s $(TARGET) $(TARGET1) - -ln -s $(TARGET) $(TARGET2) - - - -staticlib: $(TARGETA) - -$(TARGETA): lispLike.parser.cpp $(OBJECTS) $(OBJCOMP) - -$(DEL_FILE) $(TARGETA) - $(AR) $(TARGETA) $(OBJECTS) - -Makefile: QIlib.pro /usr/lib64/qt5/mkspecs/linux-g++-64/qmake.conf /usr/lib64/qt5/mkspecs/features/spec_pre.prf \ - /usr/lib64/qt5/mkspecs/common/shell-unix.conf \ - /usr/lib64/qt5/mkspecs/common/unix.conf \ - /usr/lib64/qt5/mkspecs/common/linux.conf \ - /usr/lib64/qt5/mkspecs/common/gcc-base.conf \ - /usr/lib64/qt5/mkspecs/common/gcc-base-unix.conf \ - /usr/lib64/qt5/mkspecs/common/g++-base.conf \ - /usr/lib64/qt5/mkspecs/common/g++-unix.conf \ - /usr/lib64/qt5/mkspecs/qconfig.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_clucene_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_compositor.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_compositor_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_concurrent.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_core.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_core_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_dbus.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_dbus_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_declarative.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_declarative_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_designer.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_designer_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_designercomponents_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_gui.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_gui_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_help.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_help_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_multimedia.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_multimedia_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_network.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_network_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_opengl.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_opengl_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_openglextensions.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_printsupport.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_qml.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_qml_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_qmldevtools_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_qmltest.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_qmltest_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_quick.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_quick_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_quickparticles_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_script.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_script_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_scripttools.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_scripttools_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_sql.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_sql_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_svg.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_svg_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_testlib.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_testlib_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_uitools.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_uitools_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_webkit.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_webkit_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_webkitwidgets.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_widgets.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_widgets_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_x11extras.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_x11extras_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_xml.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_xml_private.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_xmlpatterns.pri \ - /usr/lib64/qt5/mkspecs/modules/qt_lib_xmlpatterns_private.pri \ - /usr/lib64/qt5/mkspecs/features/qt_functions.prf \ - /usr/lib64/qt5/mkspecs/features/qt_config.prf \ - /usr/lib64/qt5/mkspecs/linux-g++-64/qmake.conf \ - /usr/lib64/qt5/mkspecs/features/spec_post.prf \ - /usr/lib64/qt5/mkspecs/features/exclusive_builds.prf \ - /usr/lib64/qt5/mkspecs/features/default_pre.prf \ - parsers/Flex_Bison_FIles/Flex_Bison_FIles.pri \ - /usr/lib64/qt5/mkspecs/features/resolve_config.prf \ - /usr/lib64/qt5/mkspecs/features/default_post.prf \ - /usr/lib64/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \ - /usr/lib64/qt5/mkspecs/features/warn_on.prf \ - /usr/lib64/qt5/mkspecs/features/qt.prf \ - /usr/lib64/qt5/mkspecs/features/resources.prf \ - /usr/lib64/qt5/mkspecs/features/moc.prf \ - /usr/lib64/qt5/mkspecs/features/unix/opengl.prf \ - /usr/lib64/qt5/mkspecs/features/uic.prf \ - /usr/lib64/qt5/mkspecs/features/unix/thread.prf \ - /usr/lib64/qt5/mkspecs/features/testcase_targets.prf \ - /usr/lib64/qt5/mkspecs/features/exceptions.prf \ - /usr/lib64/qt5/mkspecs/features/yacc.prf \ - /usr/lib64/qt5/mkspecs/features/lex.prf \ - QIlib.pro \ - /lib64/libQt5Widgets.prl \ - /lib64/libQt5Gui.prl \ - /lib64/libQt5Core.prl - $(QMAKE) -o Makefile QIlib.pro -/usr/lib64/qt5/mkspecs/features/spec_pre.prf: -/usr/lib64/qt5/mkspecs/common/shell-unix.conf: -/usr/lib64/qt5/mkspecs/common/unix.conf: -/usr/lib64/qt5/mkspecs/common/linux.conf: -/usr/lib64/qt5/mkspecs/common/gcc-base.conf: -/usr/lib64/qt5/mkspecs/common/gcc-base-unix.conf: -/usr/lib64/qt5/mkspecs/common/g++-base.conf: -/usr/lib64/qt5/mkspecs/common/g++-unix.conf: -/usr/lib64/qt5/mkspecs/qconfig.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_clucene_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_compositor.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_compositor_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_concurrent.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_concurrent_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_core.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_core_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_dbus.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_dbus_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_declarative.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_declarative_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_designer.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_designer_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_designercomponents_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_gui.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_gui_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_help.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_help_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_multimedia.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_multimedia_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_multimediawidgets_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_network.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_network_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_opengl.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_opengl_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_openglextensions.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_printsupport.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_printsupport_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_qml.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_qml_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_qmldevtools_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_qmltest.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_qmltest_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_quick.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_quick_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_quickparticles_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_script.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_script_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_scripttools.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_scripttools_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_sql.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_sql_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_svg.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_svg_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_testlib.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_testlib_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_uitools.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_uitools_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_webkit.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_webkit_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_webkitwidgets.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_widgets.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_widgets_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_x11extras.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_x11extras_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_xml.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_xml_private.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_xmlpatterns.pri: -/usr/lib64/qt5/mkspecs/modules/qt_lib_xmlpatterns_private.pri: -/usr/lib64/qt5/mkspecs/features/qt_functions.prf: -/usr/lib64/qt5/mkspecs/features/qt_config.prf: -/usr/lib64/qt5/mkspecs/linux-g++-64/qmake.conf: -/usr/lib64/qt5/mkspecs/features/spec_post.prf: -/usr/lib64/qt5/mkspecs/features/exclusive_builds.prf: -/usr/lib64/qt5/mkspecs/features/default_pre.prf: -parsers/Flex_Bison_FIles/Flex_Bison_FIles.pri: -/usr/lib64/qt5/mkspecs/features/resolve_config.prf: -/usr/lib64/qt5/mkspecs/features/default_post.prf: -/usr/lib64/qt5/mkspecs/features/unix/gdb_dwarf_index.prf: -/usr/lib64/qt5/mkspecs/features/warn_on.prf: -/usr/lib64/qt5/mkspecs/features/qt.prf: -/usr/lib64/qt5/mkspecs/features/resources.prf: -/usr/lib64/qt5/mkspecs/features/moc.prf: -/usr/lib64/qt5/mkspecs/features/unix/opengl.prf: -/usr/lib64/qt5/mkspecs/features/uic.prf: -/usr/lib64/qt5/mkspecs/features/unix/thread.prf: -/usr/lib64/qt5/mkspecs/features/testcase_targets.prf: -/usr/lib64/qt5/mkspecs/features/exceptions.prf: -/usr/lib64/qt5/mkspecs/features/yacc.prf: -/usr/lib64/qt5/mkspecs/features/lex.prf: -QIlib.pro: -/lib64/libQt5Widgets.prl: -/lib64/libQt5Gui.prl: -/lib64/libQt5Core.prl: -qmake: FORCE - @$(QMAKE) -o Makefile QIlib.pro - -qmake_all: FORCE - -dist: - @test -d obj/QIlib1.0.0 || mkdir -p obj/QIlib1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) obj/QIlib1.0.0/ && $(COPY_FILE) --parents parsers/Flex_Bison_FIles/lispLike.scanner.l obj/QIlib1.0.0/ && $(COPY_FILE) --parents parsers/Flex_Bison_FIles/lispLike.parser.yy obj/QIlib1.0.0/ && $(COPY_FILE) --parents qicadnetlist.h qicadnet.h qicadnetlistparser.h parsers/lispLike_driver.h parsers/lispLike_scanner.h obj/QIlib1.0.0/ && $(COPY_FILE) --parents qicadnetlist.cpp qicadnet.cpp qicadnetlistparser.cpp parsers/lispLike_driver.cpp parsers/lispLike_scanner.cpp obj/QIlib1.0.0/ && (cd `dirname obj/QIlib1.0.0` && $(TAR) QIlib1.0.0.tar QIlib1.0.0 && $(COMPRESS) QIlib1.0.0.tar) && $(MOVE) `dirname obj/QIlib1.0.0`/QIlib1.0.0.tar.gz . && $(DEL_FILE) -r obj/QIlib1.0.0 - - -clean:compiler_clean - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) *~ core *.core - - -####### Sub-libraries - -distclean: clean - -$(DEL_FILE) $(TARGET) - -$(DEL_FILE) $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA) - -$(DEL_FILE) Makefile - - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all - -check: first - -compiler_flex_make_all: lispLike.scanner.cpp -compiler_flex_clean: - -$(DEL_FILE) lispLike.scanner.cpp -lispLike.scanner.cpp: parsers/Flex_Bison_FIles/lispLike.scanner.l - flex -i -olispLike.scanner.cpp parsers/Flex_Bison_FIles/lispLike.scanner.l - -compiler_bison_make_all: lispLike.parser.cpp -compiler_bison_clean: - -$(DEL_FILE) lispLike.parser.cpp -lispLike.parser.cpp: parsers/Flex_Bison_FIles/lispLike.parser.yy - bison -d -o lispLike.parser.cpp parsers/Flex_Bison_FIles/lispLike.parser.yy - -compiler_rcc_make_all: -compiler_rcc_clean: -compiler_moc_header_make_all: -compiler_moc_header_clean: -compiler_moc_source_make_all: -compiler_moc_source_clean: -compiler_uic_make_all: -compiler_uic_clean: -compiler_yacc_decl_make_all: -compiler_yacc_decl_clean: -compiler_yacc_impl_make_all: -compiler_yacc_impl_clean: -compiler_lex_make_all: -compiler_lex_clean: -compiler_clean: compiler_flex_clean compiler_bison_clean - -####### Compile - -obj/qicadnetlist.o: qicadnetlist.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/qicadnetlist.o qicadnetlist.cpp - -obj/qicadnet.o: qicadnet.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/qicadnet.o qicadnet.cpp - -obj/qicadnetlistparser.o: qicadnetlistparser.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/qicadnetlistparser.o qicadnetlistparser.cpp - -obj/lispLike_driver.o: parsers/lispLike_driver.cpp parsers/lispLike_driver.h \ - parsers/lispLike_scanner.h \ - /usr/include/qt5/QtCore/QString \ - /usr/include/qt5/QtCore/qstring.h \ - /usr/include/qt5/QtCore/qchar.h \ - /usr/include/qt5/QtCore/qglobal.h \ - /usr/include/qt5/QtCore/qconfig.h \ - /usr/include/qt5/QtCore/qconfig-64.h \ - /usr/include/qt5/QtCore/qfeatures.h \ - /usr/include/qt5/QtCore/qsystemdetection.h \ - /usr/include/qt5/QtCore/qprocessordetection.h \ - /usr/include/qt5/QtCore/qcompilerdetection.h \ - /usr/include/qt5/QtCore/qglobalstatic.h \ - /usr/include/qt5/QtCore/qatomic.h \ - /usr/include/qt5/QtCore/qbasicatomic.h \ - /usr/include/qt5/QtCore/qatomic_bootstrap.h \ - /usr/include/qt5/QtCore/qgenericatomic.h \ - /usr/include/qt5/QtCore/qatomic_msvc.h \ - /usr/include/qt5/QtCore/qatomic_integrity.h \ - /usr/include/qt5/QtCore/qoldbasicatomic.h \ - /usr/include/qt5/QtCore/qatomic_vxworks.h \ - /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_alpha.h \ - /usr/include/qt5/QtCore/qatomic_armv7.h \ - /usr/include/qt5/QtCore/qatomic_armv6.h \ - /usr/include/qt5/QtCore/qatomic_armv5.h \ - /usr/include/qt5/QtCore/qatomic_bfin.h \ - /usr/include/qt5/QtCore/qatomic_ia64.h \ - /usr/include/qt5/QtCore/qatomic_mips.h \ - /usr/include/qt5/QtCore/qatomic_s390.h \ - /usr/include/qt5/QtCore/qatomic_sh4a.h \ - /usr/include/qt5/QtCore/qatomic_sparc.h \ - /usr/include/qt5/QtCore/qatomic_x86.h \ - /usr/include/qt5/QtCore/qatomic_cxx11.h \ - /usr/include/qt5/QtCore/qatomic_gcc.h \ - /usr/include/qt5/QtCore/qatomic_unix.h \ - /usr/include/qt5/QtCore/qmutex.h \ - /usr/include/qt5/QtCore/qlogging.h \ - /usr/include/qt5/QtCore/qflags.h \ - /usr/include/qt5/QtCore/qtypeinfo.h \ - /usr/include/qt5/QtCore/qtypetraits.h \ - /usr/include/qt5/QtCore/qsysinfo.h \ - /usr/include/qt5/QtCore/qbytearray.h \ - /usr/include/qt5/QtCore/qrefcount.h \ - /usr/include/qt5/QtCore/qnamespace.h \ - /usr/include/qt5/QtCore/qarraydata.h \ - /usr/include/qt5/QtCore/qstringbuilder.h \ - /usr/include/qt5/QtCore/QList \ - /usr/include/qt5/QtCore/qlist.h \ - /usr/include/qt5/QtCore/qalgorithms.h \ - /usr/include/qt5/QtCore/qiterator.h \ - /usr/include/qt5/QtCore/QStringList \ - /usr/include/qt5/QtCore/qstringlist.h \ - /usr/include/qt5/QtCore/qdatastream.h \ - /usr/include/qt5/QtCore/qscopedpointer.h \ - /usr/include/qt5/QtCore/qiodevice.h \ - /usr/include/qt5/QtCore/qobject.h \ - /usr/include/qt5/QtCore/qobjectdefs.h \ - /usr/include/qt5/QtCore/qobjectdefs_impl.h \ - /usr/include/qt5/QtCore/qcoreevent.h \ - /usr/include/qt5/QtCore/qmetatype.h \ - /usr/include/qt5/QtCore/qvarlengtharray.h \ - /usr/include/qt5/QtCore/qcontainerfwd.h \ - /usr/include/qt5/QtCore/qisenum.h \ - /usr/include/qt5/QtCore/qobject_impl.h \ - /usr/include/qt5/QtCore/qpair.h \ - /usr/include/qt5/QtCore/qregexp.h \ - /usr/include/qt5/QtCore/qstringmatcher.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/lispLike_driver.o parsers/lispLike_driver.cpp - -obj/lispLike_scanner.o: parsers/lispLike_scanner.cpp parsers/lispLike_scanner.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/lispLike_scanner.o parsers/lispLike_scanner.cpp - -obj/lispLike.scanner.o: lispLike.scanner.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/lispLike.scanner.o lispLike.scanner.cpp - -obj/lispLike.parser.o: lispLike.parser.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/lispLike.parser.o lispLike.parser.cpp - -####### Install - -install: FORCE - -uninstall: FORCE - -FORCE: - diff --git a/qilib/parsers/Flex_Bison_FIles/Flex_Bison_FIles.pri b/qilib/parsers/Flex_Bison_FIles/Flex_Bison_FIles.pri --- a/qilib/parsers/Flex_Bison_FIles/Flex_Bison_FIles.pri +++ b/qilib/parsers/Flex_Bison_FIles/Flex_Bison_FIles.pri @@ -32,10 +32,10 @@ BISONSOURCES += \ lispLikeHeaders.path = $$[QT_INSTALL_HEADERS]/QIlib/lispLike lispLikeHeaders.files = \ - $${DESTDIR}/../lispLike/lispLike.hpp \ - $${DESTDIR}/../lispLike/location.hh \ - $${DESTDIR}/../lispLike/position.hh \ - $${DESTDIR}/../lispLike/stack.hh + $${DESTDIR}/qilib/lispLike/lispLike.hpp \ + $${DESTDIR}/qilib/lispLike/location.hh \ + $${DESTDIR}/qilib/lispLike/position.hh \ + $${DESTDIR}/qilib/lispLike/stack.hh INCLUDEPATH += $${DESTDIR}/.. INSTALLS += lispLikeHeaders diff --git a/qilib/parsers/Flex_Bison_FIles/lispLike.l b/qilib/parsers/Flex_Bison_FIles/lispLike.l --- a/qilib/parsers/Flex_Bison_FIles/lispLike.l +++ b/qilib/parsers/Flex_Bison_FIles/lispLike.l @@ -19,7 +19,7 @@ typedef QIlib::lispLike_Parser::token to #define YY_NO_UNISTD_H %} -%option debug +/*%option debug*/ %option nodefault %option yyclass="lispLike_Scanner" %option noyywrap diff --git a/qilib/parsers/Flex_Bison_FIles/lispLike.yy b/qilib/parsers/Flex_Bison_FIles/lispLike.yy --- a/qilib/parsers/Flex_Bison_FIles/lispLike.yy +++ b/qilib/parsers/Flex_Bison_FIles/lispLike.yy @@ -1,6 +1,6 @@ %skeleton "lalr1.cc" //%require "3.0" -%debug +//%debug %defines %define namespace "QIlib" %define parser_class_name "lispLike_Parser" @@ -60,9 +60,9 @@ PartNode %% -void QIlib::lispLike_Parser::error(const location_type& loc, const std::string &err_message ) +void QIlib::lispLike_Parser::error(const std::string& error) { - std::cerr << "Error: " << err_message << "\n"; + std::cerr << "Error: " << error << "\n"; } diff --git a/qilib/qicadpcb.cpp b/qilib/qicadpcb.cpp --- a/qilib/qicadpcb.cpp +++ b/qilib/qicadpcb.cpp @@ -2,6 +2,7 @@ QIlib::QIcadPcb::QIcadPcb() + :pcbRoot(NULL) { } @@ -26,14 +27,248 @@ QString QIlib::QIcadPcb::print() void QIlib::QIcadPcb::updateConcreteTree() { -// if(this->rootNode.nodes.count()) -// { -// if(this->rootNode.nodes.at(0)->name==QIlib::Lexique::root_c) -// { -// if(this->netlistRoot==NULL) -// { -// this->netlistRoot = new QIcadNetListRoot(this->rootNode.nodes.at(0)); -// } -// } -// } + if(this->rootNode.nodes.count()) + { + if(this->rootNode.nodes.at(0)->name==QIlib::Lexique::kicad_pcb_c) + { + if(this->pcbRoot==NULL) + { + this->pcbRoot = new QIcadPcbRoot(this->rootNode.nodes.at(0)); + } + } + } +} + + +QIlib::QIcadPcbRoot::QIcadPcbRoot(QIlib::AbstractNode *node) + :QIcadAbstractNodeWrapper(node) +{ + this->setNode(node); +} + +void QIlib::QIcadPcbRoot::setNode(QIlib::AbstractNode *node) +{ + this->p_node = node; + this->clrNets(); + if(node->name==QIlib::Lexique::kicad_pcb_c) + { + for(int i=0;inodes.count();i++) + { + if(node->nodes.at(i)->name==QIlib::Lexique::version_c) + { + this->version.setNode(node->nodes.at(i)); + } + if(node->nodes.at(i)->name==QIlib::Lexique::host_c) + { + this->host.setNode(node->nodes.at(i)); + } + if(node->nodes.at(i)->name==QIlib::Lexique::page_c) + { + this->page.setNode(node->nodes.at(i)); + } + if(node->nodes.at(i)->name==QIlib::Lexique::general_c) + { + this->general.setNode(node->nodes.at(i)); + } + if(node->nodes.at(i)->name==QIlib::Lexique::layers_c) + { + this->layers.setNode(node->nodes.at(i)); + } + if(node->nodes.at(i)->name==QIlib::Lexique::setup_c) + { + this->setup.setNode(node->nodes.at(i)); + } + if(node->nodes.at(i)->name==QIlib::Lexique::net_c) + { + this->apendNet(node->nodes.at(i)); + } + } + } +} + +void QIlib::QIcadPcbRoot::clrNets() +{ + while(nets.count()) + { + QIcadAbstractNodeWrapper* net; + net = nets.last(); + nets.removeLast(); + delete net; + } +} + +void QIlib::QIcadPcbRoot::apendNet(QIlib::AbstractNode *node) +{ + if(node->name==QIlib::Lexique::net_c) + { + this->nets.append(new QIcadAbstractNodeWrapper(node)); + } +} + + +QIlib::QIcadPcbGeneralInfo::QIcadPcbGeneralInfo(QIlib::AbstractNode *node) + :QIcadAbstractNodeWrapper(node) +{ + this->setNode(node); +} + +void QIlib::QIcadPcbGeneralInfo::setNode(QIlib::AbstractNode *node) +{ + this->p_node = node; +} + + +QIlib::QIcadPcbLayers::QIcadPcbLayers(QIlib::AbstractNode *node) + :QIcadAbstractNodeWrapper(node) +{ + this->setNode(node); +} + +void QIlib::QIcadPcbLayers::setNode(QIlib::AbstractNode *node) +{ + this->p_node = node; +} + + +QIlib::QIcadPcbLine::QIcadPcbLine(QIlib::AbstractNode *node) + :QIcadAbstractNodeWrapper(node) +{ + this->setNode(node); +} + +void QIlib::QIcadPcbLine::setNode(QIlib::AbstractNode *node) +{ + this->p_node = node; +} + + +QIlib::QIcadPcbModule::QIcadPcbModule(QIlib::AbstractNode *node) + :QIcadAbstractNodeWrapper(node) +{ + this->setNode(node); } + +void QIlib::QIcadPcbModule::setNode(QIlib::AbstractNode *node) +{ + this->p_node = node; +} + + +QIlib::QIcadPcbDimension::QIcadPcbDimension(QIlib::AbstractNode *node) + :QIcadAbstractNodeWrapper(node) +{ + this->setNode(node); +} + +void QIlib::QIcadPcbDimension::setNode(QIlib::AbstractNode *node) +{ + this->p_node = node; +} + + +QIlib::QIcadPcbModuleModel::QIcadPcbModuleModel(QIlib::AbstractNode *node) + :QIcadAbstractNodeWrapper(node) +{ + this->setNode(node); +} + +void QIlib::QIcadPcbModuleModel::setNode(QIlib::AbstractNode *node) +{ + this->p_node = node; +} + + +QIlib::QIcadPcbFpText::QIcadPcbFpText(QIlib::AbstractNode *node) + :QIcadAbstractNodeWrapper(node) +{ + this->setNode(node); +} + +void QIlib::QIcadPcbFpText::setNode(QIlib::AbstractNode *node) +{ + this->p_node = node; +} + + +QIlib::QIcadPcbFpTextEffects::QIcadPcbFpTextEffects(QIlib::AbstractNode *node) + :QIcadAbstractNodeWrapper(node) +{ + this->setNode(node); +} + +void QIlib::QIcadPcbFpTextEffects::setNode(QIlib::AbstractNode *node) +{ + this->p_node = node; +} + + +QIlib::QIcadPcbFpTextEffectsFont::QIcadPcbFpTextEffectsFont(QIlib::AbstractNode *node) + :QIcadAbstractNodeWrapper(node) +{ + this->setNode(node); +} + +void QIlib::QIcadPcbFpTextEffectsFont::setNode(QIlib::AbstractNode *node) +{ + this->p_node = node; +} + + +QIlib::QIcadPcbNetClass::QIcadPcbNetClass(QIlib::AbstractNode *node) + :QIcadAbstractNodeWrapper(node) +{ + this->setNode(node); +} + +void QIlib::QIcadPcbNetClass::setNode(QIlib::AbstractNode *node) +{ + this->p_node = node; +} + + +QIlib::QIcadPcbSetup::QIcadPcbSetup(QIlib::AbstractNode *node) + :QIcadAbstractNodeWrapper(node) +{ + this->setNode(node); +} + +void QIlib::QIcadPcbSetup::setNode(QIlib::AbstractNode *node) +{ + this->p_node = node; +} + + +QIlib::QIcadPcbPlotParams::QIcadPcbPlotParams(QIlib::AbstractNode *node) + :QIcadAbstractNodeWrapper(node) +{ + this->setNode(node); +} + +void QIlib::QIcadPcbPlotParams::setNode(QIlib::AbstractNode *node) +{ + this->p_node = node; +} + + +QIlib::QIcadPcbSegment::QIcadPcbSegment(QIlib::AbstractNode *node) + :QIcadAbstractNodeWrapper(node) +{ + this->setNode(node); +} + +void QIlib::QIcadPcbSegment::setNode(QIlib::AbstractNode *node) +{ + this->p_node = node; +} + + +QIlib::QIcadPcbVia::QIcadPcbVia(QIlib::AbstractNode *node) + :QIcadAbstractNodeWrapper(node) +{ + this->setNode(node); +} + +void QIlib::QIcadPcbVia::setNode(QIlib::AbstractNode *node) +{ + this->p_node = node; +} diff --git a/qilib/qicadpcb.h b/qilib/qicadpcb.h --- a/qilib/qicadpcb.h +++ b/qilib/qicadpcb.h @@ -30,10 +30,12 @@ namespace QIlib{ + class QIcadPcbPlotParams : public QIcadAbstractNodeWrapper { public: QIcadPcbPlotParams(QIlib::AbstractNode* node); + QIcadPcbPlotParams(){} QIcadAbstractNodeWrapper layerselection; QIcadAbstractNodeWrapper usegerberextensions; QIcadAbstractNodeWrapper excludeedgelayer; @@ -50,7 +52,6 @@ public: QIcadAbstractNodeWrapper psa4output; QIcadAbstractNodeWrapper plotreference; QIcadAbstractNodeWrapper plotvalue; - QIcadAbstractNodeWrapper layerselection; QIcadAbstractNodeWrapper plotothertext; QIcadAbstractNodeWrapper plotinvisibletext; QIcadAbstractNodeWrapper padsonsilk; @@ -67,6 +68,7 @@ class QIcadPcbSetup : public QIcadAbstra { public: QIcadPcbSetup(QIlib::AbstractNode* node); + QIcadPcbSetup(){} QIcadAbstractNodeWrapper last_trace_width; QIcadAbstractNodeWrapper trace_clearance; QIcadAbstractNodeWrapper zone_clearance; @@ -102,13 +104,14 @@ class QIcadPcbNetClass : public QIcadAbs { public: QIcadPcbNetClass(QIlib::AbstractNode* node); + QIcadPcbNetClass(){} QIcadAbstractNodeWrapper clearance; QIcadAbstractNodeWrapper trace_width; QIcadAbstractNodeWrapper via_dia; QIcadAbstractNodeWrapper via_drill; QIcadAbstractNodeWrapper uvia_dia; QIcadAbstractNodeWrapper uvia_drill; - QList nets; + QList nets; void setNode(QIlib::AbstractNode* node); }; @@ -124,6 +127,7 @@ class QIcadPcbFpTextEffects : public QIc { public: QIcadPcbFpTextEffects(QIlib::AbstractNode* node); + QIcadPcbFpTextEffects(){} QIcadAbstractNodeWrapper font; QIcadAbstractNodeWrapper thickness; void setNode(QIlib::AbstractNode* node); @@ -133,16 +137,47 @@ class QIcadPcbFpText : public QIcadAbstr { public: QIcadPcbFpText(QIlib::AbstractNode* node); + QIcadPcbFpText(){} QIcadAbstractNodeWrapper at; QIcadAbstractNodeWrapper layer; void setNode(QIlib::AbstractNode* node); }; +class QIcadPcbModuleModel : public QIcadAbstractNodeWrapper +{ +public: + QIcadPcbModuleModel(QIlib::AbstractNode* node); + QIcadPcbModuleModel(){} + QIcadAbstractNodeWrapper at; + QIcadAbstractNodeWrapper scale; + QIcadAbstractNodeWrapper rotate; + void setNode(QIlib::AbstractNode* node); +}; + + +class QIcadPcbDimension : public QIcadAbstractNodeWrapper +{ +public: + QIcadPcbDimension(QIlib::AbstractNode* node); + QIcadPcbDimension(){} + QIcadAbstractNodeWrapper width; + QIcadAbstractNodeWrapper layer; + QIcadAbstractNodeWrapper gr_text; + QIcadAbstractNodeWrapper feature1; + QIcadAbstractNodeWrapper feature2; + QIcadAbstractNodeWrapper crossbar; + QIcadAbstractNodeWrapper arrow1a; + QIcadAbstractNodeWrapper arrow1b; + QIcadAbstractNodeWrapper arrow2a; + QIcadAbstractNodeWrapper arrow2b; + void setNode(QIlib::AbstractNode* node); +}; class QIcadPcbModule : public QIcadAbstractNodeWrapper { public: QIcadPcbModule(QIlib::AbstractNode* node); + QIcadPcbModule(){} QIcadAbstractNodeWrapper layer; QIcadAbstractNodeWrapper tedit; QIcadAbstractNodeWrapper tstamp; @@ -151,9 +186,48 @@ public: QIcadAbstractNodeWrapper tags; QIcadAbstractNodeWrapper path; QIcadAbstractNodeWrapper attr; - QList fp_texts; - QList fp_lines; - QList pads; + QList fp_texts; + QList fp_lines; + QList pads; + QIcadPcbModuleModel model; + void setNode(QIlib::AbstractNode* node); +}; + +class QIcadPcbSegment : public QIcadAbstractNodeWrapper +{ +public: + QIcadPcbSegment(QIlib::AbstractNode* node); + QIcadPcbSegment(){} + QIcadAbstractNodeWrapper start; + QIcadAbstractNodeWrapper end; + QIcadAbstractNodeWrapper width; + QIcadAbstractNodeWrapper layer; + QIcadAbstractNodeWrapper net; + void setNode(QIlib::AbstractNode* node); +}; +class QIcadPcbVia : public QIcadAbstractNodeWrapper +{ +public: + QIcadPcbVia(QIlib::AbstractNode* node); + QIcadPcbVia(){} + QIcadAbstractNodeWrapper at; + QIcadAbstractNodeWrapper size; + QIcadAbstractNodeWrapper drill; + QIcadAbstractNodeWrapper layer; + QIcadAbstractNodeWrapper net; + void setNode(QIlib::AbstractNode* node); +}; + +class QIcadPcbLine : public QIcadAbstractNodeWrapper +{ +public: + QIcadPcbLine(QIlib::AbstractNode* node); + QIcadPcbLine(){} + QIcadAbstractNodeWrapper start; + QIcadAbstractNodeWrapper end; + QIcadAbstractNodeWrapper angle; + QIcadAbstractNodeWrapper layer; + QIcadAbstractNodeWrapper width; void setNode(QIlib::AbstractNode* node); }; @@ -161,7 +235,8 @@ class QIcadPcbLayers : public QIcadAbstr { public: QIcadPcbLayers(QIlib::AbstractNode* node); - QList layers; + QIcadPcbLayers(){} + QList layers; void setNode(QIlib::AbstractNode* node); }; @@ -169,6 +244,7 @@ class QIcadPcbGeneralInfo : public QIcad { public: QIcadPcbGeneralInfo(QIlib::AbstractNode* node); + QIcadPcbGeneralInfo(){} QIcadAbstractNodeWrapper links; QIcadAbstractNodeWrapper no_connections; QIcadAbstractNodeWrapper area; @@ -191,8 +267,25 @@ public: QIcadPcbGeneralInfo general; QIcadPcbLayers layers; QIcadPcbSetup setup; - QList nets; + QList nets; + QList modules; + QList dimensions; + QList lines; + QList segments; + QList vias; void setNode(QIlib::AbstractNode* node); + void clrNets(); + void apendNet(QIlib::AbstractNode* node); + void setModules(QIlib::AbstractNode* node); + void apendModules(QIlib::AbstractNode* node); + void setDimensions(QIlib::AbstractNode* node); + void apendDimensions(QIlib::AbstractNode* node); + void setLines(QIlib::AbstractNode* node); + void apendLines(QIlib::AbstractNode* node); + void setSegments(QIlib::AbstractNode* node); + void apendSegments(QIlib::AbstractNode* node); + void setVias(QIlib::AbstractNode* node); + void apendVias(QIlib::AbstractNode* node); }; class QIcadPcb : private lispLike_Driver @@ -203,6 +296,8 @@ public: QString toString(); QString fileName; QString print(); + + QIcadPcbRoot* pcbRoot; private: void updateConcreteTree(); }; diff --git a/qilib/qilib.pro b/qilib/qilib.pro --- a/qilib/qilib.pro +++ b/qilib/qilib.pro @@ -22,7 +22,7 @@ LIBS += -lfl MOC_DIR = moc RCC_DIR = resources OBJECTS_DIR = obj -DESTDIR = lib +DESTDIR = ../bin include ( ./parsers/Flex_Bison_FIles/Flex_Bison_FIles.pri ) diff --git a/test/dumpLispLikeFiles/dumpLispLikeFiles.pro b/test/dumpLispLikeFiles/dumpLispLikeFiles.pro --- a/test/dumpLispLikeFiles/dumpLispLikeFiles.pro +++ b/test/dumpLispLikeFiles/dumpLispLikeFiles.pro @@ -8,10 +8,14 @@ TEMPLATE = app MOC_DIR = moc RCC_DIR = resources OBJECTS_DIR = obj -DESTDIR = bin +DESTDIR = ../../bin SOURCES += main.cpp +INCLUDEPATH += ../../qilib $${DESTDIR}/../qilib/ + +LIBS += -L../../bin -lQIlib + FILESTOCOPY.files += \ $${PWD}/../testFiles/netlist1.net \ $${PWD}/../testFiles/netlist2.net \ diff --git a/test/dumpLispLikeFiles/main.cpp b/test/dumpLispLikeFiles/main.cpp --- a/test/dumpLispLikeFiles/main.cpp +++ b/test/dumpLispLikeFiles/main.cpp @@ -43,7 +43,7 @@ int main(int argc, char *argv[]) QIlib::QIcadNetList NetListdriver; tm.start(); NetListdriver.parseNetList(argv[1]); - qDebug()<<"File parsed in "<