+ fix problems on unit tests, open transaction when creating distance object, layout warning, ...

This commit is contained in:
wmayer
2015-01-25 14:04:33 +01:00
parent 69605efc46
commit 85bc04f0a0
7 changed files with 38 additions and 24 deletions

View File

@@ -52,7 +52,10 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
Gui::ToolBarItem* root = StdWorkbench::setupToolBars();
Gui::ToolBarItem* part = new Gui::ToolBarItem(root);
part->setCommand("Image");
*part << "Image_Open" << "Image_CreateImagePlane"<< "Image_CapturerTest";
*part << "Image_Open" << "Image_CreateImagePlane";
#if HAVE_OPENCV2
*part << "Image_CapturerTest";
#endif
return root;
}
@@ -61,7 +64,9 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const
Gui::ToolBarItem* root = new Gui::ToolBarItem;
Gui::ToolBarItem* img = new Gui::ToolBarItem(root);
img->setCommand("Image");
*img << "Image_Open" << "Image_CapturerTest";
*img << "Image_Open";
#if HAVE_OPENCV2
*img << "Image_CapturerTest";
#endif
return root;
}