Power combining (develop)

.gitignore

@@ -1,3 +1,56 @@
+/compile
+/qucs-core/build-aux/ar-lib
+/qucs-core/build-aux/compile
+/qucs-core/build-aux/test-driver
+/qucs-core/build-aux/ylwrap
+/qucs-core/src/components/verilog/DLS_1ton.cpp
+/qucs-core/src/components/verilog/DLS_nto1.cpp
+/qucs-core/src/components/verilog/EKV26MOS.cpp
+/qucs-core/src/components/verilog/MESFET.cpp
+/qucs-core/src/components/verilog/andor4x2.cpp
+/qucs-core/src/components/verilog/andor4x3.cpp
+/qucs-core/src/components/verilog/andor4x4.cpp
+/qucs-core/src/components/verilog/binarytogrey4bit.cpp
+/qucs-core/src/components/verilog/comp_1bit.cpp
+/qucs-core/src/components/verilog/comp_2bit.cpp
+/qucs-core/src/components/verilog/comp_4bit.cpp
+/qucs-core/src/components/verilog/dff_SR.cpp
+/qucs-core/src/components/verilog/dmux2to4.cpp
+/qucs-core/src/components/verilog/dmux3to8.cpp
+/qucs-core/src/components/verilog/dmux4to16.cpp
+/qucs-core/src/components/verilog/fa1b.cpp
+/qucs-core/src/components/verilog/fa2b.cpp
+/qucs-core/src/components/verilog/gatedDlatch.cpp
+/qucs-core/src/components/verilog/greytobinary4bit.cpp
+/qucs-core/src/components/verilog/ha1b.cpp
+/qucs-core/src/components/verilog/hpribin4bit.cpp
+/qucs-core/src/components/verilog/jkff_SR.cpp
+/qucs-core/src/components/verilog/log_amp.cpp
+/qucs-core/src/components/verilog/logic_0.cpp
+/qucs-core/src/components/verilog/logic_1.cpp
+/qucs-core/src/components/verilog/mod_amp.cpp
+/qucs-core/src/components/verilog/mux2to1.cpp
+/qucs-core/src/components/verilog/mux4to1.cpp
+/qucs-core/src/components/verilog/mux8to1.cpp
+/qucs-core/src/components/verilog/nigbt.cpp
+/qucs-core/src/components/verilog/pad2bit.cpp
+/qucs-core/src/components/verilog/pad3bit.cpp
+/qucs-core/src/components/verilog/pad4bit.cpp
+/qucs-core/src/components/verilog/photodiode.cpp
+/qucs-core/src/components/verilog/phototransistor.cpp
+/qucs-core/src/components/verilog/potentiometer.cpp
+/qucs-core/src/components/verilog/tff_SR.cpp
+/qucs-core/src/components/verilog/vcresistor.cpp
+/qucs-core/src/converter/parse_spice.hpp
+/qucs-core/src/converter/parse_vcd.hpp
+/qucs-core/src/parse_citi.hpp
+/qucs-core/src/parse_csv.hpp
+/qucs-core/src/parse_dataset.hpp
+/qucs-core/src/parse_mdl.hpp
+/qucs-core/src/parse_netlist.hpp
+/qucs-core/src/parse_touchstone.hpp
+/qucs-core/src/parse_zvr.hpp
+/qucs/ar-lib
 # Qucs Specific #
 #################
 */src/qucsator
@@ -214,3 +267,6 @@ CMakeFiles
 CMakeCache.txt
 *.cmake
 *.depends
+/qucs-core/src/components/verilog/constants.vams
+/qucs-core/src/components/verilog/disciplines.vams
+/qucs-doc/technical/octave-workspace

qucs/CMakeLists.txt

@@ -51,7 +51,7 @@ ADD_SUBDIRECTORY( qucs-rescodes )
 #ADD_SUBDIRECTORY( examples )
 ADD_SUBDIRECTORY( translations )
 ADD_SUBDIRECTORY( contrib )
-
+ADD_SUBDIRECTORY(qucs-powercombining)
 
 #
 # Custom uninstall target

