← Back to branch summary

~ubuntu-branches/ubuntu/vivid/regina-normal/vivid

« back to all changes in this revision

Viewing changes to qtui/src/packettypes/ntriskeleton.cpp

  • Committer: Package Import Robot
  • Author(s): Ben Burton
  • Date: 2013-11-02 11:44:32 UTC
  • mfrom: (1.2.8)
  • Revision ID: package-import@ubuntu.com-20131102114432-acgci6b1pb2hjl8q
Tags: 4.95-1
* New upstream release.
* The python module is now installed in a standard location beneath
  /usr/lib/python2.7/dist-packages.
* Switched python packaging from python-support to dh_python2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
qtui/src/packettypes/ntriskeleton.cpp
99
99
    label->setWhatsThis(msg);
100
100
    nEdges->setWhatsThis(msg);
101
101
 
102
 
    label = new QLabel(tr("Faces:"), ui);
 
102
    label = new QLabel(tr("Triangles:"), ui);
103
103
    grid->addWidget(label, 2, 1);
104
 
    nFaces = new QLabel(ui);
105
 
    nFaces->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
106
 
    grid->addWidget(nFaces, 2, 3);
107
 
    msg = tr("The total number of faces in this triangulation.");
 
104
    nTriangles = new QLabel(ui);
 
105
    nTriangles->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
 
106
    grid->addWidget(nTriangles, 2, 3);
 
107
    msg = tr("The total number of triangles in this triangulation.");
108
108
    label->setWhatsThis(msg);
109
 
    nFaces->setWhatsThis(msg);
 
109
    nTriangles->setWhatsThis(msg);
110
110
 
111
111
    label = new QLabel(tr("Components:"), ui);
112
112
    grid->addWidget(label, 0, 7);
125
125
    grid->addWidget(nBdryComps, 1, 9);
126
126
    msg = tr("The total number of boundary components in this "
127
127
        "triangulation.  Boundary components can either be ideal vertices "
128
 
        "or collections of adjacent boundary faces.");
 
128
        "or collections of adjacent boundary triangles.");
129
129
    label->setWhatsThis(msg);
130
130
    nBdryComps->setWhatsThis(msg);
131
131
 
158
158
 
159
159
    btn = new QPushButton(ReginaSupport::regIcon("packet_view"),
160
160
        tr("View..."), ui);
161
 
    btn->setToolTip(tr("View details of individual faces"));
 
161
    btn->setToolTip(tr("View details of individual triangles"));
162
162
    btn->setWhatsThis(tr("View details of this triangulation's "
163
 
        "individual faces in a separate window."));
 
163
        "individual triangles in a separate window."));
164
164
    // btn->setFlat(true);
165
 
    connect(btn, SIGNAL(clicked()), this, SLOT(viewFaces()));
 
165
    connect(btn, SIGNAL(clicked()), this, SLOT(viewTriangles()));
166
166
    grid->addWidget(btn, 2, 5);
167
167
 
168
168
    btn = new QPushButton(ReginaSupport::regIcon("packet_view"),
180
180
    btn->setWhatsThis(tr("View details of this triangulation's "
181
181
        "individual boundary components in a separate window.  Note that "
182
182
        "boundary components can either be ideal vertices of collections "
183
 
        "of adjacent boundary faces."));
 
183
        "of adjacent boundary triangles."));
184
184
    // btn->setFlat(true);
185
185
    connect(btn, SIGNAL(clicked()), this, SLOT(viewBoundaryComponents()));
186
186
    grid->addWidget(btn, 1, 11);
199
199
void NTriSkelCompUI::refresh() {
200
200
    nVertices->setText(QString::number(tri->getNumberOfVertices()));
201
201
    nEdges->setText(QString::number(tri->getNumberOfEdges()));
202
 
    nFaces->setText(QString::number(tri->getNumberOfFaces()));
 
202
    nTriangles->setText(QString::number(tri->getNumberOfTriangles()));
203
203
    nTets->setText(QString::number(tri->getNumberOfTetrahedra()));
204
204
    nComps->setText(QString::number(tri->getNumberOfComponents()));
205
205
    nBdryComps->setText(QString::number(tri->getNumberOfBoundaryComponents()));
212
212
void NTriSkelCompUI::editingElsewhere() {
213
213
    nVertices->setText(tr("Editing..."));
214
214
    nEdges->setText(tr("Editing..."));
215
 
    nFaces->setText(tr("Editing..."));
 
215
    nTriangles->setText(tr("Editing..."));
216
216
    nTets->setText(tr("Editing..."));
217
217
    nComps->setText(tr("Editing..."));
218
218
    nBdryComps->setText(tr("Editing..."));
226
226
    // Because we pass this as parent to the new window, we are
227
227
    // guaranteed that the window will be closed and deleted
228
228
    // automatically if the packet pane is closed.
229
 
    // Similarly for edges, faces, etc.
 
229
    // Similarly for edges, triangles, etc.
230
230
    SkeletonWindow* win = new SkeletonWindow(this, new VertexModel(tri));
231
231
    win->show();
232
232
    viewers.append(win);
238
238
    viewers.append(win);
239
239
}
240
240
 
241
 
void NTriSkelCompUI::viewFaces() {
242
 
    SkeletonWindow* win = new SkeletonWindow(this, new FaceModel(tri));
 
241
void NTriSkelCompUI::viewTriangles() {
 
242
    SkeletonWindow* win = new SkeletonWindow(this, new TriangleModel(tri));
243
243
    win->show();
244
244
    viewers.append(win);
245
245
}