@@ -48,6 +48,16 @@ namespace Avogadro { m_dialog = parent; + // Setup signals/slots + connect(this, SIGNAL(plotDataChanged()), + m_dialog, SLOT(regenerateCalculatedSpectra())); + connect(ui.cb_labelPeaks, SIGNAL(toggled(bool)), + this, SIGNAL(plotDataChanged())); + connect(ui.spin_FWHM, SIGNAL(valueChanged(double)), + this, SIGNAL(plotDataChanged())); + connect(ui.combo_rotatoryType, SIGNAL(currentIndexChanged(QString)), + this, SLOT(rotatoryTypeChanged(QString))); + readSettings(); } @@ -81,16 +91,6 @@ namespace Avogadro { if ( etd->GetRotatoryStrengthsVelocity().size() == 0 && etd->GetRotatoryStrengthsLength().size() == 0 ) return false; - // Setup signals/slots - connect(this, SIGNAL(plotDataChanged()), - m_dialog, SLOT(regenerateCalculatedSpectra())); - connect(ui.cb_labelPeaks, SIGNAL(toggled(bool)), - this, SIGNAL(plotDataChanged())); - connect(ui.spin_FWHM, SIGNAL(valueChanged(double)), - this, SIGNAL(plotDataChanged())); - connect(ui.combo_rotatoryType, SIGNAL(currentIndexChanged(QString)), - this, SLOT(rotatoryTypeChanged(QString))); - // OK, we have valid data, so store them for later std::vector<double> wavelengths = etd->GetWavelengths(); std::vector<double> rotl = etd->GetRotatoryStrengthsLength(); libavogadro/src/extensions/spectratype_cd.cpp @@ -45,6 +45,24 @@ namespace Avogadro { m_dialog = parent; + // Setup signals/slots + connect(this, SIGNAL(plotDataChanged()), + m_dialog, SLOT(regenerateCalculatedSpectra())); + connect(this, SIGNAL(plotDataChanged()), + m_dialog, SLOT(regenerateImportedSpectra())); + connect(ui.cb_toggleIntegrated, SIGNAL(toggled(bool)), + this, SLOT(toggleIntegratedDOS(bool))); + connect(ui.cb_scaleIntegrated, SIGNAL(toggled(bool)), + m_dialog, SLOT(regenerateImportedSpectra())); + connect(ui.combo_energy, SIGNAL(currentIndexChanged(int)), + this, SIGNAL(plotDataChanged())); + connect(ui.combo_density, SIGNAL(currentIndexChanged(int)), + this, SIGNAL(plotDataChanged())); + connect(ui.cb_fermi, SIGNAL(toggled(bool)), + this, SIGNAL(plotDataChanged())); + connect(ui.spin_valence, SIGNAL(valueChanged(int)), + this, SIGNAL(plotDataChanged())); + readSettings(); } @@ -93,24 +111,6 @@ namespace Avogadro { if (energies.size() == 0 || energies.size() != densities.size()) return false; - // Setup signals/slots - connect(this, SIGNAL(plotDataChanged()), - m_dialog, SLOT(regenerateCalculatedSpectra())); - connect(this, SIGNAL(plotDataChanged()), - m_dialog, SLOT(regenerateImportedSpectra())); - connect(ui.cb_toggleIntegrated, SIGNAL(toggled(bool)), - this, SLOT(toggleIntegratedDOS(bool))); - connect(ui.cb_scaleIntegrated, SIGNAL(toggled(bool)), - m_dialog, SLOT(regenerateImportedSpectra())); - connect(ui.combo_energy, SIGNAL(currentIndexChanged(int)), - this, SIGNAL(plotDataChanged())); - connect(ui.combo_density, SIGNAL(currentIndexChanged(int)), - this, SIGNAL(plotDataChanged())); - connect(ui.cb_fermi, SIGNAL(toggled(bool)), - this, SIGNAL(plotDataChanged())); - connect(ui.spin_valence, SIGNAL(valueChanged(int)), - this, SIGNAL(plotDataChanged())); - // Store in member vars m_numAtoms = mol->numAtoms(); m_fermi = dos->GetFermiEnergy(); libavogadro/src/extensions/spectratype_dos.cpp @@ -45,6 +45,14 @@ namespace Avogadro { m_dialog = parent; + // Setup signals/slots + connect(this, SIGNAL(plotDataChanged()), + m_dialog, SLOT(regenerateCalculatedSpectra())); + connect(ui.cb_labelPeaks, SIGNAL(toggled(bool)), + this, SIGNAL(plotDataChanged())); + connect(ui.spin_FWHM, SIGNAL(valueChanged(double)), + this, SIGNAL(plotDataChanged())); + readSettings(); } @@ -77,14 +85,6 @@ namespace Avogadro { if (!etd) return false; if (etd->GetEDipole().size() == 0) return false; - // Setup signals/slots - connect(this, SIGNAL(plotDataChanged()), - m_dialog, SLOT(regenerateCalculatedSpectra())); - connect(ui.cb_labelPeaks, SIGNAL(toggled(bool)), - this, SIGNAL(plotDataChanged())); - connect(ui.spin_FWHM, SIGNAL(valueChanged(double)), - this, SIGNAL(plotDataChanged())); - // OK, we have valid data, so store them for later std::vector<double> wavelengths = etd->GetWavelengths(); std::vector<double> edipole= etd->GetEDipole(); libavogadro/src/extensions/spectratype_uv.cpp 8583c355aa711faba6ae3cbc83673c26066380a0 David Lonie loniedavid@gmail.com http://github.com/dlonie/avogadro/commit/0a6d33f41be468020ed19de1cf245d95ac116ef8 0a6d33f41be468020ed19de1cf245d95ac116ef8 2009-11-07T05:17:21-08:00 2009-11-07T05:17:21-08:00 DOS only: move connections to ctors 02ce2f45eb203bbee015eec15d30d84648f20678 David Lonie loniedavid@gmail.com