i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-02 09:30:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Windows: Fixed QVTKWidget error with VTK9.2, fixed ambiguous "byte" compilation error

Browse Source
This commit is contained in:
matlabbe
2023-03-16 19:27:54 -07:00
parent e3b7e9378d
commit e7bea0ec03
5 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
guilib/include/rtabmap/gui/CloudViewer.h
View File

@@ -33,6 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "rtabmap/core/Transform.h"
#include "rtabmap/core/StereoCameraModel.h"
#include "rtabmap/gui/CloudViewerInteractorStyle.h"
#include <vtkVersionMacros.h>
#if VTK_MAJOR_VERSION > 8
#ifndef slots

4
guilib/src/3rdParty/QMultiComboBox.cpp vendored
View File

@@ -114,8 +114,8 @@ void QMultiComboBox::showPopup()
// determine rect
int contheight = vlist_.count()*vlist_.sizeHintForRow(0) + 4; // +4 - should be determined by margins?
belowHeight = min(abs(belowHeight)-screenbound_, contheight);
aboveHeight = min(abs(aboveHeight)-screenbound_, contheight);
belowHeight = std::min(abs(belowHeight)-screenbound_, contheight);
aboveHeight = std::min(abs(aboveHeight)-screenbound_, contheight);
if (popheight_ > 0) // fixed
{
rec2.setHeight(popheight_);

1
guilib/src/3rdParty/QMultiComboBox.h vendored
View File

@@ -12,7 +12,6 @@
#define __MULTIBOXCOMBO_H__
#include <iostream>
using namespace std;
#include <QComboBox>
#include <QListWidget>