diff --git a/.gitignore b/.gitignore
index 14a3932859b0d3861f1f04b3b5317090ae1dc7e1..d19703ea40413c96614c18f21061cff3d079a629 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,14 +7,10 @@
# Unignore all dirs
!*/
-<<<<<<< HEAD
-!Makefile
-=======
# Unignore Makefiles, and TestPreferences
!Makefile
!TestPreferences
!*/3rdParty/Makefile
->>>>>>> dev
*.cub
*.o
@@ -25,36 +21,14 @@ moc_*
*.pb.*
*.lbl
*.img
-<<<<<<< HEAD
-
-!TestPreferences
-
-print.prt
-
-=======
*.kate-swp
->>>>>>> dev
object_script.*.Release
object_script.*.Debug
*_plugin_import.cpp
*.moc
ui_*.h
+*.html
-<<<<<<< HEAD
-*/3rdParty/*
-!*/3rdParty/Makefile
-
-*/inc/*
-
-*/bin/*
-
-*/lib/*
-
-*/tsts/*/input/*
-*/tsts/*/truth/*
-*/tsts/*/output/*
-
-=======
# ignore all files created by squish coco
*csmes
@@ -67,4 +41,3 @@ print.prt
*/tsts/*/input/*
*/tsts/*/truth/*
*/tsts/*/output/*
->>>>>>> dev
diff --git a/isis/src/base/objs/LabelTranslationManager/LabelTranslationManager.cpp b/isis/src/base/objs/LabelTranslationManager/LabelTranslationManager.cpp
index df4273b8564b6ae3ccbd43180ccb088be532f516..515be4df6038d1b4f2a3c352cd6a948e63738145 100644
--- a/isis/src/base/objs/LabelTranslationManager/LabelTranslationManager.cpp
+++ b/isis/src/base/objs/LabelTranslationManager/LabelTranslationManager.cpp
@@ -174,16 +174,6 @@ namespace Isis {
* <li>the value to check for</li>
* </ol>
*
-<<<<<<< HEAD
- * @throws IException::Unknown "Malformed dependency specification."
- * @throws IException::Unknown "Specification does not have two components
- * separated by [@], the type of dependency and
- * the name-value pair.
- * @throws IException::Unknown "Dependency type specification is invalid.
- * Valid types are [att] and [tag]"
- * @throws IException::Unknown "Name-value specification does not have two
- * components separated by [:]."
-=======
* @throws IException::Programmer "Malformed dependency specification."
* @throws IException::Programmer "Specification does not have two components
* separated by [@], the type of dependency and
@@ -192,7 +182,6 @@ namespace Isis {
* Valid types are [att] and [tag]"
* @throws IException::Programmer "Name-value specification does not have two
* components separated by [|]."
->>>>>>> dev
*
*/
QStringList LabelTranslationManager::parseSpecification(QString specification) const {
@@ -200,34 +189,20 @@ QStringList LabelTranslationManager::parseSpecification(QString specification) c
QStringList parsedSpecification;
try {
-<<<<<<< HEAD
- QStringList typeSplit = specification.split("@", QString::SkipEmptyParts);
- QStringList colonSplit = specification.split(":", QString::SkipEmptyParts);
- if (typeSplit.size() == 2) { //handle tag@elementname:value
-=======
QStringList typeSplit = specification.split("@", QString::SkipEmptyParts);
QStringList barSplit = specification.split("|", QString::SkipEmptyParts);
if (typeSplit.size() == 2) { //handle tag@elementname|value
->>>>>>> dev
if (typeSplit[0].toLower() != "att" &&
typeSplit[0].toLower() != "tag" &&
typeSplit[0].toLower() != "new") {
QString msg = "Dependency type specification [" + typeSplit[0] +
"] is invalid. Valid types are [att], [tag] and [new]";
-<<<<<<< HEAD
- throw IException(IException::Unknown, msg, _FILEINFO_);
- }
- parsedSpecification.append(typeSplit[0].toLower());
-
- QStringList nameValueSplit = typeSplit[1].split(":", QString::SkipEmptyParts);
-=======
throw IException(IException::Programmer, msg, _FILEINFO_);
}
parsedSpecification.append(typeSplit[0].toLower());
QStringList nameValueSplit = typeSplit[1].split("|", QString::SkipEmptyParts);
->>>>>>> dev
if (nameValueSplit.size() == 2) {
parsedSpecification.append(nameValueSplit);
}
@@ -236,20 +211,6 @@ QStringList LabelTranslationManager::parseSpecification(QString specification) c
}
else { //nameValueSplit is an unexpected value
QString msg = "Malformed dependency specification [" + specification + "].";
-<<<<<<< HEAD
- throw IException(IException::Unknown, msg, _FILEINFO_);
- }
- }
- else if (colonSplit.size() == 2) { //handle elementname:value
- parsedSpecification = colonSplit;
- }
- else if (colonSplit.size() == 1 && typeSplit.size() == 1) { //handle value with no "@" or ":" characters
- parsedSpecification = colonSplit;
- }
- else { //nameValueSplit is an unexpected value
- QString msg = " [" + specification + "] has unexpected number of '@' or ':' delimiters";
- throw IException(IException::Unknown,msg, _FILEINFO_);
-=======
throw IException(IException::Programmer, msg, _FILEINFO_);
}
}
@@ -262,17 +223,12 @@ QStringList LabelTranslationManager::parseSpecification(QString specification) c
else { //nameValueSplit is an unexpected value
QString msg = " [" + specification + "] has unexpected number of '@' or '|' delimiters";
throw IException(IException::Programmer,msg, _FILEINFO_);
->>>>>>> dev
}
}
catch (IException &e) {
QString msg = "Malformed dependency specification [" + specification + "].";
-<<<<<<< HEAD
- throw IException(e, IException::Unknown, msg, _FILEINFO_);
-=======
throw IException(e, IException::Programmer, msg, _FILEINFO_);
->>>>>>> dev
}
return parsedSpecification;
diff --git a/isis/src/base/objs/LabelTranslationManager/LabelTranslationManager.truth b/isis/src/base/objs/LabelTranslationManager/LabelTranslationManager.truth
index 484c5ebff4fc20bf7b092e0ebc2f2b03b4f9a2c2..3d46e24b94a0a3ee15236d27e6158440230dc41d 100644
--- a/isis/src/base/objs/LabelTranslationManager/LabelTranslationManager.truth
+++ b/isis/src/base/objs/LabelTranslationManager/LabelTranslationManager.truth
@@ -22,41 +22,14 @@ Group = Mapping
End_Group
End
-<<<<<<< HEAD
-Testing parseSpecification method: att@name:value
-
-Testing parseSpecification method: tag@name:value
-=======
Testing parseSpecification method: att@name|value
Testing parseSpecification method: tag@name|value
->>>>>>> dev
Testing parseSpecification method: att@name
Testing parseSpecification method: new@name
-<<<<<<< HEAD
-Testing parseSpecification method: name:value
-
-Testing parseSpecification method: value
-
-Testing parseSpecification method: att:name:value
-**ERROR** Malformed dependency specification [att:name:value].
-**ERROR** [att:name:value] has unexpected number of '@' or ':' delimiters.
-
-Testing parseSpecification method: att@name@value
-**ERROR** Malformed dependency specification [att@name@value].
-**ERROR** [att@name@value] has unexpected number of '@' or ':' delimiters.
-
-Testing parseSpecification method: not@name:value
-**ERROR** Malformed dependency specification [not@name:value].
-**ERROR** Dependency type specification [not] is invalid. Valid types are [att], [tag] and [new].
-
-Testing parseSpecification method: att@name:value1:value2
-**ERROR** Malformed dependency specification [att@name:value1:value2].
-**ERROR** Malformed dependency specification [att@name:value1:value2].
-=======
Testing parseSpecification method: name|value
Testing parseSpecification method: value
@@ -84,4 +57,3 @@ Testing parseSpecification method: not@name|value
Testing parseSpecification method: att@name|value1|value2
**PROGRAMMER ERROR** Malformed dependency specification [att@name|value1|value2].
**PROGRAMMER ERROR** Malformed dependency specification [att@name|value1|value2].
->>>>>>> dev
diff --git a/isis/src/base/objs/LabelTranslationManager/unitTest.cpp b/isis/src/base/objs/LabelTranslationManager/unitTest.cpp
index 081d6a52a0140260a6c24b4258f9b6a49e2367e4..b87406c76bb83651b61f9919782e03f889bfd21c 100644
--- a/isis/src/base/objs/LabelTranslationManager/unitTest.cpp
+++ b/isis/src/base/objs/LabelTranslationManager/unitTest.cpp
@@ -120,28 +120,6 @@ int main(void) {
e.print();
}
try {
-<<<<<<< HEAD
- cout << endl << "Testing parseSpecification method: att@name:value" << endl;
- transMgr.parseSpecification((QString)"att@name:value");
-
- cout << endl << "Testing parseSpecification method: tag@name:value" << endl;
- transMgr.parseSpecification((QString)"tag@name:value");
-
- cout << endl << "Testing parseSpecification method: att@name" << endl;
- transMgr.parseSpecification((QString)"att@name");
-
- cout << endl << "Testing parseSpecification method: new@name" << endl;
- transMgr.parseSpecification((QString)"new@name");
-
- cout << endl << "Testing parseSpecification method: name:value" << endl;
- transMgr.parseSpecification((QString)"name:value");
-
- cout << endl << "Testing parseSpecification method: value" << endl;
- transMgr.parseSpecification((QString)"value");
-
- cout << endl << "Testing parseSpecification method: att:name:value" << endl;
- transMgr.parseSpecification((QString)"att:name:value");
-=======
cout << endl << "Testing parseSpecification method: att@name|value" << endl;
transMgr.parseSpecification((QString)"att@name:value");
@@ -197,36 +175,14 @@ int main(void) {
try {
cout << endl << "Testing parseSpecification method: not@name|value" << endl;
transMgr.parseSpecification((QString)"not@name|value");
->>>>>>> dev
- }
- catch(IException &e) {
- e.print();
- }
-
- try {
-<<<<<<< HEAD
- cout << endl << "Testing parseSpecification method: att@name@value" << endl;
- transMgr.parseSpecification((QString)"att@name@value");
- }
- catch(IException &e) {
- e.print();
- }
-
- try {
- cout << endl << "Testing parseSpecification method: not@name:value" << endl;
- transMgr.parseSpecification((QString)"not@name:value");
}
catch(IException &e) {
e.print();
}
try {
- cout << endl << "Testing parseSpecification method: att@name:value1:value2" << endl;
- transMgr.parseSpecification((QString)"att@name:value1:value2");
-=======
cout << endl << "Testing parseSpecification method: att@name|value1|value2" << endl;
transMgr.parseSpecification((QString)"att@name|value1|value2");
->>>>>>> dev
}
catch(IException &e) {
e.print();
diff --git a/isis/src/base/objs/ProcessExportPds4/Makefile b/isis/src/base/objs/ProcessExportPds4/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..b8aa4a99802e3d979cf7c55457fa6f4f50d5f6f0
--- /dev/null
+++ b/isis/src/base/objs/ProcessExportPds4/Makefile
@@ -0,0 +1,7 @@
+ifeq ($(ISISROOT), $(BLANK))
+.SILENT:
+error:
+ echo "Please set ISISROOT";
+else
+ include $(ISISROOT)/make/isismake.objs
+endif
diff --git a/isis/src/base/objs/PushFrameCameraCcdLayout/Makefile b/isis/src/base/objs/PushFrameCameraCcdLayout/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..f122bc88227c5c7ebd108dea5d339d1d2e074d82
--- /dev/null
+++ b/isis/src/base/objs/PushFrameCameraCcdLayout/Makefile
@@ -0,0 +1,7 @@
+ifeq ($(ISISROOT), $(BLANK))
+.SILENT:
+error:
+ echo "Please set ISISROOT";
+else
+ include $(ISISROOT)/make/isismake.objs
+endif
\ No newline at end of file
diff --git a/isis/src/base/objs/SpicePosition/SpicePosition.cpp b/isis/src/base/objs/SpicePosition/SpicePosition.cpp
index 51cf90d9dcd6c41a53449c799251e2c6de90fed8..82ff26f6b6b7d4f6175881f2e26cd6d90521693f 100644
--- a/isis/src/base/objs/SpicePosition/SpicePosition.cpp
+++ b/isis/src/base/objs/SpicePosition/SpicePosition.cpp
@@ -1483,24 +1483,12 @@ namespace Isis {
if( p_degree == 0) {
p_velocity = p_cacheVelocity[0];
}
-<<<<<<< HEAD
else {
std::vector<double> veloc = computeVelocityInTime(p_et);
p_velocity[0] = veloc[0];
p_velocity[1] = veloc[1];
p_velocity[2] = veloc[2];
}
-=======
- else {
- p_velocity[0] = ComputeVelocityInTime(WRT_X);
- p_velocity[1] = ComputeVelocityInTime(WRT_Y);
- p_velocity[2] = ComputeVelocityInTime(WRT_Z);
- }
-
-// p_velocity[0] = functionX.DerivativeVar(rtime);
-// p_velocity[1] = functionY.DerivativeVar(rtime);
-// p_velocity[2] = functionZ.DerivativeVar(rtime);
->>>>>>> dev
}
}
diff --git a/isis/src/control/apps/jigsaw/tsts/errors/Makefile b/isis/src/control/apps/jigsaw/tsts/errors/Makefile
index 38427ba0c8106b61004f4d34b0f9682589a150b2..8cde58284f2494256f08f76e4082664dd8c45f25 100644
--- a/isis/src/control/apps/jigsaw/tsts/errors/Makefile
+++ b/isis/src/control/apps/jigsaw/tsts/errors/Makefile
@@ -56,38 +56,21 @@ commands:
true; \
fi;
# TEST F: CNET=[invalid control net file]
-<<<<<<< HEAD
- echo -e "Error Test F:" >> $(OUTPUT)/error.txt;
- if [[ `$(APPNAME) \
- fromlist=$(INPUT)/empty.lis \
- cnet=$(INPUT)/empty.net \
-=======
echo -e "Error Test F:" >> $(OUTPUT)/error_temp.txt;
if [[ `$(APPNAME) \
fromlist=$(INPUT)/empty.lis \
cnet=$(INPUT)/notacnet.net \
->>>>>>> dev
onet=$(output)/out.net \
radius=yes \
spsolve=positions \
point_radius_sigma=500 \
spacecraft_position_sigma=500 \
camera_angles_sigma=2 \
-<<<<<<< HEAD
- 2>> $(OUTPUT)/error.txt \
-=======
2>> $(OUTPUT)/error_temp.txt \
->>>>>>> dev
> /dev/null` ]]; \
then \
true; \
fi;
-<<<<<<< HEAD
-# Remove full paths from the errors file
- sed -i "s/$(INPUT)\///" $(OUTPUT)/error.txt;
- sed -i "s/$(OUTPUT)\///" $(OUTPUT)/error.txt;
-=======
# Remove paths from errors file
$(SED) 's/\(\[\)\/.*\(input\)/\1\2/g' $(OUTPUT)/error_temp.txt > $(OUTPUT)/error.txt;
$(RM) $(OUTPUT)/error_temp.txt;
->>>>>>> dev
diff --git a/isis/src/hayabusa2/apps/hyb2onc2isis/Makefile b/isis/src/hayabusa2/apps/hyb2onc2isis/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..a9d06c45370209af2065e5092f2430ffeea126b7
--- /dev/null
+++ b/isis/src/hayabusa2/apps/hyb2onc2isis/Makefile
@@ -0,0 +1,14 @@
+ifeq ($(ISISROOT), $(BLANK))
+.SILENT:
+error:
+ echo "Please set ISISROOT";
+else
+ include $(ISISROOT)/make/isismake.apps
+endif
+
+# opencv includes path and libs that are not in
+# isismake.os, but we don't want all apps to
+# link against the large opencv libraries
+# so they are added here:
+#
+ALLLIBS += $(OPENCVLIBS)
diff --git a/isis/src/juno/apps/junocam2isis/Makefile b/isis/src/juno/apps/junocam2isis/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..7578f0b21d038db6a5042c095cda9b34b6bb2570
--- /dev/null
+++ b/isis/src/juno/apps/junocam2isis/Makefile
@@ -0,0 +1,7 @@
+ifeq ($(ISISROOT), $(BLANK))
+.SILENT:
+error:
+ echo "Please set ISISROOT";
+else
+ include $(ISISROOT)/make/isismake.apps
+endif
\ No newline at end of file
diff --git a/isis/src/qisis/objs/Directory/RemoveImagesWorkOrder.cpp b/isis/src/qisis/objs/Directory/RemoveImagesWorkOrder.cpp
index af6941d4d797cc347a9058e2a75dbce75ed7686c..28cf82e5c28b6a3d150713ce72fbc7539fdd72f8 100644
--- a/isis/src/qisis/objs/Directory/RemoveImagesWorkOrder.cpp
+++ b/isis/src/qisis/objs/Directory/RemoveImagesWorkOrder.cpp
@@ -37,13 +37,8 @@ namespace Isis {
RemoveImagesWorkOrder::RemoveImagesWorkOrder(Project *project) : WorkOrder(project) {
m_isUndoable = false;
-<<<<<<< HEAD
- QAction::setText(tr("&Delete images from project..."));
- QUndoCommand::setText(tr("Delete images from project"));
-=======
QAction::setText("&Delete images from project...");
->>>>>>> dev
setModifiesDiskState(true);
}
@@ -81,11 +76,7 @@ namespace Isis {
* @description Set up the execution.
*
* @return bool True if parent WordOrder can set up the execution.
-<<<<<<< HEAD
- *
-=======
*
->>>>>>> dev
*/
bool RemoveImagesWorkOrder::setupExecution() {
@@ -134,13 +125,6 @@ namespace Isis {
/**
* @description Remove any selected items from the project directory.
-<<<<<<< HEAD
- *
- * @internal
- * @history 2017-08-08 Marjorie Hahn - Created a conditional to check if the currently
- * selected item to be deleted is actually an image list, so that
- * each image can be removed one by one. Fixes #5074.
-=======
*
* @internal
* @history 2017-08-08 Marjorie Hahn - Created a conditional to check if the currently
@@ -149,19 +133,10 @@ namespace Isis {
* @history 2017-10-04 Cole Neubauer - Moved ImageList to its own loop so images are deleted
* first and we avoid the issue of attempting to delete an image that
* is gone
->>>>>>> dev
*/
void RemoveImagesWorkOrder::execute() {
QList<ProjectItem *> selectedItems = project()->directory()->model()->selectedItems();
-<<<<<<< HEAD
- QList<ImageList *> projectImageLists = project()->images();
-
- foreach (ProjectItem *selectedItem, selectedItems) {
-
- if (selectedItem->isImage()) {
- Image *selectedImage = selectedItem->image();
-=======
QList<ProjectItem *> needToRemoveItems;
@@ -172,30 +147,11 @@ namespace Isis {
Image *selectedImage = selectedItem->image();
project()->directory()->model()->removeItem(selectedItem);
->>>>>>> dev
foreach (ImageList* projectImageList, projectImageLists) {
projectImageList->removeAll(selectedImage);
}
}
else if (selectedItem->isImageList()) {
-<<<<<<< HEAD
- ImageList *selectedImageList = selectedItem->imageList();
- foreach (Image *selectedImage, *selectedImageList) {
- foreach (ImageList* projectImageList, projectImageLists) {
- projectImageList->removeAll(selectedImage);
- }
- }
- project()->removeImages(*selectedImageList);
- }
- else {
- throw IException(IException::User,
- "Item cannot be removed from the project.",
- _FILEINFO_);
- }
- }
-
- project()->directory()->model()->removeItems(selectedItems);
-=======
imageListToProcess.append(selectedItem->imageList());
needToRemoveItems.append(selectedItem);
}
@@ -215,7 +171,6 @@ namespace Isis {
}
project()->directory()->model()->removeItems(needToRemoveItems);
->>>>>>> dev
project()->setClean(false);
}
}
diff --git a/isis/src/qisis/objs/WindowTool/WindowTool.cpp b/isis/src/qisis/objs/WindowTool/WindowTool.cpp
index 43f41e22485d2adea04c7c3b250cf3f6eef34a9d..351737eeefc74014afae0d44af40a4d121e50030 100644
--- a/isis/src/qisis/objs/WindowTool/WindowTool.cpp
+++ b/isis/src/qisis/objs/WindowTool/WindowTool.cpp
@@ -162,19 +162,11 @@ namespace Isis {
else {
sy = mdiHeight/py;
}
-<<<<<<< HEAD
-
- return std::max(sx,sy);
- }
-
-
-=======
return std::max(sx,sy);
}
->>>>>>> dev
/**
* Tiles the cube viewports over the Cube DN View.
*
@@ -185,17 +177,6 @@ namespace Isis {
int vpSize = viewportSize();
QPoint position(0, 0);
-<<<<<<< HEAD
-
- QList<QMdiSubWindow *> windowList = p_mdiArea->subWindowList();
-
- for (int i = windowList.size() - 1; i >= 0; i--) {
- QMdiSubWindow *window = windowList[i];
- QRect rect(0, 0, vpSize, vpSize);
- window->setGeometry(rect);
- window->move(position);
-
-=======
QList<QMdiSubWindow *> windowList = p_mdiArea->subWindowList();
@@ -206,17 +187,12 @@ namespace Isis {
window->setGeometry(rect);
window->move(position);
->>>>>>> dev
position.setX(position.x() + window->width());
if (position.x() + window->width() > p_mdiArea->width()) {
position.setX(0);
position.setY(position.y() + window->height());
}
-<<<<<<< HEAD
- }
-=======
}
->>>>>>> dev
}
diff --git a/isis/src/tgo/apps/tgocassisrdrgen/Makefile b/isis/src/tgo/apps/tgocassisrdrgen/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..7578f0b21d038db6a5042c095cda9b34b6bb2570
--- /dev/null
+++ b/isis/src/tgo/apps/tgocassisrdrgen/Makefile
@@ -0,0 +1,7 @@
+ifeq ($(ISISROOT), $(BLANK))
+.SILENT:
+error:
+ echo "Please set ISISROOT";
+else
+ include $(ISISROOT)/make/isismake.apps
+endif
\ No newline at end of file