Skip to content

Commit cc8417d

Browse files
hunting down include error? idk what is wrong
1 parent cd0418c commit cc8417d

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

src/Core/Algorithms/Legacy/Fields/FieldData/ConvertIndicesToFieldDataAlgo.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ ConvertIndicesToFieldDataAlgo::runImpl(FieldHandle input_field, MatrixHandle inp
190190
{
191191
if ((input_matrix->ncols() != 6) && (input_matrix->ncols() != 9))
192192
{
193-
auto dmht = dmh->transpose();
193+
auto dmht = dmh->transpose();
194194
DenseMatrixHandle dmh(boost::make_shared<DenseMatrix>(dmht));
195195
}
196196

src/Interface/Modules/Factory/ModuleDialogFactory.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ void ModuleDialogFactory::addDialogsToMakerMap1()
172172
ADD_MODULE_DIALOG(BuildNoiseColumnMatrix,BuildNoiseColumnMatrixDialog)
173173
ADD_MODULE_DIALOG(SwapFieldDataWithMatrixEntries, SwapFieldDataWithMatrixEntriesDialog)
174174
ADD_MODULE_DIALOG(BuildMappingMatrix, BuildMappingMatrixDialog)
175-
ADD_MODULE_DIALOG(EditMeshBoundingBox, EditMeshBoundingBoxDialog)
176-
ADD_MODULE_DIALOG(ConvertIndicesToFieldData, ConvertIndicesToFieldDataDialog)
175+
ADD_MODULE_DIALOG(EditMeshBoundingBox, EditMeshBoundingBoxDialog)
176+
ADD_MODULE_DIALOG(ConvertIndicesToFieldData, ConvertIndicesToFieldDataDialog)
177177
;
178178
}
179179

src/Interface/Modules/Fields/ConvertIndicesToFieldData.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ui version="4.0">
3-
<class>Dialog</class>
4-
<widget class="QDialog" name="Dialog">
3+
<class>ConvertIndicesToFieldData</class>
4+
<widget class="QDialog" name="ConvertIndicesToFieldData">
55
<property name="geometry">
66
<rect>
77
<x>0</x>

src/Interface/Modules/Fields/ConvertIndicesToFieldDataDialog.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*/
2828

2929
#include <Interface/Modules/Fields/ConvertIndicesToFieldDataDialog.h>
30-
#include <Core/Algorithms/Legacy/Fields/FieldData/ConvertIndicesToFieldDataDialog.h>
30+
#include <Core/Algorithms/Legacy/Fields/FieldData/ConvertIndicesToFieldDataAlgo.h>
3131

3232
using namespace SCIRun::Gui;
3333
using namespace SCIRun::Dataflow::Networks;
@@ -41,7 +41,7 @@ ConvertIndicesToFieldDataDialog::ConvertIndicesToFieldDataDialog(const std::stri
4141
setWindowTitle(QString::fromStdString(name));
4242
fixSize();
4343

44-
addCheckBoxManager( dataTypeComboBox_, ConvertIndicesToFieldDataDialog::OutputFieldTypeData);
44+
addCheckBoxManager( dataTypeComboBox_, Parameters::OutputFieldDataType);
4545
}
4646

4747
void ConvertIndicesToFieldDataDialog::pull()

src/Interface/Modules/Fields/ConvertIndicesToFieldDataDialog.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
DEALINGS IN THE SOFTWARE.
2727
*/
2828

29-
#ifndef INTERFACE_MODULES_CONVERTINDICESTOFIELDDATADIALOG_H
30-
#define INTERFACE_MODULES_CONVERTINDICESTOFIELDDATADIALOG_H
29+
#ifndef INTERFACE_MODULES_CONVERT_INDICES_TO_FIELD_DATA_DIALOG_H
30+
#define INTERFACE_MODULES_CONVERT_INDICES_TO_FIELD_DATA_DIALOG_H
3131

3232
#include "Interface/Modules/Fields/ui_ConvertIndicesToFieldData.h"
3333
#include <Interface/Modules/Base/ModuleDialogGeneric.h>
@@ -37,7 +37,7 @@ namespace SCIRun {
3737
namespace Gui {
3838

3939
class SCISHARE ConvertIndicesToFieldDataDialog : public ModuleDialogGeneric,
40-
public Ui::ConvertIndicesToFieldData
40+
public Ui::ConvertIndicesToFieldData
4141
{
4242
Q_OBJECT
4343

0 commit comments

Comments
 (0)