@@ -47,7 +47,7 @@ namespace Avogadro BondPropIndex, AnglePropIndex, TorsionPropIndex, - CartesianIndex, + //CartesianIndex, ConformerIndex }; @@ -85,10 +85,10 @@ namespace Avogadro action->setData(ConformerIndex); m_actions.append( action ); - action = new QAction( this ); + /*action = new QAction( this ); action->setText( tr("Cartesian Editor..." )); action->setData(CartesianIndex); - m_actions.append( action ); + m_actions.append( action );*/ } PropertiesExtension::~PropertiesExtension() @@ -111,7 +111,7 @@ namespace Avogadro case TorsionPropIndex: case ConformerIndex: return tr("&View") + '>' + tr("&Properties"); - case CartesianIndex: + //case CartesianIndex: default: return tr("&Build"); break; @@ -174,7 +174,7 @@ namespace Avogadro // view will delete itself in PropertiesView::hideEvent using deleteLater(). view = new PropertiesView(PropertiesView::TorsionType, widget); break; - case CartesianIndex: // cartesian editor + /*case CartesianIndex: // cartesian editor // m_angleModel will be deleted in PropertiesView::hideEvent using deleteLater(). model = new PropertiesModel(PropertiesModel::CartesianType); model->setMolecule( m_molecule ); @@ -182,7 +182,7 @@ namespace Avogadro view = new PropertiesView(PropertiesView::CartesianType, widget); connect(m_molecule, SIGNAL(atomAdded(Atom*)), model, SLOT( atomAdded(Atom*))); connect(m_molecule, SIGNAL(atomRemoved(Atom*)), model, SLOT(atomRemoved(Atom*))); - break; + break;*/ case ConformerIndex: // conformers // model will be deleted in PropertiesView::hideEvent using deleteLater(). model = new PropertiesModel(PropertiesModel::ConformerType, dialog); @@ -239,9 +239,9 @@ namespace Avogadro case TorsionType: title = tr("Torsion Properties"); break; - case CartesianType: + /*case CartesianType: title = tr("Cartesian Properties"); - break; + break;*/ case ConformerType: title = tr("Conformer Properties"); break; @@ -272,7 +272,7 @@ namespace Avogadro if (!index.isValid()) return; - if (m_type == AtomType || m_type == CartesianType) { + if (m_type == AtomType /*|| m_type == CartesianType*/) { if ((unsigned int) index.row() >= m_molecule->numAtoms()) return; libavogadro/src/extensions/propextension.cpp @@ -76,7 +76,7 @@ namespace Avogadro { BondType, AngleType, TorsionType, - CartesianType, + //CartesianType, ConformerType, MoleculeType }; libavogadro/src/extensions/propextension.h 7f6cadf84e0b2416da89a798be78682a7041d280 Konstantin Tokarev annulen@users.sourceforge.net http://github.com/cryos/avogadro/commit/21e49021bc5a6795ec018b3515f61254305f28a5 21e49021bc5a6795ec018b3515f61254305f28a5 2009-10-30T01:11:24-07:00 2009-10-30T01:11:24-07:00 Blocked old cartesian editor in propextension 525bc36cb9caf442fa75d91b5f61bc03c814dcb9 Konstantin Tokarev annulen@users.sourceforge.net