X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Frs_actionblocksinsert.h;h=5ef409566843f150dabcdaf586c53b3de701cada;hb=3f46c180da0806c9c263e6d87d0f1404632402da;hp=433dc9f2ce7db9eaa44236b4d906ceaf4f73cb87;hpb=16ce54abf01ca3032e42a5bb11a4afcf9014dcca;p=architektonas

diff --git a/src/actions/rs_actionblocksinsert.h b/src/actions/rs_actionblocksinsert.h
index 433dc9f..5ef4095 100644
--- a/src/actions/rs_actionblocksinsert.h
+++ b/src/actions/rs_actionblocksinsert.h
@@ -1,29 +1,3 @@
-/****************************************************************************
-** $Id: rs_actionblocksinsert.h 1062 2004-01-16 21:51:20Z andrew $
-**
-** Copyright (C) 2001-2003 RibbonSoft. All rights reserved.
-**
-** This file is part of the qcadlib Library project.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid qcadlib Professional Edition licenses may use 
-** this file in accordance with the qcadlib Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.ribbonsoft.com for further details.
-**
-** Contact info@ribbonsoft.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
 #ifndef RS_ACTIONBLOCKSINSERT_H
 #define RS_ACTIONBLOCKSINSERT_H
 
@@ -36,107 +10,60 @@
  *
  * @author Andrew Mustun
  */
-class RS_ActionBlocksInsert : public RS_PreviewActionInterface {
-	//Q_OBJECT
-public:
-    /**
-     * Action States.
-     */
-    enum Status {
-        SetTargetPoint,    /**< Setting the reference point. */
-		SetAngle,          /**< Setting angle in the command line. */
-		SetFactor,         /**< Setting factor in the command line. */
-		SetColumns,        /**< Setting columns in the command line. */
-		SetRows,           /**< Setting rows in the command line. */
-		SetColumnSpacing,  /**< Setting column spacing in the command line. */
-		SetRowSpacing      /**< Setting row spacing in the command line. */
-    };
-
-public:
-    RS_ActionBlocksInsert(RS_EntityContainer& container,
-                        RS_GraphicView& graphicView);
-    ~RS_ActionBlocksInsert();
-	
-	static QAction* createGUIAction(RS2::ActionType /*type*/, QObject* /*parent*/);
-	
-	virtual RS2::ActionType rtti() {
-		return RS2::ActionBlocksInsert;
-	}
-
-    virtual void init(int status=0);
-
-	void reset();
-
-    virtual void trigger();
-
-    virtual void mouseMoveEvent(QMouseEvent* e);
-    virtual void mouseReleaseEvent(QMouseEvent* e);
-
-    virtual void coordinateEvent(RS_CoordinateEvent* e);
-    virtual void commandEvent(RS_CommandEvent* e);
-	virtual QStringList getAvailableCommands();
-
-	virtual void showOptions();
-	virtual void hideOptions();
-
-    virtual void updateMouseButtonHints();
-    virtual void updateMouseCursor();
-    virtual void updateToolBar();
-
-	double getAngle() {
-		return data.angle;
-	}
-
-	void setAngle(double a) {
-		data.angle = a;
-	}
-
-	double getFactor() {
-		return data.scaleFactor.x;
-	}
-
-	void setFactor(double f) {
-		data.scaleFactor = Vector(f, f);
-	}
-
-	int getColumns() {
-		return data.cols;
-	}
-
-	void setColumns(int c) {
-		data.cols = c;
-	}
-	
-	int getRows() {
-		return data.rows;
-	}
-
-	void setRows(int r) {
-		data.rows = r;
-	}
-
-	double getColumnSpacing() {
-		return data.spacing.x;
-	}
-
-	void setColumnSpacing(double cs) {
-		data.spacing.x = cs;
-	}
-	
-	double getRowSpacing() {
-		return data.spacing.y;
-	}
-
-	void setRowSpacing(double rs) {
-		data.spacing.y = rs;
-	}
-
-protected:
-	RS_Block* block;
-	RS_InsertData data;
-	
-	/** Last status before entering option. */
-	Status lastStatus;
+class RS_ActionBlocksInsert: public RS_PreviewActionInterface
+{
+	public:
+		/**
+		 * Action States.
+		 */
+		enum Status {
+			SetTargetPoint,    /**< Setting the reference point. */
+			SetAngle,          /**< Setting angle in the command line. */
+			SetFactor,         /**< Setting factor in the command line. */
+			SetColumns,        /**< Setting columns in the command line. */
+			SetRows,           /**< Setting rows in the command line. */
+			SetColumnSpacing,  /**< Setting column spacing in the command line. */
+			SetRowSpacing      /**< Setting row spacing in the command line. */
+		};
+
+	public:
+		RS_ActionBlocksInsert(RS_EntityContainer & container, RS_GraphicView & graphicView);
+		~RS_ActionBlocksInsert();
+
+		virtual RS2::ActionType rtti();
+		virtual void init(int status = 0);
+		void reset();
+		virtual void trigger();
+		virtual void mouseMoveEvent(QMouseEvent * e);
+		virtual void mouseReleaseEvent(QMouseEvent * e);
+		virtual void coordinateEvent(Vector * e);
+		virtual void commandEvent(RS_CommandEvent * e);
+		virtual QStringList getAvailableCommands();
+		virtual void showOptions();
+		virtual void hideOptions();
+		virtual void updateMouseButtonHints();
+		virtual void updateMouseCursor();
+		virtual void updateToolBar();
+
+		double getAngle();
+		void setAngle(double a);
+		double getFactor();
+		void setFactor(double f);
+		int getColumns();
+		void setColumns(int c);
+		int getRows();
+		void setRows(int r);
+		double getColumnSpacing();
+		void setColumnSpacing(double cs);
+		double getRowSpacing();
+		void setRowSpacing(double rs);
+
+	protected:
+		RS_Block * block;
+		RS_InsertData data;
+
+		/** Last status before entering option. */
+		Status lastStatus;
 };
 
 #endif