projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ruler tick legends don't partly disappear when scrolled off the ends
[pulseview.git]
/
pv
/
widgets
/
colourpopup.cpp
diff --git
a/pv/widgets/colourpopup.cpp
b/pv/widgets/colourpopup.cpp
index 816a4c50b95c773b89df1d86893cbf5bbe247d58..170385b3bb4ab26cd49b1d3ef40141d7892d9282 100644
(file)
--- a/
pv/widgets/colourpopup.cpp
+++ b/
pv/widgets/colourpopup.cpp
@@
-14,32
+14,31
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
*/
-#include "colourpopup.h"
+#include "colourpopup.h
pp
"
namespace pv {
namespace widgets {
ColourPopup::ColourPopup(int rows, int cols, QWidget *parent) :
Popup(parent),
namespace pv {
namespace widgets {
ColourPopup::ColourPopup(int rows, int cols, QWidget *parent) :
Popup(parent),
-
_well_array
(rows, cols, this),
-
_layout
(this)
+
well_array_
(rows, cols, this),
+
layout_
(this)
{
{
-
_layout.addWidget(&_well_array
);
- setLayout(&
_layout
);
+
layout_.addWidget(&well_array_
);
+ setLayout(&
layout_
);
- connect(&
_well_array
, SIGNAL(selected(int, int)),
+ connect(&
well_array_
, SIGNAL(selected(int, int)),
this, SIGNAL(selected(int, int)));
this, SIGNAL(selected(int, int)));
- connect(&
_well_array
, SIGNAL(selected(int, int)),
+ connect(&
well_array_
, SIGNAL(selected(int, int)),
this, SLOT(colour_selected(int, int)));
}
this, SLOT(colour_selected(int, int)));
}
-
Q
WellArray& ColourPopup::well_array()
+WellArray& ColourPopup::well_array()
{
{
- return
_well_array
;
+ return
well_array_
;
}
void ColourPopup::colour_selected(int, int)
}
void ColourPopup::colour_selected(int, int)
@@
-47,5
+46,5
@@
void ColourPopup::colour_selected(int, int)
close();
}
close();
}
-}
//
widgets
-}
//
pv
+}
// namespace
widgets
+}
// namespace
pv