added new icons

DrStS · Dec 29, 2016 · e0585ee · e0585ee
1 parent ff5a585
commit e0585ee
Show file tree

Hide file tree

Showing 34 changed files with 100 additions and 87 deletions.
diff --git a/build/.gitignore b/build/.gitignore
diff --git a/etc/.gitignore b/etc/.gitignore
diff --git a/etc/runWin64.bat b/etc/runWin64.bat
@@ -3,4 +3,5 @@ call C:\software\libs\OpenCASCADE7.1.0-vc12-64\opencascade-7.1.0\env.bat vc12 wi
 echo Setting QT 5.7.0
 set "PATH=C:\software\libs\QT\QT570\5.7\msvc2013_64\bin;%PATH%"
 echo Starting STACCATO ...
-"..\bin64\Debug\STACCATO.exe"
+call ping -n 3 127.0.0.1 > NUL
+"..\bin64\Release\STACCATO.exe"
diff --git a/src/Qt/OccViewer.cpp b/src/Qt/OccViewer.cpp
@@ -162,7 +162,7 @@ void OccViewer::initOccView(){
 		myView = myViewer->CreateView();
 	}
 	Handle_Aspect_Window myWindow;
-#if OCC_VERSION_HEX >= 0x070000 
+#if OCC_VERSION_HEX >= 0x071000 
 	myWindow = new OcctWindow( this );
 #else
 #if defined _WIN32 || defined __WIN32__

