Skip to content

Commit

Permalink
Merge pull request #1362 from ghutchis/add-atomlabel-coordeditor
Browse files Browse the repository at this point in the history 
Add support for atom labels in the coordinate editor
  • Loading branch information
@ghutchis
ghutchis authored Oct 7, 2023
2 parents 306af95 + 8b97201 commit 6540a08
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 23 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/build_cmake.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,14 +194,14 @@ jobs:
otool -L libinchi.?.?.?.dylib
cp -p libinchi* ../Avogadro2.app/Contents/Frameworks/
# finally, fixup the binaries
cd ../bin
for exe in obabel obmm eht_bind genXrdPattern; do
for libpath in `otool -L ${exe} | grep '/Users/runner/work' | awk '{print $1}'`; do
export lib=`echo $libpath | cut -d '/' -f 9`;
echo "Fixing $exe $lib $libpath"
install_name_tool -change $libpath @executable_path/../Frameworks/$lib $exe
done
done
#cd ../bin
#for exe in obabel obmm eht_bind genXrdPattern; do
# for libpath in `otool -L ${exe} | grep '/Users/runner/work' | awk '{print $1}'`; do
# export lib=`echo $libpath | cut -d '/' -f 9`;
# echo "Fixing $exe $lib $libpath"
# install_name_tool -change $libpath @executable_path/../Frameworks/$lib $exe
# done
#done
- name: Run tests
if: matrix.config.os == 'ubuntu-20.04'
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/build_m1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,14 @@ jobs:
otool -L libinchi.?.?.?.dylib
cp -p libinchi* ../Avogadro2.app/Contents/Frameworks/
# finally, fixup the binaries
cd ../bin
for exe in obabel obmm eht_bind genXrdPattern; do
for libpath in `otool -L ${exe} | grep '/Users/runner' | awk '{print $1}'`; do
export lib=`echo $libpath | cut -d '/' -f 10`;
echo "Fixing $exe $lib $libpath"
install_name_tool -change $libpath @executable_path/../Frameworks/$lib $exe
done
done
#cd ../bin
#for exe in obabel obmm eht_bind genXrdPattern; do
# for libpath in `otool -L ${exe} | grep '/Users/runner' | awk '{print $1}'`; do
# export lib=`echo $libpath | cut -d '/' -f 10`;
# echo "Fixing $exe $lib $libpath"
# install_name_tool -change $libpath @executable_path/../Frameworks/$lib $exe
# done
#done
- name: Install the Apple certificate
Expand Down
11 changes: 10 additions & 1 deletion avogadro/core/coordinateblockgenerator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ std::string CoordinateBlockGenerator::generateCoordinateBlock()
for (it = begin; it != end; ++it) {
switch (*it) {
case 'S':
case 'L':
needElementSymbol = true;
break;
case 'N':
Expand Down Expand Up @@ -76,6 +77,7 @@ std::string CoordinateBlockGenerator::generateCoordinateBlock()
{
atomicNumberPrecision = 0,
atomicNumberWidth = 3,
atomicLabelWidth = 8, // 3 element symbol + 5 index
coordinatePrecision = 6,
coordinateWidth = 11,
elementNameWidth = 13, // Currently the longest element name
Expand All @@ -89,10 +91,14 @@ std::string CoordinateBlockGenerator::generateCoordinateBlock()
// Use fixed number format.
m_stream << std::fixed;

// Count the number for each element
std::vector<unsigned int> elementCounts(Elements::elementCount(), 0);

// Iterate through the atoms
for (Index atomI = 0; atomI < numAtoms; ++atomI) {
atom = m_molecule->atom(atomI);
atomicNumber = atom.atomicNumber();
elementCounts[atomicNumber]++;
if (needElementSymbol)
symbol = Core::Elements::symbol(atomicNumber);
if (needElementName)
Expand Down Expand Up @@ -137,6 +143,9 @@ std::string CoordinateBlockGenerator::generateCoordinateBlock()
case 'S':
m_stream << std::left << std::setw(elementSymbolWidth) << symbol;
break;
case 'L':
m_stream << std::left << symbol << elementCounts[atomicNumber] << " ";
break;
case 'N':
m_stream << std::left << std::setw(elementNameWidth) << name;
break;
Expand Down Expand Up @@ -193,4 +202,4 @@ std::string CoordinateBlockGenerator::generateCoordinateBlock()
return m_stream.str();
}

} // namespace Avogadro
} // namespace Avogadro::Core
1 change: 1 addition & 0 deletions avogadro/core/coordinateblockgenerator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class AVOGADROCORE_EXPORT CoordinateBlockGenerator
* about each atom in the coordinate block.
* - @c #: Atom index (one-based index)
* - @c Z: Atomic number (e.g. "6" for carbon)
* - @c L: Atomic label (e.g., "C1" for first carbon)")
* - @c G: GAMESS-styled Atomic number (e.g. "6.0" for carbon)
* - @c S: Element symbol (e.g. "C" for carbon)
* - @c N: Element name (e.g. "Carbon")
Expand Down
32 changes: 27 additions & 5 deletions avogadro/qtplugins/coordinateeditor/coordinateeditordialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
#define FORMAT_DEBUG(x)
#endif // ENABLE_FORMAT_DEBUG

using Avogadro::QtGui::Molecule;
using Avogadro::Core::Elements;
using Avogadro::Vector3;
using Avogadro::Core::Elements;
using Avogadro::QtGui::Molecule;

namespace {

Expand Down Expand Up @@ -96,7 +96,7 @@ struct AtomStruct
Vector3 pos;
};

} // end anon namespace
} // namespace

