Breakpad

avogadro/src/main.cpp

@@ -26,7 +26,6 @@
 
 #include <avogadro/global.h>
 #include <openbabel/babelconfig.h>
-
 #ifdef ENABLE_GLSL
   #include <GL/glew.h>
 #endif
@@ -41,6 +40,9 @@
 #include <QLibraryInfo>
 #include <QProcess>
 #include <QFont>
+#include <QDir>
+#include <QDialog>
+#include <QCheckBox>
 
 #include <iostream>
 
@@ -51,6 +53,12 @@
 #include "mainwindow.h"
 #include "application.h"
 
+// Google breakpapd
+#ifdef WIN32
+#include "client/windows/handler/exception_handler.h"
+#include "client/windows/sender/crash_report_sender.h"
+#endif
+
 #ifdef Q_WS_X11
   #include <X11/Xlib.h>
 #endif
@@ -68,8 +76,23 @@ using namespace Avogadro;
 void printVersion(const QString &appName);
 void printHelp(const QString &appName);
 
+//for Breakpad error reporting
+bool sendErrorDialog(void* context, EXCEPTION_POINTERS* exinfo, MDRawAssertionInfo* assertion);
+bool sendCrashServer(const wchar_t* dump_path, const wchar_t* minidump_id, void* context,
+	EXCEPTION_POINTERS* exinfo, MDRawAssertionInfo* assertion, bool succeeded);
+
+struct arginfo {
+	int argc;
+	char **argv;
+}*args;
+
 int main(int argc, char *argv[])
 {
+	//save main args in case of crash
+	args = new struct arginfo;
+	args->argc = argc;
+	args->argv = argv;
+
 #ifdef Q_WS_X11
   if(Library::threadedGL()) {
     std::cout << "Enabling Threads" << std::endl;
@@ -85,6 +108,12 @@ int main(int argc, char *argv[])
         QFont::insertSubstitution(".Lucida Grande UI", "Lucida Grande");
     }
 #endif
+  //set up Google Breakpad directory
+
+  if (!(QDir().mkdir("crash-reports")) && !(QDir("crash-reports").exists())) 
+	qDebug() << "Could not create crash-reports directory.";
+  else
+	qDebug() << "/crash-reports successfully created.";
 
   // set up groups for QSettings
   QCoreApplication::setOrganizationName("SourceForge");
@@ -263,6 +292,15 @@ int main(int argc, char *argv[])
       }
     }
   }
+
+  //initate Google Breakpad
+  google_breakpad::ExceptionHandler *pHandler = new google_breakpad::ExceptionHandler(
+	  L"crash-reports",
+	  sendErrorDialog,
+	  sendCrashServer,
+	  args,
+	  google_breakpad::ExceptionHandler::HANDLER_ALL);
+
   window->show();
   return app.exec();
 }
@@ -297,3 +335,39 @@ void printHelp(const QString &appName)
       ).arg(appName, VERSION).toStdWString();
   #endif
 }
+
+bool sendCrashServer(const wchar_t* dump_path, const wchar_t* minidump_id, void* context,
+	EXCEPTION_POINTERS* exinfo, MDRawAssertionInfo* assertion, bool succeeded) 
+{
+	if (succeeded) {
+		google_breakpad::CrashReportSender sender(L"crash.checkpoint");
+		std::map<std::wstring, std::wstring> params;
+		std::wstring filename = dump_path;
+		filename += L"\\";
+		filename += minidump_id;
+		filename += L".dmp";
+
+		sender.set_max_reports_per_day(-1);
+
+		return(google_breakpad::RESULT_SUCCEEDED == sender.SendCrashReport(L"http://crash.avogadro.cc/crash_upload", params, filename, 0));
+	}
+	else
+		return false;
+}
+
+bool sendErrorDialog(void* context, EXCEPTION_POINTERS* exinfo, MDRawAssertionInfo* assertion) {
+	QSettings settings;
+	if (settings.value("noAskErrorReport").toBool())
+		return settings.value("sendErrorReport").toBool();
+	else {
+		Application app(args->argc, args->argv);
+		delete(args);
+
+		QMessageBox msgBox(QMessageBox::Question, "Avogadro", "Avogadro has crashed! Would you like to send an error report?", 0, NULL);
+
+		QAbstractButton* yes = (QAbstractButton*)msgBox.addButton(QMessageBox::Yes);
+		QAbstractButton* no = (QAbstractButton*)msgBox.addButton(QMessageBox::No);
+
+		return (msgBox.exec() == QMessageBox::Yes);
+	}
+}

avogadro/src/mainwindow.cpp

@@ -116,6 +116,7 @@
 
 #include <Eigen/Geometry>
 #include <Eigen/Array>
+
 #define USEQUAT
 // This is a "hidden" exported Qt function on the Mac for Qt-4.x.
 #ifdef Q_WS_MAC
@@ -2576,6 +2577,18 @@ class XMLEventSource : public pqEventSource
     return d->glWidget->quality();
   }
 
