diff --git a/src/meshlabplugins/editslice/editslice.cpp b/src/meshlabplugins/editslice/editslice.cpp index 1b406a628..cd5b00af3 100644 --- a/src/meshlabplugins/editslice/editslice.cpp +++ b/src/meshlabplugins/editslice/editslice.cpp @@ -114,7 +114,7 @@ void ExtraMeshSlidePlugin::mouseReleaseEvent (QAction *,QMouseEvent * e, MeshMo } void ExtraMeshSlidePlugin::SlotExportButton() { - + QFileDialog saveF; fileName = saveF.getSaveFileName(gla->window(), tr("Saving..."),"/",tr("Mesh (*.svg)")); if (fileName==0) return; @@ -145,15 +145,15 @@ void ExtraMeshSlidePlugin::mouseReleaseEvent (QAction *,QMouseEvent * e, MeshMo else pr.numCol=point_Vector.size(); pr.numRow=1; + mesh_grid = new TriMeshGrid(); mesh_grid->Set(m.cm.face.begin() ,m.cm.face.end()); - float scale = (pr.getViewBox().V(0)/pr.numCol) /edgeMax ; - + float scale = (pr.getViewBox().V(0)/pr.numCol) /(edgeMax*(1.4142)) ; pr.setScale(scale); pr.setTextDetails( svgpro->showText ); for(int i=0; iX() )+ (rotationCenter.Y()*dir->Y()) +(rotationCenter.Z()*dir->Z())+ (off*(*dir)) ); + p.SetOffset( (rotationCenter.X()*dir->X() )+ (rotationCenter.Y()*dir->Y()) +(rotationCenter.Z()*dir->Z())+ (off*(*dir))); + double avg_length; edge_mesh = new n_EdgeMesh(); vcg::Intersection(p , *edge_mesh, avg_length, mesh_grid, intersected_cells); @@ -177,7 +178,8 @@ void ExtraMeshSlidePlugin::mouseReleaseEvent (QAction *,QMouseEvent * e, MeshMo pr.setPosition(Point2d(0,0)); pr.numCol=1; pr.numRow=1; - vcg::edge::io::ExporterSVG::Save(edge_mesh, fileN.toLatin1().data(), pr ); + + vcg::edge::io::ExporterSVG::Save(edge_mesh, fileN.toLatin1().data(), pr); } else{ diff --git a/src/meshlabplugins/editslice/slicedialog.ui b/src/meshlabplugins/editslice/slicedialog.ui index 671b3c871..eb65beb0a 100644 --- a/src/meshlabplugins/editslice/slicedialog.ui +++ b/src/meshlabplugins/editslice/slicedialog.ui @@ -12,18 +12,6 @@ 380 - - - 370 - 380 - - - - - 370 - 380 - - 5 @@ -39,267 +27,309 @@ Qt::LeftToRight - + + + + 10 + 120 + 351 + 161 + + + + Distance between plans + + + + + 10 + 80 + 331 + 80 + + + + + 0 + + + 6 + + + + + + + + false + + + + 300 + 0 + + + + 6 + + + 1 + + + 100 + + + 1 + + + Qt::Horizontal + + + true + + + QSlider::TicksBelow + + + 1 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + 10 + 20 + 331 + 61 + + + + + 0 + + + 6 + + + + + Restore Default + + + + + + + 1 + + + QLineEdit::Normal + + + 1 + + + Qt::AlignHCenter + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + 10 + 50 + 341 + 71 + + + + Number of plans + + + + + 20 + 20 + 311 + 41 + + + + + 0 + + + 6 + + + + + + 5 + 0 + 0 + 0 + + + + + 0 + 15 + + + + + 50 + 16777215 + + + + QAbstractSpinBox::PlusMinus + + + 1 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 20 - 30 + 290 331 - 330 + 80 - - - 330 - 330 - - - - - 350 - 16777215 - - - - - 1 - 1 - - - - images/iconslice.png - - - true - - - QDockWidget::DockWidgetMovable - - - Qt::NoDockWidgetArea - - - Slice dialog... - - - - - - 10 - 60 - 321 - 131 - - - - Distance between plans - - - - - 190 - 30 - 101 - 21 - - - - 1 - - - QLineEdit::Normal - - - 1 - - - Qt::AlignHCenter - - - - - - 10 - 70 - 241 - 21 - - - - - - false - - - - 10 - 100 - 300 - 26 - - + + + 3 + + + 6 + + + - 300 - 0 - - - - 6 - - - 1 - - - 100 - - - 1 - - - Qt::Horizontal - - - true - - - QSlider::TicksBelow - - - 1 - - - - - - 20 - 20 - 91 + 200 30 - - - - Restore Default - - - - - - - 120 - 200 - 211 - 51 - - - - - 200 - 30 - - - - - 300 - 16777215 - - - - - - 10 - 30 - 83 - 18 - - - - Multi file - - - true - - - - - - 110 - 10 - 96 - 30 - - - - Export Polyline... - - - QToolButton::InstantPopup - - - - - - 10 - 10 - 83 - 18 - - - - Single file - - - - - - - 10 - 0 - 321 - 51 - - - - Number of plans - - - - - 30 - 20 - 50 - 18 - - - - - 5 - 0 - 0 - 0 - - - - - 0 - 15 - 50 + 300 16777215 - - QAbstractSpinBox::PlusMinus - - - 1 - + + + + 100 + 20 + 96 + 30 + + + + Export Polyline... + + + QToolButton::InstantPopup + + + + + + 10 + 10 + 83 + 18 + + + + Single file + + + + + + 10 + 40 + 83 + 18 + + + + Multi file + + + true + + - - + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + diff --git a/src/meshlabplugins/editslice/svgpro.ui b/src/meshlabplugins/editslice/svgpro.ui index 0bb7d9a83..a2f44f6d7 100644 --- a/src/meshlabplugins/editslice/svgpro.ui +++ b/src/meshlabplugins/editslice/svgpro.ui @@ -12,45 +12,6 @@ SVGPro - - - - 280 - 50 - 120 - 61 - - - - - - 10 - 30 - 83 - 18 - - - - Pixel - - - - - - 10 - 10 - 83 - 18 - - - - Cm - - - true - - - @@ -72,270 +33,366 @@ - - - - 240 - 340 - 156 - 23 - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok - - - 40 - 30 - 241 - 131 + 10 + 40 + 381 + 161 Image Size - + - 140 + 0 20 - 46 - 14 + 381 + 48 - - Height - + + + 0 + + + 6 + + + + + + + + Width + + + + + + + + + + Height + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - + - 10 - 20 - 46 - 14 + 0 + 80 + 381 + 58 - - Width - + + + 0 + + + 6 + + + + + 0 + + + 6 + + + + + Width of Items: + + + + + + + Height of Items: + + + + + + + + + + + + + Number of Item: + + + + + + + + 50 + 0 + + + + + + + + + + + 100 + 0 + + + + + + 10 + 10 + 41 + 18 + + + + Cm + + + true + + + + + + 10 + 30 + 51 + 18 + + + + Pixel + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - + - 100 - 110 - 46 - 21 - - - - - - - 140 - 40 - 80 + 0 + 140 + 71 18 - - - - - 10 - 40 - 81 - 20 - - - - - - - 100 - 70 - 46 - 21 - - - - - - - 20 - 70 - 82 - 16 - - - Number of Item: + view text - - - - - 20 - 90 - 81 - 16 - - - - Width of Items: - - - - - - 20 - 110 - 81 - 16 - - - - Height of Items: - - - - - - 100 - 90 - 46 - 21 - + + true - 40 - 170 - 241 - 131 + 0 + 200 + 361 + 161 View Box Resolution - + 10 20 - 46 - 14 + 351 + 51 - - Width - + + + 0 + + + 6 + + + + + + + + + + + Height + + + + + + + Width + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - - - - 140 - 20 - 46 - 14 - - - - Height - - - - - - 10 - 40 - 81 - 18 - - - - - - - 140 - 40 - 80 - 18 - - - - - - - 100 - 110 - 46 - 16 - - - - - - - 10 - 110 - 81 - 16 - - - - Height of Items: - - - + 10 80 - 81 - 16 + 351 + 79 - - Width of Items: - + + + 0 + + + 6 + + + + + Width of Items: + + + + + + + Height of Items: + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - - - - 100 - 80 - 46 - 16 - - - - - - - - 300 - 180 - 71 - 18 - - - - view text - - - true -