diff --git a/src/Qt/StartWindow.cpp b/src/Qt/StartWindow.cpp
@@ -67,7 +67,7 @@ QMainWindow(parent),
 ui(new Ui::StartWindow)
 {
 	ui->setupUi(this);
-	setWindowIcon(QIcon(":/Qt/resources/FitAll.png"));
+	setWindowIcon(QIcon(":/Qt/resources/STACCATO.png"));
 	myOccViewer = new OccViewer(this);
 	setCentralWidget(myOccViewer);
 	createActions();
@@ -83,26 +83,46 @@ StartWindow::~StartWindow()
 
 void StartWindow::createActions(void)
 {
+	// File actions
 	mExitAction = new QAction(tr("Exit"), this);
 	mExitAction->setShortcut(tr("Ctrl+Q"));
-	mExitAction->setIcon(QIcon(":/Qt/resources/close.png"));
+	mExitAction->setIcon(QIcon(":/Qt/resources/closeDoc.png"));
 	mExitAction->setStatusTip(tr("Exit the application"));
 	connect(mExitAction, SIGNAL(triggered()), this, SLOT(close()));
 
 	mReadSTLAction = new QAction(tr("Read STL file"), this);
-	mReadSTLAction->setShortcut(tr("Ctrl+R"));
-	mReadSTLAction->setIcon(QIcon(":/Qt/resources/close.png"));
+	mReadSTLAction->setIcon(QIcon(":/Qt/resources/openDoc.png"));
 	mReadSTLAction->setStatusTip(tr("Read STL file"));
 	connect(mReadSTLAction, SIGNAL(triggered()), this, SLOT(readSTL()));
 
+	// View actions
+	mPanAction = new QAction(tr("Pan"), this);
+	mPanAction->setIcon(QIcon(":/Qt/resources/pan.png"));
+	mPanAction->setStatusTip(tr("Panning the view"));
+
+	mZoomAction = new QAction(tr("Zoom"), this);
+	mZoomAction->setIcon(QIcon(":/Qt/resources/zoom.png"));
+	mZoomAction->setStatusTip(tr("Zooming the view"));
+
+	mFitAllAction = new QAction(tr("Zoom fit all"), this);
+	mFitAllAction->setIcon(QIcon(":/Qt/resources/fitAll.png"));
+	mFitAllAction->setStatusTip(tr("Fit the view to show all"));
+
+	mRotateAction = new QAction(tr("Rotate"), this);
+	mRotateAction->setIcon(QIcon(":/Qt/resources/rotate.png"));
+	mRotateAction->setStatusTip(tr("Rotate the view"));
+
+
+	// Create actions
 	mDrawCantileverAction = new QAction(tr("Draw Cantilever"), this);
 	mDrawCantileverAction->setIcon(QIcon(":/Qt/resources/torus.png"));
 	mDrawCantileverAction->setStatusTip(tr("Draw Cantilever"));
 	connect(mDrawCantileverAction, SIGNAL(triggered()), this, SLOT(drawCantilever()));
 
+	//Help actions
 	mAboutAction = new QAction(tr("About"), this);
 	mAboutAction->setStatusTip(tr("About the application"));
-	mAboutAction->setIcon(QIcon(":/Qt/resources/lamp.png"));
+	mAboutAction->setIcon(QIcon(":/Qt/resources/about.png"));
 	connect(mAboutAction, SIGNAL(triggered()), this, SLOT(about()));
 
 	connect(myOccViewer, SIGNAL(selectionChanged()), this, SLOT(handleSelectionChanged()));
@@ -126,6 +146,11 @@ void StartWindow::createToolBars(void)
 {
 	mFileToolBar = addToolBar(tr("&File"));
 	mFileToolBar->addAction(mReadSTLAction);
+	mViewToolBar = addToolBar(tr("View"));
+	mViewToolBar->addAction(mPanAction);
+	mViewToolBar->addAction(mZoomAction);
+	mViewToolBar->addAction(mFitAllAction);
+	mViewToolBar->addAction(mRotateAction);
 	mHelpToolBar = addToolBar(tr("Help"));
 	mHelpToolBar->addAction(mAboutAction);
 }

diff --git a/src/Qt/StartWindow.h b/src/Qt/StartWindow.h
@@ -68,12 +68,19 @@ private slots:
 	QAction* mReadSTLAction;
 	QAction* mDrawCantileverAction;
 
+	//! View action
+	QAction* mPanAction;
+	QAction* mZoomAction;
+	QAction* mFitAllAction;
+	QAction* mRotateAction;
+
 	//! the menus of the application.
 	QMenu* mFileMenu;
 	QMenu* mCreateMenu;
 	QMenu* mHelpMenu;
 
 	QToolBar* mFileToolBar;
+	QToolBar* mViewToolBar;
 	QToolBar* mHelpToolBar;
 
 	// wrapped the widget for occ.

diff --git a/src/Qt/resources/FitAll.png b/src/Qt/resources/FitAll.png
diff --git a/src/Qt/resources/Home.png b/src/Qt/resources/Home.png
diff --git a/src/Qt/resources/Pan.png b/src/Qt/resources/Pan.png
diff --git a/src/Qt/resources/Rotate.png b/src/Qt/resources/Rotate.png
diff --git a/src/Qt/resources/STACCATO.png b/src/Qt/resources/STACCATO.png
diff --git a/src/Qt/resources/Zoom.png b/src/Qt/resources/Zoom.png
diff --git a/src/Qt/resources/about.png b/src/Qt/resources/about.png
diff --git a/src/Qt/resources/box.png b/src/Qt/resources/box.png
diff --git a/src/Qt/resources/chamfer.png b/src/Qt/resources/chamfer.png
diff --git a/src/Qt/resources/close.png b/src/Qt/resources/close.png
diff --git a/src/Qt/resources/closeDoc.png b/src/Qt/resources/closeDoc.png
diff --git a/src/Qt/resources/common.png b/src/Qt/resources/common.png
diff --git a/src/Qt/resources/cone.png b/src/Qt/resources/cone.png
diff --git a/src/Qt/resources/cut.png b/src/Qt/resources/cut.png
diff --git a/src/Qt/resources/cylinder.png b/src/Qt/resources/cylinder.png
diff --git a/src/Qt/resources/extrude.png b/src/Qt/resources/extrude.png
diff --git a/src/Qt/resources/fillet.png b/src/Qt/resources/fillet.png
diff --git a/src/Qt/resources/fuse.png b/src/Qt/resources/fuse.png
diff --git a/src/Qt/resources/helix.png b/src/Qt/resources/helix.png
diff --git a/src/Qt/resources/lamp.png b/src/Qt/resources/lamp.png
diff --git a/src/Qt/resources/loft.png b/src/Qt/resources/loft.png
diff --git a/src/Qt/resources/openDoc.png b/src/Qt/resources/openDoc.png
diff --git a/src/Qt/resources/revolve.png b/src/Qt/resources/revolve.png
diff --git a/src/Qt/resources/sphere.png b/src/Qt/resources/sphere.png
diff --git a/src/Qt/resources/torus.png b/src/Qt/resources/torus.png
diff --git a/src/Qt/resources/wedge.png b/src/Qt/resources/wedge.png
diff --git a/src/resources.qrc b/src/resources.qrc
@@ -1,25 +1,13 @@
 <RCC>
     <qresource prefix="/">
-        <file>Qt/resources/FitAll.png</file>
-        <file>Qt/resources/Home.png</file>
-        <file>Qt/resources/Pan.png</file>
-        <file>Qt/resources/Rotate.png</file>
-        <file>Qt/resources/Zoom.png</file>
+        <file>Qt/resources/fitAll.png</file>
+        <file>Qt/resources/pan.png</file>
+        <file>Qt/resources/rotate.png</file>
+        <file>Qt/resources/zoom.png</file>
         <file>Qt/resources/cone.png</file>
-        <file>Qt/resources/cylinder.png</file>
-        <file>Qt/resources/sphere.png</file>
-        <file>Qt/resources/box.png</file>
-        <file>Qt/resources/torus.png</file>
-        <file>Qt/resources/chamfer.png</file>
-        <file>Qt/resources/fillet.png</file>
-        <file>Qt/resources/lamp.png</file>
-        <file>Qt/resources/common.png</file>
-		<file>Qt/resources/close.png</file>
-        <file>Qt/resources/cut.png</file>
-        <file>Qt/resources/fuse.png</file>
-        <file>Qt/resources/extrude.png</file>
-        <file>Qt/resources/loft.png</file>
-        <file>Qt/resources/revolve.png</file>
-        <file>Qt/resources/helix.png</file>
+		<file>Qt/resources/closeDoc.png</file>
+		<file>Qt/resources/openDoc.png</file>
+		<file>Qt/resources/STACCATO.png</file>
+		<file>Qt/resources/about.png</file>
     </qresource>
 </RCC>
diff --git a/src/tools/AuxiliaryParameters.h b/src/tools/AuxiliaryParameters.h
@@ -1,52 +1,52 @@
-/*  Copyright &copy; 2016, Dr. Stefan Sicklinger, Munich \n
- *
- *  All rights reserved.
- *
- *  This file is part of STACCATO.
- *
- *  STACCATO 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  STACCATO 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 STACCATO.  If not, see http://www.gnu.org/licenses/.
- */
-/***********************************************************************************************//**
- * \file AuxiliaryParameters.h
- * This file holds the class of AuxiliaryParameters.
- * \date 4/2/2016
- **************************************************************************************************/
-#ifndef AUXILIARYPARAMETERS_H_
-#define AUXILIARYPARAMETERS_H_
-#include <string>
-
-namespace STACCATO {
-/********//**
- * \brief Class AuxiliaryParameters provides a central place for STACCATO wide parameters
- ***********/
-class AuxiliaryParameters {
-public:
-    /// How many threads are used for MKL thread parallel routines
-    static const int mklSetNumThreads;
-
-    /// How many threads are used for mortar mapper thread parallel routines
-    static const int mapperSetNumThreads;
-
-    /// Machine epsilon (the difference between 1 and the least value greater than 1 that is representable).
-    static const double machineEpsilon;
-
-    /// Git hash is determined during configure by cmake
-    static const std::string gitSHA1;
-
-    /// Git tag is determined during configure by cmake
-    static const std::string gitTAG;
-};
-
-} /* namespace STACCATO */
-#endif /* AUXILIARYFUNCTIONS_H_ */
+/*  Copyright &copy; 2016, Dr. Stefan Sicklinger, Munich \n
+ *
+ *  All rights reserved.
+ *
+ *  This file is part of STACCATO.
+ *
+ *  STACCATO 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  STACCATO 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 STACCATO.  If not, see http://www.gnu.org/licenses/.
+ */
+/***********************************************************************************************//**
+ * \file AuxiliaryParameters.h
+ * This file holds the class of AuxiliaryParameters.
+ * \date 4/2/2016
+ **************************************************************************************************/
+#ifndef AUXILIARYPARAMETERS_H_
+#define AUXILIARYPARAMETERS_H_
+#include <string>
+
+namespace STACCATO {
+/********//**
+ * \brief Class AuxiliaryParameters provides a central place for STACCATO wide parameters
+ ***********/
+class AuxiliaryParameters {
+public:
+    /// How many threads are used for MKL thread parallel routines
+    static const int mklSetNumThreads;
+
+    /// How many threads are used for mortar mapper thread parallel routines
+    static const int mapperSetNumThreads;
+
+    /// Machine epsilon (the difference between 1 and the least value greater than 1 that is representable).
+    static const double machineEpsilon;
+
+    /// Git hash is determined during configure by cmake
+    static const std::string gitSHA1;
+
+    /// Git tag is determined during configure by cmake
+    static const std::string gitTAG;
+};
+
+} /* namespace STACCATO */
+#endif /* AUXILIARYFUNCTIONS_H_ */