namespace Avogadro::QtPlugins {

Expand Down Expand Up @@ -140,7 +140,7 @@ CoordinateEditorDialog::CoordinateEditorDialog(QWidget* parent_)
SLOT(textModified(bool)));

// Setup spec edit
QRegExp specRegExp("[#ZGSNabcxyz01_]*");
QRegExp specRegExp("[#ZGSLNabcxyz01_]*");
auto* specValidator = new QRegExpValidator(specRegExp, this);
m_ui->spec->setValidator(specValidator);
connect(m_ui->presets, SIGNAL(currentIndexChanged(int)),
Expand Down Expand Up @@ -385,6 +385,28 @@ void CoordinateEditorDialog::validateInputWorker()
break;
}

case 'L': {
// Validate label (symbol + number)
QString cleanToken(tokenCursor.selectedText().toLower());
if (!cleanToken.isEmpty())
cleanToken.replace(0, 1, cleanToken[0].toUpper());

// Split the label into symbol and number
QRegExp labelSplitter("([A-Z][a-z]?)(\\d+)");
if (labelSplitter.indexIn(cleanToken) == -1) {
m_ui->text->markInvalid(tokenCursor, tr("Invalid atom label."));
break;
}
// check the symbol
std::string tokenStd(labelSplitter.cap(1).toStdString());
atom.atomicNumber = Elements::atomicNumberFromSymbol(tokenStd);
if (atom.atomicNumber == Avogadro::InvalidElement)
m_ui->text->markInvalid(tokenCursor, tr("Invalid element symbol."));
else
m_ui->text->markValid(tokenCursor, tr("Element symbol."));
break;
}

case '#': {
// Validate integer:
bool isInt;
Expand Down Expand Up @@ -821,4 +843,4 @@ void CoordinateEditorDialog::clearClicked()
m_ui->text->document()->clear();
}

} // namespace Avogadro
} // namespace Avogadro::QtPlugins
2 changes: 1 addition & 1 deletion avogadro/qtplugins/coordinateeditor/coordinateeditordialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<item>
<widget class="QLineEdit" name="spec">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Specification of format. Each character indicates a value to write per atom:&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;#&lt;/span&gt; - Atom index (1, 2, ..., numAtoms)&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Z&lt;/span&gt; - Atomic number (e.g. &amp;quot;6&amp;quot; for carbon)&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;G&lt;/span&gt; - GAMESS-style atomic number (e.g. &amp;quot;6.0&amp;quot; for carbon)&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;N&lt;/span&gt; - Element name (e.g. &amp;quot;Carbon&amp;quot;)&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;S&lt;/span&gt; - Element symbol (e.g. &amp;quot;C&amp;quot; for carbon)&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;x&lt;/span&gt; - X position coordinate&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;y&lt;/span&gt; - Y position coordinate&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;z&lt;/span&gt; - Z position coordinate&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;a&lt;/span&gt; - 'a' lattice coordinate (crystals only)&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;b&lt;/span&gt; - 'b' lattice coordinate (crystals only)&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;c&lt;/span&gt; - 'c' lattice coordinate (crystals only)&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;_&lt;/span&gt; - A literal space (&amp;quot; &amp;quot;), useful for alignment&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;0&lt;/span&gt; - A literal 0 (&amp;quot;0&amp;quot;), useful for optimization flags&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1&lt;/span&gt; - A literal 1 (&amp;quot;1&amp;quot;), useful for optimization flags&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Specification of format. Each character indicates a value to write per atom:&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;#&lt;/span&gt; - Atom index (1, 2, ..., numAtoms)&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Z&lt;/span&gt; - Atomic number (e.g. &amp;quot;6&amp;quot; for carbon)&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;G&lt;/span&gt; - GAMESS-style atomic number (e.g. &amp;quot;6.0&amp;quot; for carbon)&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;N&lt;/span&gt; - Element name (e.g. &amp;quot;Carbon&amp;quot;)&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;S&lt;/span&gt; - Element symbol (e.g. &amp;quot;C&amp;quot; for carbon)&lt;br/&gt;&lt;span style=&quot; font-weight:700;&quot;&gt;L&lt;/span&gt; - Atom label (e.g., &amp;quot;C2&amp;quot; for second carbon atom, &amp;quot;H1&amp;quot; for first hydrogen) &lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;x&lt;/span&gt; - X position coordinate&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;y&lt;/span&gt; - Y position coordinate&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;z&lt;/span&gt; - Z position coordinate&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;a&lt;/span&gt; - 'a' lattice coordinate (crystals only)&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;b&lt;/span&gt; - 'b' lattice coordinate (crystals only)&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;c&lt;/span&gt; - 'c' lattice coordinate (crystals only)&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;_&lt;/span&gt; - A literal space (&amp;quot; &amp;quot;), useful for alignment&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;0&lt;/span&gt; - A literal 0 (&amp;quot;0&amp;quot;), useful for optimization flags&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1&lt;/span&gt; - A literal 1 (&amp;quot;1&amp;quot;), useful for optimization flags&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
Expand Down

0 comments on commit 6540a08

Please sign in to comment.