API tools faq
paste
Advertisement
Guest User

PickPoints.diff

a guest
Sep 26th, 2011
188
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 21.43 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/trunk/meshlab/src/meshlabplugins/edit_pickpoints/editpickpoints.cpp b/trunk/meshlab/src/meshlabplugins/edit_pickpoints/editpickpoints.cpp
  2. index ecd250b..6869590 100644
  3. --- a/trunk/meshlab/src/meshlabplugins/edit_pickpoints/editpickpoints.cpp
  4. +++ b/trunk/meshlab/src/meshlabplugins/edit_pickpoints/editpickpoints.cpp
  5. @@ -75,7 +75,7 @@ void EditPickPointsPlugin::Decorate(MeshModel &mm, GLArea *gla, QPainter *painte
  6.     {
  7.         //qDebug() << "GLarea is different or no faces!!! ";
  8.         return;
  9. -   }
  10. +        }
  11.    
  12.    
  13.     //make sure we picking points on the right meshes!
  14. @@ -87,6 +87,25 @@ void EditPickPointsPlugin::Decorate(MeshModel &mm, GLArea *gla, QPainter *painte
  15.         pickPointsDialog->setCurrentMeshModel(&mm, gla);
  16.         currentModel = &mm;
  17.     }
  18. +
  19. +
  20. +        if (pickPointsDialog->snapToExistingVertices())
  21. +        {
  22. +            qDebug() << "Scanning for nearby vertices to snap to near " << currentMousePosition.x() << " " << gla->height() - currentMousePosition.y();
  23. +            std::vector<CVertexO*> vertices;
  24. +
  25. +            int result = GLPickTri<CMeshO>::PickVert(currentMousePosition.x(), gla->height() - currentMousePosition.y(), mm.cm, vertices, 40, 40);
  26. +            if (result)
  27. +            {
  28. +
  29. +                qDebug() << "Nearest vertex found.";
  30. +                glColor3f(0, 1, 0);
  31. +                glPointSize(4.5);
  32. +                glBegin(GL_POINTS);
  33. +                glVertex(vertices[0]->P());
  34. +                glEnd();
  35. +            }
  36. +        }
  37.    
  38.     //We have to calculate the position here because it doesnt work in the mouseEvent functions for some reason
  39.     Point3f pickedPoint;
  40. @@ -106,7 +125,17 @@ void EditPickPointsPlugin::Decorate(MeshModel &mm, GLArea *gla, QPainter *painte
  41.                 currentMousePosition.x(),
  42.                 currentMousePosition.y(),
  43.                 pickedPoint[0], pickedPoint[1], pickedPoint[2]); */
  44. -  
  45. +                if (pickPointsDialog->snapToExistingVertices())
  46. +                {
  47. +                    std::cout << "Snap to existing vertices is set." << std::endl;
  48. +                    std::vector<CMeshO::VertexPointer> vertices;
  49. +                    int result = GLPickTri<CMeshO>::PickVert(currentMousePosition.x(), gla->height() - currentMousePosition.y(), mm.cm, vertices, 40, 40);
  50. +                    if (result)
  51. +                    {
  52. +                        std::cout << "Nearest vertex found." << std::endl;
  53. +                        pickedPoint = vertices[0]->P();
  54. +                    }
  55. +                }
  56.        
  57.         //find the normal of the face we just clicked
  58.         CFaceO *face;
  59. @@ -134,6 +163,7 @@ void EditPickPointsPlugin::Decorate(MeshModel &mm, GLArea *gla, QPainter *painte
  60.  
  61.  bool EditPickPointsPlugin::StartEdit(MeshModel &mm, GLArea *gla )
  62.  {
  63. +        gla->setMouseTracking(true);
  64.     //qDebug() << "StartEdit Pick Points: " << mm.fileName.c_str() << " ..." << mm.cm.fn;
  65.    
  66.     //if there are no faces then we cant do anything with this plugin
  67. @@ -177,6 +207,7 @@ bool EditPickPointsPlugin::StartEdit(MeshModel &mm, GLArea *gla )
  68.  
  69.  void EditPickPointsPlugin::EndEdit(MeshModel &mm, GLArea *gla)
  70.  {
  71. +        gla->setMouseTracking(false);
  72.     //qDebug() << "EndEdit Pick Points: " << mm.fileName.c_str() << " ..." << mm.cm.fn;
  73.    
  74.     // some cleaning at the end.
  75. @@ -235,6 +266,7 @@ void EditPickPointsPlugin::mouseMoveEvent(QMouseEvent *event, MeshModel &mm, GLA
  76.         gla->suspendedEditor = true;
  77.         QCoreApplication::sendEvent(gla, event);
  78.         gla->suspendedEditor = false;
  79. +                currentMousePosition = event->pos();
  80.     }
  81.    
  82.     if(Qt::RightButton & event->buttons() &&
  83. @@ -247,6 +279,8 @@ void EditPickPointsPlugin::mouseMoveEvent(QMouseEvent *event, MeshModel &mm, GLA
  84.         //set flag that we need to add a new point
  85.         registerPoint = true;  
  86.     }
  87. +
  88. +
  89.  }
  90.  
  91.  void EditPickPointsPlugin::mouseReleaseEvent(QMouseEvent *event, MeshModel &mm, GLArea * gla)
  92. diff --git a/trunk/meshlab/src/meshlabplugins/edit_pickpoints/pickpointsDialog.cpp b/trunk/meshlab/src/meshlabplugins/edit_pickpoints/pickpointsDialog.cpp
  93. index 4269dc5..e0ea076 100644
  94. --- a/trunk/meshlab/src/meshlabplugins/edit_pickpoints/pickpointsDialog.cpp
  95. +++ b/trunk/meshlab/src/meshlabplugins/edit_pickpoints/pickpointsDialog.cpp
  96. @@ -378,6 +378,11 @@ bool PickPointsDialog::drawNormalAsPin()
  97.     return ui.pinRadioButton->isChecked();
  98.  }
  99.  
  100. +bool PickPointsDialog::snapToExistingVertices()
  101. +{
  102. +    return ui.snapToExistingVerticesCheckBox->isChecked();
  103. +}
  104. +
  105.  void PickPointsDialog::addPoint(vcg::Point3f &point, QString &name, bool present)
  106.  {
  107.     //bool result = GLPickTri<CMeshO>::PickNearestFace(currentMousePosition.x(),gla->height()-currentMousePosition.y(),
  108. @@ -418,9 +423,9 @@ PickedPointTreeWidgetItem * PickPointsDialog::addTreeWidgetItemForPoint(vcg::Poi
  109.     //select the newest item
  110.     ui.pickedPointsTreeWidget->setCurrentItem(widgetItem);
  111.    
  112. -   //add a checkbox to the widget item's 5th column (QT makes us add it in this strange way)
  113. +    //add a checkbox to the widget item's 5th column (QT makes us add it in this strange way)
  114.     TreeCheckBox *checkBox = new TreeCheckBox(ui.pickedPointsTreeWidget, widgetItem, this);
  115. -   ui.pickedPointsTreeWidget->setItemWidget(widgetItem, 4, checkBox);
  116. +    ui.pickedPointsTreeWidget->setItemWidget(widgetItem, 4, checkBox);
  117.    
  118.     //set the box to show the proper check
  119.     checkBox->setChecked(present);
  120. diff --git a/trunk/meshlab/src/meshlabplugins/edit_pickpoints/pickpointsDialog.h b/trunk/meshlab/src/meshlabplugins/edit_pickpoints/pickpointsDialog.h
  121. index dc2a4b2..2a07c6b 100644
  122. --- a/trunk/meshlab/src/meshlabplugins/edit_pickpoints/pickpointsDialog.h
  123. +++ b/trunk/meshlab/src/meshlabplugins/edit_pickpoints/pickpointsDialog.h
  124. @@ -126,6 +126,8 @@ public:
  125.     bool showNormal();
  126.    
  127.     bool drawNormalAsPin();
  128. +
  129. +        bool snapToExistingVertices();
  130.    
  131.     //set flag that says the next value will overwite one we may want to jump back to
  132.     void recordNextPointForUndo();
  133. diff --git a/trunk/meshlab/src/meshlabplugins/edit_pickpoints/pickpointsDialog.ui b/trunk/meshlab/src/meshlabplugins/edit_pickpoints/pickpointsDialog.ui
  134. index c71eee4..424bd4d 100644
  135. --- a/trunk/meshlab/src/meshlabplugins/edit_pickpoints/pickpointsDialog.ui
  136. +++ b/trunk/meshlab/src/meshlabplugins/edit_pickpoints/pickpointsDialog.ui
  137. @@ -1,84 +1,85 @@
  138. -<ui version="4.0" >
  139. +<?xml version="1.0" encoding="UTF-8"?>
  140. +<ui version="4.0">
  141.   <class>pickpointsDialog</class>
  142. - <widget class="QWidget" name="pickpointsDialog" >
  143. -  <property name="geometry" >
  144. + <widget class="QWidget" name="pickpointsDialog">
  145. +  <property name="geometry">
  146.     <rect>
  147.      <x>0</x>
  148.      <y>0</y>
  149.      <width>542</width>
  150. -    <height>654</height>
  151. +    <height>672</height>
  152.     </rect>
  153.    </property>
  154. -  <property name="windowTitle" >
  155. +  <property name="windowTitle">
  156.     <string>Form</string>
  157.    </property>
  158. -  <widget class="QFrame" name="frame" >
  159. -   <property name="geometry" >
  160. +  <widget class="QFrame" name="frame">
  161. +   <property name="geometry">
  162.      <rect>
  163.       <x>0</x>
  164.       <y>10</y>
  165.       <width>531</width>
  166. -     <height>631</height>
  167. +     <height>651</height>
  168.      </rect>
  169.     </property>
  170. -   <property name="frameShape" >
  171. +   <property name="frameShape">
  172.      <enum>QFrame::StyledPanel</enum>
  173.     </property>
  174. -   <property name="frameShadow" >
  175. +   <property name="frameShadow">
  176.      <enum>QFrame::Raised</enum>
  177.     </property>
  178. -   <widget class="QTreeWidget" name="pickedPointsTreeWidget" >
  179. -    <property name="geometry" >
  180. +   <widget class="QTreeWidget" name="pickedPointsTreeWidget">
  181. +    <property name="geometry">
  182.       <rect>
  183.        <x>10</x>
  184. -      <y>80</y>
  185. +      <y>100</y>
  186.        <width>501</width>
  187.        <height>291</height>
  188.       </rect>
  189.      </property>
  190. -    <property name="columnCount" >
  191. +    <property name="columnCount">
  192.       <number>5</number>
  193.      </property>
  194.      <column>
  195. -     <property name="text" >
  196. +     <property name="text">
  197.        <string>1</string>
  198.       </property>
  199.      </column>
  200.      <column>
  201. -     <property name="text" >
  202. +     <property name="text">
  203.        <string>2</string>
  204.       </property>
  205.      </column>
  206.      <column>
  207. -     <property name="text" >
  208. +     <property name="text">
  209.        <string>3</string>
  210.       </property>
  211.      </column>
  212.      <column>
  213. -     <property name="text" >
  214. +     <property name="text">
  215.        <string>4</string>
  216.       </property>
  217.      </column>
  218.      <column>
  219. -     <property name="text" >
  220. +     <property name="text">
  221.        <string>5</string>
  222.       </property>
  223.      </column>
  224.     </widget>
  225. -   <widget class="QGroupBox" name="groupBox" >
  226. -    <property name="geometry" >
  227. +   <widget class="QGroupBox" name="groupBox">
  228. +    <property name="geometry">
  229.       <rect>
  230.        <x>10</x>
  231.        <y>10</y>
  232.        <width>291</width>
  233. -      <height>51</height>
  234. +      <height>81</height>
  235.       </rect>
  236.      </property>
  237. -    <property name="title" >
  238. +    <property name="title">
  239.       <string>Mode: </string>
  240.      </property>
  241. -    <widget class="QRadioButton" name="pickPointModeRadioButton" >
  242. -     <property name="geometry" >
  243. +    <widget class="QRadioButton" name="pickPointModeRadioButton">
  244. +     <property name="geometry">
  245.        <rect>
  246.         <x>10</x>
  247.         <y>20</y>
  248. @@ -86,15 +87,15 @@
  249.         <height>23</height>
  250.        </rect>
  251.       </property>
  252. -     <property name="text" >
  253. +     <property name="text">
  254.        <string>Pick Point</string>
  255.       </property>
  256. -     <property name="checked" >
  257. +     <property name="checked">
  258.        <bool>true</bool>
  259.       </property>
  260.      </widget>
  261. -    <widget class="QRadioButton" name="movePointRadioButton" >
  262. -     <property name="geometry" >
  263. +    <widget class="QRadioButton" name="movePointRadioButton">
  264. +     <property name="geometry">
  265.        <rect>
  266.         <x>100</x>
  267.         <y>20</y>
  268. @@ -102,12 +103,12 @@
  269.         <height>23</height>
  270.        </rect>
  271.       </property>
  272. -     <property name="text" >
  273. +     <property name="text">
  274.        <string>Move Point</string>
  275.       </property>
  276.      </widget>
  277. -    <widget class="QRadioButton" name="selectPointRadioButton" >
  278. -     <property name="geometry" >
  279. +    <widget class="QRadioButton" name="selectPointRadioButton">
  280. +     <property name="geometry">
  281.        <rect>
  282.         <x>190</x>
  283.         <y>20</y>
  284. @@ -115,13 +116,26 @@
  285.         <height>24</height>
  286.        </rect>
  287.       </property>
  288. -     <property name="text" >
  289. +     <property name="text">
  290.        <string>Select Point</string>
  291.       </property>
  292.      </widget>
  293. +    <widget class="QCheckBox" name="snapToExistingVerticesCheckBox">
  294. +     <property name="geometry">
  295. +      <rect>
  296. +       <x>10</x>
  297. +       <y>50</y>
  298. +       <width>191</width>
  299. +       <height>22</height>
  300. +      </rect>
  301. +     </property>
  302. +     <property name="text">
  303. +      <string>Snap to existing vertices</string>
  304. +     </property>
  305. +    </widget>
  306.     </widget>
  307. -   <widget class="QWidget" name="layoutWidget" >
  308. -    <property name="geometry" >
  309. +   <widget class="QWidget" name="layoutWidget">
  310. +    <property name="geometry">
  311.       <rect>
  312.        <x>310</x>
  313.        <y>10</y>
  314. @@ -129,37 +143,37 @@
  315.        <height>64</height>
  316.       </rect>
  317.      </property>
  318. -    <layout class="QGridLayout" >
  319. -     <item row="1" column="0" >
  320. -      <widget class="QPushButton" name="loadPointsButton" >
  321. -       <property name="text" >
  322. +    <layout class="QGridLayout">
  323. +     <item row="1" column="0">
  324. +      <widget class="QPushButton" name="loadPointsButton">
  325. +       <property name="text">
  326.          <string>Load Points From File</string>
  327.         </property>
  328.        </widget>
  329.       </item>
  330. -     <item row="0" column="0" >
  331. -      <widget class="QPushButton" name="saveButton" >
  332. -       <property name="text" >
  333. +     <item row="0" column="0">
  334. +      <widget class="QPushButton" name="saveButton">
  335. +       <property name="text">
  336.          <string>Save</string>
  337.         </property>
  338.        </widget>
  339.       </item>
  340.      </layout>
  341.     </widget>
  342. -   <widget class="QGroupBox" name="groupBox_2" >
  343. -    <property name="geometry" >
  344. +   <widget class="QGroupBox" name="groupBox_2">
  345. +    <property name="geometry">
  346.       <rect>
  347.        <x>10</x>
  348. -      <y>420</y>
  349. +      <y>440</y>
  350.        <width>431</width>
  351.        <height>131</height>
  352.       </rect>
  353.      </property>
  354. -    <property name="title" >
  355. +    <property name="title">
  356.       <string>Template Controls</string>
  357.      </property>
  358. -    <widget class="QCheckBox" name="defaultTemplateCheckBox" >
  359. -     <property name="geometry" >
  360. +    <widget class="QCheckBox" name="defaultTemplateCheckBox">
  361. +     <property name="geometry">
  362.        <rect>
  363.         <x>10</x>
  364.         <y>20</y>
  365. @@ -167,12 +181,12 @@
  366.         <height>24</height>
  367.        </rect>
  368.       </property>
  369. -     <property name="text" >
  370. +     <property name="text">
  371.        <string>Save this as your default template</string>
  372.       </property>
  373.      </widget>
  374. -    <widget class="QLabel" name="label" >
  375. -     <property name="geometry" >
  376. +    <widget class="QLabel" name="label">
  377. +     <property name="geometry">
  378.        <rect>
  379.         <x>10</x>
  380.         <y>100</y>
  381. @@ -180,12 +194,12 @@
  382.         <height>18</height>
  383.        </rect>
  384.       </property>
  385. -     <property name="text" >
  386. +     <property name="text">
  387.        <string>Template Name:</string>
  388.       </property>
  389.      </widget>
  390. -    <widget class="QLabel" name="templateNameLabel" >
  391. -     <property name="geometry" >
  392. +    <widget class="QLabel" name="templateNameLabel">
  393. +     <property name="geometry">
  394.        <rect>
  395.         <x>110</x>
  396.         <y>100</y>
  397. @@ -193,12 +207,12 @@
  398.         <height>20</height>
  399.        </rect>
  400.       </property>
  401. -     <property name="palette" >
  402. +     <property name="palette">
  403.        <palette>
  404.         <active>
  405. -        <colorrole role="WindowText" >
  406. -         <brush brushstyle="SolidPattern" >
  407. -          <color alpha="255" >
  408. +        <colorrole role="WindowText">
  409. +         <brush brushstyle="SolidPattern">
  410. +          <color alpha="255">
  411.             <red>0</red>
  412.             <green>0</green>
  413.             <blue>255</blue>
  414. @@ -207,9 +221,9 @@
  415.          </colorrole>
  416.         </active>
  417.         <inactive>
  418. -        <colorrole role="WindowText" >
  419. -         <brush brushstyle="SolidPattern" >
  420. -          <color alpha="255" >
  421. +        <colorrole role="WindowText">
  422. +         <brush brushstyle="SolidPattern">
  423. +          <color alpha="255">
  424.             <red>0</red>
  425.             <green>0</green>
  426.             <blue>255</blue>
  427. @@ -218,9 +232,9 @@
  428.          </colorrole>
  429.         </inactive>
  430.         <disabled>
  431. -        <colorrole role="WindowText" >
  432. -         <brush brushstyle="SolidPattern" >
  433. -          <color alpha="255" >
  434. +        <colorrole role="WindowText">
  435. +         <brush brushstyle="SolidPattern">
  436. +          <color alpha="255">
  437.             <red>127</red>
  438.             <green>125</green>
  439.             <blue>123</blue>
  440. @@ -230,12 +244,12 @@
  441.         </disabled>
  442.        </palette>
  443.       </property>
  444. -     <property name="text" >
  445. +     <property name="text">
  446.        <string>TextLabel</string>
  447.       </property>
  448.      </widget>
  449. -    <widget class="QWidget" name="layoutWidget" >
  450. -     <property name="geometry" >
  451. +    <widget class="QWidget" name="layoutWidget">
  452. +     <property name="geometry">
  453.        <rect>
  454.         <x>10</x>
  455.         <y>60</y>
  456. @@ -243,31 +257,31 @@
  457.         <height>30</height>
  458.        </rect>
  459.       </property>
  460. -     <layout class="QHBoxLayout" name="horizontalLayout" >
  461. +     <layout class="QHBoxLayout" name="horizontalLayout">
  462.        <item>
  463. -       <widget class="QPushButton" name="saveTemplateButton" >
  464. -        <property name="text" >
  465. +       <widget class="QPushButton" name="saveTemplateButton">
  466. +        <property name="text">
  467.           <string>Save</string>
  468.          </property>
  469.         </widget>
  470.        </item>
  471.        <item>
  472. -       <widget class="QPushButton" name="loadTemplateButton" >
  473. -        <property name="text" >
  474. +       <widget class="QPushButton" name="loadTemplateButton">
  475. +        <property name="text">
  476.           <string>Load</string>
  477.          </property>
  478.         </widget>
  479.        </item>
  480.        <item>
  481. -       <widget class="QPushButton" name="clearTemplateButton" >
  482. -        <property name="text" >
  483. +       <widget class="QPushButton" name="clearTemplateButton">
  484. +        <property name="text">
  485.           <string>Clear</string>
  486.          </property>
  487.         </widget>
  488.        </item>
  489.        <item>
  490. -       <widget class="QPushButton" name="addPointToTemplateButton" >
  491. -        <property name="text" >
  492. +       <widget class="QPushButton" name="addPointToTemplateButton">
  493. +        <property name="text">
  494.           <string>Add Point</string>
  495.          </property>
  496.         </widget>
  497. @@ -275,20 +289,20 @@
  498.       </layout>
  499.      </widget>
  500.     </widget>
  501. -   <widget class="QGroupBox" name="groupBox_3" >
  502. -    <property name="geometry" >
  503. +   <widget class="QGroupBox" name="groupBox_3">
  504. +    <property name="geometry">
  505.       <rect>
  506.        <x>10</x>
  507. -      <y>560</y>
  508. +      <y>580</y>
  509.        <width>431</width>
  510.        <height>61</height>
  511.       </rect>
  512.      </property>
  513. -    <property name="title" >
  514. +    <property name="title">
  515.       <string>Normal Options</string>
  516.      </property>
  517. -    <widget class="QCheckBox" name="showNormalCheckBox" >
  518. -     <property name="geometry" >
  519. +    <widget class="QCheckBox" name="showNormalCheckBox">
  520. +     <property name="geometry">
  521.        <rect>
  522.         <x>10</x>
  523.         <y>20</y>
  524. @@ -296,43 +310,43 @@
  525.         <height>24</height>
  526.        </rect>
  527.       </property>
  528. -     <property name="text" >
  529. +     <property name="text">
  530.        <string>Show Normal?</string>
  531.       </property>
  532. -     <property name="checked" >
  533. +     <property name="checked">
  534.        <bool>true</bool>
  535.       </property>
  536.      </widget>
  537. -    <widget class="QWidget" name="layoutWidget" >
  538. -     <property name="geometry" >
  539. +    <widget class="QWidget" name="layoutWidget">
  540. +     <property name="geometry">
  541.        <rect>
  542.         <x>170</x>
  543.         <y>20</y>
  544. -       <width>181</width>
  545. +       <width>199</width>
  546.         <height>26</height>
  547.        </rect>
  548.       </property>
  549. -     <layout class="QHBoxLayout" name="horizontalLayout_4" >
  550. +     <layout class="QHBoxLayout" name="horizontalLayout_4">
  551.        <item>
  552. -       <widget class="QLabel" name="label_2" >
  553. -        <property name="text" >
  554. +       <widget class="QLabel" name="label_2">
  555. +        <property name="text">
  556.           <string>Draw as a:  </string>
  557.          </property>
  558.         </widget>
  559.        </item>
  560.        <item>
  561. -       <widget class="QRadioButton" name="pinRadioButton" >
  562. -        <property name="text" >
  563. +       <widget class="QRadioButton" name="pinRadioButton">
  564. +        <property name="text">
  565.           <string>Pin</string>
  566.          </property>
  567. -        <property name="checked" >
  568. +        <property name="checked">
  569.           <bool>true</bool>
  570.          </property>
  571.         </widget>
  572.        </item>
  573.        <item>
  574. -       <widget class="QRadioButton" name="lineRadioButton" >
  575. -        <property name="text" >
  576. +       <widget class="QRadioButton" name="lineRadioButton">
  577. +        <property name="text">
  578.           <string>Line</string>
  579.          </property>
  580.         </widget>
  581. @@ -340,69 +354,61 @@
  582.       </layout>
  583.      </widget>
  584.     </widget>
  585. -   <widget class="QWidget" name="layoutWidget" >
  586. -    <property name="geometry" >
  587. +   <widget class="QWidget" name="layoutWidget">
  588. +    <property name="geometry">
  589.       <rect>
  590.        <x>10</x>
  591. -      <y>380</y>
  592. -      <width>431</width>
  593. +      <y>400</y>
  594. +      <width>476</width>
  595.        <height>41</height>
  596.       </rect>
  597.      </property>
  598. -    <layout class="QHBoxLayout" name="horizontalLayout_2" >
  599. +    <layout class="QHBoxLayout" name="horizontalLayout_2">
  600.       <item>
  601. -      <widget class="QPushButton" name="renamePointButton" >
  602. -       <property name="text" >
  603. +      <widget class="QPushButton" name="renamePointButton">
  604. +       <property name="text">
  605.          <string>Rename Point</string>
  606.         </property>
  607.        </widget>
  608.       </item>
  609.       <item>
  610. -      <widget class="QPushButton" name="clearPointButton" >
  611. -       <property name="text" >
  612. +      <widget class="QPushButton" name="clearPointButton">
  613. +       <property name="text">
  614.          <string>Clear Point</string>
  615.         </property>
  616.        </widget>
  617.       </item>
  618.       <item>
  619. -      <widget class="QPushButton" name="removePointButton" >
  620. -       <property name="text" >
  621. +      <widget class="QPushButton" name="removePointButton">
  622. +       <property name="text">
  623.          <string>Remove Point</string>
  624.         </property>
  625.        </widget>
  626.       </item>
  627.       <item>
  628. -      <widget class="QPushButton" name="removeAllPointsButton" >
  629. -       <property name="text" >
  630. +      <widget class="QPushButton" name="removeAllPointsButton">
  631. +       <property name="text">
  632.          <string>Remove All Points</string>
  633.         </property>
  634.        </widget>
  635.       </item>
  636.      </layout>
  637.     </widget>
  638. -   <widget class="QPushButton" name="undoButton" >
  639. -    <property name="geometry" >
  640. +   <widget class="QPushButton" name="undoButton">
  641. +    <property name="geometry">
  642.       <rect>
  643.        <x>450</x>
  644. -      <y>380</y>
  645. +      <y>400</y>
  646.        <width>71</width>
  647.        <height>81</height>
  648.       </rect>
  649.      </property>
  650. -    <property name="text" >
  651. +    <property name="text">
  652.       <string>Undo
  653.  last
  654.  move</string>
  655.      </property>
  656.     </widget>
  657. -   <zorder>pickedPointsTreeWidget</zorder>
  658. -   <zorder>groupBox</zorder>
  659. -   <zorder>layoutWidget</zorder>
  660. -   <zorder>groupBox_2</zorder>
  661. -   <zorder>groupBox_3</zorder>
  662. -   <zorder>layoutWidget</zorder>
  663. -   <zorder>undoButton</zorder>
  664. -   <zorder>renamePointButton</zorder>
  665.    </widget>
  666.   </widget>
  667.   <resources/>
  668.  
  669.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!