qucs/Makefile.am

@@ -32,6 +32,7 @@ SUBDIRS = \
 	qucs-lib \
 	qucs-rescodes \
 	qucs-transcalc \
+        qucs-powercombining \
 	translations \
 	contrib \
 	examples \
@@ -50,6 +51,7 @@ app_PROGS = $(top_builddir)/qucs/qucs \
   $(top_builddir)/qucs-lib/qucslib \
   $(top_builddir)/qucs-edit/qucsedit \
   $(top_builddir)/qucs-rescodes/qucsrescodes \
+  $(top_builddir)/qucs-powercombining/qucspowercombining \
   $(top_builddir)/qucs-transcalc/qucstrans
 
 install-exec-hook: mac-install-apps mac-deploy-framework
@@ -71,6 +73,7 @@ mac-install-apps:
 	  qucslib)	  desc="Qucs Library";; \
 	  qucsedit)	  desc="Qucs Editor";; \
 	  qucrescodes)	  desc="Qucs Resistor codes";; \
+          qucspowercombining)	  desc="Qucs Power combining";; \
 	  qucstrans)	  desc="Qucs Transcalc";; \
 	esac && \
 	cat $(srcdir)/Info.plist | \

qucs/configure.ac

@@ -803,6 +803,7 @@ AC_CONFIG_FILES([Makefile
     qucs-attenuator/Makefile
     qucs-attenuator/bitmaps/Makefile
     qucs-rescodes/Makefile
+    qucs-powercombining/Makefile
     qucs/Makefile
     qucs/bitmaps/Makefile
     qucs/octave/Makefile

qucs/qucs-powercombining/CMakeLists.txt

@@ -0,0 +1,103 @@
+PROJECT(qucspowercombining CXX C)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+cmake_policy(VERSION 2.6)
+FIND_PACKAGE(Qt4 COMPONENTS QtSvg QtGui QtCore)
+INCLUDE(${QT_USE_FILE})
+# use top VERSION file
+file (STRINGS ${PROJECT_SOURCE_DIR}/../VERSION QUCS_VERSION)
+message(STATUS "Configuring ${PROJECT_NAME} (GUI): VERSION ${QUCS_VERSION}")
+
+set(PROJECT_VERSION "${QUCS_VERSION}")
+
+set(PROJECT_VENDOR "Qucs team. This program is licensed under the GNU GPL")
+set(PROJECT_COPYRIGHT_YEAR "2016")
+set(PROJECT_DOMAIN_FIRST "qucs")
+set(PROJECT_DOMAIN_SECOND "org")
+
+SET(CMAKE_BUILD_TYPE Debug)
+
+ADD_DEFINITIONS( -DHAVE_CONFIG_H )
+
+# define variables
+SET(BINARYDIR "${CMAKE_INSTALL_PREFIX}/bin/")
+SET(BITMAPDIR "${CMAKE_INSTALL_PREFIX}/share/qucs/bitmaps/")
+SET(DOCDIR "${CMAKE_INSTALL_PREFIX}/share/qucs/docs/")
+SET(LANGUAGEDIR "${CMAKE_INSTALL_PREFIX}/share/qucs/lang/")
+SET(LIBRARYDIR "${CMAKE_INSTALL_PREFIX}/share/qucs/library/")
+SET(OCTAVEDIR "${CMAKE_INSTALL_PREFIX}/share/qucs/octave/")
+
+# configure the header config.h
+CONFIGURE_FILE (
+    "${PROJECT_SOURCE_DIR}/../config.h.cmake"
+    "${PROJECT_BINARY_DIR}/config.h"
+)
+
+INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}")
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall ") # enable warning level
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x ") # enable C++11
+
+# flag not available in mingw 4.8.2, MSVC10
+IF(NOT WIN32)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-register ")
+ENDIF()
+
+FIND_PACKAGE( Qt4 REQUIRED )
+SET( QT_USE_QTGUI TRUE )
+
+INCLUDE( ${QT_USE_FILE} )
+
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+
+SET(QUCS-POWCOMB_SRCS
+  qucspowercombiningtool.cpp
+  main.cpp
+)
+
+SET(QUCS-POWCOMB_HDRS
+  qucspowercombiningtool.h
+)
+
+SET(QUCS-POWCOMB_MOC_HDRS
+  qucspowercombiningtool.h
+)
+
+QT4_WRAP_CPP(QUCS-POWCOMB_MOC_SRCS ${QUCS-POWCOMB_MOC_HDRS})
+
+SET(RESOURCES qucspowercombining.qrc)
+QT4_ADD_RESOURCES(RESOURCES_SRCS ${RESOURCES})
+
+
+IF(APPLE)
+  # set information on Info.plist file
+	SET(MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME} ${PROJECT_VERSION}")
+  SET(MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_NAME} ${PROJECT_VERSION}")
+  SET(MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_NAME} ${PROJECT_VERSION}")
+  SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION}")
+  SET(MACOSX_BUNDLE_COPYRIGHT "${PROJECT_COPYRIGHT_YEAR} ${PROJECT_VENDOR}")
+  SET(MACOSX_BUNDLE_GUI_IDENTIFIER "${PROJECT_DOMAIN_SECOND}.${PROJECT_DOMAIN_FIRST}")
+  SET(MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}")
+  SET(MACOSX_BUNDLE_ICON_FILE qucspowercombining.icns)
+
+  # set where in the bundle to put the icns file
+  SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/../qucs/bitmaps/qucspowercombining.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+  # include the icns file in the target
+  SET(QUCS-POWCOMB_SRCS ${QUCS-POWCOMB_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/../qucs/bitmaps/qucspowercombining.icns)
+
+ENDIF(APPLE)
+
+ADD_EXECUTABLE(qucspowercombining MACOSX_BUNDLE WIN32
+  ${QUCS-POWCOMB_SRCS}
+  ${QUCS-POWCOMB_HDRS}
+  ${QUCS-POWCOMB_MOC_SRCS}
+  ${RESOURCES_SRCS} )
+
+TARGET_LINK_LIBRARIES(qucspowercombining ${QT_LIBRARIES})
+
+INSTALL(TARGETS qucspowercombining
+    BUNDLE DESTINATION bin COMPONENT Runtime
+    RUNTIME DESTINATION bin COMPONENT Runtime
+    )
+
+# man pages
+INSTALL( FILES qucspowercombining.1 DESTINATION share/man/man1 )

qucs/qucs-powercombining/Makefile.am

@@ -0,0 +1,50 @@
+## Process this file with automake to produce Makefile.in
+#
+# qucs-powercombining/Makefile.am
+#
+# Automake input file.
+#
+#
+# This is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this package; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+# Boston, MA 02110-1301, USA.
+#
+
+bin_PROGRAMS = qucspowercombining
+
+MOCHEADERS = qucspowercombiningtool.h
+MOCFILES = $(MOCHEADERS:.h=.moc.cpp)
+
+qucspowercombining_SOURCES = main.cpp qucspowercombiningtool.cpp qrc_qucspowercombining.cpp
+
+EXTRA_DIST = qucspowercombining.qrc
+qrc_qucspowercombining.cpp: qucspowercombining.qrc
+	$(RCC) -o $@ $<
+
+nodist_qucspowercombining_SOURCES = $(MOCFILES)
+
+AM_CPPFLAGS = $(X11_INCLUDES) $(QT_INCLUDES)
+qucspowercombining_LDFLAGS = $(X11_LDFLAGS) $(QT_LDFLAGS)
+qucspowercombining_LDADD = $(X11_LIBS) $(QT_LIBS)
+
+noinst_HEADERS = $(MOCHEADERS)
+
+SUFFIXES = .moc.cpp
+
+.h.moc.cpp:
+	$(MOC) -o $@ $<
+
+CLEANFILES = *~
+MAINTAINERCLEANFILES = Makefile.in *.moc.cpp
+DISTCLEANFILES = *.moc.cpp