Commit 380da8b2 authored by Walterio Montanez's avatar Walterio Montanez

Merge branch 'master' of gitlab.cs.wallawalla.edu:walser/project-3-star-gazing

parents 6de8ae65 2a9fee8e
#include "Functions.h"
#include "Stars.h"
#include <string>
#include <iostream>
#include <vector>
......@@ -679,7 +680,7 @@ vector <pair<double, double>> constellationCoordinates () {
}
void viewWindow (vector <pair<double,double>> constellationCoordinates, vector <pair<double,double>> window) {
void printConstellation (vector <pair<double,double>> constellationCoordinates, vector <pair<double,double>> window) {
int inrangeCount = 0;
int coordinateCount = 0;
......@@ -698,7 +699,7 @@ void viewWindow (vector <pair<double,double>> constellationCoordinates, vector <
cout << "Constellation" << constellationNamer(coordinateCount) << "is fully in view." << endl
<< "Here is an image." << endl;
constellationOutputter(coordinateCount);
} else if (inrangeCount > 4 && inrangeCount > 0) {
} else if (inrangeCount < 4 && inrangeCount > 0) {
cout << "Constellation" << constellationNamer(coordinateCount) << "is partially in view." << endl
<< "Here is an image." << endl;
constellationOutputter(coordinateCount);
......
......@@ -15,23 +15,23 @@ class Stars {
public:
void CanisMajor();
void Eridanius();
void Gemini();
void Orion();
void Tarus();
void Bootes();
void Cancer();
void Leo();
void Virgo();
void Aquila();
void Sagistarius();
void Scorpius();
void Capricornus();
void Pegasus();
void Pisces();
void UrsaMinor();
void UrsaMajor();
void CanisMajor0();
void Eridanius1();
void Gemini2();
void Orion3();
void Tarus4();
void Bootes5();
void Cancer6();
void Leo7();
void Virgo8();
void Aquila9();
void Sagistarius10();
void Scorpius11();
void Capricornus12();
void Pegasus13();
void Pisces14();
void UrsaMinor15();
void UrsaMajor16();
private:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment