vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Swap out spaces for tabs 

modified:   src/GLView.h
	modified:   src/MainWindow.h
	modified:   src/QGLView.h
	modified:   src/mainwin.cc

QtCreator ignores the prefs and will only put in spaces instead of tabs.  These are manual fixes in Notepad++ to try and keep the indents in the standard mode.
master
Tim Deagan 2015-01-02 01:32:37 -06:00
parent 7a71e59f2d
commit 358ba86fc8
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/GLView.h
View File

@ -62,7 +62,7 @@ public:
bool showfaces; bool showfaces;
bool showedges; bool showedges;
bool showcrosshairs; bool showcrosshairs;
bool showscale; bool showscale;
#ifdef ENABLE_OPENCSG #ifdef ENABLE_OPENCSG
GLint shaderinfo[11]; GLint shaderinfo[11];
@ -77,6 +77,6 @@ private:
void showCrosshairs(); void showCrosshairs();
void showAxes(const Color4f &col); void showAxes(const Color4f &col);
void showSmallaxes(const Color4f &col); void showSmallaxes(const Color4f &col);
void showScalemarkers(const Color4f &col); void showScalemarkers(const Color4f &col);
void decodeMarkerValue(double i, double l, int size_div_sm); void decodeMarkerValue(double i, double l, int size_div_sm);
}; };

4
src/MainWindow.h
View File

@ -213,8 +213,8 @@ public slots:
void viewModeShowEdges(); void viewModeShowEdges();
void viewModeShowAxes(); void viewModeShowAxes();
void viewModeShowCrosshairs(); void viewModeShowCrosshairs();
void viewModeShowScaleProportional(); void viewModeShowScaleProportional();
void viewModeAnimate(); void viewModeAnimate();
void viewAngleTop(); void viewAngleTop();
void viewAngleBottom(); void viewAngleBottom();
void viewAngleLeft(); void viewAngleLeft();

7
src/QGLView.h
View File

@ -17,7 +17,7 @@ class QGLView : public QGLWidget, public GLView
Q_PROPERTY(bool showAxes READ showAxes WRITE setShowAxes); Q_PROPERTY(bool showAxes READ showAxes WRITE setShowAxes);
Q_PROPERTY(bool showCrosshairs READ showCrosshairs WRITE setShowCrosshairs); Q_PROPERTY(bool showCrosshairs READ showCrosshairs WRITE setShowCrosshairs);
Q_PROPERTY(bool orthoMode READ orthoMode WRITE setOrthoMode); Q_PROPERTY(bool orthoMode READ orthoMode WRITE setOrthoMode);
Q_PROPERTY(double showScaleProportional READ showScaleProportional WRITE setShowScaleProportional); Q_PROPERTY(double showScaleProportional READ showScaleProportional WRITE setShowScaleProportional);
public: public:
QGLView(QWidget *parent = NULL); QGLView(QWidget *parent = NULL);
@ -36,9 +36,8 @@ public:
void setShowCrosshairs(bool enabled) { this->showcrosshairs = enabled; } void setShowCrosshairs(bool enabled) { this->showcrosshairs = enabled; }
bool orthoMode() const { return (this->cam.projection == Camera::ORTHOGONAL); } bool orthoMode() const { return (this->cam.projection == Camera::ORTHOGONAL); }
void setOrthoMode(bool enabled); void setOrthoMode(bool enabled);
bool showScaleProportional() const { return this->showscale; } bool showScaleProportional() const { return this->showscale; }
void setShowScaleProportional(bool enabled) { this->showscale = enabled; } void setShowScaleProportional(bool enabled) { this->showscale = enabled; }
std::string getRendererInfo() const; std::string getRendererInfo() const;
#if QT_VERSION >= 0x050100 #if QT_VERSION >= 0x050100
float getDPI() { return this->devicePixelRatio(); } float getDPI() { return this->devicePixelRatio(); }

4
src/mainwin.cc
View File

@ -371,8 +371,8 @@ MainWindow::MainWindow(const QString &filename)
connect(this->viewActionShowEdges, SIGNAL(triggered()), this, SLOT(viewModeShowEdges())); connect(this->viewActionShowEdges, SIGNAL(triggered()), this, SLOT(viewModeShowEdges()));
connect(this->viewActionShowAxes, SIGNAL(triggered()), this, SLOT(viewModeShowAxes())); connect(this->viewActionShowAxes, SIGNAL(triggered()), this, SLOT(viewModeShowAxes()));
connect(this->viewActionShowCrosshairs, SIGNAL(triggered()), this, SLOT(viewModeShowCrosshairs())); connect(this->viewActionShowCrosshairs, SIGNAL(triggered()), this, SLOT(viewModeShowCrosshairs()));
connect(this->viewActionShowScaleProportional, SIGNAL(triggered()), this, SLOT(viewModeShowScaleProportional())); connect(this->viewActionShowScaleProportional, SIGNAL(triggered()), this, SLOT(viewModeShowScaleProportional()));
connect(this->viewActionAnimate, SIGNAL(triggered()), this, SLOT(viewModeAnimate())); connect(this->viewActionAnimate, SIGNAL(triggered()), this, SLOT(viewModeAnimate()));
connect(this->viewActionTop, SIGNAL(triggered()), this, SLOT(viewAngleTop())); connect(this->viewActionTop, SIGNAL(triggered()), this, SLOT(viewAngleTop()));
connect(this->viewActionBottom, SIGNAL(triggered()), this, SLOT(viewAngleBottom())); connect(this->viewActionBottom, SIGNAL(triggered()), this, SLOT(viewAngleBottom()));
connect(this->viewActionLeft, SIGNAL(triggered()), this, SLOT(viewAngleLeft())); connect(this->viewActionLeft, SIGNAL(triggered()), this, SLOT(viewAngleLeft()));