+  bool MainWindow::getNoAskErrorReport() const
+  {
+	  QSettings settings;
+	  return settings.value("noAskErrorReport").toBool();
+  }
+
+  bool MainWindow::getSendErrorReport() const
+  {
+	  QSettings settings;
+	  return settings.value("sendErrorReport").toBool();
+  }
+
   void MainWindow::setFogLevel(int level)
   {
     d->glWidget->setFogLevel(level);
@@ -2586,7 +2599,12 @@ class XMLEventSource : public pqEventSource
   {
     return d->glWidget->fogLevel();
   }
-
+  void MainWindow::setErrorReport(bool value, bool send)
+  {
+	  QSettings settings;
+	  settings.setValue("noAskErrorReport", value);
+	  settings.setValue("sendErrorReport", send);
+  }
   void MainWindow::newView()
   {
     QWidget *widget = new QWidget();

avogadro/src/mainwindow.h

@@ -72,8 +72,9 @@ namespace Avogadro {
       MainWindow();
       MainWindow(const QString &fileName);
       ~MainWindow();
-
       int painterQuality() const;
+	  bool getNoAskErrorReport() const;
+	  bool getSendErrorReport() const;
       int fogLevel() const;
       bool renderAxes() const;
       bool renderDebug() const;
@@ -159,6 +160,7 @@ namespace Avogadro {
       void setBackgroundColor();
       void setPainterQuality(int quality);
       void setFogLevel(int level);
+	  void setErrorReport(bool value, bool send);
 
       /**
        * Slot to switch glWidget to the perspective projection mode

avogadro/src/settingsdialog.cpp

@@ -47,13 +47,18 @@ namespace Avogadro {
         SLOT(qualityChanged(int)));
     connect(ui.fogSlider, SIGNAL(valueChanged(int)), this,
         SLOT(fogChanged(int)));
+	connect(ui.checkBox, SIGNAL(clicked(bool)), this,
+		SLOT(checkChanged(bool)));
   }
 
   void SettingsDialog::insertWidget(int index, QWidget *widget)
   {
     ui.stackedWidget->insertWidget(index, widget);
   }
-
+  void SettingsDialog::checkChanged(bool value) {
+	  ui.radioButton->setEnabled(value);
+	  ui.radioButton_2->setEnabled(value);
+  }
   void SettingsDialog::buttonClicked(QAbstractButton *button)
   {
     QDialogButtonBox::ButtonRole role = ui.dialogButtonBox->buttonRole(button);
@@ -87,13 +92,27 @@ namespace Avogadro {
   {
     m_mainWindow->setPainterQuality(ui.qualitySlider->value());
     m_mainWindow->setFogLevel(ui.fogSlider->value());
+	if (ui.radioButton->isChecked()) {
+		m_mainWindow->setErrorReport(ui.checkBox->isChecked(), true);
+	}
+	else {
+		m_mainWindow->setErrorReport(ui.checkBox->isChecked(), false);
+	}
   }
 
   void SettingsDialog::loadValues()
   {
     ui.qualitySlider->setValue(m_mainWindow->painterQuality());
     fogChanged(m_mainWindow->fogLevel());
     qualityChanged(m_mainWindow->painterQuality());
+	ui.checkBox->setChecked(m_mainWindow->getNoAskErrorReport());
+	if (ui.checkBox->isChecked()) {
+		bool send = m_mainWindow->getSendErrorReport();
+		if (send)
+			ui.radioButton->setChecked(true);
+		else
+			ui.radioButton->setChecked(false);
+	}
   }
 
   void SettingsDialog::qualityChanged(int value)

avogadro/src/settingsdialog.h

@@ -46,6 +46,7 @@ namespace Avogadro {
       MainWindow *m_mainWindow;
 
     private Q_SLOTS:
+	  void checkChanged(bool value);
       void buttonClicked(QAbstractButton *button);
       void saveValues();
       void loadValues();

avogadro/src/settingsdialog.ui

@@ -150,7 +150,7 @@
             </item>
            </layout>
           </item>
-          <item row="2" column="0">
+          <item row="5" column="0">
            <spacer name="verticalSpacer">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
@@ -163,6 +163,36 @@
             </property>
            </spacer>
           </item>
+          <item row="2" column="0">
+           <widget class="QCheckBox" name="checkBox">
+            <property name="text">
+             <string>Do not ask about Error Reporting</string>
+            </property>
+            <property name="tristate">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QRadioButton" name="radioButton">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Yes, always send reports</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QRadioButton" name="radioButton_2">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>No, never send reports</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>

libavogadro/src/extensions/spectra/spectraextension.cpp

@@ -103,4 +103,3 @@ namespace Avogadro {
 } // end namespace Avogadro
 
 Q_EXPORT_PLUGIN2(spectraextension, Avogadro::SpectraExtensionFactory)
-

libavogadro/src/extensions/surfaces/openqube/gaussianset.h

@@ -17,7 +17,9 @@
 
 #ifndef GAUSSIANSET_H
 #define GAUSSIANSET_H
-
+#ifndef M_PI
+    #define M_PI 3.14159265358979323846
+#endif
 #include "config.h"
 
 #include "basisset.h"