rpms/kdeedu/devel kdeedu-4.0.80-openbabel.patch,1.1,1.2

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11152/devel

Modified Files:
	kdeedu-4.0.80-openbabel.patch 
Log Message:
More openbabel hackery.

kdeedu-4.0.80-openbabel.patch:

Index: kdeedu-4.0.80-openbabel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu-4.0.80-openbabel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdeedu-4.0.80-openbabel.patch	27 May 2008 17:14:14 -0000	1.1
+++ kdeedu-4.0.80-openbabel.patch	27 May 2008 18:18:31 -0000	1.2
@@ -19,3 +19,85 @@
        unsigned long id = rhsBond->id();
        lhsBond->setId(id);
        d->bonds[id] = lhsBond;
+diff -ur kdeedu-4.0.80/kalzium/libavogadro-kalzium/src/tools/autoopttool.cpp kdeedu-4.0.80-openbabel/kalzium/libavogadro-kalzium/src/tools/autoopttool.cpp
+--- kdeedu-4.0.80/kalzium/libavogadro-kalzium/src/tools/autoopttool.cpp	2008-05-21 10:33:31.000000000 +0200
++++ kdeedu-4.0.80-openbabel/kalzium/libavogadro-kalzium/src/tools/autoopttool.cpp	2008-05-27 20:15:53.000000000 +0200
+@@ -149,7 +149,7 @@
+ 
+       if (m_clickedAtom)
+       {
+-        m_forceField->SetFixAtom(m_clickedAtom->GetIdx());
++        // m_forceField->SetFixAtom(m_clickedAtom->GetIdx());
+       }
+     }
+ 
+@@ -165,7 +165,7 @@
+     m_rightButtonPressed = false;
+ 
+     m_clickedAtom = 0;
+-    m_forceField->UnsetFixAtom();
++    // m_forceField->UnsetFixAtom();
+ 
+     widget->update();
+     return 0;
+@@ -445,7 +445,7 @@
+       m_glwidget->update(); // redraw AutoOpt label
+       
+       m_clickedAtom = 0;
+-      m_forceField->UnsetFixAtom();
++      // m_forceField->UnsetFixAtom();
+       m_leftButtonPressed = false;
+       m_midButtonPressed = false;
+       m_rightButtonPressed = false;
+diff -ur kdeedu-4.0.80/kalzium/libavogadro-kalzium/src/tools/drawtool.cpp kdeedu-4.0.80-openbabel/kalzium/libavogadro-kalzium/src/tools/drawtool.cpp
+--- kdeedu-4.0.80/kalzium/libavogadro-kalzium/src/tools/drawtool.cpp	2008-05-21 10:33:31.000000000 +0200
++++ kdeedu-4.0.80-openbabel/kalzium/libavogadro-kalzium/src/tools/drawtool.cpp	2008-05-27 20:16:43.000000000 +0200
+@@ -173,7 +173,7 @@
+         else { // create a new atom
+           m_beginAtom = newAtom(widget, event->pos());
+           m_beginAtomAdded = true;
+-          m_forceField->SetIgnoreAtom(m_beginAtom->GetIdx());
++          // m_forceField->SetIgnoreAtom(m_beginAtom->GetIdx());
+           m_beginAtom->update();
+         } // place atoms
+       } // hits
+@@ -229,7 +229,7 @@
+           m_endAtom = 0;
+           m_prevAtomElement = m_beginAtom->GetAtomicNum();
+           m_beginAtom->SetAtomicNum(m_element);
+-          m_forceField->UnsetIgnoreAtom();
++          // m_forceField->UnsetIgnoreAtom();
+         }
+         else if(m_bond) {
+           //          Atom *oldAtom = (Atom *)m_bond->GetEndAtom();
+@@ -248,8 +248,8 @@
+ 
+         // we hit an existing atom != m_endAtom
+         if(existingAtom) {
+-          m_forceField->UnsetIgnoreAtom();
+-          m_forceField->SetFixAtom(existingAtom->GetIdx());
++          // m_forceField->UnsetIgnoreAtom();
++          // m_forceField->SetFixAtom(existingAtom->GetIdx());
+           Bond *existingBond = (Bond *)molecule->GetBond(m_beginAtom, existingAtom);
+           if(!existingBond) {
+             if(m_prevBond) {
+@@ -311,7 +311,7 @@
+           }
+           m_endAtom = newAtom(widget, event->pos());
+           m_endAtomAdded = true;
+-          m_forceField->SetIgnoreAtom(m_endAtom->GetIdx());
++          // m_forceField->SetIgnoreAtom(m_endAtom->GetIdx());
+ 
+           if(!m_bond) {
+             m_bond = newBond(molecule, m_beginAtom, m_endAtom);
+@@ -430,8 +430,8 @@
+       m_beginAtomAdded=false;
+       m_endAtomAdded=false;
+       
+-      m_forceField->UnsetIgnoreAtom();
+-      m_forceField->UnsetFixAtom();
++      // m_forceField->UnsetIgnoreAtom();
++      // m_forceField->UnsetFixAtom();
+ 
+       widget->molecule()->update();
+       return undo;