Skip to content
Snippets Groups Projects
Commit 9194159c authored by Ken Edmundson's avatar Ken Edmundson
Browse files

fixed merge conflicts

parent 9525c6d9
Branches
No related tags found
No related merge requests found
Showing
with 43 additions and 242 deletions
......@@ -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
......@@ -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;
......
......@@ -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
......@@ -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();
......
ifeq ($(ISISROOT), $(BLANK))
.SILENT:
error:
echo "Please set ISISROOT";
else
include $(ISISROOT)/make/isismake.objs
endif
ifeq ($(ISISROOT), $(BLANK))
.SILENT:
error:
echo "Please set ISISROOT";
else
include $(ISISROOT)/make/isismake.objs
endif
\ No newline at end of file
......@@ -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
}
}
......
......@@ -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
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)
ifeq ($(ISISROOT), $(BLANK))
.SILENT:
error:
echo "Please set ISISROOT";
else
include $(ISISROOT)/make/isismake.apps
endif
\ No newline at end of file
......@@ -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);
}
}
......@@ -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
}
......
ifeq ($(ISISROOT), $(BLANK))
.SILENT:
error:
echo "Please set ISISROOT";
else
include $(ISISROOT)/make/isismake.apps
endif
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment