Added infrastructure to support mirror tool, cross compile script.

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..090323f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+Makefile
+obj/*
+release/*
+*.drawing
+res.old/*
+*.ui
+pix/*
+res/*.xcf

diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index a4967bb..0000000
--- a/Makefile
+++ /dev/null
@@ -1,605 +0,0 @@
-#############################################################################
-# Makefile for building: architektonas
-# Generated by qmake (2.01a) (Qt 4.8.5) on: Thu Aug 29 11:22:55 2013
-# Project:  architektonas.pro
-# Template: app
-# Command: /usr/bin/qmake -o Makefile architektonas.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC            = gcc
-CXX           = g++
-DEFINES       = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS        = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
-CXXFLAGS      = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -Isrc -Iobj
-LINK          = g++
-LFLAGS        = -Wl,-O1
-LIBS          = $(SUBLIBS)  -L/usr/lib64/qt4 -lQtGui -L/usr/lib64 -L/usr/lib64/qt4 -L/usr/X11R6/lib -lQtCore -lgthread-2.0 -lrt -lglib-2.0 -lpthread 
-AR            = ar cqs
-RANLIB        = 
-QMAKE         = /usr/bin/qmake
-TAR           = tar -cf
-COMPRESS      = gzip -9f
-COPY          = cp -f
-SED           = sed
-COPY_FILE     = $(COPY)
-COPY_DIR      = $(COPY) -r
-STRIP         = 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       = src/about.cpp \
-               src/action.cpp \
-               src/applicationwindow.cpp \
-               src/arc.cpp \
-               src/baseunittab.cpp \
-               src/blockitemwidget.cpp \
-               src/blockwidget.cpp \
-               src/circle.cpp \
-               src/connection.cpp \
-               src/container.cpp \
-               src/dimension.cpp \
-               src/drawingview.cpp \
-               src/drawarcaction.cpp \
-               src/drawcircleaction.cpp \
-               src/drawdimensionaction.cpp \
-               src/drawlineaction.cpp \
-               src/drawtextaction.cpp \
-               src/ellipse.cpp \
-               src/fileio.cpp \
-               src/generaltab.cpp \
-               src/layerwidget.cpp \
-               src/layeritemwidget.cpp \
-               src/line.cpp \
-               src/main.cpp \
-               src/mirroraction.cpp \
-               src/object.cpp \
-               src/painter.cpp \
-               src/settingsdialog.cpp \
-               src/text.cpp \
-               src/vector.cpp obj/moc_action.cpp \
-               obj/moc_applicationwindow.cpp \
-               obj/moc_baseunittab.cpp \
-               obj/moc_blockitemwidget.cpp \
-               obj/moc_blockwidget.cpp \
-               obj/moc_drawingview.cpp \
-               obj/moc_generaltab.cpp \
-               obj/moc_layerwidget.cpp \
-               obj/moc_layeritemwidget.cpp \
-               obj/moc_settingsdialog.cpp \
-               obj/qrc_architektonas.cpp
-OBJECTS       = obj/about.o \
-               obj/action.o \
-               obj/applicationwindow.o \
-               obj/arc.o \
-               obj/baseunittab.o \
-               obj/blockitemwidget.o \
-               obj/blockwidget.o \
-               obj/circle.o \
-               obj/connection.o \
-               obj/container.o \
-               obj/dimension.o \
-               obj/drawingview.o \
-               obj/drawarcaction.o \
-               obj/drawcircleaction.o \
-               obj/drawdimensionaction.o \
-               obj/drawlineaction.o \
-               obj/drawtextaction.o \
-               obj/ellipse.o \
-               obj/fileio.o \
-               obj/generaltab.o \
-               obj/layerwidget.o \
-               obj/layeritemwidget.o \
-               obj/line.o \
-               obj/main.o \
-               obj/mirroraction.o \
-               obj/object.o \
-               obj/painter.o \
-               obj/settingsdialog.o \
-               obj/text.o \
-               obj/vector.o \
-               obj/moc_action.o \
-               obj/moc_applicationwindow.o \
-               obj/moc_baseunittab.o \
-               obj/moc_blockitemwidget.o \
-               obj/moc_blockwidget.o \
-               obj/moc_drawingview.o \
-               obj/moc_generaltab.o \
-               obj/moc_layerwidget.o \
-               obj/moc_layeritemwidget.o \
-               obj/moc_settingsdialog.o \
-               obj/qrc_architektonas.o
-DIST          = /usr/share/qt4/mkspecs/common/unix.conf \
-               /usr/share/qt4/mkspecs/common/linux.conf \
-               /usr/share/qt4/mkspecs/common/gcc-base.conf \
-               /usr/share/qt4/mkspecs/common/gcc-base-unix.conf \
-               /usr/share/qt4/mkspecs/common/g++-base.conf \
-               /usr/share/qt4/mkspecs/common/g++-unix.conf \
-               /usr/share/qt4/mkspecs/qconfig.pri \
-               /usr/share/qt4/mkspecs/modules/qt_phonon.pri \
-               /usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
-               /usr/share/qt4/mkspecs/features/qt_functions.prf \
-               /usr/share/qt4/mkspecs/features/qt_config.prf \
-               /usr/share/qt4/mkspecs/features/exclusive_builds.prf \
-               /usr/share/qt4/mkspecs/features/default_pre.prf \
-               /usr/share/qt4/mkspecs/features/release.prf \
-               /usr/share/qt4/mkspecs/features/default_post.prf \
-               /usr/share/qt4/mkspecs/features/warn_on.prf \
-               /usr/share/qt4/mkspecs/features/qt.prf \
-               /usr/share/qt4/mkspecs/features/unix/thread.prf \
-               /usr/share/qt4/mkspecs/features/moc.prf \
-               /usr/share/qt4/mkspecs/features/shared.prf \
-               /usr/share/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \
-               /usr/share/qt4/mkspecs/features/resources.prf \
-               /usr/share/qt4/mkspecs/features/uic.prf \
-               /usr/share/qt4/mkspecs/features/yacc.prf \
-               /usr/share/qt4/mkspecs/features/lex.prf \
-               architektonas.pro
-QMAKE_TARGET  = architektonas
-DESTDIR       = 
-TARGET        = architektonas
-
-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):  $(OBJECTS)  
-       $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
-
-Makefile: architektonas.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/unix.conf \
-               /usr/share/qt4/mkspecs/common/linux.conf \
-               /usr/share/qt4/mkspecs/common/gcc-base.conf \
-               /usr/share/qt4/mkspecs/common/gcc-base-unix.conf \
-               /usr/share/qt4/mkspecs/common/g++-base.conf \
-               /usr/share/qt4/mkspecs/common/g++-unix.conf \
-               /usr/share/qt4/mkspecs/qconfig.pri \
-               /usr/share/qt4/mkspecs/modules/qt_phonon.pri \
-               /usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
-               /usr/share/qt4/mkspecs/features/qt_functions.prf \
-               /usr/share/qt4/mkspecs/features/qt_config.prf \
-               /usr/share/qt4/mkspecs/features/exclusive_builds.prf \
-               /usr/share/qt4/mkspecs/features/default_pre.prf \
-               /usr/share/qt4/mkspecs/features/release.prf \
-               /usr/share/qt4/mkspecs/features/default_post.prf \
-               /usr/share/qt4/mkspecs/features/warn_on.prf \
-               /usr/share/qt4/mkspecs/features/qt.prf \
-               /usr/share/qt4/mkspecs/features/unix/thread.prf \
-               /usr/share/qt4/mkspecs/features/moc.prf \
-               /usr/share/qt4/mkspecs/features/shared.prf \
-               /usr/share/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \
-               /usr/share/qt4/mkspecs/features/resources.prf \
-               /usr/share/qt4/mkspecs/features/uic.prf \
-               /usr/share/qt4/mkspecs/features/yacc.prf \
-               /usr/share/qt4/mkspecs/features/lex.prf \
-               /usr/lib64/qt4/libQtGui.prl \
-               /usr/lib64/qt4/libQtCore.prl
-       $(QMAKE) -o Makefile architektonas.pro
-/usr/share/qt4/mkspecs/common/unix.conf:
-/usr/share/qt4/mkspecs/common/linux.conf:
-/usr/share/qt4/mkspecs/common/gcc-base.conf:
-/usr/share/qt4/mkspecs/common/gcc-base-unix.conf:
-/usr/share/qt4/mkspecs/common/g++-base.conf:
-/usr/share/qt4/mkspecs/common/g++-unix.conf:
-/usr/share/qt4/mkspecs/qconfig.pri:
-/usr/share/qt4/mkspecs/modules/qt_phonon.pri:
-/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri:
-/usr/share/qt4/mkspecs/features/qt_functions.prf:
-/usr/share/qt4/mkspecs/features/qt_config.prf:
-/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
-/usr/share/qt4/mkspecs/features/default_pre.prf:
-/usr/share/qt4/mkspecs/features/release.prf:
-/usr/share/qt4/mkspecs/features/default_post.prf:
-/usr/share/qt4/mkspecs/features/warn_on.prf:
-/usr/share/qt4/mkspecs/features/qt.prf:
-/usr/share/qt4/mkspecs/features/unix/thread.prf:
-/usr/share/qt4/mkspecs/features/moc.prf:
-/usr/share/qt4/mkspecs/features/shared.prf:
-/usr/share/qt4/mkspecs/features/unix/gdb_dwarf_index.prf:
-/usr/share/qt4/mkspecs/features/resources.prf:
-/usr/share/qt4/mkspecs/features/uic.prf:
-/usr/share/qt4/mkspecs/features/yacc.prf:
-/usr/share/qt4/mkspecs/features/lex.prf:
-/usr/lib64/qt4/libQtGui.prl:
-/usr/lib64/qt4/libQtCore.prl:
-qmake:  FORCE
-       @$(QMAKE) -o Makefile architektonas.pro
-
-dist: 
-       @$(CHK_DIR_EXISTS) obj/architektonas1.0.0 || $(MKDIR) obj/architektonas1.0.0 
-       $(COPY_FILE) --parents $(SOURCES) $(DIST) obj/architektonas1.0.0/ && $(COPY_FILE) --parents src/about.h src/action.h src/applicationwindow.h src/arc.h src/baseunittab.h src/blockitemwidget.h src/blockwidget.h src/circle.h src/connection.h src/container.h src/dimension.h src/drawingview.h src/drawarcaction.h src/drawcircleaction.h src/drawdimensionaction.h src/drawlineaction.h src/drawtextaction.h src/ellipse.h src/fileio.h src/generaltab.h src/layerwidget.h src/layeritemwidget.h src/line.h src/main.h src/mirroraction.h src/mathconstants.h src/object.h src/painter.h src/settingsdialog.h src/text.h src/vector.h obj/architektonas1.0.0/ && $(COPY_FILE) --parents res/architektonas.qrc obj/architektonas1.0.0/ && $(COPY_FILE) --parents src/about.cpp src/action.cpp src/applicationwindow.cpp src/arc.cpp src/baseunittab.cpp src/blockitemwidget.cpp src/blockwidget.cpp src/circle.cpp src/connection.cpp src/container.cpp src/dimension.cpp src/drawingview.cpp src/drawarcaction.cpp src/drawcircleaction.cpp src/drawdimensionaction.cpp src/drawlineaction.cpp src/drawtextaction.cpp src/ellipse.cpp src/fileio.cpp src/generaltab.cpp src/layerwidget.cpp src/layeritemwidget.cpp src/line.cpp src/main.cpp src/mirroraction.cpp src/object.cpp src/painter.cpp src/settingsdialog.cpp src/text.cpp src/vector.cpp obj/architektonas1.0.0/ && (cd `dirname obj/architektonas1.0.0` && $(TAR) architektonas1.0.0.tar architektonas1.0.0 && $(COMPRESS) architektonas1.0.0.tar) && $(MOVE) `dirname obj/architektonas1.0.0`/architektonas1.0.0.tar.gz . && $(DEL_FILE) -r obj/architektonas1.0.0
-
-
-clean:compiler_clean 
-       -$(DEL_FILE) $(OBJECTS)
-       -$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-       -$(DEL_FILE) $(TARGET) 
-       -$(DEL_FILE) Makefile
-
-
-check: first
-
-mocclean: compiler_moc_header_clean compiler_moc_source_clean
-
-mocables: compiler_moc_header_make_all compiler_moc_source_make_all
-
-compiler_moc_header_make_all: obj/moc_action.cpp obj/moc_applicationwindow.cpp obj/moc_baseunittab.cpp obj/moc_blockitemwidget.cpp obj/moc_blockwidget.cpp obj/moc_drawingview.cpp obj/moc_generaltab.cpp obj/moc_layerwidget.cpp obj/moc_layeritemwidget.cpp obj/moc_settingsdialog.cpp
-compiler_moc_header_clean:
-       -$(DEL_FILE) obj/moc_action.cpp obj/moc_applicationwindow.cpp obj/moc_baseunittab.cpp obj/moc_blockitemwidget.cpp obj/moc_blockwidget.cpp obj/moc_drawingview.cpp obj/moc_generaltab.cpp obj/moc_layerwidget.cpp obj/moc_layeritemwidget.cpp obj/moc_settingsdialog.cpp
-obj/moc_action.cpp: src/vector.h \
-               src/action.h
-       /usr/bin/moc $(DEFINES) $(INCPATH) src/action.h -o obj/moc_action.cpp
-
-obj/moc_applicationwindow.cpp: src/applicationwindow.h
-       /usr/bin/moc $(DEFINES) $(INCPATH) src/applicationwindow.h -o obj/moc_applicationwindow.cpp
-
-obj/moc_baseunittab.cpp: src/baseunittab.h
-       /usr/bin/moc $(DEFINES) $(INCPATH) src/baseunittab.h -o obj/moc_baseunittab.cpp
-
-obj/moc_blockitemwidget.cpp: src/blockitemwidget.h
-       /usr/bin/moc $(DEFINES) $(INCPATH) src/blockitemwidget.h -o obj/moc_blockitemwidget.cpp
-
-obj/moc_blockwidget.cpp: src/blockwidget.h
-       /usr/bin/moc $(DEFINES) $(INCPATH) src/blockwidget.h -o obj/moc_blockwidget.cpp
-
-obj/moc_drawingview.cpp: src/action.h \
-               src/vector.h \
-               src/container.h \
-               src/object.h \
-               src/connection.h \
-               src/drawingview.h
-       /usr/bin/moc $(DEFINES) $(INCPATH) src/drawingview.h -o obj/moc_drawingview.cpp
-
-obj/moc_generaltab.cpp: src/generaltab.h
-       /usr/bin/moc $(DEFINES) $(INCPATH) src/generaltab.h -o obj/moc_generaltab.cpp
-
-obj/moc_layerwidget.cpp: src/layerwidget.h
-       /usr/bin/moc $(DEFINES) $(INCPATH) src/layerwidget.h -o obj/moc_layerwidget.cpp
-
-obj/moc_layeritemwidget.cpp: src/layeritemwidget.h
-       /usr/bin/moc $(DEFINES) $(INCPATH) src/layeritemwidget.h -o obj/moc_layeritemwidget.cpp
-
-obj/moc_settingsdialog.cpp: src/settingsdialog.h
-       /usr/bin/moc $(DEFINES) $(INCPATH) src/settingsdialog.h -o obj/moc_settingsdialog.cpp
-
-compiler_rcc_make_all: obj/qrc_architektonas.cpp
-compiler_rcc_clean:
-       -$(DEL_FILE) obj/qrc_architektonas.cpp
-obj/qrc_architektonas.cpp: res/architektonas.qrc \
-               res/fix-angle.png \
-               res/file-new.png \
-               res/add-circle-tool.png \
-               res/disconnect-tool.png \
-               res/delete-tool.png \
-               res/eye-closed.png \
-               res/file-save.png \
-               res/file-save-as.png \
-               res/lock-open.png \
-               res/splash.png \
-               res/snap-to-grid-tool.png \
-               res/file-open.png \
-               res/add-polygon-tool.png \
-               res/settings.png \
-               res/add-arc-tool.png \
-               res/file-close.png \
-               res/connect-tool.png \
-               res/mirror-tool.png \
-               res/atns-icon.png \
-               res/group-tool.png \
-               res/about-logo.png \
-               res/add-line-tool.png \
-               res/rotate-tool.png \
-               res/quit.png \
-               res/lock-closed.png \
-               res/zoom-out.png \
-               res/eye-open.png \
-               res/fix-length.png \
-               res/dimension-tool.png \
-               res/generic-tool.png \
-               res/zoom-in.png
-       /usr/bin/rcc -name architektonas res/architektonas.qrc -o obj/qrc_architektonas.cpp
-
-compiler_image_collection_make_all: obj/qmake_image_collection.cpp
-compiler_image_collection_clean:
-       -$(DEL_FILE) obj/qmake_image_collection.cpp
-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_moc_header_clean compiler_rcc_clean 
-
-####### Compile
-
-obj/about.o: src/about.cpp src/about.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/about.o src/about.cpp
-
-obj/action.o: src/action.cpp src/action.h \
-               src/vector.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/action.o src/action.cpp
-
-obj/applicationwindow.o: src/applicationwindow.cpp src/applicationwindow.h \
-               src/about.h \
-               src/blockwidget.h \
-               src/drawingview.h \
-               src/action.h \
-               src/vector.h \
-               src/container.h \
-               src/object.h \
-               src/connection.h \
-               src/drawarcaction.h \
-               src/drawcircleaction.h \
-               src/drawdimensionaction.h \
-               src/drawlineaction.h \
-               src/fileio.h \
-               src/generaltab.h \
-               src/layerwidget.h \
-               src/mirroraction.h \
-               src/painter.h \
-               src/settingsdialog.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/applicationwindow.o src/applicationwindow.cpp
-
-obj/arc.o: src/arc.cpp src/arc.h \
-               src/object.h \
-               src/vector.h \
-               src/connection.h \
-               src/mathconstants.h \
-               src/painter.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/arc.o src/arc.cpp
-
-obj/baseunittab.o: src/baseunittab.cpp src/baseunittab.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/baseunittab.o src/baseunittab.cpp
-
-obj/blockitemwidget.o: src/blockitemwidget.cpp src/blockitemwidget.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/blockitemwidget.o src/blockitemwidget.cpp
-
-obj/blockwidget.o: src/blockwidget.cpp src/blockwidget.h \
-               src/blockitemwidget.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/blockwidget.o src/blockwidget.cpp
-
-obj/circle.o: src/circle.cpp src/circle.h \
-               src/object.h \
-               src/vector.h \
-               src/connection.h \
-               src/painter.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/circle.o src/circle.cpp
-
-obj/connection.o: src/connection.cpp src/connection.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/connection.o src/connection.cpp
-
-obj/container.o: src/container.cpp src/container.h \
-               src/object.h \
-               src/vector.h \
-               src/connection.h \
-               src/dimension.h \
-               src/painter.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/container.o src/container.cpp
-
-obj/dimension.o: src/dimension.cpp src/dimension.h \
-               src/connection.h \
-               src/object.h \
-               src/vector.h \
-               src/mathconstants.h \
-               src/painter.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/dimension.o src/dimension.cpp
-
-obj/drawingview.o: src/drawingview.cpp src/drawingview.h \
-               src/action.h \
-               src/vector.h \
-               src/container.h \
-               src/object.h \
-               src/connection.h \
-               src/mathconstants.h \
-               src/arc.h \
-               src/circle.h \
-               src/dimension.h \
-               src/line.h \
-               src/painter.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/drawingview.o src/drawingview.cpp
-
-obj/drawarcaction.o: src/drawarcaction.cpp src/drawarcaction.h \
-               src/action.h \
-               src/vector.h \
-               src/arc.h \
-               src/object.h \
-               src/connection.h \
-               src/mathconstants.h \
-               src/painter.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/drawarcaction.o src/drawarcaction.cpp
-
-obj/drawcircleaction.o: src/drawcircleaction.cpp src/drawcircleaction.h \
-               src/action.h \
-               src/vector.h \
-               src/circle.h \
-               src/object.h \
-               src/connection.h \
-               src/painter.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/drawcircleaction.o src/drawcircleaction.cpp
-
-obj/drawdimensionaction.o: src/drawdimensionaction.cpp src/drawdimensionaction.h \
-               src/action.h \
-               src/vector.h \
-               src/dimension.h \
-               src/connection.h \
-               src/object.h \
-               src/painter.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/drawdimensionaction.o src/drawdimensionaction.cpp
-
-obj/drawlineaction.o: src/drawlineaction.cpp src/drawlineaction.h \
-               src/action.h \
-               src/vector.h \
-               src/line.h \
-               src/object.h \
-               src/connection.h \
-               src/painter.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/drawlineaction.o src/drawlineaction.cpp
-
-obj/drawtextaction.o: src/drawtextaction.cpp src/drawtextaction.h \
-               src/action.h \
-               src/vector.h \
-               src/painter.h \
-               src/text.h \
-               src/object.h \
-               src/connection.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/drawtextaction.o src/drawtextaction.cpp
-
-obj/ellipse.o: src/ellipse.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/ellipse.o src/ellipse.cpp
-
-obj/fileio.o: src/fileio.cpp src/fileio.h \
-               src/arc.h \
-               src/object.h \
-               src/vector.h \
-               src/connection.h \
-               src/circle.h \
-               src/container.h \
-               src/dimension.h \
-               src/line.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/fileio.o src/fileio.cpp
-
-obj/generaltab.o: src/generaltab.cpp src/generaltab.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/generaltab.o src/generaltab.cpp
-
-obj/layerwidget.o: src/layerwidget.cpp src/layerwidget.h \
-               src/layeritemwidget.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/layerwidget.o src/layerwidget.cpp
-
-obj/layeritemwidget.o: src/layeritemwidget.cpp src/layeritemwidget.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/layeritemwidget.o src/layeritemwidget.cpp
-
-obj/line.o: src/line.cpp src/line.h \
-               src/object.h \
-               src/vector.h \
-               src/connection.h \
-               src/container.h \
-               src/dimension.h \
-               src/mathconstants.h \
-               src/painter.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/line.o src/line.cpp
-
-obj/main.o: src/main.cpp src/main.h \
-               src/applicationwindow.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/main.o src/main.cpp
-
-obj/mirroraction.o: src/mirroraction.cpp src/mirroraction.h \
-               src/action.h \
-               src/vector.h \
-               src/line.h \
-               src/object.h \
-               src/connection.h \
-               src/mathconstants.h \
-               src/painter.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/mirroraction.o src/mirroraction.cpp
-
-obj/object.o: src/object.cpp src/object.h \
-               src/vector.h \
-               src/connection.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/object.o src/object.cpp
-
-obj/painter.o: src/painter.cpp src/painter.h \
-               src/vector.h \
-               src/mathconstants.h \
-               src/object.h \
-               src/connection.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/painter.o src/painter.cpp
-
-obj/settingsdialog.o: src/settingsdialog.cpp src/settingsdialog.h \
-               src/baseunittab.h \
-               src/generaltab.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/settingsdialog.o src/settingsdialog.cpp
-
-obj/text.o: src/text.cpp src/text.h \
-               src/object.h \
-               src/vector.h \
-               src/connection.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/text.o src/text.cpp
-
-obj/vector.o: src/vector.cpp src/vector.h \
-               src/mathconstants.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/vector.o src/vector.cpp
-
-obj/moc_action.o: obj/moc_action.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_action.o obj/moc_action.cpp
-
-obj/moc_applicationwindow.o: obj/moc_applicationwindow.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_applicationwindow.o obj/moc_applicationwindow.cpp
-
-obj/moc_baseunittab.o: obj/moc_baseunittab.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_baseunittab.o obj/moc_baseunittab.cpp
-
-obj/moc_blockitemwidget.o: obj/moc_blockitemwidget.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_blockitemwidget.o obj/moc_blockitemwidget.cpp
-
-obj/moc_blockwidget.o: obj/moc_blockwidget.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_blockwidget.o obj/moc_blockwidget.cpp
-
-obj/moc_drawingview.o: obj/moc_drawingview.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_drawingview.o obj/moc_drawingview.cpp
-
-obj/moc_generaltab.o: obj/moc_generaltab.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_generaltab.o obj/moc_generaltab.cpp
-
-obj/moc_layerwidget.o: obj/moc_layerwidget.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_layerwidget.o obj/moc_layerwidget.cpp
-
-obj/moc_layeritemwidget.o: obj/moc_layeritemwidget.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_layeritemwidget.o obj/moc_layeritemwidget.cpp
-
-obj/moc_settingsdialog.o: obj/moc_settingsdialog.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_settingsdialog.o obj/moc_settingsdialog.cpp
-
-obj/qrc_architektonas.o: obj/qrc_architektonas.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/qrc_architektonas.o obj/qrc_architektonas.cpp
-
-####### Install
-
-install:   FORCE
-
-uninstall:   FORCE
-
-FORCE:
-

diff --git a/TODO b/TODO
index c54924f1971d3ded9b8898dfe7590ae4ba42f24a..355ea29779ae11dcde66a5eeddde9f1e46686937 100644 (file)
--- a/TODO
+++ b/TODO
@@ -26,6 +26,8 @@ Stuff To Be Implemented/Fixed
    and know what it's supposed to do.
  - Fix loading and saving code
  - Add Drawing Properties dialog (separate from Application Settings)
+ - Trim/Slice tool (to be able to click on a line segment crossing another, and
+   remove it and it only, or to cut the entity at other entities crossing)
 
 
 Stuff That's Done

diff --git a/architektonas.pro b/architektonas.pro
index e8099118e552a045f2d216bb49e76b2fa4f01a8c..54e428ea04f38e9f88c818c79caef942722b38d2 100644 (file)
--- a/architektonas.pro
+++ b/architektonas.pro
@@ -18,6 +18,10 @@ MOC_DIR     = obj
 RCC_DIR     = obj
 UI_DIR      = obj
 
+# Icon on Win32, Mac
+win32 { LIBS += res/architektonas-icon.o }
+macx  { ICON = architektonas-icon.icns }
+
 INCLUDEPATH += \
        src
 #      fparser \

diff --git a/cross-compile b/cross-compile
new file mode 100755 (executable)
index 0000000..7844851
--- /dev/null
+++ b/cross-compile
@@ -0,0 +1,17 @@
+#!/bin/bash
+#
+# Short script to do cross compilation with MXE on Linux
+#
+# by James Hammons
+# (C) 2012 Underground Software
+#
+TARGET = architectonas
+echo "Cross compiling $(TARGET) for Win32..."
+export PATH=/opt/mxe/usr/bin:$PATH
+rm Makefile
+/opt/mxe/usr/i686-pc-mingw32/qt/bin/qmake
+make
+#make CROSS=i686-pc-mingw32-
+#rel=`svn info | grep Revision | cut -f 2 -d ' '`
+#rel=`git log -1 --pretty=format:%ci | cut -d ' ' -f 1 | tr -d -`
+#cd release && upx -9v $(TARGET).exe && zip -9v $(TARGET)-$rel.zip $(TARGET).exe

diff --git a/res/architektonas-icon.o b/res/architektonas-icon.o
new file mode 100644 (file)
index 0000000..7e0ccb9
Binary files /dev/null and b/res/architektonas-icon.o differ

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index bf9baf45781fb076e8c9f9c733969f3f5784ba53..445e546d01e36775abbcecb0c3170f0f988ce42b 100644 (file)
--- a/src/applicationwindow.cpp
+++ b/src/applicationwindow.cpp
@@ -43,6 +43,10 @@
 #include "settingsdialog.h"
 
 
+// Class variables
+DrawingView * ApplicationWindow::drawing;
+
+
 ApplicationWindow::ApplicationWindow():
        baseUnitInput(new QLineEdit),
        dimensionSizeInput(new QLineEdit),

diff --git a/src/applicationwindow.h b/src/applicationwindow.h
index bc65da264d904332d2915776889f51f36c795d68..9432d81347b085df0d6f8fc604b43323e4c45a2c 100644 (file)
--- a/src/applicationwindow.h
+++ b/src/applicationwindow.h
@@ -60,7 +60,6 @@ class ApplicationWindow: public QMainWindow
                void ReadSettings(void);
                void WriteSettings(void);
 
-               DrawingView * drawing;
                AboutWindow * aboutWin;
                QLabel * zoomIndicator;
                QString documentName;
@@ -93,6 +92,10 @@ class ApplicationWindow: public QMainWindow
                QAction * connectAct;
                QAction * disconnectAct;
                QAction * mirrorAct;
+
+       // Class variables
+       public:
+               static DrawingView * drawing;
 };
 
 #endif // __APPLICATIONWINDOW_H__

diff --git a/src/line.cpp b/src/line.cpp
index 7085308f9fe12eb2e3687f3469e23fde2b2971fb..8425e62356e5062cee58b39a50da4793e0c11090 100644 (file)
--- a/src/line.cpp
+++ b/src/line.cpp
@@ -575,6 +575,57 @@ same reference number.
 }
 
 
+/*virtual*/ Object * Line::Mirror(Vector p1, Vector p2)
+{
+#if 0
+       return NULL;
+
+double Vector::Parameter(Vector v1, Vector v2, Vector p)
+{
+       // Geometric interpretation:
+       // The parameterized point on the vector lineSegment is where the normal of
+       // the lineSegment to the point intersects lineSegment. If the pp < 0, then
+       // the perpendicular lies beyond the 1st endpoint. If pp > 1, then the
+       // perpendicular lies beyond the 2nd endpoint.
+
+       Vector lineSegment = v2 - v1;
+       double magnitude = lineSegment.Magnitude();
+       Vector pointSegment = p - v1;
+       double t = lineSegment.Dot(pointSegment) / (magnitude * magnitude);
+       return t;
+}
+
+
+// Return the normal to the linesegment formed by the passed in points.
+// (Not sure which is head or tail, or which hand the normal lies)
+/*static*/ Vector Vector::Normal(Vector v1, Vector v2)
+#endif
+
+       double t1 = Vector::Parameter(p1, p2, position);
+       double t2 = Vector::Parameter(p1, p2, endpoint);
+
+       Vector unit = Vector(p1, p2).Unit();
+       Vector v1 = unit * t1;
+       Vector v2 = unit * t2;
+
+//     Vector normal = Vector::Normal(p1, p2);
+       // Get the points normal to position & endpoint to the line passed in
+       // (these are tails)
+       Vector v3 = p1 + v1;
+       Vector v4 = p1 + v2;
+
+       // Make our mirrored vectors
+       Vector v5 = -(position - v3);
+       Vector v6 = -(endpoint - v4);
+
+       // Find the points
+       Vector v7 = v3 + v5;
+       Vector v8 = v4 + v6;
+
+       return new Line(v7, v8);
+}
+
+
 void Line::SetDimensionOnLine(Dimension * dimension/*=NULL*/)
 {
        // If they don't pass one in, create it for the caller.

diff --git a/src/line.h b/src/line.h
index a8dc8c88a8d624fc8b615fa46a04976345f55488..cc048a8281b90359b75976c57c4cfe9ad90de770 100644 (file)
--- a/src/line.h
+++ b/src/line.h
@@ -26,6 +26,7 @@ class Line: public Object
                virtual void Translate(Vector);
                virtual void Rotate(Vector, double);
                virtual void Scale(Vector, double);
+               virtual Object * Mirror(Vector, Vector);
                void SetDimensionOnLine(Dimension * d = 0);
                Object * FindAttachedDimension(void);
 

diff --git a/src/mirroraction.cpp b/src/mirroraction.cpp
index 61b14ac1276be53c1199b3b310db421e0ff07834..998a0e1f16b5f90344e355d1423b59b0fa44c3c4 100644 (file)
--- a/src/mirroraction.cpp
+++ b/src/mirroraction.cpp
@@ -12,6 +12,7 @@
 //
 
 #include "mirroraction.h"
+#include "applicationwindow.h"
 #include "line.h"
 #include "mathconstants.h"
 #include "painter.h"
@@ -78,7 +79,9 @@ MirrorAction::~MirrorAction()
        if (state == FIRST_POINT)
                p1 = point;
        else
+       {
                p2 = point;
+       }
 }
 
 

diff --git a/src/object.cpp b/src/object.cpp
index 346c19a11536d686a0ea63ba8f4d5883bdb8f9c6..dd80007d1998cc4c4772848c35580a53fe2f9859 100644 (file)
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -234,6 +234,12 @@ printf("Object: Destroyed!\n");
 }
 
 
+/*virtual*/ Object * Object::Mirror(Vector, Vector)
+{
+       return NULL;
+}
+
+
 ObjectState Object::GetState(void)
 {
        return state;

diff --git a/src/object.h b/src/object.h
index 0a72328cc6d8446b0804d1792c38240407a1b5af..2cdd3d36863e09fdeef2e837487be7cf87b86f7f 100644 (file)
--- a/src/object.h
+++ b/src/object.h
@@ -44,6 +44,7 @@ class Object
                virtual void Translate(Vector);
                virtual void Rotate(Vector, double);
                virtual void Scale(Vector, double);
+               virtual Object * Mirror(Vector, Vector);
                ObjectState GetState(void);
                void Reparent(Object *);
 //             Dimension * GetAttachedDimension(void);