mirror of
https://github.com/introlab/rtabmap.git
synced 2026-10-08 11:07:46 +08:00
Windows: Fixed QVTKWidget error with VTK9.2, fixed ambiguous "byte" compilation error
This commit is contained in:
@@ -36,6 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||||||
#include "rtabmap/utilite/UFile.h"
|
#include "rtabmap/utilite/UFile.h"
|
||||||
#include "rtabmap/utilite/UConversion.h"
|
#include "rtabmap/utilite/UConversion.h"
|
||||||
|
|
||||||
|
#include <vtkVersionMacros.h>
|
||||||
#include <vtkObject.h>
|
#include <vtkObject.h>
|
||||||
|
|
||||||
using namespace rtabmap;
|
using namespace rtabmap;
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||||||
#include "rtabmap/core/Transform.h"
|
#include "rtabmap/core/Transform.h"
|
||||||
#include "rtabmap/core/StereoCameraModel.h"
|
#include "rtabmap/core/StereoCameraModel.h"
|
||||||
#include "rtabmap/gui/CloudViewerInteractorStyle.h"
|
#include "rtabmap/gui/CloudViewerInteractorStyle.h"
|
||||||
|
#include <vtkVersionMacros.h>
|
||||||
|
|
||||||
#if VTK_MAJOR_VERSION > 8
|
#if VTK_MAJOR_VERSION > 8
|
||||||
#ifndef slots
|
#ifndef slots
|
||||||
|
|||||||
+2
-2
@@ -114,8 +114,8 @@ void QMultiComboBox::showPopup()
|
|||||||
|
|
||||||
// determine rect
|
// determine rect
|
||||||
int contheight = vlist_.count()*vlist_.sizeHintForRow(0) + 4; // +4 - should be determined by margins?
|
int contheight = vlist_.count()*vlist_.sizeHintForRow(0) + 4; // +4 - should be determined by margins?
|
||||||
belowHeight = min(abs(belowHeight)-screenbound_, contheight);
|
belowHeight = std::min(abs(belowHeight)-screenbound_, contheight);
|
||||||
aboveHeight = min(abs(aboveHeight)-screenbound_, contheight);
|
aboveHeight = std::min(abs(aboveHeight)-screenbound_, contheight);
|
||||||
if (popheight_ > 0) // fixed
|
if (popheight_ > 0) // fixed
|
||||||
{
|
{
|
||||||
rec2.setHeight(popheight_);
|
rec2.setHeight(popheight_);
|
||||||
|
|||||||
Vendored
-1
@@ -12,7 +12,6 @@
|
|||||||
#define __MULTIBOXCOMBO_H__
|
#define __MULTIBOXCOMBO_H__
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
using namespace std;
|
|
||||||
|
|
||||||
#include <QComboBox>
|
#include <QComboBox>
|
||||||
#include <QListWidget>
|
#include <QListWidget>
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||||||
#include "rtabmap/utilite/ULogger.h"
|
#include "rtabmap/utilite/ULogger.h"
|
||||||
|
|
||||||
#include <vtkObject.h>
|
#include <vtkObject.h>
|
||||||
|
#include <vtkVersionMacros.h>
|
||||||
|
|
||||||
int main(int argc, char * argv[])
|
int main(int argc, char * argv[])
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user