diff --git a/src/Preferences.cc b/src/Preferences.cc
index e5045780..33d71bd5 100644
--- a/src/Preferences.cc
+++ b/src/Preferences.cc
@@ -39,21 +39,6 @@ Preferences::Preferences(QWidget *parent) : QMainWindow(parent)
setupUi(this);
// Editor pane
- QFontDatabase db;
- foreach(int size, db.standardSizes()) {
- this->fontSize->addItem(QString::number(size));
- if (size == 12) {
- this->fontSize->setCurrentIndex(this->fontSize->count()-1);
- }
- }
-
- // Setup default settings
- this->defaultmap["3dview/colorscheme"] = this->colorSchemeChooser->currentItem()->text();
- this->defaultmap["advanced/opencsg_show_warning"] = true;
- this->defaultmap["advanced/enable_opencsg_opengl1x"] = true;
- this->defaultmap["caches/polysetCacheSize"] = uint(PolySetCache::instance()->maxSize());
- this->defaultmap["caches/cgalCacheSize"] = uint(CGALCache::instance()->maxSize());
-
// Setup default font (Try to use a nice monospace font)
QString fontfamily;
#ifdef Q_WS_X11
@@ -70,6 +55,23 @@ Preferences::Preferences(QWidget *parent) : QMainWindow(parent)
this->defaultmap["editor/fontfamily"] = found_family;
this->defaultmap["editor/fontsize"] = 12;
+ QFontDatabase db;
+ foreach(int size, db.standardSizes()) {
+ this->fontSize->addItem(QString::number(size));
+ if (size == 12) {
+ this->fontSize->setCurrentIndex(this->fontSize->count()-1);
+ }
+ }
+
+ // Setup default settings
+ this->defaultmap["3dview/colorscheme"] = this->colorSchemeChooser->currentItem()->text();
+ this->defaultmap["advanced/opencsg_show_warning"] = true;
+ this->defaultmap["advanced/enable_opencsg_opengl1x"] = true;
+ this->defaultmap["advanced/polysetCacheSize"] = uint(PolySetCache::instance()->maxSize());
+ this->defaultmap["advanced/cgalCacheSize"] = uint(CGALCache::instance()->maxSize());
+ this->defaultmap["advanced/openCSGLimit"] = 2000;
+
+
// Toolbar
QActionGroup *group = new QActionGroup(this);
group->addAction(prefsAction3DView);
@@ -114,14 +116,12 @@ Preferences::Preferences(QWidget *parent) : QMainWindow(parent)
this->colorschemes["Sunset"][RenderSettings::CGAL_EDGE_2D_COLOR] = QColor(0xff, 0x00, 0x00);
this->colorschemes["Sunset"][RenderSettings::CROSSHAIR_COLOR] = QColor(0x80, 0x00, 0x00);
- connect(this->colorSchemeChooser, SIGNAL(itemSelectionChanged()),
- this, SLOT(colorSchemeChanged()));
- connect(this->fontChooser, SIGNAL(activated(const QString &)),
- this, SLOT(fontFamilyChanged(const QString &)));
- connect(this->fontSize, SIGNAL(editTextChanged(const QString &)),
- this, SLOT(fontSizeChanged(const QString &)));
- connect(this->openCSGWarningBox, SIGNAL(toggled(bool)),
- this, SLOT(openCSGWarningChanged(bool)));
+ // Advanced pane
+ QValidator *validator = new QIntValidator(this);
+ this->cgalCacheSizeEdit->setValidator(validator);
+ this->polysetCacheSizeEdit->setValidator(validator);
+ this->opencsgLimitEdit->setValidator(validator);
+
updateGUI();
RenderSettings::inst()->setColors(this->colorschemes[getValue("3dview/colorscheme").toString()]);
@@ -146,7 +146,7 @@ Preferences::actionTriggered(QAction *action)
}
}
-void Preferences::colorSchemeChanged()
+void Preferences::on_colorSchemeChooser_itemSelectionChanged()
{
QString scheme = this->colorSchemeChooser->currentItem()->text();
QSettings settings;
@@ -157,14 +157,14 @@ void Preferences::colorSchemeChanged()
emit requestRedraw();
}
-void Preferences::fontFamilyChanged(const QString &family)
+void Preferences::on_fontChooser_activated(const QString &family)
{
QSettings settings;
settings.setValue("editor/fontfamily", family);
emit fontChanged(family, getValue("editor/fontsize").toUInt());
}
-void Preferences::fontSizeChanged(const QString &size)
+void Preferences::on_fontSize_editTextChanged(const QString &size)
{
uint intsize = size.toUInt();
QSettings settings;
@@ -173,19 +173,40 @@ void Preferences::fontSizeChanged(const QString &size)
}
void
-Preferences::openCSGWarningChanged(bool state)
+Preferences::on_openCSGWarningBox_toggled(bool state)
{
QSettings settings;
settings.setValue("advanced/opencsg_show_warning",state);
}
void
-Preferences::enableOpenCSGChanged(bool state)
+Preferences::on_enableOpenCSGBox_toggled(bool state)
{
QSettings settings;
settings.setValue("advanced/enable_opencsg_opengl1x", state);
}
+void Preferences::on_cgalCacheSizeEdit_textChanged(const QString &text)
+{
+ QSettings settings;
+ settings.setValue("advanced/cgalCacheSize", text);
+ CGALCache::instance()->setMaxSize(text.toULong());
+}
+
+void Preferences::on_polysetCacheSizeEdit_textChanged(const QString &text)
+{
+ QSettings settings;
+ settings.setValue("advanced/polysetCacheSize", text);
+ PolySetCache::instance()->setMaxSize(text.toULong());
+}
+
+void Preferences::on_opencsgLimitEdit_textChanged(const QString &text)
+{
+ QSettings settings;
+ settings.setValue("advanced/openCSGLimit", text);
+ // FIXME: Set this globally?
+}
+
void Preferences::keyPressEvent(QKeyEvent *e)
{
#ifdef Q_WS_MAC
@@ -218,6 +239,7 @@ void Preferences::removeDefaultSettings()
QVariant Preferences::getValue(const QString &key) const
{
QSettings settings;
+ assert(settings.contains(key) || this->defaultmap.contains(key));
return settings.value(key, this->defaultmap[key]);
}
@@ -246,6 +268,9 @@ void Preferences::updateGUI()
this->openCSGWarningBox->setChecked(getValue("advanced/opencsg_show_warning").toBool());
this->enableOpenCSGBox->setChecked(getValue("advanced/enable_opencsg_opengl1x").toBool());
+ this->cgalCacheSizeEdit->setText(getValue("advanced/cgalCacheSize").toString());
+ this->polysetCacheSizeEdit->setText(getValue("advanced/polysetCacheSize").toString());
+ this->opencsgLimitEdit->setText(getValue("advanced/openCSGLimit").toString());
}
void Preferences::apply() const
diff --git a/src/Preferences.h b/src/Preferences.h
index 7e22e63d..492a2614 100644
--- a/src/Preferences.h
+++ b/src/Preferences.h
@@ -19,11 +19,14 @@ public:
public slots:
void actionTriggered(class QAction *);
- void colorSchemeChanged();
- void fontFamilyChanged(const QString &);
- void fontSizeChanged(const QString &);
- void openCSGWarningChanged(bool);
- void enableOpenCSGChanged(bool);
+ void on_colorSchemeChooser_itemSelectionChanged();
+ void on_fontChooser_activated(const QString &);
+ void on_fontSize_editTextChanged(const QString &);
+ void on_openCSGWarningBox_toggled(bool);
+ void on_enableOpenCSGBox_toggled(bool);
+ void on_cgalCacheSizeEdit_textChanged(const QString &);
+ void on_polysetCacheSizeEdit_textChanged(const QString &);
+ void on_opencsgLimitEdit_textChanged(const QString &);
signals:
void requestRedraw() const;
diff --git a/src/Preferences.ui b/src/Preferences.ui
index 6b80674c..8ff2828a 100644
--- a/src/Preferences.ui
+++ b/src/Preferences.ui
@@ -7,7 +7,7 @@
0
0
418
- 243
+ 269
@@ -175,43 +175,99 @@
-
- 0
-
-
-
+
+
+ Show OpenCSG capability warning
+
+
+ true
+
+
+
+ -
+
+
+ Enable OpenCSG for OpenGL 1.x
+
+
+
+ -
+
-
-
+
- Show OpenCSG capability warning
-
-
- true
+ CGAL Cache size
-
-
-
- Enable OpenCSG for OpenGL 1.x
-
-
+
-
-
-
- Qt::Vertical
+
+
+ bytes
-
-
- 20
- 40
-
-
-
+
+ -
+
+
-
+
+
+ PolySet Cache size
+
+
+
+ -
+
+
+ -
+
+
+ bytes
+
+
+
+
+
+ -
+
+
-
+
+
+ Turn off OpenCSG rendering at
+
+
+
+ -
+
+
+ -
+
+
+ elements
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 11
+
+
+
+
diff --git a/src/mainwin.cc b/src/mainwin.cc
index 41988472..f8a6f433 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -411,9 +411,9 @@ MainWindow::loadDesignSettings()
if (settings.value("design/autoReload").toBool()) {
designActionAutoReload->setChecked(true);
}
- uint polySetCacheSize = Preferences::inst()->getValue("caches/polysetCacheSize").toUInt();
+ uint polySetCacheSize = Preferences::inst()->getValue("advanced/polysetCacheSize").toUInt();
PolySetCache::instance()->setMaxSize(polySetCacheSize);
- uint cgalCacheSize = Preferences::inst()->getValue("caches/cgalCacheSize").toUInt();
+ uint cgalCacheSize = Preferences::inst()->getValue("advanced/cgalCacheSize").toUInt();
CGALCache::instance()->setMaxSize(cgalCacheSize);
}
@@ -804,7 +804,7 @@ void MainWindow::compileCSG(bool procevents)
}
}
- if (root_chain->polysets.size() > 1000) {
+ if (root_chain->polysets.size() > Preferences::inst()->getValue("advanced/openCSGLimit").toUInt()) {
PRINTF("WARNING: Normalized tree has %d elements!", int(root_chain->polysets.size()));
PRINTF("WARNING: OpenCSG rendering has been disabled.");
}